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

getVcsRootObjectFor: smaller read action (IDEA-CR-29817)

Browse Source 
e.g. to allow for VFS refresh in findValidParentAccurately
This commit is contained in:
peter
2018-03-01 15:16:37 +01:00
parent 15c3f14340
commit ef4637e7ee
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ModuleDefaultVcsRootPolicy.java
+1 -3
View File
@@ -17,7 +17,6 @@
package com.intellij.openapi.vcs.impl;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
@@ -116,8 +115,7 @@ public class ModuleDefaultVcsRootPolicy extends DefaultVcsRootPolicy {
@Override
@Nullable
public VirtualFile getVcsRootFor(@NotNull VirtualFile file) {
FileIndexFacade indexFacade = ServiceManager.getService(myProject, FileIndexFacade.class);
if (myBaseDir != null && indexFacade.isValidAncestor(myBaseDir, file)) {
if (myBaseDir != null && ReadAction.compute(() -> FileIndexFacade.getInstance(myProject).isValidAncestor(myBaseDir, file))) {
LOG.debug("File " + file + " is under project base dir " + myBaseDir);
return myBaseDir;
}
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
+3 -5
View File
@@ -325,12 +325,10 @@ public class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx impleme
@Override
public VcsRoot getVcsRootObjectFor(@Nullable FilePath file) {
return ReadAction.compute(() -> {
if (file == null || myProject.isDisposed()) return null;
if (file == null) return null;
VirtualFile vFile = ChangesUtil.findValidParentAccurately(file);
return vFile != null ? getVcsRootObjectFor(vFile) : null;
});
VirtualFile vFile = ChangesUtil.findValidParentAccurately(file);
return vFile != null ? getVcsRootObjectFor(vFile) : null;
}
public void unregisterVcs(@NotNull AbstractVcs vcs) {