You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2019/09/27 01:50:42 UTC
[groovy] branch GROOVY_3_0_X updated (12c192c -> a835b25)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from 12c192c adapt to relevant parser
new b34357f don't use default compiler config
new a835b25 don't use default compiler config
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java | 2 +-
.../groovy-console/src/main/groovy/groovy/console/ui/Console.groovy | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
[groovy] 02/02: don't use default compiler config
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit a835b25984d6891ce4e71ea3db4eef34d28d2907
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri Sep 27 11:50:29 2019 +1000
don't use default compiler config
---
src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java b/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java
index 4831a5d..8c75bf7 100644
--- a/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java
+++ b/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java
@@ -584,7 +584,7 @@ public class GenericsUtils {
try {
// for parsing just class names old and new parser should be the same but let's stick to the correct parser any way
- boolean oldParserEnabled = CompilerConfiguration.DEFAULT.getPluginFactory() instanceof AntlrParserPluginFactory;
+ boolean oldParserEnabled = compilationUnit.getConfiguration().getPluginFactory() instanceof AntlrParserPluginFactory;
ClassNode parsedNode = oldParserEnabled ?
Antlr2Utils.parse("DummyNode<" + option + ">") :
Antlr4Utils.parse("DummyNode<" + option + ">", compilationUnit.getConfiguration());
[groovy] 01/02: don't use default compiler config
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit b34357f69c73d4c08e8c0f09650986403bcfd719
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri Sep 27 11:48:20 2019 +1000
don't use default compiler config
---
.../groovy-console/src/main/groovy/groovy/console/ui/Console.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/subprojects/groovy-console/src/main/groovy/groovy/console/ui/Console.groovy b/subprojects/groovy-console/src/main/groovy/groovy/console/ui/Console.groovy
index c5a6473..1a658ba 100644
--- a/subprojects/groovy-console/src/main/groovy/groovy/console/ui/Console.groovy
+++ b/subprojects/groovy-console/src/main/groovy/groovy/console/ui/Console.groovy
@@ -1041,7 +1041,7 @@ class Console implements CaretListener, HyperlinkListener, ComponentListener, Fo
void inspectTokens(EventObject evt = null) {
def content = inputArea.getText()
- def lf = (CompilerConfiguration.DEFAULT.pluginFactory instanceof org.codehaus.groovy.antlr.AntlrParserPluginFactory
+ def lf = (config.pluginFactory instanceof org.codehaus.groovy.antlr.AntlrParserPluginFactory
? LexerFrame.groovyScriptFactory(content) : new LexerFrame(GroovyLangLexer, org.apache.groovy.parser.antlr4.GroovyLexer, new StringReader(content)))
lf.visible = true