GROOVY-9991

Author: eric-milles

base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java

@@ -1314,4 +1314,24 @@ public void testTypeChecked9977() {
 
         runConformTest(sources, "-1");
     }
+
+    @Test
+    public void testTypeChecked9991() {
+        if (Float.parseFloat(System.getProperty("java.specification.version")) > 8)
+            vmArguments = new String[] {"--add-opens", "java.base/java.util.function=ALL-UNNAMED"};
+
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.TypeChecked\n" +
+            "void test() {\n" +
+            "  java.util.function.Predicate<?> p = { false }\n" +
+            "  print p.test(null)\n" +
+            "}\n" +
+            "test()\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "false");
+    }
 }

base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java

@@ -178,6 +178,7 @@
 import static org.codehaus.groovy.ast.ClassHelper.short_TYPE;
 import static org.codehaus.groovy.ast.ClassHelper.void_WRAPPER_TYPE;
 import static org.codehaus.groovy.ast.tools.ClosureUtils.getParametersSafe;
+import static org.codehaus.groovy.ast.tools.ClosureUtils.hasImplicitParameter;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.args;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.binX;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.callX;
@@ -1051,19 +1052,19 @@ private void processFunctionalInterfaceAssignment(final ClassNode lhsType, final
             Map<GenericsType, GenericsType> mappings = GenericsUtils.makeDeclaringAndActualGenericsTypeMapOfExactType(abstractMethod.getDeclaringClass(), lhsType);
             Function<ClassNode, ClassNode> resolver = t -> t.isGenericsPlaceHolder() ? GenericsUtils.findActualTypeByGenericsPlaceholderName(t.getUnresolvedName(), mappings) : t;
 
-            ClassNode[] samParameterTypes = Arrays.stream(abstractMethod.getParameters()).map(Parameter::getType).map(resolver).toArray(ClassNode[]::new);
             Parameter[] closureParameters = getParametersSafe((ClosureExpression) rhsExpression);
-            int n = closureParameters.length;
-            if (n == samParameterTypes.length) {
-                for (int i = 0; i < n; i += 1) {
+            ClassNode[] samParameterTypes = Arrays.stream(abstractMethod.getParameters()).map(Parameter::getType).map(resolver).toArray(ClassNode[]::new);
+            if (closureParameters.length == samParameterTypes.length || (1 == samParameterTypes.length && hasImplicitParameter((ClosureExpression) rhsExpression))) {
+                for (int i = 0; i < closureParameters.length; i += 1) {
                     Parameter parameter = closureParameters[i];
                     if (parameter.isDynamicTyped()) {
                         parameter.setType(samParameterTypes[i]);
                         parameter.setOriginType(samParameterTypes[i]);
                     }
                 }
             } else {
-                addStaticTypeError("Wrong number of parameters: ", rhsExpression);
+                String descriptor = toMethodParametersString(findSAM(lhsType).getName(), samParameterTypes);
+                addStaticTypeError("Wrong number of parameters for method target " + descriptor, rhsExpression);
             }
 
             storeInferredReturnType(rhsExpression, resolver.apply(abstractMethod.getReturnType()));

base/org.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java

@@ -180,6 +180,7 @@
 import static org.codehaus.groovy.ast.ClassHelper.void_WRAPPER_TYPE;
 import static org.codehaus.groovy.ast.tools.ClosureUtils.getParametersSafe;
 import static org.codehaus.groovy.ast.tools.ClosureUtils.getResolveStrategyName;
+import static org.codehaus.groovy.ast.tools.ClosureUtils.hasImplicitParameter;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.args;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.binX;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.block;
@@ -967,9 +968,15 @@ private void inferParameterAndReturnTypesOfClosureOnRHS(final ClassNode lhsType,
         Parameter[] closureParameters = getParametersSafe(rhsExpression);
         ClassNode[] parameterTypes = typeInfo.getV1();
 
+        /* GRECLIPSE edit -- GROOVY-9991
         int n = closureParameters.length;
         if (n == parameterTypes.length) {
             for (int i = 0; i < n; i += 1) {
+        */
+        if (closureParameters.length == parameterTypes.length
+                || (1 == parameterTypes.length && hasImplicitParameter(rhsExpression))) {
+            for (int i = 0; i < closureParameters.length; i += 1) {
+        // GRECLIPSE end
                 Parameter parameter = closureParameters[i];
                 if (parameter.isDynamicTyped()) {
                     parameter.setType(parameterTypes[i]);

base/org.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java

@@ -180,6 +180,7 @@
 import static org.codehaus.groovy.ast.ClassHelper.void_WRAPPER_TYPE;
 import static org.codehaus.groovy.ast.tools.ClosureUtils.getParametersSafe;
 import static org.codehaus.groovy.ast.tools.ClosureUtils.getResolveStrategyName;
+import static org.codehaus.groovy.ast.tools.ClosureUtils.hasImplicitParameter;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.args;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.binX;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.block;
@@ -965,9 +966,15 @@ private void inferParameterAndReturnTypesOfClosureOnRHS(final ClassNode lhsType,
         Parameter[] closureParameters = getParametersSafe(rhsExpression);
         ClassNode[] parameterTypes = typeInfo.getV1();
 
+        /* GRECLIPSE edit -- GROOVY-9991
         int n = closureParameters.length;
         if (n == parameterTypes.length) {
             for (int i = 0; i < n; i += 1) {
+        */
+        if (closureParameters.length == parameterTypes.length
+                || (1 == parameterTypes.length && hasImplicitParameter(rhsExpression))) {
+            for (int i = 0; i < closureParameters.length; i += 1) {
+        // GRECLIPSE end
                 Parameter parameter = closureParameters[i];
                 if (parameter.isDynamicTyped()) {
                     parameter.setType(parameterTypes[i]);