Fix some cases for "Inline local variable" quick assist

#516
groovy · Dec 10, 2018 · fe2f0b3 · fe2f0b3
1 parent edfaa10
commit fe2f0b3
Show file tree

Hide file tree

Showing 7 changed files with 1,164 additions and 688 deletions.
diff --git a/....builder/src/org/eclipse/jdt/core/groovy/tests/locations/ASTNodeSourceLocationsTests.java b/....builder/src/org/eclipse/jdt/core/groovy/tests/locations/ASTNodeSourceLocationsTests.java
diff --git a/...ovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java b/...ovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java
@@ -15,8 +15,6 @@
  */
 package org.eclipse.jdt.groovy.core.tests.xform;
 
-import static org.eclipse.jdt.groovy.core.tests.GroovyBundle.isParrotParser;
-
 import org.eclipse.jdt.groovy.core.tests.basic.GroovyCompilerTestSuite;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -48,7 +46,7 @@ public void testTypeChecked1() {
             "----------\n" +
             "2. ERROR in Foo.groovy (at line 5)\n" +
             "\tprintln \"Did you spot the error in this ${message.toUppercase()}?\"\n" +
-            "\t                                         " + (isParrotParser() ? " ^^^^^^^^^^^^^^^^^^^^^" : "^^^^^^^^^^^^^^^^^^^^^^^") + "\n" +
+            "\t                                          ^^^^^^^^^^^^^^^^^^^^^\n" +
             "Groovy:[Static type checking] - Cannot find matching method java.lang.String#toUppercase(). Please check if the declared type is correct and if the method exists.\n" +
             "----------\n");
     }

diff --git a/base/org.codehaus.groovy24/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java b/base/org.codehaus.groovy24/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java
diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java
diff --git a/base/org.codehaus.groovy26/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java b/base/org.codehaus.groovy26/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java