GROOVY-10807

eric-milles · eric-milles · commit bea24fc1652a · 2022-11-04T12:01:05.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
@@ -7931,4 +7931,27 @@ public void testCompileStatic10791() {
 
         runConformTest(sources, "works");
     }
+
+    @Test
+    public void testCompileStatic10807() {
+        assumeTrue(isParrotParser());
+
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.CompileStatic\n" +
+            "class C {\n" +
+            "  public static final Comparator<String> BY_DISPLAY_NAME = Comparator.<String,String>comparing(C::getDisplayName)\n" +
+            "  static String getDisplayName(String component) {\n" +
+            "    return component\n" +
+            "  }\n" +
+            "}\n" +
+            "def list = ['foo','bar','baz']\n" +
+            "list.sort(C.BY_DISPLAY_NAME)\n" +
+            "print list\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "[bar, baz, foo]");
+    }
 }
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
@@ -3239,7 +3239,8 @@ protected void inferClosureParameterTypes(final ClassNode receiver, final Expres
                 Expression emc = typeCheckingContext.getEnclosingMethodCall();
                 if (emc instanceof MethodCallExpression) {
                     MethodCallExpression mce = (MethodCallExpression) emc;
-                    if (mce.getArguments() == arguments) {
+                    if (mce.getArguments() == arguments // GROOVY-10807 ::
+                        || expression.getCode() == GENERATED_EMPTY_STATEMENT){
                         GenericsType[] typeArguments = mce.getGenericsTypes();
                         if (typeArguments != null) {
                             int n = typeParameters.length;
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
@@ -2979,7 +2979,8 @@ protected void inferClosureParameterTypes(final ClassNode receiver, final Expres
                     Expression emc = typeCheckingContext.getEnclosingMethodCall();
                     if (emc instanceof MethodCallExpression) {
                         MethodCallExpression mce = (MethodCallExpression) emc;
-                        if (mce.getArguments() == arguments) {
+                        if (mce.getArguments() == arguments // GROOVY-10807 ::
+                            || expression.getCode() == GENERATED_EMPTY_STATEMENT){
                             GenericsType[] typeArguments = mce.getGenericsTypes();
                             if (typeArguments != null) {
                                 int n = typeParameters.length;
