[groovy] branch master updated: GROOVY-10628: STC: fix inference for elvis assignment with setter target

[em...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

emilles pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new a976ecdee1 GROOVY-10628: STC: fix inference for elvis assignment with setter target
a976ecdee1 is described below

commit a976ecdee1f17f7fafc55767de2d857c44d44697
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Thu May 19 14:57:46 2022 -0500

    GROOVY-10628: STC: fix inference for elvis assignment with setter target
---
 .../transform/stc/StaticTypeCheckingVisitor.java   | 13 +++++---
 .../groovy/transform/stc/STCAssignmentTest.groovy  | 35 ++++++++++++++++++----
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index 91834456a7..5c73dd6296 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -1020,10 +1020,15 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
         }
 
         Function<Expression, MethodNode> setterCall = right -> {
-            MethodCallExpression call = callX(receiver, setterInfo.name, right);
-            call.setImplicitThis(false);
-            visitMethodCallExpression(call);
-            return call.getNodeMetaData(DIRECT_METHOD_CALL_TARGET);
+            typeCheckingContext.pushEnclosingBinaryExpression(null); // GROOVY-10628: LHS re-purposed
+            try {
+                MethodCallExpression call = new MethodCallExpression(receiver, setterInfo.name, right);
+                call.setImplicitThis(false);
+                visitMethodCallExpression(call);
+                return call.getNodeMetaData(DIRECT_METHOD_CALL_TARGET);
+            } finally {
+                typeCheckingContext.popEnclosingBinaryExpression();
+            }
         };
 
         Function<MethodNode, ClassNode> setterType = setter -> {
diff --git a/src/test/groovy/transform/stc/STCAssignmentTest.groovy b/src/test/groovy/transform/stc/STCAssignmentTest.groovy
index 9064e5e225..c573582bcc 100644
--- a/src/test/groovy/transform/stc/STCAssignmentTest.groovy
+++ b/src/test/groovy/transform/stc/STCAssignmentTest.groovy
@@ -1292,7 +1292,7 @@ class STCAssignmentTest extends StaticTypeCheckingTestCase {
     }
 
     // GROOVY-10419
-    void testElvisAssignmentAndSetter() {
+    void testElvisAssignmentAndSetter1() {
         assertScript '''
             class C {
                 def p
@@ -1300,13 +1300,36 @@ class STCAssignmentTest extends StaticTypeCheckingTestCase {
                     this.p = p
                 }
             }
-            @groovy.transform.TypeChecked
-            void test(C c) {
-                c.p ?= 'x'
-            }
             def c = new C()
-            test(c)
+            c.p ?= 'x'
+            assert c.p == 'x'
+            c.with {
+                p ?= 'y'
+            }
             assert c.p == 'x'
         '''
     }
+
+    // GROOVY-10628
+    void testElvisAssignmentAndSetter2() {
+        assertScript '''
+            class C {
+                String getFoo() {
+                }
+                void setFoo(String foo) {
+                }
+            }
+            new C().foo ?= 'bar'
+        '''
+    }
+
+    void testElvisAssignmentMismatched() {
+        shouldFailWithMessages '''
+            class C {
+                Number foo
+            }
+            new C().foo ?= 'bar'
+        ''',
+        'Cannot assign value of type java.io.Serializable to variable of type java.lang.Number'
+    }
 }