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

RootIndex: support libs inside modules and vice versa

Browse Source
This commit is contained in:
peter
2013-10-24 19:20:40 +02:00
parent 89f4853a3b
commit 9c87cfcddc
1 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/openapi/roots/impl/RootIndex.java
+44 -1
View File
@@ -172,6 +172,45 @@ class RootIndex {
for (Map.Entry<VirtualFile, Collection<OrderEntry>> mapEntry : libSourceRootEntries.entrySet()) {
fillMapWithOrderEntries(mapEntry.getKey(), mapEntry.getValue(), null, null, mapEntry.getKey());
}
mergeWithParentInfos();
}
private void mergeWithParentInfos() {
for (Map.Entry<VirtualFile, DirectoryInfo> entry : myRoots.entrySet()) {
DirectoryInfo info = entry.getValue();
Module module = info.getModule();
VirtualFile libraryClassRoot = info.getLibraryClassRoot();
boolean inModuleSource = info.isInModuleSource();
boolean inLibrarySource = info.isInLibrarySource();
boolean nested = false;
VirtualFile eachFile = entry.getKey().getParent();
while (eachFile != null) {
DirectoryInfo eachInfo = myRoots.get(eachFile);
if (eachInfo != null) {
nested = true;
if (module == null) {
module = eachInfo.getModule();
}
if (libraryClassRoot == null) {
libraryClassRoot = eachInfo.getLibraryClassRoot();
}
inModuleSource |= eachInfo.isInModuleSource();
inLibrarySource |= eachInfo.isInLibrarySource();
}
if (isAnyExcludeRoot(eachFile)) {
break;
}
eachFile = eachFile.getParent();
}
if (nested) {
int sourceRootTypeData = DirectoryInfo.createSourceRootTypeData(inModuleSource, inLibrarySource, info.getSourceRootTypeId());
entry.setValue(info.with(module, info.getContentRoot(), info.getSourceRoot(), libraryClassRoot, sourceRootTypeData, info.getOrderEntries()));
}
}
}
public void checkConsistency() {
@@ -268,7 +307,7 @@ class RootIndex {
if (info != null) {
return info;
}
if (myProjectExcludedRoots.contains(root) || myLibraryExcludedRoots.contains(root)) {
if (isAnyExcludeRoot(root)) {
return null;
}
}
@@ -276,6 +315,10 @@ class RootIndex {
return null;
}
private boolean isAnyExcludeRoot(VirtualFile root) {
return myProjectExcludedRoots.contains(root) || myLibraryExcludedRoots.contains(root);
}
public boolean isProjectExcludeRoot(@NotNull final VirtualFile dir) {
return myProjectExcludedRoots.contains(dir);
}