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 2021/03/08 16:28:45 UTC
[groovy] branch GROOVY-9970 created (now e5dd8f1)
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a change to branch GROOVY-9970
in repository https://gitbox.apache.org/repos/asf/groovy.git.
at e5dd8f1 GROOVY-9970: resolve return type generics from arguments then enclosing
This branch includes the following new commits:
new e5dd8f1 GROOVY-9970: resolve return type generics from arguments then enclosing
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[groovy] 01/01: GROOVY-9970: resolve return type generics from
arguments then enclosing
Posted by em...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch GROOVY-9970
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit e5dd8f1a517e857b41df1b97981da0a561fb8b73
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Mon Mar 8 10:22:55 2021 -0600
GROOVY-9970: resolve return type generics from arguments then enclosing
---
.../transform/stc/StaticTypeCheckingVisitor.java | 8 ++++----
.../groovy/transform/stc/GenericsSTCTest.groovy | 22 ++++++++++++++++++++++
2 files changed, 26 insertions(+), 4 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 252ffb8..10c5586 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -5142,10 +5142,8 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
if (resolvedPlaceholders.isEmpty()) {
return boundUnboundedWildcards(returnType);
}
- Map<GenericsTypeName, GenericsType> placeholdersFromContext = extractGenericsParameterMapOfThis(typeCheckingContext);
- applyGenericsConnections(placeholdersFromContext, resolvedPlaceholders);
- // then resolve receivers from method arguments
+ // resolve type parameters from method arguments
List<Expression> expressions = InvocationWriter.makeArgumentList(arguments).getExpressions();
Parameter[] parameters = method.getParameters();
boolean isVargs = isVargs(parameters);
@@ -5181,11 +5179,13 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
extractGenericsConnectionsForSuperClassAndInterfaces(resolvedPlaceholders, connections);
applyGenericsConnections(connections, resolvedPlaceholders);
- applyGenericsConnections(placeholdersFromContext, resolvedPlaceholders);
}
}
}
+ // GROOVY-9970: resolve from enclosing context after arguments, in case a type parameter name is reused
+ applyGenericsConnections(extractGenericsParameterMapOfThis(typeCheckingContext), resolvedPlaceholders);
+
return applyGenericsContext(resolvedPlaceholders, returnType);
}
diff --git a/src/test/groovy/transform/stc/GenericsSTCTest.groovy b/src/test/groovy/transform/stc/GenericsSTCTest.groovy
index f48b18d..e416b98 100644
--- a/src/test/groovy/transform/stc/GenericsSTCTest.groovy
+++ b/src/test/groovy/transform/stc/GenericsSTCTest.groovy
@@ -339,6 +339,28 @@ class GenericsSTCTest extends StaticTypeCheckingTestCase {
'''
}
+ // GROOVY-9970
+ void testDiamondInferrenceFromConstructor11() {
+ assertScript '''
+ @groovy.transform.TupleConstructor
+ class A<T extends B> {
+ T p
+ }
+ class B {
+ }
+ class C<T extends Number> {
+ void test(T n) {
+ A<B> x = new A<>(new B())
+ def closure = { ->
+ A<B> y = new A<>(new B())
+ }
+ closure.call()
+ }
+ }
+ new C<Long>().test(42L)
+ '''
+ }
+
void testLinkedListWithListArgument() {
assertScript '''
List<String> list = new LinkedList<String>(['1','2','3'])