GROOVY-9971

Author: eric-milles

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

@@ -1624,6 +1624,29 @@ public void testTypeChecked9970() {
         runConformTest(sources, "");
     }
 
+    @Test
+    public void testTypeChecked9971() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "def m(Closure<String> block) {\n" +
+            "  block.call()\n" +
+            "}\n" +
+            "@groovy.transform.TypeChecked\n" +
+            "void test() {\n" +
+            "  final x = 123\n" +
+            "  Closure<String> c = { \"x=$x\" }\n" +
+            "  print c.call().class.name\n" +
+            "  print((m { \"x=$x\" }).class.name)\n" +
+            "  assert m { -> \"x=$x\" } == 'x=123'\n" +
+            "}\n" +
+            "test()\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "java.lang.Stringjava.lang.String");
+    }
+
     @Test
     public void testTypeChecked9972() {
         //@formatter:off

base/org.codehaus.groovy25/.checkstyle

@@ -47,6 +47,7 @@
         <file-match-pattern match-pattern="groovy/classgen/asm/BinaryExpressionHelper.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/asm/BytecodeHelper.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/asm/CallSiteWriter.java" include-pattern="false" />
+        <file-match-pattern match-pattern="groovy/classgen/asm/ClosureWriter.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/asm/CompileStack.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/asm/InvocationWriter.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/asm/StatementMetaTypeChooser.java" include-pattern="false" />

base/org.codehaus.groovy25/src/org/codehaus/groovy/classgen/asm/ClosureWriter.java

@@ -1063,7 +1063,7 @@ private static boolean isFunctionalInterface(final ClassNode type) {
 
     private void processFunctionalInterfaceAssignment(final ClassNode lhsType, final Expression rhsExpression) {
         if (rhsExpression instanceof ClosureExpression) {
-            MethodNode abstractMethod = ClassHelper.findSAM(lhsType);
+            MethodNode abstractMethod = findSAM(lhsType);
             Map<GenericsType, GenericsType> mappings = GenericsUtils.makeDeclaringAndActualGenericsTypeMapOfExactType(abstractMethod.getDeclaringClass(), lhsType);
             Function<ClassNode, ClassNode> resolver = t -> t.isGenericsPlaceHolder() ? GenericsUtils.findActualTypeByGenericsPlaceholderName(t.getUnresolvedName(), mappings) : t;
 
@@ -2581,6 +2581,11 @@ protected ClassNode checkReturnType(final ReturnStatement statement) {
     }
 
     protected void addClosureReturnType(ClassNode returnType) {
+        // GRECLIPSE add -- GROOVY-9971
+        if (StaticTypeCheckingSupport.isGStringOrGStringStringLUB(returnType) && STRING_TYPE.equals(
+                getInferredReturnType(typeCheckingContext.getEnclosingClosure().getClosureExpression())))
+            returnType = STRING_TYPE;
+        // GRECLIPSE end
         typeCheckingContext.getEnclosingClosure().addReturnType(returnType);
     }
 
@@ -3153,6 +3158,14 @@ protected void visitMethodCallArguments(final ClassNode receiver, ArgumentListEx
                     } else {
                         inferClosureParameterTypes(receiver, newArgs, (ClosureExpression) expression, param, selectedMethod);
                     }
+                    // GRECLIPSE add -- GROOVY-9971
+                    ClassNode targetType = param.getType();
+                    if (isFunctionalInterface(targetType)) {
+                        processFunctionalInterfaceAssignment(targetType, expression);
+                    } else if (isClosureWithType(targetType)) {
+                        storeInferredReturnType(expression, getCombinedBoundType(targetType.getGenericsTypes()[0]));
+                    }
+                    // GRECLIPSE end
                 }
                 expression.visit(this);
                 if (expression.getNodeMetaData(StaticTypesMarker.DELEGATION_METADATA) != null) {

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

@@ -46,6 +46,7 @@
         <file-match-pattern match-pattern="groovy/classgen/ReturnAdder.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/Verifier.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/asm/CallSiteWriter.java" include-pattern="false" />
+        <file-match-pattern match-pattern="groovy/classgen/asm/ClosureWriter.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/asm/CompileStack.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/asm/InvocationWriter.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/asm/StatementMetaTypeChooser.java" include-pattern="false" />