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

vcs: try parent if content root is a file, add logging

Browse Source
This commit is contained in:
Kirill Likhodedov
2017-01-24 18:22:18 +03:00
parent f6454d2bce
commit 0209fc68d2
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ModuleDefaultVcsRootPolicy.java
+11 -2
View File
@@ -116,18 +116,27 @@ public class ModuleDefaultVcsRootPolicy extends DefaultVcsRootPolicy {
public VirtualFile getVcsRootFor(@NotNull VirtualFile file) {
FileIndexFacade indexFacade = PeriodicalTasksCloser.getInstance().safeGetService(myProject, FileIndexFacade.class);
if (myBaseDir != null && indexFacade.isValidAncestor(myBaseDir, file)) {
LOG.debug("File " + file + " is under project base dir " + myBaseDir);
return myBaseDir;
}
VirtualFile contentRoot = ProjectRootManager.getInstance(myProject).getFileIndex().getContentRootForFile(file, Registry.is("ide.hide.excluded.files"));
if (contentRoot != null && contentRoot.isDirectory()) {
return contentRoot;
if (contentRoot != null) {
LOG.debug("Content root for file " + file + " is " + contentRoot);
if (contentRoot.isDirectory()) {
return contentRoot;
}
VirtualFile parent = contentRoot.getParent();
LOG.debug("Content root is not a directory, using its parent " + parent);
return parent;
}
if (ProjectKt.isDirectoryBased(myProject)) {
VirtualFile ideaDir = ProjectKt.getStateStore(myProject).getDirectoryStoreFile();
if (ideaDir != null && VfsUtilCore.isAncestor(ideaDir, file, false)) {
LOG.debug("File " + file + " is under .idea");
return ideaDir;
}
}
LOG.debug("Couldn't find proper root for " + file);
return null;
}