GROOVY-10269

eric-milles · eric-milles · commit 267a78222091 · 2021-10-12T16:00:01.000-05:00
diff --git a/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java b/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java
@@ -3985,6 +3985,37 @@ public void testTypeChecked10254() {
         runConformTest(sources, "42");
     }
 
+    @Test
+    public void testTypeChecked10269() {
+        assumeTrue(isParrotParser());
+
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "import java.util.function.Consumer\n" +
+            "void foo(Integer y) {\n" +
+            "}\n" +
+            "void bar(Consumer<Integer> x) {\n" +
+            "}\n" +
+            "@groovy.transform.TypeChecked\n" +
+            "void test() {\n" +
+            "  def baz = { Consumer<Integer> x -> }\n" +
+            "  bar(this::foo)\n" +
+            "  baz(this::foo)\n" +
+            "}\n" +
+            "test()\n",
+        };
+        //@formatter:on
+
+        runNegativeTest(sources,
+            "----------\n" +
+            "1. ERROR in Main.groovy (at line 10)\n" +
+            "\tbaz(this::foo)\n" +
+            "\t    ^^^^^^^^^\n" +
+            "Groovy:The argument is a method reference, but the parameter type is not a functional interface\n" +
+            "----------\n");
+    }
+
     @Test
     public void testTypeChecked10280() {
         //@formatter:off
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
@@ -4060,7 +4060,9 @@ private void inferMethodReferenceType(final ClassNode receiver, final ArgumentLi
                 methodReferenceParamIndexList.add(i);
             }
         }
-
+        // GRECLIPSE add -- GROOVY-10269
+        if (methodReferenceParamIndexList.isEmpty()) return;
+        // GRECLIPSE end
         visitMethodCallArguments(receiver, new ArgumentListExpression(newArgumentExpressionList), true, selectedMethod);
 
         for (Integer methodReferenceParamIndex : methodReferenceParamIndexList) {
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
@@ -3818,7 +3818,9 @@ private void inferMethodReferenceType(final ClassNode receiver, final ArgumentLi
                 methodReferenceParamIndexList.add(i);
             }
         }
-
+        // GRECLIPSE add -- GROOVY-10269
+        if (methodReferenceParamIndexList.isEmpty()) return;
+        // GRECLIPSE end
         visitMethodCallArguments(receiver, args(newArgumentExpressionList), true, selectedMethod);
 
         for (int index : methodReferenceParamIndexList) {

Original file line number	Diff line number	Diff line change
`@@ -4060,7 +4060,9 @@ private void inferMethodReferenceType(final ClassNode receiver, final ArgumentLi`
`4060`	`4060`	`methodReferenceParamIndexList.add(i);`
`4061`	`4061`	`}`
`4062`	`4062`	`}`
`4063`		`-`
	`4063`	`+ // GRECLIPSE add -- GROOVY-10269`
	`4064`	`+ if (methodReferenceParamIndexList.isEmpty()) return;`
	`4065`	`+ // GRECLIPSE end`
`4064`	`4066`	`visitMethodCallArguments(receiver, new ArgumentListExpression(newArgumentExpressionList), true, selectedMethod);`
`4065`	`4067`
`4066`	`4068`	`for (Integer methodReferenceParamIndex : methodReferenceParamIndexList) {`
Original file line number	Diff line number	Diff line change
`@@ -3818,7 +3818,9 @@ private void inferMethodReferenceType(final ClassNode receiver, final ArgumentLi`
`3818`	`3818`	`methodReferenceParamIndexList.add(i);`
`3819`	`3819`	`}`
`3820`	`3820`	`}`
`3821`		`-`
	`3821`	`+ // GRECLIPSE add -- GROOVY-10269`
	`3822`	`+ if (methodReferenceParamIndexList.isEmpty()) return;`
	`3823`	`+ // GRECLIPSE end`
`3822`	`3824`	`visitMethodCallArguments(receiver, args(newArgumentExpressionList), true, selectedMethod);`
`3823`	`3825`
`3824`	`3826`	`for (int index : methodReferenceParamIndexList) {`