GROOVY-8433

groovy · Jan 23, 2022 · 183554e · 183554e
1 parent e30b62e
commit 183554e
Show file tree

Hide file tree

Showing 5 changed files with 372 additions and 15 deletions.
diff --git a/...groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/CategoryTests.java b/...groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/CategoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2019 the original author or authors.
+ * Copyright 2009-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ public final class CategoryTests extends GroovyCompilerTestSuite {
     public void testCategory0() {
         //@formatter:off
         String[] sources = {
-            "Demo.groovy",
+            "Main.groovy",
             "use(NumberCategory) {\n" +
             "  def dist = 300.meters\n" +
             "  \n" +
@@ -58,7 +58,7 @@ public void testCategory0() {
     public void testCategory1() {
         //@formatter:off
         String[] sources = {
-            "Demo.groovy",
+            "Main.groovy",
             "use(NumberCategory) {\n" +
             "  def dist = 300.meters\n" +
             "  \n" +
@@ -89,7 +89,7 @@ public void testCategory1() {
     public void testCategory2() {
         //@formatter:off
         String[] sources = {
-            "Foo.groovy",
+            "Main.groovy",
             "assert new Plane().fly() ==\n" +
             "       \"I'm the Concorde and I fly!\"\n" +
             "assert new Submarine().dive() ==\n" +
@@ -139,11 +139,35 @@ public void testCategory2() {
         runConformTest(sources, "I'm the James Bond's vehicle and I dive!");
     }
 
+    @Test
+    public void testCategory8433() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "use(NumberCategory) {\n" +
+            "  print 1.something()\n" +
+            "}\n",
+
+            "NumberCategory.groovy",
+            "@Category(Number) class NumberCategory {\n" +
+            "  def something() {\n" +
+            "    String variable = 'works'\n" +
+            "    new Object() {\n" + // cast exception due to implicit first param "this"
+            "      String toString() { variable }\n" +
+            "    }\n" +
+            "  }\n" +
+            "}\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "works");
+    }
+
     @Test // not a great test, needs work
     public void testCategory_STS3822() {
         //@formatter:off
         String[] sources = {
-            "bad.groovy",
+            "Bad.groovy",
             "@Category(C.class) \n" +
             "@ScriptMixin(C.class)\n" +
             "class Bad {\n" +
@@ -156,37 +180,37 @@ public void testCategory_STS3822() {
 
         runNegativeTest(sources,
             "----------\n" +
-            "1. ERROR in bad.groovy (at line 1)\n" +
+            "1. ERROR in Bad.groovy (at line 1)\n" +
             "\t@Category(C.class) \n" +
             "\t^^^^^^^^^^^^^^^^^^\n" +
             "Groovy:@groovy.lang.Category must define \'value\' which is the class to apply this category to\n" +
             "----------\n" +
-            "2. ERROR in bad.groovy (at line 1)\n" +
+            "2. ERROR in Bad.groovy (at line 1)\n" +
             "\t@Category(C.class) \n" +
             "\t          ^\n" +
             "Groovy:unable to find class \'C.class\' for annotation attribute constant\n" +
             "----------\n" +
-            "3. ERROR in bad.groovy (at line 1)\n" +
+            "3. ERROR in Bad.groovy (at line 1)\n" +
             "\t@Category(C.class) \n" +
             "\t          ^^^^^^^\n" +
             "Groovy:Only classes and closures can be used for attribute \'value\' in @groovy.lang.Category\n" +
             "----------\n" +
-            "4. ERROR in bad.groovy (at line 2)\n" +
+            "4. ERROR in Bad.groovy (at line 2)\n" +
             "\t@ScriptMixin(C.class)\n" +
             "\t^^^^^^^^^^^^\n" +
             "Groovy:class ScriptMixin is not an annotation in @ScriptMixin\n" +
             "----------\n" +
-            "5. ERROR in bad.groovy (at line 2)\n" +
+            "5. ERROR in Bad.groovy (at line 2)\n" +
             "\t@ScriptMixin(C.class)\n" +
             "\t ^^^^^^^^^^^\n" +
             "Groovy:unable to resolve class ScriptMixin for annotation\n" +
             "----------\n" +
-            "6. ERROR in bad.groovy (at line 2)\n" +
+            "6. ERROR in Bad.groovy (at line 2)\n" +
             "\t@ScriptMixin(C.class)\n" +
             "\t             ^\n" +
             "Groovy:unable to find class \'C.class\' for annotation attribute constant\n" +
             "----------\n" +
-            "7. ERROR in bad.groovy (at line 4)\n" +
+            "7. ERROR in Bad.groovy (at line 4)\n" +
             "\t@Override\n" +
             "\t^^^^^^^^^\n" +
             "Groovy:Method \'toString\' from class \'Bad\' does not override method from its superclass or interfaces but is annotated with @Override.\n" +

diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/classgen/InnerClassVisitor.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/classgen/InnerClassVisitor.java
@@ -220,7 +220,7 @@ public void visitConstructorCallExpression(ConstructorCallExpression call) {
         innerClass.addConstructor(ACC_SYNTHETIC, parameters.toArray(Parameter.EMPTY_ARRAY), ClassNode.EMPTY_ARRAY, block);
     }
 
-    private boolean isStatic(InnerClassNode innerClass, VariableScope scope, final ConstructorCallExpression call) {
+    private boolean isStatic(final ClassNode innerClass, final VariableScope scope, final ConstructorCallExpression call) {
         boolean isStatic = innerClass.isStaticClass();
         if (!isStatic) {
             if (currentMethod != null) {
@@ -255,6 +255,10 @@ public void visitConstructorCallExpression(ConstructorCallExpression cce) {
                 isStatic = currentField.isStatic();
             }
         }
+        // GRECLIPSE add -- GROOVY-8433: Category transform applies static
+        isStatic = isStatic || innerClass.getOuterClass().getAnnotations().stream()
+            .anyMatch(a -> a.getClassNode().getName().equals("groovy.lang.Category"));
+        // GRECLIPSE end
         return isStatic;
     }
 

diff --git a/base/org.codehaus.groovy30/src/org/codehaus/groovy/classgen/InnerClassVisitor.java b/base/org.codehaus.groovy30/src/org/codehaus/groovy/classgen/InnerClassVisitor.java
@@ -225,7 +225,7 @@ public void visitConstructorCallExpression(ConstructorCallExpression call) {
         innerClass.addConstructor(ACC_SYNTHETIC, parameters.toArray(Parameter.EMPTY_ARRAY), ClassNode.EMPTY_ARRAY, block);
     }
 
-    private boolean isStatic(InnerClassNode innerClass, VariableScope scope, ConstructorCallExpression call) {
+    private boolean isStatic(final ClassNode innerClass, final VariableScope scope, final ConstructorCallExpression call) {
         boolean isStatic = innerClass.isStaticClass();
         if (!isStatic) {
             if (currentMethod != null) {
@@ -253,6 +253,10 @@ public void visitConstructorCallExpression(ConstructorCallExpression cce) {
                 isStatic = currentField.isStatic();
             }
         }
+        // GRECLIPSE add -- GROOVY-8433: Category transform applies static
+        isStatic = isStatic || innerClass.getOuterClass().getAnnotations().stream()
+            .anyMatch(a -> a.getClassNode().getName().equals("groovy.lang.Category"));
+        // GRECLIPSE end
         return isStatic;
     }
 

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|VariableScope)Visitor.java" include-pattern="false" />
+        <file-match-pattern match-pattern="groovy/classgen/(Annotation|Enum|InnerClass|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" />