Fix for issue #355: handle naming collisions in code select

groovy · Nov 1, 2017 · 366827e · 366827e
1 parent 4b641c8
commit 366827e
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 9 deletions.
diff --git a/...ovy.core.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/InferencingTests.java b/...ovy.core.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/InferencingTests.java
@@ -31,8 +31,13 @@
 
 public final class InferencingTests extends InferencingTestSuite {
 
-    private void assertNoUnknowns(String contents) {
-        GroovyCompilationUnit unit = createUnit("Search", contents);
+    private void assertExprType(String source, String target, String type) {
+        final int offset = source.lastIndexOf(target);
+        assertType(source, offset, offset + target.length(), type);
+    }
+
+    private void assertNoUnknowns(String source) {
+        GroovyCompilationUnit unit = createUnit("Search", source);
 
         TypeInferencingVisitorWithRequestor visitor = factory.createVisitor(unit);
         visitor.DEBUG = true;
@@ -2844,16 +2849,24 @@ public void testFieldAndPropertyWithSameName() {
             "  private Wrapper<String> foo = new Wrapper<>(\"foo\");\n" +
             "  public String getFoo() { return foo.getWrapped(); }\n" +
             "}");
+
         String contents =
             "class GroovyTest {\n" +
             "  static void main(String[] args) {\n" +
             "    def b = new MyBean()\n" +
             "    println b.foo.toUpperCase()\n" +
             "  }\n" +
             "}";
+        assertExprType(contents, "foo", "java.lang.String");
+    }
 
-        int start = contents.lastIndexOf("foo");
-        int end = start + "foo".length();
-        assertType(contents, start, end, "java.lang.String");
+    @Test // https://github.com/groovy/groovy-eclipse/issues/355
+    public void testLocalTypeAndDefaultImportCollision() {
+        createJavaUnit("domain", "Calendar",
+            "public class Calendar { public static Calendar instance() { return null; } }");
+
+        String contents = "def cal = domain.Calendar.instance()";
+        assertExprType(contents, "instance", "domain.Calendar");
+        assertExprType(contents, "cal", "domain.Calendar");
     }
 }
diff --git a/...ing.test/src/org/codehaus/groovy/eclipse/codebrowsing/tests/CodeSelectMethodsTests.groovy b/...ing.test/src/org/codehaus/groovy/eclipse/codebrowsing/tests/CodeSelectMethodsTests.groovy
@@ -93,7 +93,7 @@ final class CodeSelectMethodsTests extends BrowsingTestSuite {
     void testCodeSelectClosure() {
         String contents = 'def x = { t -> print t }\nx("hello")'
         IJavaElement elem = assertCodeSelect([contents], 'x')
-        assert elem.typeSignature == 'QClosure;'
+        assert elem.typeSignature =~ 'groovy.lang.Closure'
     }
 
     @Test

diff --git a/...g.test/src/org/codehaus/groovy/eclipse/codebrowsing/tests/CodeSelectVariablesTests.groovy b/...g.test/src/org/codehaus/groovy/eclipse/codebrowsing/tests/CodeSelectVariablesTests.groovy
@@ -41,6 +41,14 @@ final class CodeSelectVariablesTests extends BrowsingTestSuite {
         assertCodeSelect([contents], 'yyy')
     }
 
+    @Test // https://github.com/groovy/groovy-eclipse/issues/355
+    void testSelectLocalVar5() {
+        addJavaSource 'public class Calendar { public static Calendar instance() { return null; } }', 'Calendar', 'domain'
+        String contents = 'def cal = domain.Calendar.instance()'
+        def elem = assertCodeSelect([contents], 'cal')
+        assert elem.typeSignature =~ 'domain.Calendar'
+    }
+
     @Test // GRECLIPSE-1330
     void testSelectLocalVarInGString1() {
         String contents = 'def i\n"$i"'

diff --git a/...ebrowsing/src/org/codehaus/groovy/eclipse/codebrowsing/requestor/CodeSelectRequestor.java b/...ebrowsing/src/org/codehaus/groovy/eclipse/codebrowsing/requestor/CodeSelectRequestor.java
@@ -272,16 +272,15 @@ private void handleMatch(TypeLookupResult result, IJavaElement enclosingElement)
     }
 
     private LocalVariable createLocalVariable(TypeLookupResult result, IJavaElement enclosingElement, Variable var) {
-        ClassNode type = result.type != null ? result.type : var.getType();
-
         int start;
         if (var instanceof Parameter) {
             start = ((Parameter) var).getNameStart();
         } else {
             start = ((VariableExpression) var).getStart();
         }
         int until = start + var.getName().length() - 1;
-        String signature = GroovyUtils.getTypeSignature(type, false, false);
+        ClassNode type = result.type != null ? result.type : var.getType();
+        String signature = GroovyUtils.getTypeSignature(type, /*fully-qualified:*/ true, false);
         return new LocalVariable((JavaElement) enclosingElement, var.getName(), start, until, start, until, signature, null, 0, false);
     }