GROOVY-10159

eric-milles · eric-milles · commit 01cc9acb9676 · 2021-08-09T12:13:40.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
@@ -1069,6 +1069,23 @@ public void testStaticProperty14() {
             "----------\n");
     }
 
+    @Test // GROOVY-10159
+    public void testStaticProperty15() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "public class Main {\n" +
+            "  static final String foo = 1 + 1\n" +
+            "  static main(args) {\n" +
+            "    print(foo);\n" +
+            "  }\n" +
+            "}\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "2");
+    }
+
     @Test
     public void testClash_GRE1076() {
         //@formatter:off
diff --git a/base/org.codehaus.groovy25/src/org/apache/groovy/ast/tools/ExpressionUtils.java b/base/org.codehaus.groovy25/src/org/apache/groovy/ast/tools/ExpressionUtils.java
@@ -82,6 +82,9 @@ public static ConstantExpression transformBinaryConstantExpression(BinaryExpress
                 Expression left = transformInlineConstants(be.getLeftExpression(), targetType);
                 Expression right = transformInlineConstants(be.getRightExpression(), targetType);
                 if (left instanceof ConstantExpression && right instanceof ConstantExpression) {
+                    // GRECLIPSE add -- GROOVY-10159
+                    if (((ConstantExpression) left).getValue() instanceof String)
+                    // GRECLIPSE end
                     return configure(be, new ConstantExpression((String) ((ConstantExpression) left).getValue() +
                             ((ConstantExpression) right).getValue()));
                 }
diff --git a/base/org.codehaus.groovy30/src/org/apache/groovy/ast/tools/ExpressionUtils.java b/base/org.codehaus.groovy30/src/org/apache/groovy/ast/tools/ExpressionUtils.java
@@ -77,6 +77,9 @@ public static ConstantExpression transformBinaryConstantExpression(final BinaryE
                 Expression left = transformInlineConstants(be.getLeftExpression(), targetType);
                 Expression right = transformInlineConstants(be.getRightExpression(), targetType);
                 if (left instanceof ConstantExpression && right instanceof ConstantExpression) {
+                    // GRECLIPSE add -- GROOVY-10159
+                    if (((ConstantExpression) left).getValue() instanceof String)
+                    // GRECLIPSE end
                     return configure(be, new ConstantExpression((String) ((ConstantExpression) left).getValue() + ((ConstantExpression) right).getValue()));
                 }
             }
diff --git a/base/org.codehaus.groovy40/src/org/apache/groovy/ast/tools/ExpressionUtils.java b/base/org.codehaus.groovy40/src/org/apache/groovy/ast/tools/ExpressionUtils.java
@@ -76,6 +76,9 @@ public static ConstantExpression transformBinaryConstantExpression(final BinaryE
                 Expression left = transformInlineConstants(be.getLeftExpression(), targetType);
                 Expression right = transformInlineConstants(be.getRightExpression(), targetType);
                 if (left instanceof ConstantExpression && right instanceof ConstantExpression) {
+                    // GRECLIPSE add -- GROOVY-10159
+                    if (((ConstantExpression) left).getValue() instanceof String)
+                    // GRECLIPSE end
                     return configure(be, new ConstantExpression((String) ((ConstantExpression) left).getValue() + ((ConstantExpression) right).getValue()));
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,9 @@ public static ConstantExpression transformBinaryConstantExpression(final BinaryE`
`77`	`77`	`Expression left = transformInlineConstants(be.getLeftExpression(), targetType);`
`78`	`78`	`Expression right = transformInlineConstants(be.getRightExpression(), targetType);`
`79`	`79`	`if (left instanceof ConstantExpression && right instanceof ConstantExpression) {`
	`80`	`+ // GRECLIPSE add -- GROOVY-10159`
	`81`	`+ if (((ConstantExpression) left).getValue() instanceof String)`
	`82`	`+ // GRECLIPSE end`
`80`	`83`	`return configure(be, new ConstantExpression((String) ((ConstantExpression) left).getValue() + ((ConstantExpression) right).getValue()));`
`81`	`84`	`}`
`82`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,9 @@ public static ConstantExpression transformBinaryConstantExpression(final BinaryE`
`76`	`76`	`Expression left = transformInlineConstants(be.getLeftExpression(), targetType);`
`77`	`77`	`Expression right = transformInlineConstants(be.getRightExpression(), targetType);`
`78`	`78`	`if (left instanceof ConstantExpression && right instanceof ConstantExpression) {`
	`79`	`+ // GRECLIPSE add -- GROOVY-10159`
	`80`	`+ if (((ConstantExpression) left).getValue() instanceof String)`
	`81`	`+ // GRECLIPSE end`
`79`	`82`	`return configure(be, new ConstantExpression((String) ((ConstantExpression) left).getValue() + ((ConstantExpression) right).getValue()));`
`80`	`83`	`}`
`81`	`84`	`}`