GROOVY-10188

eric-milles · eric-milles · commit 463ecb7f0f5b · 2021-08-09T12:11:50.000-05: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
@@ -446,6 +446,19 @@ public void testClosureScope8() {
         runConformTest(sources, "Outer");
     }
 
+    @Test // GROOVY-10188
+    public void testClosureScope9() {
+        //@formatter:off
+        String[] sources = {
+            "Script.groovy",
+            "List<Integer> numbers = [1,2,3]\n" +
+            "numbers.each { Number -> print Number.xxx }\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "", "groovy.lang.MissingPropertyException: No such property: xxx for class: java.lang.Integer");
+    }
+
     @Test
     public void testClosureSyntax() {
         //@formatter:off
diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/control/ResolveVisitor.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/control/ResolveVisitor.java
@@ -979,6 +979,9 @@ else if (it.getClass() != PropertyExpression.class) {
                 }
                 Tuple2<StringBuilder, Boolean> classNameInfo = makeClassName(doInitialClassTest, name, propertyPart);
                 name = classNameInfo.getFirst();
+                // GRECLIPSE add -- GROOVY-10188
+                if (name == null) return null;
+                // GRECLIPSE end
                 doInitialClassTest = classNameInfo.getSecond();
             }
         }
diff --git a/base/org.codehaus.groovy30/src/org/codehaus/groovy/control/ResolveVisitor.java b/base/org.codehaus.groovy30/src/org/codehaus/groovy/control/ResolveVisitor.java
@@ -885,9 +885,8 @@ public Expression transform(final Expression exp) {
     private static String lookupClassName(final PropertyExpression pe) {
         boolean doInitialClassTest = true;
         StringBuilder name = new StringBuilder(32);
-        // this loop builds a name from right to left each name part
-        // separated by "."
-        for (Expression expr = pe; expr != null; expr = ((PropertyExpression) expr).getObjectExpression()) {
+        // this loop builds a name from right to left each name part separated by "."
+        for (Expression expr = pe; expr != null && name != null; expr = ((PropertyExpression) expr).getObjectExpression()) {
             if (expr instanceof VariableExpression) {
                 VariableExpression ve = (VariableExpression) expr;
                 // stop at super and this
diff --git a/base/org.codehaus.groovy40/src/org/codehaus/groovy/control/ResolveVisitor.java b/base/org.codehaus.groovy40/src/org/codehaus/groovy/control/ResolveVisitor.java
@@ -880,9 +880,8 @@ public Expression transform(final Expression exp) {
     private static String lookupClassName(final PropertyExpression pe) {
         boolean doInitialClassTest = true;
         StringBuilder name = new StringBuilder(32);
-        // this loop builds a name from right to left each name part
-        // separated by "."
-        for (Expression expr = pe; expr != null; expr = ((PropertyExpression) expr).getObjectExpression()) {
+        // this loop builds a name from right to left each name part separated by "."
+        for (Expression expr = pe; expr != null && name != null; expr = ((PropertyExpression) expr).getObjectExpression()) {
             if (expr instanceof VariableExpression) {
                 VariableExpression ve = (VariableExpression) expr;
                 // stop at super and this

Original file line number	Diff line number	Diff line change
`@@ -979,6 +979,9 @@ else if (it.getClass() != PropertyExpression.class) {`
`979`	`979`	`}`
`980`	`980`	`Tuple2<StringBuilder, Boolean> classNameInfo = makeClassName(doInitialClassTest, name, propertyPart);`
`981`	`981`	`name = classNameInfo.getFirst();`
	`982`	`+ // GRECLIPSE add -- GROOVY-10188`
	`983`	`+ if (name == null) return null;`
	`984`	`+ // GRECLIPSE end`
`982`	`985`	`doInitialClassTest = classNameInfo.getSecond();`
`983`	`986`	`}`
`984`	`987`	`}`