GROOVY-10036

eric-milles · eric-milles · commit 51e7349e25d2 · 2021-04-14T16:53:30.000-05:00
diff --git a/base-test/org.eclipse.jdt.groovy.core.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/DGMInferencingTests.java b/base-test/org.eclipse.jdt.groovy.core.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/DGMInferencingTests.java
@@ -171,6 +171,29 @@ public void testDGM11() {
         assertExprType(contents, "index", "java.lang.Integer");
     }
 
+    @Test
+    public void testDGM11a() {
+        //@formatter:off
+        String contents =
+            "def map = ['x'].<String,Object,String>collectEntries { [it, it.size()] }\n";
+        //@formatter:on
+        assertExprType(contents, "it", "java.lang.String");
+        assertExprType(contents, "map", "java.util.Map<java.lang.String,java.lang.Object>");
+    }
+
+    @Test // https://issues.apache.org/jira/browse/GROOVY-10036
+    public void testDGM11b() {
+        //@formatter:off
+        String contents =
+            "@groovy.transform.TypeChecked\n" +
+            "void test() {\n" +
+            "  def map = ['x'].<String,Object,String>collectEntries { [it, it.size()] }\n" +
+            "}\n";
+        //@formatter:on
+        assertExprType(contents, "it", "java.lang.String");
+        assertExprType(contents, "map", "java.util.Map<java.lang.String,java.lang.Object>");
+    }
+
     @Test
     public void testDGM12() {
         //@formatter:off
@@ -469,8 +492,7 @@ public void testDGM42() {
         assertExprType(contents, "it", "java.lang.String");
     }
 
-    @Test @Ignore("ClosureParams states 'List<String>' or 'String[]', but " +
-        "runtime allows for destructuring if number of elements fits into params")
+    @Test @Ignore("ClosureParams states 'List<String>' or 'String[]', but runtime allows for destructuring if number of elements fits into params")
     public void testDGM43() {
         //@formatter:off
         String contents =
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
@@ -5794,7 +5794,7 @@ protected ClassNode inferReturnTypeGenerics(
             } else {
                 argList.addExpression(arguments);
             }
-            return inferReturnTypeGenerics(receiver, dgmMethod, argList);
+            return inferReturnTypeGenerics(receiver, dgmMethod, argList, explicitTypeHints); // GRECLIPSE edit -- GROOVY-10036
         }
         if (!isUsingGenericsOrIsArrayUsingGenerics(returnType)) return returnType;
         if (getGenericsWithoutArray(returnType) == null) return returnType;
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
@@ -5583,7 +5583,7 @@ protected ClassNode inferReturnTypeGenerics(final ClassNode receiver, final Meth
             } else {
                 args.addExpression(arguments);
             }
-            return inferReturnTypeGenerics(receiver, dgm, args);
+            return inferReturnTypeGenerics(receiver, dgm, args, explicitTypeHints); // GRECLIPSE edit -- GROOVY-10036
         }
         Map<GenericsTypeName, GenericsType> resolvedPlaceholders = resolvePlaceHoldersFromDeclaration(receiver, getDeclaringClass(method, arguments), method, method.isStatic());
         resolvePlaceholdersFromExplicitTypeHints(method, explicitTypeHints, resolvedPlaceholders);
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
@@ -5547,7 +5547,7 @@ protected ClassNode inferReturnTypeGenerics(final ClassNode receiver, final Meth
             } else {
                 args.addExpression(arguments);
             }
-            return inferReturnTypeGenerics(receiver, dgm, args);
+            return inferReturnTypeGenerics(receiver, dgm, args, explicitTypeHints); // GRECLIPSE edit -- GROOVY-10036
         }
         Map<GenericsTypeName, GenericsType> resolvedPlaceholders = resolvePlaceHoldersFromDeclaration(receiver, getDeclaringClass(method, arguments), method, method.isStatic());
         resolvePlaceholdersFromExplicitTypeHints(method, explicitTypeHints, resolvedPlaceholders);

Original file line number	Diff line number	Diff line change
`@@ -5794,7 +5794,7 @@ protected ClassNode inferReturnTypeGenerics(`
`5794`	`5794`	`} else {`
`5795`	`5795`	`argList.addExpression(arguments);`
`5796`	`5796`	`}`
`5797`		`- return inferReturnTypeGenerics(receiver, dgmMethod, argList);`
	`5797`	`+ return inferReturnTypeGenerics(receiver, dgmMethod, argList, explicitTypeHints); // GRECLIPSE edit -- GROOVY-10036`
`5798`	`5798`	`}`
`5799`	`5799`	`if (!isUsingGenericsOrIsArrayUsingGenerics(returnType)) return returnType;`
`5800`	`5800`	`if (getGenericsWithoutArray(returnType) == null) return returnType;`
Original file line number	Diff line number	Diff line change
`@@ -5583,7 +5583,7 @@ protected ClassNode inferReturnTypeGenerics(final ClassNode receiver, final Meth`
`5583`	`5583`	`} else {`
`5584`	`5584`	`args.addExpression(arguments);`
`5585`	`5585`	`}`
`5586`		`- return inferReturnTypeGenerics(receiver, dgm, args);`
	`5586`	`+ return inferReturnTypeGenerics(receiver, dgm, args, explicitTypeHints); // GRECLIPSE edit -- GROOVY-10036`
`5587`	`5587`	`}`
`5588`	`5588`	`Map<GenericsTypeName, GenericsType> resolvedPlaceholders = resolvePlaceHoldersFromDeclaration(receiver, getDeclaringClass(method, arguments), method, method.isStatic());`
`5589`	`5589`	`resolvePlaceholdersFromExplicitTypeHints(method, explicitTypeHints, resolvedPlaceholders);`
Original file line number	Diff line number	Diff line change
`@@ -5547,7 +5547,7 @@ protected ClassNode inferReturnTypeGenerics(final ClassNode receiver, final Meth`
`5547`	`5547`	`} else {`
`5548`	`5548`	`args.addExpression(arguments);`
`5549`	`5549`	`}`
`5550`		`- return inferReturnTypeGenerics(receiver, dgm, args);`
	`5550`	`+ return inferReturnTypeGenerics(receiver, dgm, args, explicitTypeHints); // GRECLIPSE edit -- GROOVY-10036`
`5551`	`5551`	`}`
`5552`	`5552`	`Map<GenericsTypeName, GenericsType> resolvedPlaceholders = resolvePlaceHoldersFromDeclaration(receiver, getDeclaringClass(method, arguments), method, method.isStatic());`
`5553`	`5553`	`resolvePlaceholdersFromExplicitTypeHints(method, explicitTypeHints, resolvedPlaceholders);`