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

TranslatingCompilerFilesMonitor cleanup (IDEA-CR-48732)

Browse Source 
GitOrigin-RevId: db2795b8a7624e3fe496ba64d146dec899dba6ac
This commit is contained in:
peter
2019-07-08 20:07:55 +03:00
committed by intellij-monorepo-bot
parent 5ce7c1f604
commit 4ffc408f44
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/impl/TranslatingCompilerFilesMonitor.java
+8 -11
View File
@@ -113,11 +113,11 @@ public class TranslatingCompilerFilesMonitor implements AsyncFileListener {
Set<File> filesChanged = new THashSet<>(FileUtil.FILE_HASHING_STRATEGY);
Set<File> filesDeleted = new THashSet<>(FileUtil.FILE_HASHING_STRATEGY);
for (VFileEvent event : events) {
if (event instanceof VFileDeleteEvent || event instanceof VFileMoveEvent || event instanceof VFileContentChangeEvent) {
final VirtualFile file = event.getFile();
if (file != null) {
collectPaths(file, event instanceof VFileContentChangeEvent ? filesChanged : filesDeleted);
}
if (event instanceof VFileDeleteEvent || event instanceof VFileMoveEvent) {
collectPaths(event.getFile(), filesDeleted);
}
else if (event instanceof VFileContentChangeEvent) {
collectPaths(event.getFile(), filesChanged);
}
}
return new ChangeApplier() {
@@ -134,10 +134,7 @@ public class TranslatingCompilerFilesMonitor implements AsyncFileListener {
handlePropChange((VFilePropertyChangeEvent)event, filesDeleted, filesChanged);
}
else if (event instanceof VFileMoveEvent || event instanceof VFileCreateEvent || event instanceof VFileCopyEvent) {
VirtualFile file = event.getFile();
if (file != null) {
collectPaths(file, filesChanged);
}
collectPaths(event.getFile(), filesChanged);
}
}
@@ -202,8 +199,8 @@ public class TranslatingCompilerFilesMonitor implements AsyncFileListener {
}
}
private static void collectPaths(@NotNull VirtualFile file, @NotNull Collection<? super File> outFiles) {
if (!isIgnoredOrUnderIgnoredDirectory(file)) {
private static void collectPaths(@Nullable VirtualFile file, @NotNull Collection<? super File> outFiles) {
if (file != null && !isIgnoredOrUnderIgnoredDirectory(file)) {
processRecursively(file, !isInContentOfOpenedProject(file), f -> outFiles.add(new File(f.getPath())));
}
}