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

IDEA-117852 NullPointerException when making project with mixed java/groovy sources

Browse Source
This commit is contained in:
peter
2014-01-27 17:51:38 +01:00
parent a4d583667e
commit 37e2a4c481
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java
+8 -2
View File
@@ -328,12 +328,18 @@ public class GroovyBuilder extends ModuleLevelBuilder {
GroovycOSProcessHandler.OutputItem item,
Map<ModuleBuildTarget, String> generationOutputs,
String compilerOutput,
ModuleBuildTarget srcTarget) throws IOException {
@NotNull ModuleBuildTarget srcTarget) throws IOException {
if (chunk.getModules().size() > 1 && !srcTarget.equals(chunk.representativeTarget())) {
File output = new File(item.outputPath);
String srcTargetOutput = generationOutputs.get(srcTarget);
if (srcTargetOutput == null) {
LOG.info("No output for " + srcTarget + "; outputs=" + generationOutputs + "; targets = " + chunk.getTargets());
return item.outputPath;
}
//todo honor package prefixes
File correctRoot = new File(generationOutputs.get(srcTarget));
File correctRoot = new File(srcTargetOutput);
File correctOutput = new File(correctRoot, FileUtil.getRelativePath(new File(compilerOutput), output));
FileUtil.rename(output, correctOutput);