Fix for #1268: GROOVY-10141: store anon. inner class before block visit

groovy · Jun 16, 2021 · 5423f47 · 5423f47
1 parent 5640837
commit 5423f47
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 9 deletions.
diff --git a/...oovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/InnerClassTests.java b/...oovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/InnerClassTests.java
@@ -1568,6 +1568,33 @@ public void testAnonymousInnerClass31() {
         runConformTest(sources, "1:B;2:B;3:B;");
     }
 
+    @Test // https://github.com/groovy/groovy-eclipse/issues/1268
+    public void testAnonymousInnerClass32() {
+        //@formatter:off
+        String[] sources = {
+            "Script.groovy",
+            "class C {\n" +
+            "  class D {\n" +
+            "  }\n" +
+            "  def obj = new Object() {\n" +
+            "    @Override\n" +
+            "    String toString() {\n" +
+            "      return new Object() {\n" +
+            "        @Override\n" +
+            "        String toString() {\n" +
+            "          new D()\n" +
+            "        }\n" +
+            "      }\n" +
+            "    }\n" +
+            "  }\n" +
+            "}\n" +
+            "new C().obj\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources);
+    }
+
     @Test
     public void testMixedModeInnerProperties_GRE597() {
         //@formatter:off

diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java
@@ -802,13 +802,17 @@ protected Expression anonymousInnerClassDef(AST node) {
         ((InnerClassNode) classNode).setAnonymous(true);
         classNode.setEnclosingMethod(methodNode);
         configureAST(classNode, node);
-
+        // GRECLIPSE add
+        output.addClass(classNode);
+        // GRECLIPSE end
         assertNodeType(OBJBLOCK, node);
         objectBlock(node);
 
         AnonymousInnerClassCarrier ret = new AnonymousInnerClassCarrier();
         ret.innerClass = classNode;
+        /* GRECLIPSE edit
         output.addClass(classNode);
+        */
         classNode = oldNode;
         return ret;
     }

diff --git a/base/org.codehaus.groovy30/src/org/apache/groovy/parser/antlr4/AstBuilder.java b/base/org.codehaus.groovy30/src/org/apache/groovy/parser/antlr4/AstBuilder.java
@@ -3677,14 +3677,16 @@ public InnerClassNode visitAnonymousInnerClassDeclaration(AnonymousInnerClassDec
         anonymousInnerClass.setAnonymous(true);
         anonymousInnerClass.putNodeMetaData(CLASS_NAME, innerClassName);
         configureAST(anonymousInnerClass, ctx);
-
+        // GRECLIPSE add
+        classNodeList.add(anonymousInnerClass);
+        // GRECLIPSE end
         classNodeStack.push(anonymousInnerClass);
         ctx.classBody().putNodeMetaData(CLASS_DECLARATION_CLASS_NODE, anonymousInnerClass);
         this.visitClassBody(ctx.classBody());
         classNodeStack.pop();
-
+        /* GRECLIPSE edit
         classNodeList.add(anonymousInnerClass);
-
+        */
         return anonymousInnerClass;
     }
 

diff --git a/base/org.codehaus.groovy30/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java b/base/org.codehaus.groovy30/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java
@@ -889,13 +889,17 @@ protected Expression anonymousInnerClassDef(AST node) {
         ((InnerClassNode) classNode).setAnonymous(true);
         classNode.setEnclosingMethod(methodNode);
         configureAST(classNode, node);
-
+        // GRECLIPSE add
+        output.addClass(classNode);
+        // GRECLIPSE end
         assertNodeType(OBJBLOCK, node);
         objectBlock(node);
 
         AnonymousInnerClassCarrier ret = new AnonymousInnerClassCarrier();
         ret.innerClass = classNode;
+        /* GRECLIPSE edit
         output.addClass(classNode);
+        */
         classNode = oldNode;
         return ret;
     }

diff --git a/base/org.codehaus.groovy40/src/org/apache/groovy/parser/antlr4/AstBuilder.java b/base/org.codehaus.groovy40/src/org/apache/groovy/parser/antlr4/AstBuilder.java
@@ -3533,14 +3533,16 @@ public InnerClassNode visitAnonymousInnerClassDeclaration(final AnonymousInnerCl
         anonymousInnerClass.setAnonymous(true);
         anonymousInnerClass.putNodeMetaData(CLASS_NAME, innerClassName);
         configureAST(anonymousInnerClass, ctx);
-
+        // GRECLIPSE add
+        classNodeList.add(anonymousInnerClass);
+        // GRECLIPSE end
         classNodeStack.push(anonymousInnerClass);
         ctx.classBody().putNodeMetaData(CLASS_DECLARATION_CLASS_NODE, anonymousInnerClass);
         this.visitClassBody(ctx.classBody());
         classNodeStack.pop();
-
+        /* GRECLIPSE edit
         classNodeList.add(anonymousInnerClass);
-
+        */
         return anonymousInnerClass;
     }
 

diff --git a/base/org.codehaus.groovy40/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java b/base/org.codehaus.groovy40/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java
@@ -889,13 +889,17 @@ protected Expression anonymousInnerClassDef(AST node) {
         ((InnerClassNode) classNode).setAnonymous(true);
         classNode.setEnclosingMethod(methodNode);
         configureAST(classNode, node);
-
+        // GRECLIPSE add
+        output.addClass(classNode);
+        // GRECLIPSE end
         assertNodeType(OBJBLOCK, node);
         objectBlock(node);
 
         AnonymousInnerClassCarrier ret = new AnonymousInnerClassCarrier();
         ret.innerClass = classNode;
+        /* GRECLIPSE edit
         output.addClass(classNode);
+        */
         classNode = oldNode;
         return ret;
     }