GROOVY-9855

groovy · Dec 22, 2020 · 7ff9638 · 7ff9638
1 parent 807f93f
commit 7ff9638
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 2 deletions.
diff --git a/...re.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/StaticCompilationTests.java b/...re.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/StaticCompilationTests.java
@@ -5344,6 +5344,29 @@ public void testCompileStatic9799() {
         runConformTest(sources, "works");
     }
 
+    @Test
+    public void testCompileStatic9855() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.CompileStatic\n" +
+            "@SuppressWarnings(C.PREFIX + 'checked')\n" + // not 'un'.plus('checked')
+            "class C {\n" +
+            "  public static final String PREFIX = 'un'\n" +
+            "}\n" +
+            "new C()\n",
+        };
+        //@formatter:on
+
+        runNegativeTest(sources,
+            "----------\n" +
+            "1. WARNING in Main.groovy (at line 2)\n" +
+            "\t@SuppressWarnings(C.PREFIX + 'checked')\n" +
+            "\t                  ^^^^^^^^^^^^^^^^^^^^\n" +
+            "Unnecessary @SuppressWarnings(\"unchecked\")\n" +
+            "----------\n");
+    }
+
     @Test
     public void testCompileStatic9860() {
         //@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
@@ -350,9 +350,21 @@ public static Expression transformInlineConstants(final Expression exp) {
             }
         } else if (exp instanceof BinaryExpression) {
             BinaryExpression be = (BinaryExpression) exp;
+            /* GRECLIPSE edit -- GROOVY-9855: inline string concat sooner
             be.setLeftExpression(transformInlineConstants(be.getLeftExpression()));
             be.setRightExpression(transformInlineConstants(be.getRightExpression()));
             return be;
+            */
+            Expression lhs = transformInlineConstants(be.getLeftExpression());
+            Expression rhs = transformInlineConstants(be.getRightExpression());
+            if (be.getOperation().getType() == PLUS && lhs instanceof ConstantExpression && rhs instanceof ConstantExpression &&
+                    lhs.getType().equals(ClassHelper.STRING_TYPE) && rhs.getType().equals(ClassHelper.STRING_TYPE)) {
+                return configure(be, new ConstantExpression(lhs.getText() + rhs.getText()));
+            }
+            be.setLeftExpression(lhs);
+            be.setRightExpression(rhs);
+            return be;
+            // GRECLIPSE end
         } else if (exp instanceof ListExpression) {
             ListExpression origList = (ListExpression) exp;
             ListExpression newList = new ListExpression();

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
@@ -337,9 +337,21 @@ public static Expression transformInlineConstants(final Expression exp) {
             }
         } else if (exp instanceof BinaryExpression) {
             BinaryExpression be = (BinaryExpression) exp;
+            /* GRECLIPSE edit -- GROOVY-9855: inline string concat sooner
             be.setLeftExpression(transformInlineConstants(be.getLeftExpression()));
             be.setRightExpression(transformInlineConstants(be.getRightExpression()));
             return be;
+            */
+            Expression lhs = transformInlineConstants(be.getLeftExpression());
+            Expression rhs = transformInlineConstants(be.getRightExpression());
+            if (be.getOperation().getType() == PLUS && lhs instanceof ConstantExpression && rhs instanceof ConstantExpression &&
+                    lhs.getType().equals(ClassHelper.STRING_TYPE) && rhs.getType().equals(ClassHelper.STRING_TYPE)) {
+                return configure(be, new ConstantExpression(lhs.getText() + rhs.getText()));
+            }
+            be.setLeftExpression(lhs);
+            be.setRightExpression(rhs);
+            return be;
+            // GRECLIPSE end
         } else if (exp instanceof ListExpression) {
             ListExpression origList = (ListExpression) exp;
             ListExpression newList = new ListExpression();

diff --git a/...e/src/org/codehaus/jdt/groovy/internal/compiler/ast/GroovyCompilationUnitDeclaration.java b/...e/src/org/codehaus/jdt/groovy/internal/compiler/ast/GroovyCompilationUnitDeclaration.java
@@ -89,6 +89,7 @@
 import org.codehaus.groovy.syntax.PreciseSyntaxException;
 import org.codehaus.groovy.syntax.SyntaxException;
 import org.codehaus.groovy.syntax.Token;
+import org.codehaus.groovy.syntax.Types;
 import org.codehaus.groovy.tools.GroovyClass;
 import org.codehaus.jdt.groovy.control.EclipseSourceUnit;
 import org.codehaus.jdt.groovy.core.dom.GroovyCompilationUnit;
@@ -1655,8 +1656,18 @@ private org.eclipse.jdt.internal.compiler.ast.Expression createAnnotationMemberE
                 return new ClassLiteralAccess(expr.getStart() - 1, new Wildcard(Wildcard.UNBOUND));
 
             } else if (expr instanceof BinaryExpression) {
-                // annotation may be something like "@Tag(value = List<String)" (incomplete generics specification)
-
+                BinaryExpression be = (BinaryExpression) expr;
+                if (be.getOperation().getType() == Types.PLUS) {
+                    org.eclipse.jdt.internal.compiler.ast.Expression expression = new org.eclipse.jdt.internal.compiler.ast.BinaryExpression(
+                        createAnnotationMemberExpression(be.getLeftExpression(),  type),
+                        createAnnotationMemberExpression(be.getRightExpression(), type),
+                        org.eclipse.jdt.internal.compiler.ast.OperatorIds.PLUS
+                    );
+                    expression.sourceStart = expr.getStart();
+                    expression.sourceEnd = expr.getEnd() - 1;
+                    return expression;
+                }
+                // or annotation may be something like "@Tag(value = List<String)" (incomplete generics specification)
             } else {
                 org.eclipse.jdt.internal.compiler.ast.Expression expression = createInitializationExpression(expr, type);
                 if (expression != null) {