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

external compiler: several fixes in artifact builder (IDEA-93026, IDEA-81955, IDEA-88716)

Browse Source
This commit is contained in:
nik
2012-10-30 12:43:19 +04:00
parent 78918be5c0
commit 5ac9d4d19b
8 changed files with 69 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/impl/TranslatingCompilerFilesMonitor.java
+7 -4
View File
@@ -1601,7 +1601,6 @@ public class TranslatingCompilerFilesMonitor implements ApplicationComponent {
}
private void processNewFile(final VirtualFile file, final boolean notifyServer) {
final Set<File> pathsToMark = notifyServer ? new THashSet<File>(FileUtil.FILE_HASHING_STRATEGY) : Collections.<File>emptySet();
ApplicationManager.getApplication().runReadAction(new Runnable() {
// need read action to ensure that the project was not disposed during the iteration over the project list
public void run() {
@@ -1616,9 +1615,6 @@ public class TranslatingCompilerFilesMonitor implements ApplicationComponent {
final TranslatingCompiler[] translators = CompilerManager.getInstance(project).getCompilers(TranslatingCompiler.class);
processRecursively(file, false, new FileProcessor() {
public void execute(final VirtualFile file) {
if (notifyServer) {
pathsToMark.add(new File(file.getPath()));
}
if (!projectSuspended && isCompilable(file)) {
loadInfoAndAddSourceForRecompilation(projectId, file);
}
@@ -1647,6 +1643,13 @@ public class TranslatingCompilerFilesMonitor implements ApplicationComponent {
}
});
if (notifyServer) {
final Set<File> pathsToMark = new THashSet<File>(FileUtil.FILE_HASHING_STRATEGY);
processRecursively(file, false, new FileProcessor() {
@Override
public void execute(VirtualFile file) {
pathsToMark.add(new File(file.getPath()));
}
});
notifyFilesChanged(pathsToMark);
}
}