From af6c50944d6bfb8eef8c6f21bb74c3ded2b2c1e4 Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 11 Feb 2015 17:23:01 +0100 Subject: [PATCH] fix GroovyCompilerTest: order chunk rebuild when stub generation failed (with NCDFE) --- .../jetbrains/jps/incremental/groovy/GroovycOutputParser.java | 4 ++++ .../org/jetbrains/groovy/compiler/rt/GroovyRtConstants.java | 1 + .../jetbrains/groovy/compiler/rt/GroovyCompilerWrapper.java | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovycOutputParser.java b/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovycOutputParser.java index a0e2a97fd94f..c85d5e8bd92e 100644 --- a/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovycOutputParser.java +++ b/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovycOutputParser.java @@ -184,6 +184,10 @@ public abstract class GroovycOutputParser { LOG.debug("Error message: " + message); return true; } + if (message.getMessageText().contains(GroovyRtConstants.GROOVYC_STUB_GENERATION_FAILED)) { + LOG.debug("Stub failed message: " + message); + return true; + } } if (getStdErr().length() > 0) { LOG.debug("Non-empty stderr: '" + getStdErr() + "'"); diff --git a/plugins/groovy/rt-constants/src/org/jetbrains/groovy/compiler/rt/GroovyRtConstants.java b/plugins/groovy/rt-constants/src/org/jetbrains/groovy/compiler/rt/GroovyRtConstants.java index 855b27722595..6a37194597f9 100644 --- a/plugins/groovy/rt-constants/src/org/jetbrains/groovy/compiler/rt/GroovyRtConstants.java +++ b/plugins/groovy/rt-constants/src/org/jetbrains/groovy/compiler/rt/GroovyRtConstants.java @@ -35,4 +35,5 @@ public class GroovyRtConstants { public static final String CLEAR_PRESENTABLE = "$@#$%^ CLEAR_PRESENTABLE"; public static final String NO_GROOVY = "Cannot compile Groovy files: no Groovy library is defined"; public static final String OPTIMIZE = "optimize"; + public static final String GROOVYC_STUB_GENERATION_FAILED = "Groovyc stub generation failed"; } diff --git a/plugins/groovy/rt/src/org/jetbrains/groovy/compiler/rt/GroovyCompilerWrapper.java b/plugins/groovy/rt/src/org/jetbrains/groovy/compiler/rt/GroovyCompilerWrapper.java index 369a112d62eb..6824474b7394 100644 --- a/plugins/groovy/rt/src/org/jetbrains/groovy/compiler/rt/GroovyCompilerWrapper.java +++ b/plugins/groovy/rt/src/org/jetbrains/groovy/compiler/rt/GroovyCompilerWrapper.java @@ -194,7 +194,7 @@ public class GroovyCompilerWrapper { if (forStubs) { collector.add(new CompilerMessage(GroovyCompilerMessageCategories.INFORMATION, - "Groovyc stub generation failed", null, -1, -1)); + GroovyRtConstants.GROOVYC_STUB_GENERATION_FAILED, null, -1, -1)); } final StringWriter writer = new StringWriter();