GROOVY-10357

groovy · Mar 14, 2022 · 9ce3f1d · 9ce3f1d
1 parent 453b272
commit 9ce3f1d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 0 deletions.
diff --git a/...ovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java b/...ovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java
@@ -5116,6 +5116,28 @@ public void testTypeChecked10351() {
         runConformTest(sources);
     }
 
+    @Test
+    public void testTypeChecked10357() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "import java.util.function.Function\n" +
+            "@groovy.transform.TypeChecked\n" +
+            "abstract class A {\n" +
+            "  abstract long m(Function<Boolean,Integer> f = { Boolean b -> b ? +1 : -1 })\n" +
+            "}\n" +
+            "print new A() {\n" +
+            "  @Override\n" +
+            "  long m(Function<Boolean,Integer> f) {\n" +
+            "    f.apply(true).longValue()\n" +
+            "  }\n" +
+            "}.m()\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "1");
+    }
+
     @Test
     public void testTypeChecked10414() {
         //@formatter:off

diff --git a/...rg.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/...rg.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -4964,6 +4964,7 @@ && isAssignment(enclosingBinaryExpression.getOperation().getType())
                 && isTypeSource(expr, enclosingBinaryExpression.getRightExpression())) {
             targetType = getDeclaredOrInferredType(enclosingBinaryExpression.getLeftExpression());
         } else if (enclosingMethod != null
+                && !enclosingMethod.isAbstract()
                 && !enclosingMethod.isVoidMethod()
                 && isTypeSource(expr, enclosingMethod)) {
              targetType = enclosingMethod.getReturnType();

diff --git a/...rg.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/...rg.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -4849,6 +4849,7 @@ && isAssignment(enclosingBinaryExpression.getOperation().getType())
                 && isTypeSource(expr, enclosingBinaryExpression.getRightExpression())) {
             targetType = getDeclaredOrInferredType(enclosingBinaryExpression.getLeftExpression());
         } else if (enclosingMethod != null
+                && !enclosingMethod.isAbstract()
                 && !enclosingMethod.isVoidMethod()
                 && isTypeSource(expr, enclosingMethod)) {
              targetType = enclosingMethod.getReturnType();

diff --git a/...rg.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/...rg.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -4212,6 +4212,7 @@ && isAssignment(enclosingExpression.getOperation().getType())
                 && isTypeSource(expr, enclosingExpression.getRightExpression())) {
             targetType = getDeclaredOrInferredType(enclosingExpression.getLeftExpression());
         } else if (enclosingMethod != null
+                && !enclosingMethod.isAbstract()
                 && !enclosingMethod.isVoidMethod()
                 && isTypeSource(expr, enclosingMethod)) {
              targetType = enclosingMethod.getReturnType();