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

don't fail when compiling with old groovy distributions (IDEADEV-41513, IDEADEV-41514)

Browse Source
This commit is contained in:
peter
2009-11-22 22:25:44 +00:00
parent bc1ae2e2dc
commit cd2b1f0a36
1 changed files with 59 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/rt/src/org/jetbrains/groovy/compiler/rt/GroovycRunner.java
+59 -39
View File
@@ -330,16 +330,12 @@ public class GroovycRunner {
}
private static CompilationUnit createCompilationUnit(final boolean forStubs, final CompilerConfiguration config, final String finalOutput) {
config.setClasspathList(Collections.EMPTY_LIST);
config.setClasspath("");
final GroovyClassLoader classLoader = buildClassLoaderFor(config);
final GroovyClassLoader transformLoader = new GroovyClassLoader(classLoader) {
public Enumeration getResources(String name) throws IOException {
if (forStubs) {
//return Collections.enumeration(Collections.EMPTY_LIST);
}
if (name.endsWith("org.codehaus.groovy.transform.ASTTransformation")) {
final Enumeration resources = super.getResources(name);
final ArrayList list = Collections.list(resources);
@@ -354,47 +350,71 @@ public class GroovycRunner {
return super.getResources(name);
}
};
final CompilationUnit unit = new CompilationUnit(config, null, classLoader, transformLoader) {
CompilationUnit unit;
try {
unit = new CompilationUnit(config, null, classLoader, transformLoader) {
public void gotoPhase(int phase) throws CompilationFailedException {
super.gotoPhase(phase);
if (phase <= Phases.ALL) {
System.out.println(PRESENTABLE_MESSAGE + (forStubs ? "Groovy stub generator: " : "Groovy compiler: ") + getPhaseDescription());
public void gotoPhase(int phase) throws CompilationFailedException {
super.gotoPhase(phase);
if (phase <= Phases.ALL) {
System.out.println(PRESENTABLE_MESSAGE + (forStubs ? "Groovy stub generator: " : "Groovy compiler: ") + getPhaseDescription());
}
}
}
};
};
}
catch (NoSuchMethodError e) {
//groovy 1.5.x
unit = new CompilationUnit(config, null, classLoader) {
public void gotoPhase(int phase) throws CompilationFailedException {
super.gotoPhase(phase);
if (phase <= Phases.ALL) {
System.out.println(PRESENTABLE_MESSAGE + (forStubs ? "Groovy stub generator: " : "Groovy compiler: ") + getPhaseDescription());
}
}
};
}
if (forStubs) {
//todo reuse JavaStubCompilationUnit in groovy 1.7
boolean useJava5 = config.getTargetBytecode().equals(CompilerConfiguration.POST_JDK5);
final JavaStubGenerator stubGenerator = new JavaStubGenerator(config.getTargetDirectory(), false, useJava5);
//but JavaStubCompilationUnit doesn't have this...
unit.addPhaseOperation(new CompilationUnit.PrimaryClassNodeOperation() {
public void call(SourceUnit source, GeneratorContext context, ClassNode node) throws CompilationFailedException {
new JavaAwareResolveVisitor(unit).startResolving(node, source);
}
},Phases.CONVERSION);
unit.addPhaseOperation(new CompilationUnit.PrimaryClassNodeOperation() {
public void call(final SourceUnit source, final GeneratorContext context, final ClassNode node) throws CompilationFailedException {
final String name = node.getNameWithoutPackage();
if ("package-info".equals(name)) {
return;
}
System.out.println(PRESENTABLE_MESSAGE + "Generating stub for " + name);
try {
stubGenerator.generateClass(node);
}
catch (FileNotFoundException e) {
source.addException(e);
}
}
},Phases.CONVERSION);
try {
addStubGeneration(config, unit);
}
catch (LinkageError e) {
//older groovy distributions, just don't generate stubs
}
}
return unit;
}
private static void addStubGeneration(CompilerConfiguration config, final CompilationUnit unit) {
//todo reuse JavaStubCompilationUnit in groovy 1.7
boolean useJava5 = config.getTargetBytecode().equals(CompilerConfiguration.POST_JDK5);
final JavaStubGenerator stubGenerator = new JavaStubGenerator(config.getTargetDirectory(), false, useJava5);
//but JavaStubCompilationUnit doesn't have this...
unit.addPhaseOperation(new CompilationUnit.PrimaryClassNodeOperation() {
public void call(SourceUnit source, GeneratorContext context, ClassNode node) throws CompilationFailedException {
new JavaAwareResolveVisitor(unit).startResolving(node, source);
}
}, Phases.CONVERSION);
unit.addPhaseOperation(new CompilationUnit.PrimaryClassNodeOperation() {
public void call(final SourceUnit source, final GeneratorContext context, final ClassNode node) throws CompilationFailedException {
final String name = node.getNameWithoutPackage();
if ("package-info".equals(name)) {
return;
}
System.out.println(PRESENTABLE_MESSAGE + "Generating stub for " + name);
try {
stubGenerator.generateClass(node);
}
catch (FileNotFoundException e) {
source.addException(e);
}
}
},Phases.CONVERSION);
}
static GroovyClassLoader buildClassLoaderFor(final CompilerConfiguration compilerConfiguration) {
return (GroovyClassLoader) AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {