MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[^jeka] fix groovy compiler tests

Browse Source 
(cherry-picked from 929fdfa)
This commit is contained in:
peter
2012-11-23 21:51:41 +01:00
parent a345240b37
commit fa91e1ccb0
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/rt/src/org/jetbrains/groovy/compiler/rt/GroovycRunner.java
+14 -9
View File
@@ -328,14 +328,6 @@ public class GroovycRunner {
final CompilerConfiguration config,
final String finalOutput, final GroovyClassLoader classLoader) {
try {
if (forStubs) {
return createStubGenerator(config, classLoader);
}
}
catch (NoClassDefFoundError ignore) { // older groovy distributions just don't have stub generation capability
}
final GroovyClassLoader transformLoader = new GroovyClassLoader(classLoader) {
public Enumeration<URL> getResources(String name) throws IOException {
if (name.endsWith("org.codehaus.groovy.transform.ASTTransformation")) {
@@ -358,6 +350,15 @@ public class GroovycRunner {
return super.getResources(name);
}
};
try {
if (forStubs) {
return createStubGenerator(config, classLoader, transformLoader);
}
}
catch (NoClassDefFoundError ignore) { // older groovy distributions just don't have stub generation capability
}
CompilationUnit unit;
try {
unit = new CompilationUnit(config, null, classLoader, transformLoader) {
@@ -385,10 +386,14 @@ public class GroovycRunner {
return unit;
}
private static CompilationUnit createStubGenerator(final CompilerConfiguration config, final GroovyClassLoader classLoader) {
private static CompilationUnit createStubGenerator(final CompilerConfiguration config, final GroovyClassLoader classLoader, final GroovyClassLoader transformLoader) {
JavaAwareCompilationUnit unit = new JavaAwareCompilationUnit(config, classLoader) {
private boolean annoRemovedAdded;
public GroovyClassLoader getTransformLoader() {
return transformLoader;
}
@Override
public void addPhaseOperation(PrimaryClassNodeOperation op, int phase) {
if (!annoRemovedAdded && phase == Phases.CONVERSION && op.getClass().getName().startsWith("org.codehaus.groovy.tools.javac.JavaAwareCompilationUnit$")) {