Fix for #1327: closure parameter type-checking: declared vs inferred

groovy · Dec 30, 2021 · df8dc75 · df8dc75
1 parent 9577649
commit df8dc75
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/...ovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java b/...ovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java
@@ -500,6 +500,28 @@ public void testTypeChecked20() {
         runConformTest(sources);
     }
 
+    @Test // https://github.com/groovy/groovy-eclipse/issues/1327
+    public void testTypeChecked21() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "def <T> T m(java.util.function.Consumer<? super T> c) {\n" +
+            "  c.accept(null)\n" +
+            "  null\n" +
+            "}\n" +
+            "@groovy.transform.TypeChecked\n" +
+            "void test() {\n" +
+            "  this.m { Number n ->\n" +
+            "    n?.toBigInteger()\n" +
+            "  }\n" +
+            "}\n" +
+            "test()\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources);
+    }
+
     @Test
     public void testTypeChecked5450() {
         //@formatter:off

diff --git a/...rg.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/...rg.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -3651,7 +3651,7 @@ protected void inferClosureParameterTypes(final ClassNode receiver, final Expres
                 } else {
                     paramTypes = new ClassNode[n];
                     for (int i = 0; i < n; i += 1) {
-                        paramTypes[i] = i < samParamTypes.length ? samParamTypes[i] : null;
+                        paramTypes[i] = !p[i].isDynamicTyped() ? p[i].getOriginType() : (i < samParamTypes.length ? samParamTypes[i] : null);
                     }
                 }
                 expression.putNodeMetaData(StaticTypesMarker.CLOSURE_ARGUMENTS, paramTypes);

diff --git a/...rg.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/...rg.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -3335,7 +3335,7 @@ protected void inferClosureParameterTypes(final ClassNode receiver, final Expres
                 } else {
                     paramTypes = new ClassNode[n];
                     for (int i = 0; i < n; i += 1) {
-                        paramTypes[i] = i < samParamTypes.length ? samParamTypes[i] : null;
+                        paramTypes[i] = !p[i].isDynamicTyped() ? p[i].getOriginType() : (i < samParamTypes.length ? samParamTypes[i] : null);
                     }
                 }
                 expression.putNodeMetaData(CLOSURE_ARGUMENTS, paramTypes);

diff --git a/...rg.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/...rg.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -2978,6 +2978,7 @@ protected void inferClosureParameterTypes(final ClassNode receiver, final Expres
                 } else { // TODO: error for length mismatch
                     paramTypes = Arrays.copyOf(samParamTypes, n);
                     for (int i = 0; i < Math.min(n, samParamTypes.length); i += 1) {
+if (!p[i].isDynamicTyped() && isObjectType(paramTypes[i])) paramTypes[i] = p[i].getOriginType(); else //#1327
                         checkParamType(p[i], paramTypes[i], i == n-1, expression instanceof LambdaExpression);
                     }
                 }