Fix for issue #539: no category methods in static imports

groovy · Mar 19, 2018 · 5ade982 · 5ade982
1 parent 674a8b6
commit 5ade982
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/...re.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/StaticInferencingTests.java b/...re.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/StaticInferencingTests.java
@@ -333,4 +333,12 @@ public void testStaticImport9() throws Exception {
         String contents = "import static p.Other.*\nFOO";
         assertKnown(contents, "p.Other", "p.Other", "p.Other");
     }
+
+    @Test // https://github.com/groovy/groovy-eclipse/issues/539
+    public void testStaticImport10() throws Exception {
+        createUnit("p", "Other", "package p\nclass Other { static void dump(Object o) { } }");
+
+        String contents = "import static p.Other.dump\n";
+        assertKnown(contents, "dump", "p.Other", "java.lang.Void");
+    }
 }
diff --git a/base/org.eclipse.jdt.groovy.core/src/org/eclipse/jdt/groovy/search/CategoryTypeLookup.java b/base/org.eclipse.jdt.groovy.core/src/org/eclipse/jdt/groovy/search/CategoryTypeLookup.java
@@ -96,7 +96,7 @@ public TypeLookupResult lookupType(Expression node, VariableScope scope, ClassNo
     }
 
     protected static boolean isCompatibleConstantExpression(Expression node, VariableScope scope) {
-        if (node instanceof ConstantExpression) {
+        if (node instanceof ConstantExpression && !scope.isTopLevel()) {
             org.codehaus.groovy.ast.ASTNode enclosingNode = scope.getEnclosingNode();
             if (!(enclosingNode instanceof AttributeExpression || enclosingNode instanceof MethodPointerExpression)) {
                 return (VariableScope.STRING_CLASS_NODE.equals(node.getType()) && node.getLength() <= node.getText().length());