stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8189248: Jshell: error with mutually dependent snippets, when one must be replaced

Browse Source 
Ensuring proper imports are generated for mutually dependent snippets if one of them is replaced.

Reviewed-by: rfield
This commit is contained in:
Jan Lahoda 2017-12-07 19:24:27 +01:00
parent 77b4045e0f
commit 9f07305ab6
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jdk.jshell/share/classes/jdk/jshell/Eval.java
View File

@ -834,6 +834,8 @@ class Eval {
if (!toReplace.isEmpty()) { if (!toReplace.isEmpty()) {
replaced.addAll(toReplace); replaced.addAll(toReplace);
replaced.stream().forEach(Unit::markForReplacement); replaced.stream().forEach(Unit::markForReplacement);
//ensure correct classnames are set in the snippets:
replaced.stream().forEach(u -> u.setWrap(ins, legit));
} }
return toReplace.isEmpty() ? Result.SUCESS : Result.FAILURE; return toReplace.isEmpty() ? Result.SUCESS : Result.FAILURE;

23
test/langtools/jdk/jshell/ClassesTest.java
View File

@ -23,7 +23,7 @@
/* /*
* @test * @test
* @bug 8145239 8129559 8080354 * @bug 8145239 8129559 8080354 8189248
* @summary Tests for EvaluationState.classes * @summary Tests for EvaluationState.classes
* @build KullaTesting TestingInputStream ExpectedDiagnostic * @build KullaTesting TestingInputStream ExpectedDiagnostic
* @run testng ClassesTest * @run testng ClassesTest
@ -41,6 +41,7 @@ import org.testng.annotations.DataProvider;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import jdk.jshell.Diag; import jdk.jshell.Diag;
import jdk.jshell.Snippet.Status;
import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toList;
import static jdk.jshell.Snippet.Status.VALID; import static jdk.jshell.Snippet.Status.VALID;
import static jdk.jshell.Snippet.Status.RECOVERABLE_NOT_DEFINED; import static jdk.jshell.Snippet.Status.RECOVERABLE_NOT_DEFINED;
@ -327,4 +328,24 @@ public class ClassesTest extends KullaTesting {
VarSnippet variableKey = varKey(assertEval("a.x;")); VarSnippet variableKey = varKey(assertEval("a.x;"));
assertEquals(variableKey.typeName(), "A.I1"); assertEquals(variableKey.typeName(), "A.I1");
} }
public void testCircular() {
assertEval("import java.util.function.Supplier;");
TypeDeclSnippet aClass =
classKey(assertEval("public class A<T> {\n" +
" private class SomeClass {}\n" +
" public Supplier<T> m() {\n" +
" return new B<>(this);\n" +
" }\n" +
"}",
added(RECOVERABLE_DEFINED)));
assertEval("public class B<T> implements Supplier<T> {\n" +
" public B(A<T> a) {}\n" +
" public T get() {return null;}\n" +
"}",
added(VALID),
ste(aClass, Status.RECOVERABLE_DEFINED, Status.VALID, true, null));
assertEval("new A()");
}
} }