GROOVY-10114

Author: eric-milles

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

@@ -3090,7 +3090,8 @@ public void testTypeChecked9983() {
             "  C.m(new A<>(new B()))\n" +
             "  C.m(new A<>(new D()))\n" +
             "  C.m(flag ? new A<>(new B()) : new A<>(new B()))\n" +
-            "  C.m(flag ? new A<>(new B()) : new A<>(new D()))\n" + // Cannot call m(A<B>) with arguments [A<? extends B>]\n" +
+            "  C.m(flag ? new A<>(new B()) : new A<>((B)null))\n" +
+            "  C.m(flag ? new A<>(new B()) : new A<>((B)new D()))\n" + // Cannot call m(A<B>) with arguments [A<? extends B>]\n" +
             "}\n" +
             "test()\n",
         };
@@ -3995,6 +3996,36 @@ public void testTypeChecked10111a() {
         runConformTest(sources);
     }
 
+    @Test
+    public void testTypeChecked10114() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "class C<T> {\n" +
+            "  T p\n" +
+            "  C(T p) {\n" +
+            "    this.p = p\n" +
+            "  }\n" +
+            "}\n" +
+            "class D {\n" +
+            "  Character m() {\n" +
+            "    (Character) '!'\n" +
+            "  }\n" +
+            "}\n" +
+            "@groovy.transform.TypeChecked\n" +
+            "void test() {\n" +
+            "  print((false ? new C<D>(new D()) : new C<>(new D())).p.m())\n" +
+            "  print((false ? new C< >(new D()) : new C<>(new D())).p.m())\n" +
+            "  def c = (true ? new C<>(new D()) : new C<>(new D()))\n" +
+            "  print c.p.m()\n" +
+            "}\n" +
+            "test()\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "!!!");
+    }
+
     @Test
     public void testTypeChecked10128() {
         //@formatter:off

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

@@ -4938,7 +4938,7 @@ && isOrImplements(typeOfFalse, typeOfTrue))) { // List/Collection/Iterable : []
     }
 
     private ClassNode checkForTargetType(final Expression expr, final ClassNode type) {
-        /* GRECLIPSE edit -- GROOVY-9972, GROOVY-9983
+        /* GRECLIPSE edit -- GROOVY-9972, GROOVY-9983, GROOVY-10114
         BinaryExpression enclosingBinaryExpression = typeCheckingContext.getEnclosingBinaryExpression();
         if (enclosingBinaryExpression instanceof DeclarationExpression
                 && isEmptyCollection(expr) && isAssignment(enclosingBinaryExpression.getOperation().getType())) {
@@ -4971,11 +4971,14 @@ && isTypeSource(expr, enclosingMethod)) {
              targetType = enclosingMethod.getReturnType();
         }
 
-        if (targetType == null) return sourceType;
-
         if (expr instanceof ConstructorCallExpression) {
+            if (targetType == null) targetType = OBJECT_TYPE;
             inferDiamondType((ConstructorCallExpression) expr, targetType);
-        } else if (targetType != null && !isPrimitiveType(getUnwrapper(targetType))
+        }
+
+        if (targetType == null) return sourceType;
+
+        if (!isPrimitiveType(getUnwrapper(targetType))
                 && !targetType.equals(OBJECT_TYPE) && missesGenericsTypes(sourceType)) {
             // unchecked assignment with ternary/elvis, like "List<T> list = listOfT ?: []"
             // the inferred type is the RHS type "completed" with generics information from LHS

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

@@ -4823,7 +4823,7 @@ && isOrImplements(typeOfFalse, typeOfTrue))) { // List/Collection/Iterable : []
     }
 
     private ClassNode checkForTargetType(final Expression expr, final ClassNode type) {
-        /* GRECLIPSE edit -- GROOVY-9972, GROOVY-9983
+        /* GRECLIPSE edit -- GROOVY-9972, GROOVY-9983, GROOVY-10114
         BinaryExpression enclosingBinaryExpression = typeCheckingContext.getEnclosingBinaryExpression();
         if (enclosingBinaryExpression instanceof DeclarationExpression
                 && isEmptyCollection(expr) && isAssignment(enclosingBinaryExpression.getOperation().getType())) {
@@ -4856,11 +4856,15 @@ && isTypeSource(expr, enclosingMethod)) {
              targetType = enclosingMethod.getReturnType();
         }
 
-        if (targetType == null) return sourceType;
-
         if (expr instanceof ConstructorCallExpression) {
+            if (targetType == null) targetType = OBJECT_TYPE;
             inferDiamondType((ConstructorCallExpression) expr, targetType);
-        } else if (targetType != null && !isPrimitiveType(getUnwrapper(targetType))
+            return sourceType;
+        }
+
+        if (targetType == null) return sourceType;
+
+        if (!isPrimitiveType(getUnwrapper(targetType))
                 && !targetType.equals(OBJECT_TYPE) && missesGenericsTypes(sourceType)) {
             // unchecked assignment with ternary/elvis, like "List<T> list = listOfT ?: []"
             // the inferred type is the RHS type "completed" with generics information from LHS

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

@@ -4219,11 +4219,16 @@ && isTypeSource(expr, enclosingMethod)) {
              targetType = enclosingMethod.getReturnType();
         }
 
+        if (expr instanceof ConstructorCallExpression) { // GROOVY-9972, GROOVY-9983
+            // GROOVY-10114: type parameter(s) could be inferred from call arguments
+            if (targetType == null) targetType = sourceType.getPlainNodeReference();
+            inferDiamondType((ConstructorCallExpression) expr, targetType);
+            return sourceType;
+        }
+
         if (targetType == null) return sourceType;
 
-        if (expr instanceof ConstructorCallExpression) {
-            inferDiamondType((ConstructorCallExpression) expr, targetType);
-        } else if (!isPrimitiveType(getUnwrapper(targetType))
+        if (!isPrimitiveType(getUnwrapper(targetType))
                 && !isObjectType(targetType) && missesGenericsTypes(sourceType)) {
             // unchecked assignment with ternary/elvis, like "List<T> list = listOfT ?: []"
             // the inferred type is the RHS type "completed" with generics information from LHS