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

EA-40118 - assert: ModuleManagerImpl.findModuleByName

Browse Source
This commit is contained in:
nik
2012-11-08 09:36:03 +04:00
parent feb53786a7
commit 6d1fe4877b
1 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+37 -35
View File
@@ -33,10 +33,7 @@ import com.intellij.compiler.server.CustomBuilderMessageHandler;
import com.intellij.compiler.server.DefaultMessageHandler;
import com.intellij.diagnostic.IdeErrorsDialog;
import com.intellij.diagnostic.PluginException;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.application.Result;
import com.intellij.openapi.application.WriteAction;
import com.intellij.openapi.application.*;
import com.intellij.openapi.compiler.*;
import com.intellij.openapi.compiler.Compiler;
import com.intellij.openapi.compiler.ex.CompileContextEx;
@@ -1104,40 +1101,45 @@ public class CompileDriver {
}
}
private void clearAffectedOutputPathsIfPossible(CompileContextEx context) {
final MultiMap<File, Module> outputToModulesMap = new MultiMap<File, Module>();
for (Module module : ModuleManager.getInstance(myProject).getModules()) {
final CompilerModuleExtension compilerModuleExtension = CompilerModuleExtension.getInstance(module);
if (compilerModuleExtension == null) {
continue;
}
final String outputPathUrl = compilerModuleExtension.getCompilerOutputUrl();
if (outputPathUrl != null) {
final String path = VirtualFileManager.extractPath(outputPathUrl);
outputToModulesMap.putValue(new File(path), module);
}
private void clearAffectedOutputPathsIfPossible(final CompileContextEx context) {
final List<File> scopeOutputs = new ReadAction<List<File>>() {
protected void run(final Result<List<File>> result) {
final MultiMap<File, Module> outputToModulesMap = new MultiMap<File, Module>();
for (Module module : ModuleManager.getInstance(myProject).getModules()) {
final CompilerModuleExtension compilerModuleExtension = CompilerModuleExtension.getInstance(module);
if (compilerModuleExtension == null) {
continue;
}
final String outputPathUrl = compilerModuleExtension.getCompilerOutputUrl();
if (outputPathUrl != null) {
final String path = VirtualFileManager.extractPath(outputPathUrl);
outputToModulesMap.putValue(new File(path), module);
}
final String outputPathForTestsUrl = compilerModuleExtension.getCompilerOutputUrlForTests();
if (outputPathForTestsUrl != null) {
final String path = VirtualFileManager.extractPath(outputPathForTestsUrl);
outputToModulesMap.putValue(new File(path), module);
}
}
final Set<Module> affectedModules = new HashSet<Module>(Arrays.asList(context.getCompileScope().getAffectedModules()));
final List<File> scopeOutputs = new ArrayList<File>(affectedModules.size() * 2);
for (File output : outputToModulesMap.keySet()) {
if (affectedModules.containsAll(outputToModulesMap.get(output))) {
scopeOutputs.add(output);
}
}
final String outputPathForTestsUrl = compilerModuleExtension.getCompilerOutputUrlForTests();
if (outputPathForTestsUrl != null) {
final String path = VirtualFileManager.extractPath(outputPathForTestsUrl);
outputToModulesMap.putValue(new File(path), module);
}
}
final Set<Module> affectedModules = new HashSet<Module>(Arrays.asList(context.getCompileScope().getAffectedModules()));
List<File> scopeOutputs = new ArrayList<File>(affectedModules.size() * 2);
for (File output : outputToModulesMap.keySet()) {
if (affectedModules.containsAll(outputToModulesMap.get(output))) {
scopeOutputs.add(output);
}
}
final Set<Artifact> artifactsToBuild = ArtifactCompileScope.getArtifactsToBuild(myProject, context.getCompileScope(), true);
for (Artifact artifact : artifactsToBuild) {
final String outputFilePath = ((ArtifactImpl)artifact).getOutputDirectoryPathToCleanOnRebuild();
if (outputFilePath != null) {
scopeOutputs.add(new File(FileUtil.toSystemDependentName(outputFilePath)));
final Set<Artifact> artifactsToBuild = ArtifactCompileScope.getArtifactsToBuild(myProject, context.getCompileScope(), true);
for (Artifact artifact : artifactsToBuild) {
final String outputFilePath = ((ArtifactImpl)artifact).getOutputDirectoryPathToCleanOnRebuild();
if (outputFilePath != null) {
scopeOutputs.add(new File(FileUtil.toSystemDependentName(outputFilePath)));
}
}
result.setResult(scopeOutputs);
}
}
}.execute().getResultObject();
if (scopeOutputs.size() > 0) {
CompilerUtil.runInContext(context, CompilerBundle.message("progress.clearing.output"), new ThrowableRunnable<RuntimeException>() {
public void run() {