GROOVY-9966

eric-milles · eric-milles · commit ccc389697e47 · 2021-03-04T20:34:23.000-06:00
diff --git a/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovySimpleTests.java b/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovySimpleTests.java
@@ -4655,6 +4655,21 @@ public void testGroovy9906() {
         runConformTest(sources, "");
     }
 
+    @Test // https://issues.apache.org/jira/browse/GROOVY-9966
+    public void testGroovy9966() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "import static java.util.Arrays.*\n" +
+            "def m(x) { return x }\n" +
+            "final value = 123.456\n" +
+            "m(\"$value\").missing\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "", "groovy.lang.MissingPropertyException: No such property: missing for class: org.codehaus.groovy.runtime.GStringImpl");
+    }
+
     // was worried <clinit> would surface in list of methods used to build the type declaration, but that doesn't appear to be the case
     @Test
     public void testExtendingGroovyObjects_clinit() {
diff --git a/base/org.codehaus.groovy30/src/org/codehaus/groovy/control/StaticImportVisitor.java b/base/org.codehaus.groovy30/src/org/codehaus/groovy/control/StaticImportVisitor.java
@@ -132,13 +132,19 @@ public Expression transform(Expression exp) {
         }
         if (clazz == ArgumentListExpression.class) {
             Expression result = exp.transformExpression(this);
+            // GRECLIPSE add -- GROOVY-9966
+            if (foundArgs == null)
+            // GRECLIPSE end
             if (inPropertyExpression) {
                 foundArgs = result;
             }
             return result;
         }
         if (exp instanceof ConstantExpression) {
             Expression result = exp.transformExpression(this);
+            // GRECLIPSE add -- GROOVY-9966
+            if (foundConstant == null)
+            // GRECLIPSE end
             if (inPropertyExpression) {
                 foundConstant = result;
             }
diff --git a/base/org.codehaus.groovy40/src/org/codehaus/groovy/control/StaticImportVisitor.java b/base/org.codehaus.groovy40/src/org/codehaus/groovy/control/StaticImportVisitor.java
@@ -135,13 +135,19 @@ public Expression transform(Expression exp) {
         }
         if (clazz == ArgumentListExpression.class) {
             Expression result = exp.transformExpression(this);
+            // GRECLIPSE add -- GROOVY-9966
+            if (foundArgs == null)
+            // GRECLIPSE end
             if (inPropertyExpression) {
                 foundArgs = result;
             }
             return result;
         }
         if (exp instanceof ConstantExpression) {
             Expression result = exp.transformExpression(this);
+            // GRECLIPSE add -- GROOVY-9966
+            if (foundConstant == null)
+            // GRECLIPSE end
             if (inPropertyExpression) {
                 foundConstant = result;
             }

Original file line number	Diff line number	Diff line change
`@@ -132,13 +132,19 @@ public Expression transform(Expression exp) {`
`132`	`132`	`}`
`133`	`133`	`if (clazz == ArgumentListExpression.class) {`
`134`	`134`	`Expression result = exp.transformExpression(this);`
	`135`	`+ // GRECLIPSE add -- GROOVY-9966`
	`136`	`+ if (foundArgs == null)`
	`137`	`+ // GRECLIPSE end`
`135`	`138`	`if (inPropertyExpression) {`
`136`	`139`	`foundArgs = result;`
`137`	`140`	`}`
`138`	`141`	`return result;`
`139`	`142`	`}`
`140`	`143`	`if (exp instanceof ConstantExpression) {`
`141`	`144`	`Expression result = exp.transformExpression(this);`
	`145`	`+ // GRECLIPSE add -- GROOVY-9966`
	`146`	`+ if (foundConstant == null)`
	`147`	`+ // GRECLIPSE end`
`142`	`148`	`if (inPropertyExpression) {`
`143`	`149`	`foundConstant = result;`
`144`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,13 +135,19 @@ public Expression transform(Expression exp) {`
`135`	`135`	`}`
`136`	`136`	`if (clazz == ArgumentListExpression.class) {`
`137`	`137`	`Expression result = exp.transformExpression(this);`
	`138`	`+ // GRECLIPSE add -- GROOVY-9966`
	`139`	`+ if (foundArgs == null)`
	`140`	`+ // GRECLIPSE end`
`138`	`141`	`if (inPropertyExpression) {`
`139`	`142`	`foundArgs = result;`
`140`	`143`	`}`
`141`	`144`	`return result;`
`142`	`145`	`}`
`143`	`146`	`if (exp instanceof ConstantExpression) {`
`144`	`147`	`Expression result = exp.transformExpression(this);`
	`148`	`+ // GRECLIPSE add -- GROOVY-9966`
	`149`	`+ if (foundConstant == null)`
	`150`	`+ // GRECLIPSE end`
`145`	`151`	`if (inPropertyExpression) {`
`146`	`152`	`foundConstant = result;`
`147`	`153`	`}`