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

8278039: Code completion not woking after some statements such as "if" or "while"

Browse Source 
Reviewed-by: jlaskey
This commit is contained in:
Jan Lahoda 2022-05-13 11:03:17 +00:00
parent 11fa03f3ee
commit 6a1b09898d
2 changed files with 15 additions and 5 deletions
src/jdk.jshell/share/classes/jdk/jshell
SourceCodeAnalysisImpl.java
test/langtools/jdk/jshell
CompletionSuggestionTest.java

4
src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java

@ -876,11 +876,9 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
long start = sp.getStartPosition(topLevel, tree);
long end = sp.getEndPosition(topLevel, tree);
long prevEnd = deepest[0] != null ? sp.getEndPosition(topLevel, deepest[0].getLeaf()) : -1;
if (start <= wrapEndPos && wrapEndPos <= end &&
(start != end || prevEnd != end || deepest[0] == null ||
deepest[0].getParentPath().getLeaf() != getCurrentPath().getLeaf())) {
(deepest[0] == null || deepest[0].getLeaf() == getCurrentPath().getLeaf())) {
deepest[0] = new TreePath(getCurrentPath(), tree);
return super.scan(tree, p);
}

16
test/langtools/jdk/jshell/CompletionSuggestionTest.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -23,7 +23,7 @@
/*
* @test
* @bug 8131025 8141092 8153761 8145263 8131019 8175886 8176184 8176241 8176110 8177466 8197439 8221759 8234896 8240658
* @bug 8131025 8141092 8153761 8145263 8131019 8175886 8176184 8176241 8176110 8177466 8197439 8221759 8234896 8240658 8278039
* @summary Test Completion and Documentation
* @library /tools/lib
* @modules jdk.compiler/com.sun.tools.javac.api
@ -773,4 +773,16 @@ public class CompletionSuggestionTest extends KullaTesting {
assertEval("import p.*;");
assertCompletion("Broke|", "BrokenA", "BrokenC");
}
public void testStatements() {
assertEval("String s = \"\";");
assertCompletion("if (s.conta|", (Boolean) null, "contains(");
assertCompletion("if (s.ch|", (Boolean) null, "charAt(", "chars()");
assertCompletion("while (s.conta|", (Boolean) null, "contains(");
assertCompletion("do {} while (s.conta|", (Boolean) null, "contains(");
assertCompletion("try (var v = s.conta|", (Boolean) null, "contains(");
assertCompletion("for (var v = s.conta|", (Boolean) null, "contains(");
assertCompletion("for (;;s.conta|", (Boolean) null, "contains(");
assertCompletion("for (var v : s.conta|", (Boolean) null, "contains(");
}
}