GROOVY-8965, GROOVY-10180, GROOVY-10668

eric-milles · eric-milles · commit 5d64fb81cd25 · 2022-07-07T14:24:55.000-05:00
diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -4470,12 +4470,16 @@ protected List<Receiver<String>> makeOwnerList(final Expression objectExpression
         List<Receiver<String>> owners = new ArrayList<>();
         if (typeCheckingContext.delegationMetadata != null
                 && objectExpression instanceof VariableExpression
-                && ((VariableExpression) objectExpression).getName().equals("owner")
+                && ((Variable) objectExpression).getName().equals("owner")
                 && /*isNested:*/typeCheckingContext.delegationMetadata.getParent() != null) {
             List<Receiver<String>> enclosingClass = Collections.singletonList(
                     Receiver.<String>make(typeCheckingContext.getEnclosingClassNode()));
             addReceivers(owners, enclosingClass, typeCheckingContext.delegationMetadata.getParent(), "owner.");
         } else {
+            // GRECLIPSE add -- GROOVY-8965, GROOVY-10180, GROOVY-10668
+            List<ClassNode> temporaryTypes = getTemporaryTypesForExpression(objectExpression);
+            if (asBoolean(temporaryTypes)) owners.add(Receiver.make(lowestUpperBound(temporaryTypes)));
+            // GRECLIPSE end
             if (isClassClassNodeWrappingConcreteType(receiver)) {
                 ClassNode staticType = receiver.getGenericsTypes()[0].getType();
                 owners.add(Receiver.<String>make(staticType)); // Type from Class<Type>
@@ -4489,6 +4493,7 @@ protected List<Receiver<String>> makeOwnerList(final Expression objectExpression
                     owners.add(Receiver.<String>make(OBJECT_TYPE));
                 }
             }
+            /* GRECLIPSE edit
             if (!typeCheckingContext.temporaryIfBranchTypeInformation.isEmpty()) {
                 List<ClassNode> potentialReceiverType = getTemporaryTypesForExpression(objectExpression);
                 if (potentialReceiverType != null && !potentialReceiverType.isEmpty()) {
@@ -4497,9 +4502,10 @@ protected List<Receiver<String>> makeOwnerList(final Expression objectExpression
                     }
                 }
             }
+            */
             if (typeCheckingContext.lastImplicitItType != null
                     && objectExpression instanceof VariableExpression
-                    && ((VariableExpression) objectExpression).getName().equals("it")) {
+                    && ((Variable) objectExpression).getName().equals("it")) {
                 owners.add(Receiver.<String>make(typeCheckingContext.lastImplicitItType));
             }
         }
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
@@ -4185,12 +4185,16 @@ protected List<Receiver<String>> makeOwnerList(final Expression objectExpression
         List<Receiver<String>> owners = new ArrayList<>();
         if (typeCheckingContext.delegationMetadata != null
                 && objectExpression instanceof VariableExpression
-                && ((VariableExpression) objectExpression).getName().equals("owner")
+                && ((Variable) objectExpression).getName().equals("owner")
                 && /*isNested:*/typeCheckingContext.delegationMetadata.getParent() != null) {
             List<Receiver<String>> enclosingClass = Collections.singletonList(
                     Receiver.make(typeCheckingContext.getEnclosingClassNode()));
             addReceivers(owners, enclosingClass, typeCheckingContext.delegationMetadata.getParent(), "owner.");
         } else {
+            // GRECLIPSE add -- GROOVY-8965, GROOVY-10180, GROOVY-10668
+            List<ClassNode> temporaryTypes = getTemporaryTypesForExpression(objectExpression);
+            if (asBoolean(temporaryTypes)) owners.add(Receiver.make(lowestUpperBound(temporaryTypes)));
+            // GRECLIPSE end
             if (isClassClassNodeWrappingConcreteType(receiver)) {
                 ClassNode staticType = receiver.getGenericsTypes()[0].getType();
                 owners.add(Receiver.make(staticType)); // Type from Class<Type>
@@ -4209,6 +4213,7 @@ protected List<Receiver<String>> makeOwnerList(final Expression objectExpression
                     && ((Variable) objectExpression).getName().equals("it")) {
                 owners.add(Receiver.make(typeCheckingContext.lastImplicitItType));
             }
+            /* GRECLIPSE edit
             if (!typeCheckingContext.temporaryIfBranchTypeInformation.isEmpty()) {
                 List<ClassNode> instanceofTypes = getTemporaryTypesForExpression(objectExpression);
                 if (instanceofTypes != null && !instanceofTypes.isEmpty()) {
@@ -4217,6 +4222,7 @@ protected List<Receiver<String>> makeOwnerList(final Expression objectExpression
                     owners.add(Receiver.make(instanceofType));
                 }
             }
+            */
         }
         return owners;
     }
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
@@ -3804,12 +3804,13 @@ protected List<Receiver<String>> makeOwnerList(final Expression objectExpression
         List<Receiver<String>> owners = new ArrayList<>();
         if (typeCheckingContext.delegationMetadata != null
                 && objectExpression instanceof VariableExpression
-                && ((VariableExpression) objectExpression).getName().equals("owner")
+                && ((Variable) objectExpression).getName().equals("owner")
                 && /*isNested:*/typeCheckingContext.delegationMetadata.getParent() != null) {
             List<Receiver<String>> enclosingClass = Collections.singletonList(
                     Receiver.make(typeCheckingContext.getEnclosingClassNode()));
             addReceivers(owners, enclosingClass, typeCheckingContext.delegationMetadata.getParent(), "owner.");
         } else {
+            /* GRECLIPSE edit -- GROOVY-8965, GROOVY-10180, GROOVY-10668
             if (!typeCheckingContext.temporaryIfBranchTypeInformation.isEmpty()) {
                 List<ClassNode> potentialReceiverType = getTemporaryTypesForExpression(objectExpression);
                 if (potentialReceiverType != null && !potentialReceiverType.isEmpty()) {
@@ -3818,9 +3819,13 @@ protected List<Receiver<String>> makeOwnerList(final Expression objectExpression
                     }
                 }
             }
+            */
+            List<ClassNode> temporaryTypes = getTemporaryTypesForExpression(objectExpression);
+            if (asBoolean(temporaryTypes)) owners.add(Receiver.make(lowestUpperBound(temporaryTypes)));
+            // GRECLIPSE end
             if (typeCheckingContext.lastImplicitItType != null
                     && objectExpression instanceof VariableExpression
-                    && ((VariableExpression) objectExpression).getName().equals("it")) {
+                    && ((Variable) objectExpression).getName().equals("it")) {
                 owners.add(Receiver.make(typeCheckingContext.lastImplicitItType));
             }
             if (isClassClassNodeWrappingConcreteType(receiver)) {

Original file line number	Diff line number	Diff line change
`@@ -4470,12 +4470,16 @@ protected List<Receiver<String>> makeOwnerList(final Expression objectExpression`
`4470`	`4470`	`List<Receiver<String>> owners = new ArrayList<>();`
`4471`	`4471`	`if (typeCheckingContext.delegationMetadata != null`
`4472`	`4472`	`&& objectExpression instanceof VariableExpression`
`4473`		`- && ((VariableExpression) objectExpression).getName().equals("owner")`
	`4473`	`+ && ((Variable) objectExpression).getName().equals("owner")`
`4474`	`4474`	`&& /isNested:/typeCheckingContext.delegationMetadata.getParent() != null) {`
`4475`	`4475`	`List<Receiver<String>> enclosingClass = Collections.singletonList(`
`4476`	`4476`	`Receiver.<String>make(typeCheckingContext.getEnclosingClassNode()));`
`4477`	`4477`	`addReceivers(owners, enclosingClass, typeCheckingContext.delegationMetadata.getParent(), "owner.");`
`4478`	`4478`	`} else {`
	`4479`	`+ // GRECLIPSE add -- GROOVY-8965, GROOVY-10180, GROOVY-10668`
	`4480`	`+ List<ClassNode> temporaryTypes = getTemporaryTypesForExpression(objectExpression);`
	`4481`	`+ if (asBoolean(temporaryTypes)) owners.add(Receiver.make(lowestUpperBound(temporaryTypes)));`
	`4482`	`+ // GRECLIPSE end`
`4479`	`4483`	`if (isClassClassNodeWrappingConcreteType(receiver)) {`
`4480`	`4484`	`ClassNode staticType = receiver.getGenericsTypes()[0].getType();`
`4481`	`4485`	`owners.add(Receiver.<String>make(staticType)); // Type from Class<Type>`
`@@ -4489,6 +4493,7 @@ protected List<Receiver<String>> makeOwnerList(final Expression objectExpression`
`4489`	`4493`	`owners.add(Receiver.<String>make(OBJECT_TYPE));`
`4490`	`4494`	`}`
`4491`	`4495`	`}`
	`4496`	`+ /* GRECLIPSE edit`
`4492`	`4497`	`if (!typeCheckingContext.temporaryIfBranchTypeInformation.isEmpty()) {`
`4493`	`4498`	`List<ClassNode> potentialReceiverType = getTemporaryTypesForExpression(objectExpression);`
`4494`	`4499`	`if (potentialReceiverType != null && !potentialReceiverType.isEmpty()) {`
`@@ -4497,9 +4502,10 @@ protected List<Receiver<String>> makeOwnerList(final Expression objectExpression`
`4497`	`4502`	`}`
`4498`	`4503`	`}`
`4499`	`4504`	`}`
	`4505`	`+ */`
`4500`	`4506`	`if (typeCheckingContext.lastImplicitItType != null`
`4501`	`4507`	`&& objectExpression instanceof VariableExpression`
`4502`		`- && ((VariableExpression) objectExpression).getName().equals("it")) {`
	`4508`	`+ && ((Variable) objectExpression).getName().equals("it")) {`
`4503`	`4509`	`owners.add(Receiver.<String>make(typeCheckingContext.lastImplicitItType));`
`4504`	`4510`	`}`
`4505`	`4511`	`}`