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

[java] explicit module cycle compilation error (IDEA-168811)

Browse Source
This commit is contained in:
Roman Shevchenko
2017-04-11 17:21:39 +02:00
parent 138b4b6a6d
commit ecf47c4fb1
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
+12 -3
View File
@@ -78,6 +78,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Executor;
import java.util.concurrent.Future;
import java.util.stream.Collectors;
/**
* @author Eugene Zhuravlev
@@ -222,7 +223,8 @@ public class JavaBuilder extends ModuleLevelBuilder {
return true;
});
boolean hasModules = false;
int javaModulesCount = 0;
if ((!filesToCompile.isEmpty() || dirtyFilesHolder.hasRemovedFiles()) &&
JpsJavaSdkType.parseVersion(getLanguageLevel(ContainerUtil.getFirstItem(chunk.getModules()))) >= 9) {
// at the moment, there is no incremental compilation for module-info files, so they should be rebuilt on every change
@@ -231,7 +233,7 @@ public class JavaBuilder extends ModuleLevelBuilder {
File moduleInfoFile = index.getModuleInfoFile(target.getModule(), target.isTests());
if (moduleInfoFile != null) {
filesToCompile.add(moduleInfoFile);
hasModules = true;
javaModulesCount++;
}
}
}
@@ -243,7 +245,14 @@ public class JavaBuilder extends ModuleLevelBuilder {
}
}
return compile(context, chunk, dirtyFilesHolder, filesToCompile, outputConsumer, compilingTool, hasModules);
if (javaModulesCount > 1) {
String prefix = "Cannot compile a module cycle with multiple module-info.java files: ";
String message = chunk.getModules().stream().map(JpsModule::getName).collect(Collectors.joining(", ", prefix, ""));
context.processMessage(new CompilerMessage(BUILDER_NAME, BuildMessage.Kind.ERROR, message));
return ExitCode.ABORT;
}
return compile(context, chunk, dirtyFilesHolder, filesToCompile, outputConsumer, compilingTool, javaModulesCount > 0);
}
catch (BuildDataCorruptedException | PersistentEnumeratorBase.CorruptedException | ProjectBuildException e) {
throw e;