GROOVY-8499

Author: eric-milles

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

@@ -2821,6 +2821,28 @@ public void testCompileStatic8487() {
         }
     }
 
+    @Test
+    public void testCompileStatic8499() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.CompileStatic\n" +
+            "void test() {\n" +
+            "  [].stream().map{item,xxxx ->}\n" +
+            "}\n" +
+            "test()\n",
+        };
+        //@formatter:on
+
+        runNegativeTest(sources,
+            "----------\n" +
+            "1. ERROR in Main.groovy (at line 3)\n" +
+            "\t[].stream().map{item,xxxx ->}\n" +
+            "\t               ^^^^^^^^^^^^^^\n" +
+            "Groovy:Incorrect number of parameters. Expected 1 but found 2\n" +
+            "----------\n");
+    }
+
     @Test
     public void testCompileStatic8509() {
         //@formatter:off

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

@@ -3432,7 +3432,7 @@ protected void inferClosureParameterTypes(final ClassNode receiver, final Expres
                     doInferClosureParameterTypes(receiver, arguments, expression, selectedMethod, hintClass, resolverClass, options);
                 }
             }
-        /* GRECLIPSE edit -- GROOVY-8917, GROOVY-9347, GROOVY-10047, GROOVY-10049
+        /* GRECLIPSE edit -- GROOVY-8499, GROOVY-8917, GROOVY-9347, GROOVY-10047, GROOVY-10049
         } else if (isSAMType(param.getOriginType())) {
             // SAM coercion
             inferSAMType(param, receiver, selectedMethod, InvocationWriter.makeArgumentList(arguments), expression);
@@ -3506,6 +3506,9 @@ protected void inferClosureParameterTypes(final ClassNode receiver, final Expres
                     }
                 }
                 expression.putNodeMetaData(StaticTypesMarker.CLOSURE_ARGUMENTS, paramTypes);
+                if (paramTypes.length != samParamTypes.length) {
+                    addError("Incorrect number of parameters. Expected " + samParamTypes.length + " but found " + paramTypes.length, expression);
+                }
             }
         }
         // GRECLIPSE end

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

@@ -3332,6 +3332,11 @@ protected void inferClosureParameterTypes(final ClassNode receiver, final Expres
                     paramTypes = Arrays.copyOf(samParamTypes, n);
                 }
                 expression.putNodeMetaData(CLOSURE_ARGUMENTS, paramTypes);
+                // GRECLIPSE add -- GROOVY-8499
+                if (paramTypes.length != samParamTypes.length) {
+                    addError("Incorrect number of parameters. Expected " + samParamTypes.length + " but found " + paramTypes.length, expression);
+                }
+                // GRECLIPSE end
             }
         }
     }

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

@@ -3007,6 +3007,11 @@ protected void inferClosureParameterTypes(final ClassNode receiver, final Expres
                     }
                 }
                 expression.putNodeMetaData(CLOSURE_ARGUMENTS, paramTypes);
+                // GRECLIPSE add -- GROOVY-8499
+                if (paramTypes.length != samParamTypes.length) {
+                    addError("Incorrect number of parameters. Expected " + samParamTypes.length + " but found " + paramTypes.length, expression);
+                }
+                // GRECLIPSE end
             }
         }
     }