GROOVY-10861, GROOVY-10862

groovy · Dec 5, 2022 · bacc5e5 · bacc5e5
1 parent 13ff11b
commit bacc5e5
Show file tree

Hide file tree

Showing 15 changed files with 2,088 additions and 31 deletions.
diff --git a/base/org.codehaus.groovy25/.checkstyle b/base/org.codehaus.groovy25/.checkstyle
@@ -68,6 +68,7 @@
         <file-match-pattern match-pattern="groovy/transform/trait/TraitASTTransformation.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/transform/trait/TraitComposer.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/transform/trait/Traits.java" include-pattern="false" />
+        <file-match-pattern match-pattern="groovy/vmplugin/v5/Java5.java" include-pattern="false" />
     </fileset>
     <filter name="DerivedFiles" enabled="true" />
 </fileset-config>
diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/ast/MethodNode.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/ast/MethodNode.java
@@ -31,9 +31,9 @@
  * Represents a method declaration.
  */
 public class MethodNode extends AnnotatedNode implements Opcodes {
-
+    /* GRECLIPSE edit
     public static final String SCRIPT_BODY_METHOD_KEY = "org.codehaus.groovy.ast.MethodNode.isScriptBody";
-
+    */
     private String name;
     private int modifiers;
     private boolean syntheticPublic;
@@ -190,11 +190,11 @@ public boolean isScriptBody() {
         /* GRECLIPSE edit
         return getNodeMetaData(SCRIPT_BODY_METHOD_KEY) != null;
         */
-        return getDeclaringClass() != null &&
-            getDeclaringClass().isScript() &&
-            getName().equals("run") &&
-            (parameters == null || parameters.length == 0) &&
-            (returnType != null && returnType.getName().equals("java.lang.Object"));
+        return getName().equals("run")
+            && getDeclaringClass() != null
+            && getDeclaringClass().isScript()
+            && (parameters == null || parameters.length == 0)
+            && (returnType != null && returnType.getName().equals(ClassHelper.OBJECT));
         // GRECLIPSE end
     }
 
@@ -203,7 +203,9 @@ public boolean isScriptBody() {
      * @see ModuleNode#createStatementsClass()
      */
     public void setIsScriptBody() {
+        /* GRECLIPSE edit
         setNodeMetaData(SCRIPT_BODY_METHOD_KEY, Boolean.TRUE);
+        */
     }
 
     public String toString() {

diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/classgen/AnnotationVisitor.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/classgen/AnnotationVisitor.java
@@ -142,7 +142,8 @@ private boolean checkIfMandatoryAnnotationValuesPassed(AnnotationNode node) {
             /* GRECLIPSE edit
             if (mn.getCode() == null && !attributes.containsKey(methodName)) {
             */
-            if (!mn.hasAnnotationDefault() && !attributes.containsKey(methodName)) {
+            if (!mn.hasAnnotationDefault() && !attributes.containsKey(methodName) && !"dataVariableNames".equals(methodName)) {
+            // TODO: https://github.com/spockframework/spock/issues/1549          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
             // GRECLIPSE end
                 addError("No explicit/default value found for annotation attribute '" + methodName + "'", node);
                 ok = false;