Fix for issue #502: resolve static members from closure in static scope

- handles closures within closures
groovy · Mar 1, 2018 · 085cfce · 085cfce
1 parent 5a1aad1
commit 085cfce
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/...e.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/ClosureInferencingTests.java b/...e.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/ClosureInferencingTests.java
@@ -168,6 +168,24 @@ public void testClosure9a() {
         assertExprType(contents, "bar", "java.lang.Long");
     }
 
+    @Test // https://github.com/groovy/groovy-eclipse/issues/502
+    public void testClosure9b() {
+        String contents =
+            "class Foo {\n" +
+            "  static long bar(String arg) {\n" +
+            "  }\n" +
+            "  static void baz() {\n" +
+            "    String a = 'bc'\n" +
+            "    def closure = {\n" +
+            "      [].each {\n" +
+            "        bar(a)\n" + // call static method from closure within closure within static scope
+            "      }\n" +
+            "    }\n" +
+            "  }\n" +
+            "}";
+        assertExprType(contents, "bar", "java.lang.Long");
+    }
+
     @Test
     public void testClosure10() {
         String contents =

diff --git a/base/org.eclipse.jdt.groovy.core/src/org/eclipse/jdt/groovy/search/SimpleTypeLookup.java b/base/org.eclipse.jdt.groovy.core/src/org/eclipse/jdt/groovy/search/SimpleTypeLookup.java
@@ -481,7 +481,7 @@ protected ASTNode findDeclarationForDynamicVariable(VariableExpression var, Clas
                 if (isLhsExpr) scope.getWormhole().put("lhs", var);
                 VariableScope.CallAndType cat = outer.getEnclosingMethodCallExpression();
                 int enclosingResolveStrategy = (cat == null ? 0 : cat.getResolveStrategy(outer.getEnclosingClosure()));
-                candidate = findDeclarationForDynamicVariable(var, outer.getOwner(), outer, enclosingResolveStrategy);
+                candidate = findDeclarationForDynamicVariable(var, getBaseDeclaringType(outer.getOwner()), outer, enclosingResolveStrategy);
             } else {
                 candidate = findDeclaration(var.getName(), owner, isLhsExpr, scope.isOwnerStatic(), scope.isFieldAccessDirect(), callArgs);
             }