Fix for #690: range expression as supporting node, defer to outer expr

groovy · Aug 21, 2018 · 1c306ad · 1c306ad
1 parent 51cd09e
commit 1c306ad
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 11 deletions.
diff --git a/...pletion.test/src/org/codehaus/groovy/eclipse/codeassist/tests/FieldCompletionTests.groovy b/...pletion.test/src/org/codehaus/groovy/eclipse/codeassist/tests/FieldCompletionTests.groovy
@@ -646,6 +646,17 @@ final class FieldCompletionTests extends CompletionTestSuite {
 
     @Test
     void testRangeExpressionCompletion1() {
+        String contents = '''\
+            (0..1).
+            '''.stripIndent()
+        ICompletionProposal[] proposals = createProposalsAtOffset(contents, getLastIndexOf(contents, '.'))
+        proposalExists(proposals, 'to : Comparable', 1)
+        proposalExists(proposals, 'from : Comparable', 1)
+        proposalExists(proposals, 'reverse : boolean', 1)
+    }
+
+    @Test
+    void testRangeExpressionCompletion2() {
         setJavaPreference(PreferenceConstants.CODEASSIST_AUTOACTIVATION, 'true')
         String contents = '''\
             def range = 0.
@@ -663,7 +674,7 @@ final class FieldCompletionTests extends CompletionTestSuite {
     }
 
     @Test
-    void testRangeExpressionCompletion2() {
+    void testRangeExpressionCompletion3() {
         setJavaPreference(PreferenceConstants.CODEASSIST_AUTOACTIVATION, 'true')
         String contents = '''\
             def other = 0.b

diff --git a/...letion.test/src/org/codehaus/groovy/eclipse/codeassist/tests/MethodCompletionTests.groovy b/...letion.test/src/org/codehaus/groovy/eclipse/codeassist/tests/MethodCompletionTests.groovy
@@ -688,6 +688,21 @@ final class MethodCompletionTests extends CompletionTestSuite {
 
     @Test
     void testRangeExpressionCompletion1() {
+        String contents = '''\
+            (0..1).
+            '''.stripIndent()
+        ICompletionProposal[] proposals = createProposalsAtOffset(contents, getLastIndexOf(contents, '.'))
+        proposalExists(proposals, 'getTo', 1)
+        proposalExists(proposals, 'getFrom', 1)
+        proposalExists(proposals, 'isReverse', 1)
+        proposalExists(proposals, 'containsWithinBounds', 1)
+        // and some proposals from java.util.List as well
+        proposalExists(proposals, 'iterator', 1)
+        proposalExists(proposals, 'listIterator', 2)
+    }
+
+    @Test
+    void testRangeExpressionCompletion2() {
         setJavaPreference(PreferenceConstants.CODEASSIST_AUTOACTIVATION, 'true')
         String contents = '''\
             def range = 0.
@@ -705,7 +720,7 @@ final class MethodCompletionTests extends CompletionTestSuite {
     }
 
     @Test
-    void testRangeExpressionCompletion2() {
+    void testRangeExpressionCompletion3() {
         setJavaPreference(PreferenceConstants.CODEASSIST_AUTOACTIVATION, 'true')
         String contents = '''\
             def other = 0.h
@@ -723,7 +738,7 @@ final class MethodCompletionTests extends CompletionTestSuite {
     }
 
     @Test
-    void testRangeExpressionCompletion3() {
+    void testRangeExpressionCompletion4() {
         setJavaPreference(PreferenceConstants.CODEASSIST_AUTOACTIVATION, 'true')
         String contents = '''\
             def other = 0.

diff --git a/...completion/src/org/codehaus/groovy/eclipse/codeassist/requestor/CompletionNodeFinder.java b/...completion/src/org/codehaus/groovy/eclipse/codeassist/requestor/CompletionNodeFinder.java
@@ -648,17 +648,15 @@ public void visitPropertyExpression(PropertyExpression expression) {
 
     @Override
     public void visitRangeExpression(RangeExpression expression) {
-        if (!check(expression)) {
-            return;
-        }
-
         super.visitRangeExpression(expression);
 
-        if (completionOffset <= expression.getFrom().getEnd() || completionOffset >= expression.getTo().getStart()) {
-            createContext(expression, blockStack.getLast(), ContentAssistLocation.STATEMENT);
+        if (completionOffset > expression.getStart() && completionOffset <= expression.getEnd()) {
+            if (completionOffset <= expression.getFrom().getEnd() || completionOffset >= expression.getTo().getStart()) {
+                createContext(expression, blockStack.getLast(), ContentAssistLocation.STATEMENT);
+            }
+            // no completions within the operator
+            throw new VisitCompleteException();
         }
-        // no completions within the operator
-        throw new VisitCompleteException();
     }
 
     @Override