You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by em...@apache.org on 2022/01/31 21:08:01 UTC
[groovy] 03/06: GROOVY-9903: incomplete DelegatesTo parameters error links to annotation
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 00b5b0ff85145d130db5fb798f5702721fa60b09
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Wed Jan 20 15:57:26 2021 -0600
GROOVY-9903: incomplete DelegatesTo parameters error links to annotation
Conflicts:
src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
---
.../transform/stc/StaticTypeCheckingVisitor.java | 2 +-
.../groovy/transform/stc/DelegatesToSTCTest.groovy | 29 ++++++++++------------
.../stc/StaticTypeCheckingTestCase.groovy | 7 +++---
3 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index e0cad0c..3cea7e5 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -3221,7 +3221,7 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
}
}
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/src/test/groovy/transform/stc/DelegatesToSTCTest.groovy b/src/test/groovy/transform/stc/DelegatesToSTCTest.groovy
index fdd7e62..4d8f49d 100644
--- a/src/test/groovy/transform/stc/DelegatesToSTCTest.groovy
+++ b/src/test/groovy/transform/stc/DelegatesToSTCTest.groovy
@@ -277,24 +277,21 @@ class DelegatesToSTCTest extends StaticTypeCheckingTestCase {
}
void testShouldFailDelegateToParameterIfNoTargetSpecified() {
- shouldFailWithMessages '''
- class Foo {
- boolean called = false
- def foo() { called = true }
- }
+ shouldFailWithMessages '''\
+ class Foo {
+ boolean called = false
+ def bar() { called = true }
+ }
- def with(Object target, @DelegatesTo Closure arg) {
- arg.delegate = target
- arg()
- }
+ def m(Object o, @DelegatesTo Closure c) {
+ c.delegate = o
+ c.call()
+ }
- def test() {
- def obj = new Foo()
- with(obj) { foo() }
- assert obj.called
- }
- test()
- ''', 'Not enough arguments found for a @DelegatesTo method call', 'Cannot find matching method'
+ def foo = new Foo()
+ m(foo) { -> bar() }
+ assert foo.called
+ ''', 'Not enough arguments found for a @DelegatesTo method call', '@ line 6, column 29', 'Cannot find matching method'
}
void testDelegatesToWithSetter() {
diff --git a/src/test/groovy/transform/stc/StaticTypeCheckingTestCase.groovy b/src/test/groovy/transform/stc/StaticTypeCheckingTestCase.groovy
index cfb9480..34d69f0 100644
--- a/src/test/groovy/transform/stc/StaticTypeCheckingTestCase.groovy
+++ b/src/test/groovy/transform/stc/StaticTypeCheckingTestCase.groovy
@@ -83,14 +83,13 @@ abstract class StaticTypeCheckingTestCase extends GroovyTestCase {
it instanceof SyntaxErrorMessage && it.cause.message.contains(message)
}
}
- if (success && mce.errorCollector.errorCount!=messages.length) {
- throw new AssertionError("Expected error messages were found, but compiler threw additional errors : " + mce.toString())
+ if (success && mce.errorCollector.errorCount > messages.length) {
+ throw new AssertionError("Expected error messages were found, but compiler threw additional errors : $mce")
}
if (!success) {
- throw new AssertionError("Not all expected error messages were found, compiler threw these errors : " + mce.toString())
+ throw new AssertionError("Not all expected error messages were found, compiler threw these errors : $mce")
}
}
if (!success) throw new AssertionError("Test passed but should have failed with messages [$messages]")
}
-
}