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

Check VFS event for validity during async processing EA-109103

Browse Source
This commit is contained in:
Kirill Likhodedov
2017-10-11 15:17:56 +03:00
parent a4b2916186
commit 816f3118a7
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/repo/GitUntrackedFilesHolder.java
+13 -7
View File
@@ -17,6 +17,7 @@ package git4idea.repo;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vcs.ProjectLevelVcsManager;
@@ -295,13 +296,18 @@ public class GitUntrackedFilesHolder implements Disposable, AsyncVfsEventsListen
@Nullable
private static VirtualFile getAffectedFile(@NotNull VFileEvent event) {
if (event instanceof VFileCreateEvent || event instanceof VFileDeleteEvent || event instanceof VFileMoveEvent || isRename(event)) {
return event.getFile();
} else if (event instanceof VFileCopyEvent) {
VFileCopyEvent copyEvent = (VFileCopyEvent) event;
return copyEvent.getNewParent().findChild(copyEvent.getNewChildName());
}
return null;
return ReadAction.compute(() -> {
if (!event.isValid()) return null;
if (event instanceof VFileCreateEvent || event instanceof VFileDeleteEvent || event instanceof VFileMoveEvent || isRename(event)) {
return event.getFile();
}
else if (event instanceof VFileCopyEvent) {
VFileCopyEvent copyEvent = (VFileCopyEvent) event;
return copyEvent.getNewParent().findChild(copyEvent.getNewChildName());
}
return null;
});
}
private static boolean isRename(@NotNull VFileEvent event) {