GROOVY-7033

groovy · Jan 20, 2022 · 5bd1319 · 5bd1319
1 parent 6b4f5d2
commit 5bd1319
Show file tree

Hide file tree

Showing 5 changed files with 644 additions and 1 deletion.
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
@@ -1754,6 +1754,26 @@ public void testAnonymousInnerClass33() {
         runConformTest(sources);
     }
 
+    @Test // GROOVY-7033
+    public void testAnonymousInnerClass34() {
+        //@formatter:off
+        String[] sources = {
+            "Script.groovy",
+            "new Object() {\n" +
+            "  @Tag(String) def field\n" +
+            "  @Tag(String) def method(@Tag(String) param) {\n" +
+            "    def type = String\n" +
+            "  }\n" +
+            "}\n",
+
+            "Tag.groovy",
+            "@interface Tag { Class<?> value() }\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources);
+    }
+
     @Test
     public void testMixedModeInnerProperties_GRE597() {
         //@formatter:off

diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/classgen/VariableScopeVisitor.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/classgen/VariableScopeVisitor.java
@@ -569,14 +569,23 @@ public void visitConstructorCallExpression(ConstructorCallExpression call) {
         currentScope.setClassScope(innerClass);
         currentScope.setInStaticContext(false);
         for (MethodNode method : innerClass.getMethods()) {
+            // GRECLIPSE add -- GROOVY-7033
+            visitAnnotations(method);
+            // GRECLIPSE end
             Parameter[] parameters = method.getParameters();
+            // GRECLIPSE add -- GROOVY-7033
+            for (Parameter p : parameters) visitAnnotations(p);
+            // GRECLIPSE end
             if (parameters.length == 0)
                 parameters = null; // null means no implicit "it"
             ClosureExpression cl = new ClosureExpression(parameters, method.getCode());
             visitClosureExpression(cl);
         }
 
         for (FieldNode field : innerClass.getFields()) {
+            // GRECLIPSE add -- GROOVY-7033
+            visitAnnotations(field);
+            // GRECLIPSE end
             Expression expression = field.getInitialExpression();
             pushState(field.isStatic());
             if (expression != null) {

diff --git a/base/org.codehaus.groovy30/src/org/codehaus/groovy/classgen/VariableScopeVisitor.java b/base/org.codehaus.groovy30/src/org/codehaus/groovy/classgen/VariableScopeVisitor.java
@@ -504,14 +504,23 @@ public void visitConstructorCallExpression(final ConstructorCallExpression expre
         currentScope.setClassScope(innerClass);
         currentScope.setInStaticContext(false);
         for (MethodNode method : innerClass.getMethods()) {
+            // GRECLIPSE add -- GROOVY-7033
+            visitAnnotations(method);
+            // GRECLIPSE end
             Parameter[] parameters = method.getParameters();
+            // GRECLIPSE add -- GROOVY-7033
+            for (Parameter p : parameters) visitAnnotations(p);
+            // GRECLIPSE end
             if (parameters.length == 0) {
                 parameters = null; // null means no implicit "it"
             }
             visitClosureExpression(new ClosureExpression(parameters, method.getCode()));
         }
 
         for (FieldNode field : innerClass.getFields()) {
+            // GRECLIPSE add -- GROOVY-7033
+            visitAnnotations(field);
+            // GRECLIPSE end
             Expression initExpression = field.getInitialExpression();
             pushState(field.isStatic());
             if (initExpression != null) {

diff --git a/base/org.codehaus.groovy40/.checkstyle b/base/org.codehaus.groovy40/.checkstyle
@@ -35,7 +35,7 @@
         <file-match-pattern match-pattern="groovy/ast/expr/RangeExpression.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/ast/expr/(Static)?MethodCallExpression.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/ast/tools/(Expression|Generics)Utils.java" include-pattern="false" />
-        <file-match-pattern match-pattern="groovy/classgen/(Annotation|Enum)Visitor.java" include-pattern="false" />
+        <file-match-pattern match-pattern="groovy/classgen/(Annotation|Enum|VariableScope)Visitor.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/(Extended)?Verifier.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/asm/WriterController.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/asm/sc/StaticInvocationWriter.java" include-pattern="false" />