Skip to content

Commit

Permalink
Update the Groovy plugin to 4.0.10
Browse files Browse the repository at this point in the history 
for #1462
  • Loading branch information
@eric-milles
eric-milles committed Mar 9, 2023
1 parent 13beff4 commit 47837ce
Show file tree
Hide file tree
Showing 32 changed files with 127 additions and 2,725 deletions.
2 changes: 1 addition & 1 deletion ...e.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovyCompilerTestSuite.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ protected String[] getDefaultClassPaths() {
String[] cps = super.getDefaultClassPaths();
String[] newcps = Arrays.copyOf(cps, cps.length + 2);

String[] groovyVersions = {"4.0.9", "3.0.16-indy", "2.5.21-indy"};
String[] groovyVersions = {"4.0.10", "3.0.16-indy", "2.5.21-indy"};
String[] ivyVersions = {"2.5.1", "2.4.0"};
try {
URL groovyJar = null;
Expand Down
4 changes: 0 additions & 4 deletions ...0/src/org/codehaus/groovy/classgen/asm/sc/StaticTypesMethodReferenceExpressionWriter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,6 @@ public void writeMethodReferenceExpression(final MethodReferenceExpression metho
parametersWithExactType,
false
);
// GRECLIPSE add -- GROOVY-10933
if (abstractMethod.isVoidMethod()) bootstrapArgs[2] = groovyjarjarasm.asm.Type.getType(
BytecodeHelper.getMethodDescriptor(ClassHelper.VOID_TYPE, parametersWithExactType));
// GRECLIPSE end
controller.getMethodVisitor().visitInvokeDynamicInsn(methodName, methodDesc, bootstrapMethod, bootstrapArgs);

if (isClassExpression) {
Expand Down
4 changes: 2 additions & 2 deletions base/org.codehaus.groovy40/.checkstyle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@
<file-match-pattern match-pattern="groovy/transform/ASTTestTransformation.groovy" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/ASTTransformationCollectorCodeVisitor.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/ASTTransformationVisitor.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/(Category|Field|Log|Sealed|TupleConstructor)ASTTransformation.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/(Category|Field|Log|TupleConstructor)ASTTransformation.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/NotYetImplemented.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/sc/transformers/(Binary|MethodCall|Property|Variable)ExpressionTransformer.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/stc/StaticTypeChecking(Support|Visitor).java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/stc/StaticTypeCheckingVisitor.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/trait/SuperCallTraitTransformer.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/trait/TraitASTTransformation.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/trait/TraitComposer.java" include-pattern="false" />
Expand Down
8 changes: 4 additions & 4 deletions base/org.codehaus.groovy40/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy40/lib/ivy-2.5.1-javadoc.jar!/" />
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/groovy-4.0.9.jar" sourcepath="lib/groovy-4.0.9-sources.jar" exported="true">
<classpathentry kind="lib" path="lib/groovy-4.0.10.jar" sourcepath="lib/groovy-4.0.10-sources.jar" exported="true">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy40/lib/groovy-4.0.9-javadoc.jar!/" />
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy40/lib/groovy-4.0.10-javadoc.jar!/" />
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/groovy-test-4.0.9.jar" sourcepath="lib/groovy-test-4.0.9-sources.jar" exported="true">
<classpathentry kind="lib" path="lib/groovy-test-4.0.10.jar" sourcepath="lib/groovy-test-4.0.10-sources.jar" exported="true">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy40/lib/groovy-test-4.0.9-javadoc.jar!/" />
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy40/lib/groovy-test-4.0.10-javadoc.jar!/" />
</attributes>
</classpathentry>

Expand Down
174 changes: 87 additions & 87 deletions base/org.codehaus.groovy40/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,99 +4,99 @@ Bundle-SymbolicName: org.codehaus.groovy
Automatic-Module-Name: org.codehaus.groovy
Bundle-Name: Apache Groovy
Bundle-Vendor: Pivotal Software, Inc.
Bundle-Version: 4.0.9.qualifier
Bundle-Version: 4.0.10.qualifier
Bundle-ClassPath: eclipse-trace.jar,
groovy-eclipse.jar,
groovy-parser2.jar,
lib/ivy-2.5.1.jar,
lib/groovy-4.0.9.jar,
lib/groovy-test-4.0.9.jar
Export-Package: groovy.beans;version="4.0.9",
groovy.cli;version="4.0.9",
groovy.grape;version="4.0.9",
groovy.inspect;version="4.0.9",
groovy.io;version="4.0.9",
groovy.lang;version="4.0.9",
groovy.lang.groovydoc;version="4.0.9",
groovy.mock.interceptor;version="4.0.9",
groovy.namespace;version="4.0.9",
groovy.security;version="4.0.9",
groovy.test;version="4.0.9",
groovy.time;version="4.0.9",
groovy.transform;version="4.0.9",
groovy.transform.builder;version="4.0.9",
groovy.transform.options;version="4.0.9",
groovy.transform.stc;version="4.0.9",
groovy.ui;version="4.0.9",
groovy.util;version="4.0.9",
groovy.util.logging;version="4.0.9",
lib/groovy-4.0.10.jar,
lib/groovy-test-4.0.10.jar
Export-Package: groovy.beans;version="4.0.10",
groovy.cli;version="4.0.10",
groovy.grape;version="4.0.10",
groovy.inspect;version="4.0.10",
groovy.io;version="4.0.10",
groovy.lang;version="4.0.10",
groovy.lang.groovydoc;version="4.0.10",
groovy.mock.interceptor;version="4.0.10",
groovy.namespace;version="4.0.10",
groovy.security;version="4.0.10",
groovy.test;version="4.0.10",
groovy.time;version="4.0.10",
groovy.transform;version="4.0.10",
groovy.transform.builder;version="4.0.10",
groovy.transform.options;version="4.0.10",
groovy.transform.stc;version="4.0.10",
groovy.ui;version="4.0.10",
groovy.util;version="4.0.10",
groovy.util.logging;version="4.0.10",
groovyjarjarantlr;x-friends:="org.codehaus.groovy.eclipse.refactoring",
org.apache.groovy.antlr;version="4.0.9",
org.apache.groovy.ast.tools;version="4.0.9",
org.apache.groovy.io;version="4.0.9",
org.apache.groovy.lang;version="4.0.9",
org.apache.groovy.lang.annotation;version="4.0.9",
org.apache.groovy.metaclass;version="4.0.9",
org.apache.groovy.plugin;version="4.0.9",
org.apache.groovy.test;version="4.0.9",
org.apache.groovy.test.transform;version="4.0.9",
org.apache.groovy.util;version="4.0.9",
org.apache.groovy.util.concurrent;version="4.0.9",
org.codehaus.groovy;version="4.0.9",
org.codehaus.groovy.antlr;version="4.0.9",
org.codehaus.groovy.antlr.parser;version="4.0.9",
org.codehaus.groovy.ast;version="4.0.9",
org.codehaus.groovy.ast.builder;version="4.0.9",
org.codehaus.groovy.ast.decompiled;version="4.0.9",
org.codehaus.groovy.ast.expr;version="4.0.9",
org.codehaus.groovy.ast.stmt;version="4.0.9",
org.codehaus.groovy.ast.tools;version="4.0.9",
org.codehaus.groovy.classgen;version="4.0.9",
org.codehaus.groovy.classgen.asm;version="4.0.9",
org.codehaus.groovy.classgen.asm.indy;version="4.0.9",
org.codehaus.groovy.classgen.asm.indy.sc;version="4.0.9",
org.codehaus.groovy.classgen.asm.sc;version="4.0.9",
org.codehaus.groovy.classgen.asm.util;version="4.0.9",
org.codehaus.groovy.control;version="4.0.9",
org.codehaus.groovy.control.customizers;version="4.0.9",
org.codehaus.groovy.control.customizers.builder;version="4.0.9",
org.codehaus.groovy.control.io;version="4.0.9",
org.codehaus.groovy.control.messages;version="4.0.9",
org.apache.groovy.antlr;version="4.0.10",
org.apache.groovy.ast.tools;version="4.0.10",
org.apache.groovy.io;version="4.0.10",
org.apache.groovy.lang;version="4.0.10",
org.apache.groovy.lang.annotation;version="4.0.10",
org.apache.groovy.metaclass;version="4.0.10",
org.apache.groovy.plugin;version="4.0.10",
org.apache.groovy.test;version="4.0.10",
org.apache.groovy.test.transform;version="4.0.10",
org.apache.groovy.util;version="4.0.10",
org.apache.groovy.util.concurrent;version="4.0.10",
org.codehaus.groovy;version="4.0.10",
org.codehaus.groovy.antlr;version="4.0.10",
org.codehaus.groovy.antlr.parser;version="4.0.10",
org.codehaus.groovy.ast;version="4.0.10",
org.codehaus.groovy.ast.builder;version="4.0.10",
org.codehaus.groovy.ast.decompiled;version="4.0.10",
org.codehaus.groovy.ast.expr;version="4.0.10",
org.codehaus.groovy.ast.stmt;version="4.0.10",
org.codehaus.groovy.ast.tools;version="4.0.10",
org.codehaus.groovy.classgen;version="4.0.10",
org.codehaus.groovy.classgen.asm;version="4.0.10",
org.codehaus.groovy.classgen.asm.indy;version="4.0.10",
org.codehaus.groovy.classgen.asm.indy.sc;version="4.0.10",
org.codehaus.groovy.classgen.asm.sc;version="4.0.10",
org.codehaus.groovy.classgen.asm.util;version="4.0.10",
org.codehaus.groovy.control;version="4.0.10",
org.codehaus.groovy.control.customizers;version="4.0.10",
org.codehaus.groovy.control.customizers.builder;version="4.0.10",
org.codehaus.groovy.control.io;version="4.0.10",
org.codehaus.groovy.control.messages;version="4.0.10",
org.codehaus.groovy.eclipse,
org.codehaus.groovy.reflection;version="4.0.9",
org.codehaus.groovy.reflection.android;version="4.0.9",
org.codehaus.groovy.reflection.stdclasses;version="4.0.9",
org.codehaus.groovy.reflection.v7;version="4.0.9",
org.codehaus.groovy.runtime;version="4.0.9",
org.codehaus.groovy.runtime.callsite;version="4.0.9",
org.codehaus.groovy.runtime.dgmimpl;version="4.0.9",
org.codehaus.groovy.runtime.dgmimpl.arrays;version="4.0.9",
org.codehaus.groovy.runtime.m12n;version="4.0.9",
org.codehaus.groovy.runtime.memoize;version="4.0.9",
org.codehaus.groovy.runtime.metaclass;version="4.0.9",
org.codehaus.groovy.runtime.powerassert;version="4.0.9",
org.codehaus.groovy.runtime.typehandling;version="4.0.9",
org.codehaus.groovy.runtime.wrappers;version="4.0.9",
org.codehaus.groovy.syntax;version="4.0.9",
org.codehaus.groovy.tools;version="4.0.9",
org.codehaus.groovy.tools.ast;version="4.0.9",
org.codehaus.groovy.tools.gse;version="4.0.9",
org.codehaus.groovy.tools.javac;version="4.0.9",
org.codehaus.groovy.tools.shell;version="4.0.9",
org.codehaus.groovy.tools.shell.util;version="4.0.9",
org.codehaus.groovy.transform;version="4.0.9",
org.codehaus.groovy.transform.sc;version="4.0.9",
org.codehaus.groovy.transform.sc.transformers;version="4.0.9",
org.codehaus.groovy.transform.stc;version="4.0.9",
org.codehaus.groovy.transform.tailrec;version="4.0.9",
org.codehaus.groovy.transform.trait;version="4.0.9",
org.codehaus.groovy.util;version="4.0.9",
org.codehaus.groovy.vmplugin;version="4.0.9",
org.codehaus.groovy.vmplugin.v7;version="4.0.9",
org.codehaus.groovy.vmplugin.v8;version="4.0.9",
org.codehaus.groovy.vmplugin.v9;version="4.0.9",
org.codehaus.groovy.vmplugin.v10;version="4.0.9",
org.codehaus.groovy.vmplugin.v16;version="4.0.9"
org.codehaus.groovy.reflection;version="4.0.10",
org.codehaus.groovy.reflection.android;version="4.0.10",
org.codehaus.groovy.reflection.stdclasses;version="4.0.10",
org.codehaus.groovy.reflection.v7;version="4.0.10",
org.codehaus.groovy.runtime;version="4.0.10",
org.codehaus.groovy.runtime.callsite;version="4.0.10",
org.codehaus.groovy.runtime.dgmimpl;version="4.0.10",
org.codehaus.groovy.runtime.dgmimpl.arrays;version="4.0.10",
org.codehaus.groovy.runtime.m12n;version="4.0.10",
org.codehaus.groovy.runtime.memoize;version="4.0.10",
org.codehaus.groovy.runtime.metaclass;version="4.0.10",
org.codehaus.groovy.runtime.powerassert;version="4.0.10",
org.codehaus.groovy.runtime.typehandling;version="4.0.10",
org.codehaus.groovy.runtime.wrappers;version="4.0.10",
org.codehaus.groovy.syntax;version="4.0.10",
org.codehaus.groovy.tools;version="4.0.10",
org.codehaus.groovy.tools.ast;version="4.0.10",
org.codehaus.groovy.tools.gse;version="4.0.10",
org.codehaus.groovy.tools.javac;version="4.0.10",
org.codehaus.groovy.tools.shell;version="4.0.10",
org.codehaus.groovy.tools.shell.util;version="4.0.10",
org.codehaus.groovy.transform;version="4.0.10",
org.codehaus.groovy.transform.sc;version="4.0.10",
org.codehaus.groovy.transform.sc.transformers;version="4.0.10",
org.codehaus.groovy.transform.stc;version="4.0.10",
org.codehaus.groovy.transform.tailrec;version="4.0.10",
org.codehaus.groovy.transform.trait;version="4.0.10",
org.codehaus.groovy.util;version="4.0.10",
org.codehaus.groovy.vmplugin;version="4.0.10",
org.codehaus.groovy.vmplugin.v7;version="4.0.10",
org.codehaus.groovy.vmplugin.v8;version="4.0.10",
org.codehaus.groovy.vmplugin.v9;version="4.0.10",
org.codehaus.groovy.vmplugin.v10;version="4.0.10",
org.codehaus.groovy.vmplugin.v16;version="4.0.10"
Require-Bundle: org.eclipse.core.runtime,
org.junit;resolution:=optional
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Expand Down
1 change: 1 addition & 0 deletions base/org.codehaus.groovy40/VERSION
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@
2022-12-21: GROOVY_4_0_7
2023-01-19: GROOVY_4_0_8
2023-02-06: GROOVY_4_0_9
2023-03-09: GROOVY_4_0_10
24 changes: 12 additions & 12 deletions base/org.codehaus.groovy40/about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ <h3>License</h3>

<h3>Third Party Content</h3>

<h4>groovy-4.0.9.jar</h4>
<h4>groovy-test-4.0.9.jar</h4>
<h4>groovy-4.0.10.jar</h4>
<h4>groovy-test-4.0.10.jar</h4>

<ul>
<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/4.0.9/distribution/apache-groovy-binary-4.0.9.zip">https://dist.apache.org/repos/dist/release/groovy/4.0.9/distribution/apache-groovy-binary-4.0.9.zip</a></li>
<li>Sources available at: <a href="https://dist.apache.org/repos/dist/release/groovy/4.0.9/sources/apache-groovy-src-4.0.9.zip">https://dist.apache.org/repos/dist/release/groovy/4.0.9/sources/apache-groovy-src-4.0.9.zip</a></li>
<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/4.0.10/distribution/apache-groovy-binary-4.0.10.zip">https://dist.apache.org/repos/dist/release/groovy/4.0.10/distribution/apache-groovy-binary-4.0.10.zip</a></li>
<li>Sources available at: <a href="https://dist.apache.org/repos/dist/release/groovy/4.0.10/sources/apache-groovy-src-4.0.10.zip">https://dist.apache.org/repos/dist/release/groovy/4.0.10/sources/apache-groovy-src-4.0.10.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>
Expand All @@ -45,15 +45,15 @@ <h4>ivy-2.5.1.jar</h4>
<li>License text: <a href="about_files/asl2-license.txt">asl2-license.txt</a></li>
</ul>

<h4>groovy-console-4.0.9.jar</h4>
<h4>groovy-groovysh-4.0.9.jar</h4>
<h4>groovy-swing-4.0.9.jar</h4>
<h4>groovy-templates-4.0.9.jar</h4>
<h4>groovy-xml-4.0.9.jar</h4>
<h4>javaparser-core-3.25.0.jar</h4>
<h4>groovy-console-4.0.10.jar</h4>
<h4>groovy-groovysh-4.0.10.jar</h4>
<h4>groovy-swing-4.0.10.jar</h4>
<h4>groovy-templates-4.0.10.jar</h4>
<h4>groovy-xml-4.0.10.jar</h4>
<h4>javaparser-core-3.25.1.jar</h4>

<ul>
<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/4.0.9/distribution/apache-groovy-binary-4.0.9.zip">https://dist.apache.org/repos/dist/release/groovy/4.0.9/distribution/apache-groovy-binary-4.0.9.zip</a></li>
<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/4.0.10/distribution/apache-groovy-binary-4.0.10.zip">https://dist.apache.org/repos/dist/release/groovy/4.0.10/distribution/apache-groovy-binary-4.0.10.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>
Expand All @@ -62,7 +62,7 @@ <h4>javaparser-core-3.25.0.jar</h4>
<h4>jline-2.14.6.jar</h4>

<ul>
<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/4.0.9/distribution/apache-groovy-binary-4.0.9.zip">https://dist.apache.org/repos/dist/release/groovy/4.0.9/distribution/apache-groovy-binary-4.0.9.zip</a></li>
<li>Obtained from: <a href="https://dist.apache.org/repos/dist/release/groovy/4.0.10/distribution/apache-groovy-binary-4.0.10.zip">https://dist.apache.org/repos/dist/release/groovy/4.0.10/distribution/apache-groovy-binary-4.0.10.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>
Expand Down
Binary file renamed ...vy40/lib/console/groovy-console-4.0.9.jar → ...y40/lib/console/groovy-console-4.0.10.jar
View file
Binary file not shown.
Binary file renamed ...oovy40/lib/console/groovy-swing-4.0.9.jar → ...ovy40/lib/console/groovy-swing-4.0.10.jar
View file
Binary file not shown.
Binary file renamed ...40/lib/console/groovy-templates-4.0.9.jar → ...0/lib/console/groovy-templates-4.0.10.jar
View file
Binary file not shown.
Binary file renamed ...groovy40/lib/console/groovy-xml-4.0.9.jar → ...roovy40/lib/console/groovy-xml-4.0.10.jar
View file
Binary file not shown.
Binary file renamed ...40/lib/console/javaparser-core-3.25.0.jar → ...40/lib/console/javaparser-core-3.25.1.jar
View file
Binary file not shown.
Binary file added base/org.codehaus.groovy40/lib/groovy-4.0.10-javadoc.jar
View file
Binary file not shown.
Binary file renamed ...aus.groovy40/lib/groovy-4.0.9-sources.jar → ...us.groovy40/lib/groovy-4.0.10-sources.jar
View file
Binary file not shown.
Binary file renamed ...rg.codehaus.groovy40/lib/groovy-4.0.9.jar → ...g.codehaus.groovy40/lib/groovy-4.0.10.jar
View file
Binary file not shown.
Binary file removed base/org.codehaus.groovy40/lib/groovy-4.0.9-javadoc.jar
View file
Binary file not shown.
Binary file renamed ...roovy40/lib/groovy-test-4.0.9-javadoc.jar → ...oovy40/lib/groovy-test-4.0.10-javadoc.jar
View file
Binary file not shown.
Binary file renamed ...roovy40/lib/groovy-test-4.0.9-sources.jar → ...oovy40/lib/groovy-test-4.0.10-sources.jar
View file
Binary file not shown.
Binary file renamed ...dehaus.groovy40/lib/groovy-test-4.0.9.jar → ...ehaus.groovy40/lib/groovy-test-4.0.10.jar
View file
Binary file not shown.
Binary file renamed ...ovy40/lib/shell/groovy-groovysh-4.0.9.jar → ...vy40/lib/shell/groovy-groovysh-4.0.10.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion base/org.codehaus.groovy40/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</parent>
<groupId>org.codehaus.groovy.eclipse</groupId>
<artifactId>org.codehaus.groovy</artifactId>
<version>4.0.9-SNAPSHOT</version>
<version>4.0.10-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<build>
Expand Down
15 changes: 5 additions & 10 deletions base/org.codehaus.groovy40/src/GroovyLexer.g4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,20 +220,21 @@ options {
return Integer.MIN_VALUE;
}

// GRECLIPSE add
private void addComment(int type) {
String text = _input.getText(Interval.of(_tokenStartCharIndex, getCharIndex() - 1));
// GRECLIPSE add
Comment comment;
if (type == 0) {
comment = Comment.makeMultiLineComment( _tokenStartLine, _tokenStartCharPositionInLine + 1, getLine(), getCharPositionInLine() + 1, text);
} else {
comment = Comment.makeSingleLineComment(_tokenStartLine, _tokenStartCharPositionInLine + 1, getLine(), getCharPositionInLine() + 1, text);
}
comments.add(comment);
// GRECLIPSE end
}

public List<Comment> getComments() { return comments; }
private final List<Comment> comments = new ArrayList<>();
// GRECLIPSE end

private static boolean isJavaIdentifierStartAndNotIdentifierIgnorable(int codePoint) {
return Character.isJavaIdentifierStart(codePoint) && !Character.isIdentifierIgnorable(codePoint);
Expand Down Expand Up @@ -986,23 +987,17 @@ WS : ([ \t]+ | LineEscape+) -> skip
;

// Inside (...) and [...] but not {...}, ignore newlines.
NL : LineTerminator { this.ignoreTokenInsideParens(); }
NL : LineTerminator { ignoreTokenInsideParens(); }
;

// Multiple-line comments (including groovydoc comments)
ML_COMMENT
// GRECLIPSE edit
// : '/*' .*? '*/' { this.ignoreMultiLineCommentConditionally(); } -> type(NL)
: '/*' .*? '*/' { addComment(0); ignoreMultiLineCommentConditionally(); } -> type(NL)
// GRECLIPSE end
;

// Single-line comments
SL_COMMENT
// GRECLIPSE edit
// : '//' ~[\r\n\uFFFF]* { this.ignoreTokenInsideParens(); } -> type(NL)
: '//' ~[\r\n\uFFFF]* { addComment(1); ignoreTokenInsideParens(); } -> type(NL)
// GRECLIPSE end
: '//' ~[\r\n\uFFFF]* { addComment(1); ignoreTokenInsideParens(); } -> type(NL)
;

// Script-header comments.
Expand Down
7 changes: 4 additions & 3 deletions base/org.codehaus.groovy40/src/org/apache/groovy/parser/antlr4/GroovyLexer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,20 +359,21 @@ public int popMode() {
return Integer.MIN_VALUE;
}

// GRECLIPSE add
private void addComment(int type) {
String text = _input.getText(Interval.of(_tokenStartCharIndex, getCharIndex() - 1));
// GRECLIPSE add
Comment comment;
if (type == 0) {
comment = Comment.makeMultiLineComment( _tokenStartLine, _tokenStartCharPositionInLine + 1, getLine(), getCharPositionInLine() + 1, text);
} else {
comment = Comment.makeSingleLineComment(_tokenStartLine, _tokenStartCharPositionInLine + 1, getLine(), getCharPositionInLine() + 1, text);
}
comments.add(comment);
// GRECLIPSE end
}

public List<Comment> getComments() { return comments; }
private final List<Comment> comments = new ArrayList<>();
// GRECLIPSE end

private static boolean isJavaIdentifierStartAndNotIdentifierIgnorable(int codePoint) {
return Character.isJavaIdentifierStart(codePoint) && !Character.isIdentifierIgnorable(codePoint);
Expand Down Expand Up @@ -561,7 +562,7 @@ private void RBRACK_action(RuleContext _localctx, int actionIndex) {
private void NL_action(RuleContext _localctx, int actionIndex) {
switch (actionIndex) {
case 13:
this.ignoreTokenInsideParens();
ignoreTokenInsideParens();
break;
}
}
Expand Down
Loading

0 comments on commit 47837ce

Please sign in to comment.