Update the Groovy plug-in to 3.0.0

#1029
groovy · Feb 10, 2020 · 19584c5 · 19584c5
1 parent b04c8fc
commit 19584c5
Show file tree

Hide file tree

Showing 39 changed files with 3,514 additions and 3,388 deletions.
diff --git a/....core.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/DGMInferencingTests.java b/....core.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/DGMInferencingTests.java
@@ -1001,7 +1001,8 @@ public void testDGMDeclaring4() {
     @Test // https://github.com/groovy/groovy-eclipse/issues/1002
     public void testDGMDeclaring5() {
         String contents = "new StringBuilder().size()";
-        assertDeclType(contents, "size", "org.codehaus.groovy.vmplugin.v5.PluginDefaultGroovyMethods");
+        String vmplugin = isAtLeastGroovy(30) ? "8" : "5";
+        assertDeclType(contents, "size", "org.codehaus.groovy.vmplugin.v" + vmplugin + ".PluginDefaultGroovyMethods");
     }
 
     @Test // https://github.com/groovy/groovy-eclipse/issues/1002
@@ -1015,7 +1016,8 @@ public void testDGMDeclaring6() {
     @Test // https://github.com/groovy/groovy-eclipse/issues/1002
     public void testDGMDeclaring7() {
         String contents = "Thread.State.NEW.next().name()";
-        assertDeclType(contents, "next", "org.codehaus.groovy.vmplugin.v5.PluginDefaultGroovyMethods");
+        String vmplugin = isAtLeastGroovy(30) ? "8" : "5";
+        assertDeclType(contents, "next", "org.codehaus.groovy.vmplugin.v" + vmplugin + ".PluginDefaultGroovyMethods");
     }
 
     @Test // https://github.com/groovy/groovy-eclipse/issues/372

diff --git a/base/org.codehaus.groovy30/.checkstyle b/base/org.codehaus.groovy30/.checkstyle
@@ -43,7 +43,6 @@
         <file-match-pattern match-pattern="groovy/classgen/EnumVisitor.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/ExtendedVerifier.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/Verifier.java" include-pattern="false" />
-        <file-match-pattern match-pattern="groovy/classgen/asm/WriterController.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/asm/sc/StaticInvocationWriter.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/asm/sc/StaticPropertyAccessHelper.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/control/CompilationUnit.java" include-pattern="false" />

diff --git a/base/org.codehaus.groovy30/META-INF/MANIFEST.MF b/base/org.codehaus.groovy30/META-INF/MANIFEST.MF
@@ -99,8 +99,7 @@ Export-Package: groovy.beans;version="3.0.0",
  org.codehaus.groovy.vmplugin.v5;version="3.0.0",
  org.codehaus.groovy.vmplugin.v6;version="3.0.0",
  org.codehaus.groovy.vmplugin.v7;version="3.0.0",
- org.codehaus.groovy.vmplugin.v8;version="3.0.0",
- org.codehaus.groovy.vmplugin.v9;version="3.0.0"
+ org.codehaus.groovy.vmplugin.v8;version="3.0.0"
 Require-Bundle: org.eclipse.core.runtime,
  org.apache.ant;resolution:=optional,
  org.junit;resolution:=optional

diff --git a/base/org.codehaus.groovy30/VERSION b/base/org.codehaus.groovy30/VERSION
@@ -5,3 +5,4 @@
 2019-10-25: GROOVY_3_0_0_RC_1
 2019-12-08: GROOVY_3_0_0_RC_2
 2020-01-15: GROOVY_3_0_0_RC_3
+2020-02-10: GROOVY_3_0_0
diff --git a/base/org.codehaus.groovy30/about.html b/base/org.codehaus.groovy30/about.html
@@ -28,8 +28,8 @@ <h4>groovy-3.0.0-indy.jar</h4>
 <h4>groovy-test-3.0.0-indy.jar</h4>
 
 <ul>
-<li>Obtained from: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-binary-3.0.0-rc-3.zip">https://dl.bintray.com/groovy/maven/apache-groovy-binary-3.0.0-rc-3.zip</a></li>
-<li>Sources available at: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-src-3.0.0-rc-3.zip">https://dl.bintray.com/groovy/maven/apache-groovy-src-3.0.0-rc-3.zip</a></li>
+<li>Obtained from: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-binary-3.0.0.zip">https://dl.bintray.com/groovy/maven/apache-groovy-binary-3.0.0.zip</a></li>
+<li>Sources available at: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-src-3.0.0.zip">https://dl.bintray.com/groovy/maven/apache-groovy-src-3.0.0.zip</a></li>
 <li>License kind: ASL</li>
 <li>License URL: <a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a></li>
 <li>License text: <a href="about_files/asl2-license.txt">asl2-license.txt</a></li>
@@ -52,7 +52,7 @@ <h4>groovy-templates-3.0.0.jar</h4>
 <h4>groovy-xml-3.0.0.jar</h4>
 
 <ul>
-<li>Obtained from: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-sdk-3.0.0-rc-3.zip">https://dl.bintray.com/groovy/maven/apache-groovy-sdk-3.0.0-rc-3.zip</a></li>
+<li>Obtained from: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-sdk-3.0.0.zip">https://dl.bintray.com/groovy/maven/apache-groovy-sdk-3.0.0.zip</a></li>
 <li>License kind: ASL</li>
 <li>License URL: <a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a></li>
 <li>License text: <a href="about_files/asl2-license.txt">asl2-license.txt</a></li>
@@ -61,7 +61,7 @@ <h4>groovy-xml-3.0.0.jar</h4>
 <h4>jline-2.14.6.jar</h4>
 
 <ul>
-<li>Obtained from: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-sdk-3.0.0-rc-3.zip">https://dl.bintray.com/groovy/maven/apache-groovy-sdk-3.0.0-rc-3.zip</a></li>
+<li>Obtained from: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-sdk-3.0.0.zip">https://dl.bintray.com/groovy/maven/apache-groovy-sdk-3.0.0.zip</a></li>
 <li>License kind: BSD</li>
 <li>License URL: <a href="https://www.opensource.org/licenses/bsd-license.php">https://www.opensource.org/licenses/bsd-license.php</a></li>
 <li>License text: <a href="about_files/jline2-license.txt">jline2-license.txt</a></li>

diff --git a/base/org.codehaus.groovy30/lib/console/groovy-console-3.0.0.jar b/base/org.codehaus.groovy30/lib/console/groovy-console-3.0.0.jar
diff --git a/base/org.codehaus.groovy30/lib/console/groovy-swing-3.0.0.jar b/base/org.codehaus.groovy30/lib/console/groovy-swing-3.0.0.jar
diff --git a/base/org.codehaus.groovy30/lib/console/groovy-templates-3.0.0.jar b/base/org.codehaus.groovy30/lib/console/groovy-templates-3.0.0.jar
diff --git a/base/org.codehaus.groovy30/lib/console/groovy-xml-3.0.0.jar b/base/org.codehaus.groovy30/lib/console/groovy-xml-3.0.0.jar
diff --git a/base/org.codehaus.groovy30/lib/groovy-3.0.0-indy.jar b/base/org.codehaus.groovy30/lib/groovy-3.0.0-indy.jar
diff --git a/base/org.codehaus.groovy30/lib/groovy-3.0.0-javadoc.jar b/base/org.codehaus.groovy30/lib/groovy-3.0.0-javadoc.jar
diff --git a/base/org.codehaus.groovy30/lib/groovy-3.0.0-sources.jar b/base/org.codehaus.groovy30/lib/groovy-3.0.0-sources.jar
diff --git a/base/org.codehaus.groovy30/lib/groovy-test-3.0.0-indy.jar b/base/org.codehaus.groovy30/lib/groovy-test-3.0.0-indy.jar
diff --git a/base/org.codehaus.groovy30/lib/groovy-test-3.0.0-javadoc.jar b/base/org.codehaus.groovy30/lib/groovy-test-3.0.0-javadoc.jar
diff --git a/base/org.codehaus.groovy30/lib/groovy-test-3.0.0-sources.jar b/base/org.codehaus.groovy30/lib/groovy-test-3.0.0-sources.jar
diff --git a/base/org.codehaus.groovy30/lib/shell/groovy-groovysh-3.0.0.jar b/base/org.codehaus.groovy30/lib/shell/groovy-groovysh-3.0.0.jar
diff --git a/base/org.codehaus.groovy30/src/GroovyLexer.g4 b/base/org.codehaus.groovy30/src/GroovyLexer.g4
@@ -67,11 +67,25 @@ options {
         super.emit(token);
     }
 
-    private static final Set<Integer> REGEX_CHECK_SET =
-                                            Collections.unmodifiableSet(
-                                                new HashSet<>(Arrays.asList(Identifier, CapitalizedIdentifier, NullLiteral, BooleanLiteral, THIS, RPAREN, RBRACK, RBRACE, IntegerLiteral, FloatingPointLiteral, StringLiteral, GStringEnd, INC, DEC)));
+    private static final int[] REGEX_CHECK_ARRAY =
+                                    /* GRECLIPSE edit
+                                    IntStream.of(
+                                    */
+                                    {
+                                    // GRECLIPSE end
+                                        Identifier, CapitalizedIdentifier, NullLiteral, BooleanLiteral, THIS, RPAREN, RBRACK, RBRACE,
+                                        IntegerLiteral, FloatingPointLiteral, StringLiteral, GStringEnd, INC, DEC
+                                    /* GRECLIPSE edit
+                                    ).sorted().toArray();
+                                    */
+                                    };
+        static {
+            Arrays.sort(REGEX_CHECK_ARRAY);
+        }
+        // GRECLIPSE end
+
     private boolean isRegexAllowed() {
-        if (REGEX_CHECK_SET.contains(this.lastTokenType)) {
+        if (Arrays.binarySearch(REGEX_CHECK_ARRAY, this.lastTokenType) >= 0) {
             return false;
         }
 
@@ -104,10 +118,12 @@ options {
             return this.lastTokenType;
         }
 
+        @SuppressWarnings("unused")
         public int getLine() {
             return line;
         }
 
+        @SuppressWarnings("unused")
         public int getColumn() {
             return column;
         }
@@ -129,22 +145,6 @@ options {
         }
     }
 
-    /* GRECLIPSE edit
-    private static final Map<String, String> PAREN_MAP = Collections.unmodifiableMap(new HashMap<String, String>() {
-        {
-            put("(", ")");
-            put("[", "]");
-            put("{", "}");
-        }
-    });
-    */
-    private static final Map<String, String> PAREN_MAP = org.apache.groovy.util.Maps.of(
-        "(", ")",
-        "[", "]",
-        "{", "}"
-    );
-    // GRECLIPSE end
-
     protected void enterParenCallback(String text) {}
 
     protected void exitParenCallback(String text) {}
@@ -154,19 +154,18 @@ options {
     private void enterParen() {
         String text = getText();
         enterParenCallback(text);
+
         parenStack.push(new Paren(text, this.lastTokenType, getLine(), getCharPositionInLine()));
     }
 
     private void exitParen() {
-        Paren paren = parenStack.peek();
         String text = getText();
-        require(null != paren, "Too many '" + text + "'");
-        require(text.equals(PAREN_MAP.get(paren.getText())),
-                "'" + paren.getText() + "'" + new PositionInfo(paren.getLine(), paren.getColumn()) + " can not match '" + text + "'", -1);
         exitParenCallback(text);
+
+        Paren paren = parenStack.peek();
+        if (null == paren) return;
         parenStack.pop();
     }
-
     private boolean isInsideParens() {
         Paren paren = parenStack.peek();
 
@@ -175,6 +174,7 @@ options {
         if (null == paren) {
             return false;
         }
+
         return ("(".equals(paren.getText()) && TRY != paren.getLastTokenType()) // we don't treat try-paren(i.e. try (....)) as parenthesis
                     || "[".equals(paren.getText());
     }
@@ -208,6 +208,15 @@ options {
         return getCharPositionInLine() + 1;
     }
 
+    @Override
+    public int popMode() {
+        try {
+            return super.popMode();
+        } catch (EmptyStackException ignore) { // raised when parens are unmatched: too many ), ], or }
+        }
+
+        return Integer.MIN_VALUE;
+    }
     // GRECLIPSE add
     private void addComment(int type) {
         String text = _input.getText(Interval.of(_tokenStartCharIndex, getCharIndex() - 1));
@@ -312,7 +321,8 @@ GStringPathPart
 RollBackOne
     :   . {
             // a trick to handle GStrings followed by EOF properly
-            if (EOF == _input.LA(1) && ('"' == _input.LA(-1) || '/' == _input.LA(-1))) {
+            int readChar = _input.LA(-1);
+            if (EOF == _input.LA(1) && ('"' == readChar || '/' == readChar)) {
                 setType(GStringEnd);
             } else {
                 setChannel(HIDDEN);
@@ -817,8 +827,10 @@ NOT_IN              : '!in'         { isFollowedBy(_input, ' ', '\t', '\r', '\n'
 
 LPAREN          : '('  { this.enterParen();     } -> pushMode(DEFAULT_MODE);
 RPAREN          : ')'  { this.exitParen();      } -> popMode;
+
 LBRACE          : '{'  { this.enterParen();     } -> pushMode(DEFAULT_MODE);
 RBRACE          : '}'  { this.exitParen();      } -> popMode;
+
 LBRACK          : '['  { this.enterParen();     } -> pushMode(DEFAULT_MODE);
 RBRACK          : ']'  { this.exitParen();      } -> popMode;