MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

RUBY-33346 inline FileIndexFacade access, do not store the service in a field or attempt to retrieve in a constructor

Browse Source 
(cherry picked from commit 230341f728763bbd3dd07423d0222f5ad6ef25b8)

IJ-CR-145937

GitOrigin-RevId: 3af2460e10d0b8552350a91a9e52948d115488b6
This commit is contained in:
Henry Wylde
2024-10-02 13:34:42 +13:00
committed by intellij-monorepo-bot
parent b1f6dd7e8f
commit efd46d0c2e
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
View File

@@ -78,11 +78,8 @@ public final class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx i
private final Set<ActionKey> myBackgroundRunningTasks = ConcurrentCollectionFactory.createConcurrentSet();
private final FileIndexFacade myExcludedIndex;
public ProjectLevelVcsManagerImpl(@NotNull Project project, @NotNull CoroutineScope coroutineScope) {
myProject = project;
myExcludedIndex = FileIndexFacade.getInstance(project);
myMappings = new NewMappings(myProject, this, coroutineScope);
}
@@ -693,11 +690,12 @@ public final class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx i
}
return ReadAction.compute(() -> {
if (!vf.isValid()) return false;
FileIndexFacade fileIndex = FileIndexFacade.getInstance(myProject);
boolean isUnderProject = isFileInBaseDir(vf) ||
isInDirectoryBasedRoot(vf) ||
hasExplicitMapping(vf) ||
myExcludedIndex.isInContent(vf) ||
(!Registry.is("ide.hide.excluded.files") && myExcludedIndex.isExcludedFile(vf));
fileIndex.isInContent(vf) ||
(!Registry.is("ide.hide.excluded.files") && fileIndex.isExcludedFile(vf));
return isUnderProject && !isIgnored(vf);
});
}
@@ -709,10 +707,10 @@ public final class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx i
if (!vf.isValid()) return false;
if (Registry.is("ide.hide.excluded.files")) {
return myExcludedIndex.isExcludedFile(vf);
return FileIndexFacade.getInstance(myProject).isExcludedFile(vf);
}
else {
return myExcludedIndex.isUnderIgnored(vf);
return FileIndexFacade.getInstance(myProject).isUnderIgnored(vf);
}
});
}
@@ -724,7 +722,7 @@ public final class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx i
if (Registry.is("ide.hide.excluded.files")) {
VirtualFile vf = VcsImplUtil.findValidParentAccurately(filePath);
return vf != null && myExcludedIndex.isExcludedFile(vf);
return vf != null && FileIndexFacade.getInstance(myProject).isExcludedFile(vf);
}
else {
// WARN: might differ from 'myExcludedIndex.isUnderIgnored' if whole content root is under folder with 'ignored' name.