GROOVY-10033, GROOVY-10047

eric-milles · eric-milles · commit 6d200a4028af · 2021-04-21T13:23:56.000-05:00
diff --git a/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/StaticCompilationTests.java b/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/StaticCompilationTests.java
@@ -4594,7 +4594,7 @@ public void testCompileStatic9340() {
             "  }\n" +
             "  @groovy.transform.CompileStatic\n" +
             "  void test() {\n" +
-            "    java.util.function.Consumer<Main> consumer = main -> print 'works'\n" + // A transform used a generics containing ClassNode Main for the method ...
+            "    java.util.function.Consumer<Main> consumer = main -> print('works')\n" + // A transform used a generics containing ClassNode Main for the method ...
             "    consumer.accept(this)\n" +
             "  }\n" +
             "}\n",
@@ -6098,4 +6098,47 @@ public void testCompileStatic9973() {
 
         runConformTest(sources, "123456123");
     }
+
+    @Test
+    public void testCompileStatic10033() {
+        assumeTrue(isParrotParser());
+
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.CompileStatic\n" +
+            "class Main {\n" +
+            "  Main(java.util.function.Function<Main,String> f) {" +
+            "    print f.apply(this)\n" +
+            "  }\n" +
+            "  String m() { 'works' }\n" +
+            "  static main(args) {\n" +
+            "    new Main(Main::m)\n" +
+            "  }\n" +
+            "}\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "works");
+    }
+
+    @Test
+    public void testCompileStatic10047() {
+        assumeTrue(isParrotParser());
+
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "import static java.util.stream.Collectors.toMap\n" +
+            "import java.util.function.Function\n" +
+            "@groovy.transform.CompileStatic\n" +
+            "void test() {\n" +
+            "  print(['a','bc','def'].stream().collect(toMap(Function.<String>identity(), String::length)))\n" +
+            "}\n" +
+            "test()\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "[a:1, bc:2, def:3]");
+    }
 }
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
@@ -2887,6 +2887,11 @@ protected void visitMethodCallArguments(final ClassNode receiver, final Argument
         if (nExpressions > 0 && expressions.get(0) instanceof MapExpression && params.length > 0) {
             checkNamedParamsAnnotation(params[0], (MapExpression) expressions.get(0));
         }
+        // GRECLIPSE add -- GROOVY-10033, GROOVY-10047
+        if (visitClosures) {
+            inferMethodReferenceType(receiver, arguments, selectedMethod);
+        }
+        // GRECLIPSE end
     }
 
     private void checkNamedParamsAnnotation(final Parameter param, final MapExpression args) {
@@ -3743,8 +3748,9 @@ && isNumberType(getType(argumentList.getExpression(0)))) {
                     }
                 }
             }
-
+            /* GRECLIPSE edit -- GROOVY-10033, GROOVY-10047
             inferMethodReferenceType(call, receiver, argumentList);
+            */
         } finally {
             typeCheckingContext.popEnclosingMethodCall();
             extension.afterMethodCall(call);
@@ -3762,8 +3768,12 @@ private int getResolveStrategy(final Parameter parameter) {
         return Closure.OWNER_FIRST;
     }
 
+    /* GRECLIPSE edit -- GROOVY-10033, GROOVY-10047
     private void inferMethodReferenceType(final MethodCallExpression call, final ClassNode receiver, final ArgumentListExpression argumentList) {
         if (call == null) return;
+    */
+    private void inferMethodReferenceType(final ClassNode receiver, final ArgumentListExpression argumentList, final MethodNode selectedMethod) {
+    // GRECLISPE end
         if (receiver == null) return;
         if (argumentList == null) return;
 
@@ -3775,7 +3785,9 @@ private void inferMethodReferenceType(final MethodCallExpression call, final Cla
             return;
         }
 
+        /* GRECLIPSE edit -- GROOVY-10033, GROOVY-10047
         MethodNode selectedMethod = call.getNodeMetaData(DIRECT_METHOD_CALL_TARGET);
+        */
         if (selectedMethod == null) return;
 
         Parameter[] parameters = selectedMethod.getParameters();
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
@@ -2801,6 +2801,11 @@ protected void visitMethodCallArguments(final ClassNode receiver, final Argument
         if (nExpressions > 0 && expressions.get(0) instanceof MapExpression && params.length > 0) {
             checkNamedParamsAnnotation(params[0], (MapExpression) expressions.get(0));
         }
+        // GRECLIPSE add -- GROOVY-10033, GROOVY-10047
+        if (visitClosures) {
+            inferMethodReferenceType(receiver, arguments, selectedMethod);
+        }
+        // GRECLIPSE end
     }
 
     private void checkNamedParamsAnnotation(final Parameter param, final MapExpression args) {
@@ -3643,8 +3648,9 @@ && isNumberType(getType(argumentList.getExpression(0)))) {
                     }
                 }
             }
-
+            /* GRECLIPSE edit -- GROOVY-10033, GROOVY-10047
             inferMethodReferenceType(call, receiver, argumentList);
+            */
         } finally {
             typeCheckingContext.popEnclosingMethodCall();
             extension.afterMethodCall(call);
@@ -3662,8 +3668,12 @@ private int getResolveStrategy(final Parameter parameter) {
         return Closure.OWNER_FIRST;
     }
 
+    /* GRECLIPSE edit -- GROOVY-10033, GROOVY-10047
     private void inferMethodReferenceType(final MethodCallExpression call, final ClassNode receiver, final ArgumentListExpression argumentList) {
         if (call == null) return;
+    */
+    private void inferMethodReferenceType(final ClassNode receiver, final ArgumentListExpression argumentList, final MethodNode selectedMethod) {
+    // GRECLISPE end
         if (receiver == null) return;
         if (argumentList == null) return;
 
@@ -3675,7 +3685,9 @@ private void inferMethodReferenceType(final MethodCallExpression call, final Cla
             return;
         }
 
+        /* GRECLIPSE edit -- GROOVY-10033, GROOVY-10047
         MethodNode selectedMethod = call.getNodeMetaData(DIRECT_METHOD_CALL_TARGET);
+        */
         if (selectedMethod == null) return;
 
         Parameter[] parameters = selectedMethod.getParameters();

Original file line number	Diff line number	Diff line change
`@@ -2887,6 +2887,11 @@ protected void visitMethodCallArguments(final ClassNode receiver, final Argument`
`2887`	`2887`	`if (nExpressions > 0 && expressions.get(0) instanceof MapExpression && params.length > 0) {`
`2888`	`2888`	`checkNamedParamsAnnotation(params[0], (MapExpression) expressions.get(0));`
`2889`	`2889`	`}`
	`2890`	`+ // GRECLIPSE add -- GROOVY-10033, GROOVY-10047`
	`2891`	`+ if (visitClosures) {`
	`2892`	`+ inferMethodReferenceType(receiver, arguments, selectedMethod);`
	`2893`	`+ }`
	`2894`	`+ // GRECLIPSE end`
`2890`	`2895`	`}`
`2891`	`2896`
`2892`	`2897`	`private void checkNamedParamsAnnotation(final Parameter param, final MapExpression args) {`
`@@ -3743,8 +3748,9 @@ && isNumberType(getType(argumentList.getExpression(0)))) {`
`3743`	`3748`	`}`
`3744`	`3749`	`}`
`3745`	`3750`	`}`
`3746`		`-`
	`3751`	`+ /* GRECLIPSE edit -- GROOVY-10033, GROOVY-10047`
`3747`	`3752`	`inferMethodReferenceType(call, receiver, argumentList);`
	`3753`	`+ */`
`3748`	`3754`	`} finally {`
`3749`	`3755`	`typeCheckingContext.popEnclosingMethodCall();`
`3750`	`3756`	`extension.afterMethodCall(call);`
`@@ -3762,8 +3768,12 @@ private int getResolveStrategy(final Parameter parameter) {`
`3762`	`3768`	`return Closure.OWNER_FIRST;`
`3763`	`3769`	`}`
`3764`	`3770`
	`3771`	`+ /* GRECLIPSE edit -- GROOVY-10033, GROOVY-10047`
`3765`	`3772`	`private void inferMethodReferenceType(final MethodCallExpression call, final ClassNode receiver, final ArgumentListExpression argumentList) {`
`3766`	`3773`	`if (call == null) return;`
	`3774`	`+ */`
	`3775`	`+ private void inferMethodReferenceType(final ClassNode receiver, final ArgumentListExpression argumentList, final MethodNode selectedMethod) {`
	`3776`	`+ // GRECLISPE end`
`3767`	`3777`	`if (receiver == null) return;`
`3768`	`3778`	`if (argumentList == null) return;`
`3769`	`3779`
`@@ -3775,7 +3785,9 @@ private void inferMethodReferenceType(final MethodCallExpression call, final Cla`
`3775`	`3785`	`return;`
`3776`	`3786`	`}`
`3777`	`3787`
	`3788`	`+ /* GRECLIPSE edit -- GROOVY-10033, GROOVY-10047`
`3778`	`3789`	`MethodNode selectedMethod = call.getNodeMetaData(DIRECT_METHOD_CALL_TARGET);`
	`3790`	`+ */`
`3779`	`3791`	`if (selectedMethod == null) return;`
`3780`	`3792`
`3781`	`3793`	`Parameter[] parameters = selectedMethod.getParameters();`
Original file line number	Diff line number	Diff line change
`@@ -2801,6 +2801,11 @@ protected void visitMethodCallArguments(final ClassNode receiver, final Argument`
`2801`	`2801`	`if (nExpressions > 0 && expressions.get(0) instanceof MapExpression && params.length > 0) {`
`2802`	`2802`	`checkNamedParamsAnnotation(params[0], (MapExpression) expressions.get(0));`
`2803`	`2803`	`}`
	`2804`	`+ // GRECLIPSE add -- GROOVY-10033, GROOVY-10047`
	`2805`	`+ if (visitClosures) {`
	`2806`	`+ inferMethodReferenceType(receiver, arguments, selectedMethod);`
	`2807`	`+ }`
	`2808`	`+ // GRECLIPSE end`
`2804`	`2809`	`}`
`2805`	`2810`
`2806`	`2811`	`private void checkNamedParamsAnnotation(final Parameter param, final MapExpression args) {`
`@@ -3643,8 +3648,9 @@ && isNumberType(getType(argumentList.getExpression(0)))) {`
`3643`	`3648`	`}`
`3644`	`3649`	`}`
`3645`	`3650`	`}`
`3646`		`-`
	`3651`	`+ /* GRECLIPSE edit -- GROOVY-10033, GROOVY-10047`
`3647`	`3652`	`inferMethodReferenceType(call, receiver, argumentList);`
	`3653`	`+ */`
`3648`	`3654`	`} finally {`
`3649`	`3655`	`typeCheckingContext.popEnclosingMethodCall();`
`3650`	`3656`	`extension.afterMethodCall(call);`
`@@ -3662,8 +3668,12 @@ private int getResolveStrategy(final Parameter parameter) {`
`3662`	`3668`	`return Closure.OWNER_FIRST;`
`3663`	`3669`	`}`
`3664`	`3670`
	`3671`	`+ /* GRECLIPSE edit -- GROOVY-10033, GROOVY-10047`
`3665`	`3672`	`private void inferMethodReferenceType(final MethodCallExpression call, final ClassNode receiver, final ArgumentListExpression argumentList) {`
`3666`	`3673`	`if (call == null) return;`
	`3674`	`+ */`
	`3675`	`+ private void inferMethodReferenceType(final ClassNode receiver, final ArgumentListExpression argumentList, final MethodNode selectedMethod) {`
	`3676`	`+ // GRECLISPE end`
`3667`	`3677`	`if (receiver == null) return;`
`3668`	`3678`	`if (argumentList == null) return;`
`3669`	`3679`
`@@ -3675,7 +3685,9 @@ private void inferMethodReferenceType(final MethodCallExpression call, final Cla`
`3675`	`3685`	`return;`
`3676`	`3686`	`}`
`3677`	`3687`
	`3688`	`+ /* GRECLIPSE edit -- GROOVY-10033, GROOVY-10047`
`3678`	`3689`	`MethodNode selectedMethod = call.getNodeMetaData(DIRECT_METHOD_CALL_TARGET);`
	`3690`	`+ */`
`3679`	`3691`	`if (selectedMethod == null) return;`
`3680`	`3692`
`3681`	`3693`	`Parameter[] parameters = selectedMethod.getParameters();`