GROOVY-9903

eric-milles · eric-milles · commit 9c2f0264e53e · 2021-01-20T15:26:25.000-06:00
diff --git a/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java b/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2020 the original author or authors.
+ * Copyright 2009-2021 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.
@@ -632,4 +632,29 @@ public void testTypeChecked9873() {
 
         runConformTest(sources, "123", options);
     }
+
+    @Test
+    public void testTypeChecked9903() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "def m(@DelegatesTo(strategy=Closure.TO_SELF) Closure<Object> c) {\n" +
+            "}\n" +
+            "@groovy.transform.TypeChecked\n" +
+            "def x() {\n" +
+            "  m {" +
+            "  }\n" +
+            "}\n",
+        };
+        //@formatter:on
+
+        runNegativeTest(sources,
+            "----------\n" +
+            "1. ERROR in Main.groovy (at line 1)\n" +
+            "\tdef m(@DelegatesTo(strategy=Closure.TO_SELF) Closure<Object> c) {\n" +
+            "\t      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" +
+            "Groovy:Not enough arguments found for a @DelegatesTo method call. Please check " +
+            "that you either use an explicit class or @DelegatesTo.Target with a correct id\n" +
+            "----------\n");
+    }
 }
diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -3451,7 +3451,7 @@ private void checkClosureWithDelegatesTo(final ClassNode receiver,
                         }
                     }
                     if (expression.getNodeMetaData(StaticTypesMarker.DELEGATION_METADATA) == null) {
-                        addError("Not enough arguments found for a @DelegatesTo method call. Please check that you either use an explicit class or @DelegatesTo.Target with a correct id", arguments);
+                        addError("Not enough arguments found for a @DelegatesTo method call. Please check that you either use an explicit class or @DelegatesTo.Target with a correct id", annotation);
                     }
                 }
             }
diff --git a/base/org.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/base/org.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -3249,7 +3249,7 @@ private void checkClosureWithDelegatesTo(final ClassNode receiver, final MethodN
                         }
                     }
                     if (expression.getNodeMetaData(DELEGATION_METADATA) == null) {
-                        addError("Not enough arguments found for a @DelegatesTo method call. Please check that you either use an explicit class or @DelegatesTo.Target with a correct id", arguments);
+                        addError("Not enough arguments found for a @DelegatesTo method call. Please check that you either use an explicit class or @DelegatesTo.Target with a correct id", annotation);
                     }
                 }
             }
diff --git a/base/org.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/base/org.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -3234,7 +3234,7 @@ private void checkClosureWithDelegatesTo(final ClassNode receiver, final MethodN
                         }
                     }
                     if (expression.getNodeMetaData(DELEGATION_METADATA) == null) {
-                        addError("Not enough arguments found for a @DelegatesTo method call. Please check that you either use an explicit class or @DelegatesTo.Target with a correct id", arguments);
+                        addError("Not enough arguments found for a @DelegatesTo method call. Please check that you either use an explicit class or @DelegatesTo.Target with a correct id", annotation);
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -3451,7 +3451,7 @@ private void checkClosureWithDelegatesTo(final ClassNode receiver,`
`3451`	`3451`	`}`
`3452`	`3452`	`}`
`3453`	`3453`	`if (expression.getNodeMetaData(StaticTypesMarker.DELEGATION_METADATA) == null) {`
`3454`		`- addError("Not enough arguments found for a @DelegatesTo method call. Please check that you either use an explicit class or @DelegatesTo.Target with a correct id", arguments);`
	`3454`	`+ addError("Not enough arguments found for a @DelegatesTo method call. Please check that you either use an explicit class or @DelegatesTo.Target with a correct id", annotation);`
`3455`	`3455`	`}`
`3456`	`3456`	`}`
`3457`	`3457`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3249,7 +3249,7 @@ private void checkClosureWithDelegatesTo(final ClassNode receiver, final MethodN`
`3249`	`3249`	`}`
`3250`	`3250`	`}`
`3251`	`3251`	`if (expression.getNodeMetaData(DELEGATION_METADATA) == null) {`
`3252`		`- addError("Not enough arguments found for a @DelegatesTo method call. Please check that you either use an explicit class or @DelegatesTo.Target with a correct id", arguments);`
	`3252`	`+ addError("Not enough arguments found for a @DelegatesTo method call. Please check that you either use an explicit class or @DelegatesTo.Target with a correct id", annotation);`
`3253`	`3253`	`}`
`3254`	`3254`	`}`
`3255`	`3255`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3234,7 +3234,7 @@ private void checkClosureWithDelegatesTo(final ClassNode receiver, final MethodN`
`3234`	`3234`	`}`
`3235`	`3235`	`}`
`3236`	`3236`	`if (expression.getNodeMetaData(DELEGATION_METADATA) == null) {`
`3237`		`- addError("Not enough arguments found for a @DelegatesTo method call. Please check that you either use an explicit class or @DelegatesTo.Target with a correct id", arguments);`
	`3237`	`+ addError("Not enough arguments found for a @DelegatesTo method call. Please check that you either use an explicit class or @DelegatesTo.Target with a correct id", annotation);`
`3238`	`3238`	`}`
`3239`	`3239`	`}`
`3240`	`3240`	`}`