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

[by Jan Voung] ModuleWithDependenciesScope: calculate module set lazily

Browse Source
This commit is contained in:
peter
2015-11-26 08:28:05 +01:00
parent ab6ec15175
commit b9463781db
2 changed files with 82 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/roots/ModuleScopesTest.java
+36
View File
@@ -145,6 +145,42 @@ public class ModuleScopesTest extends ModuleTestCase {
assertTrue(deps.contains(file));
}
public void testModuleContentWithDependenciesScopeRootOrdering() throws IOException {
Module m = createModule("m.iml", StdModuleTypes.JAVA);
Module a = createModule("a.iml", StdModuleTypes.JAVA);
Module b = createModule("b.iml", StdModuleTypes.JAVA);
Module c = createModule("c.iml", StdModuleTypes.JAVA);
ModuleRootModificationUtil.addDependency(b, m, DependencyScope.COMPILE, true);
ModuleRootModificationUtil.addDependency(a, b, DependencyScope.COMPILE, true);
ModuleRootModificationUtil.addDependency(a, m, DependencyScope.COMPILE, true);
ModuleRootModificationUtil.addDependency(c, a, DependencyScope.COMPILE, true);
VirtualFile mRoot = myFixture.findOrCreateDir("m");
PsiTestUtil.addSourceContentToRoots(m, mRoot);
VirtualFile aRoot = myFixture.findOrCreateDir("a");
PsiTestUtil.addSourceContentToRoots(a, aRoot);
VirtualFile bRoot = myFixture.findOrCreateDir("b");
PsiTestUtil.addSourceContentToRoots(b, bRoot);
VirtualFile cRoot = myFixture.findOrCreateDir("c");
PsiTestUtil.addSourceContentToRoots(c, cRoot);
VirtualFile file = cRoot.createChildData(this, "x.txt");
GlobalSearchScope deps = c.getModuleContentWithDependenciesScope();
assertTrue(deps.contains(file));
assertTrue(deps.compare(mRoot, aRoot) < 0);
assertTrue(deps.compare(mRoot, bRoot) < 0);
assertTrue(deps.compare(mRoot, cRoot) < 0);
assertTrue(deps.compare(bRoot, aRoot) < 0);
assertTrue(deps.compare(bRoot, cRoot) < 0);
assertTrue(deps.compare(aRoot, cRoot) < 0);
assertTrue(deps.compare(cRoot, mRoot) > 0);
assertTrue(deps.compare(cRoot, aRoot) > 0);
assertTrue(deps.compare(cRoot, bRoot) > 0);
assertEquals(0, deps.compare(cRoot, cRoot));
}
public void testTestOnlyLibraryDependency() throws IOException {
Module m = createModule("a.iml", StdModuleTypes.JAVA);
addLibrary(m, DependencyScope.TEST);
platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependenciesScope.java
+46 -33
View File
@@ -24,7 +24,6 @@ import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.util.NotNullFunction;
import com.intellij.util.Processor;
import com.intellij.util.containers.ContainerUtil;
import gnu.trove.THashSet;
import gnu.trove.TObjectIntHashMap;
import org.intellij.lang.annotations.MagicConstant;
import org.jetbrains.annotations.NotNull;
@@ -50,7 +49,7 @@ public class ModuleWithDependenciesScope extends GlobalSearchScope {
private final ProjectFileIndex myProjectFileIndex;
private final Set<Module> myModules;
private volatile Set<Module> myModules;
private final TObjectIntHashMap<VirtualFile> myRoots = new TObjectIntHashMap<VirtualFile>();
public ModuleWithDependenciesScope(@NotNull Module module, @ScopeConstant int options) {
@@ -60,39 +59,11 @@ public class ModuleWithDependenciesScope extends GlobalSearchScope {
myProjectFileIndex = ProjectRootManager.getInstance(module.getProject()).getFileIndex();
OrderEnumerator en = ModuleRootManager.getInstance(module).orderEntries();
en.recursively();
if (hasOption(COMPILE)) {
en.exportedOnly().compileOnly();
}
if (hasOption(RUNTIME)) {
en.runtimeOnly();
}
if (!hasOption(LIBRARIES)) en.withoutLibraries().withoutSdk();
if (!hasOption(MODULES)) en.withoutDepModules();
if (!hasOption(TESTS)) en.productionOnly();
final LinkedHashSet<Module> modules = ContainerUtil.newLinkedHashSet();
en.forEach(new Processor<OrderEntry>() {
@Override
public boolean process(OrderEntry each) {
if (each instanceof ModuleOrderEntry) {
ContainerUtil.addIfNotNull(modules, ((ModuleOrderEntry)each).getModule());
}
else if (each instanceof ModuleSourceOrderEntry) {
ContainerUtil.addIfNotNull(modules, each.getOwnerModule());
}
return true;
}
});
myModules = new THashSet<Module>(modules);
final LinkedHashSet<VirtualFile> roots = ContainerUtil.newLinkedHashSet();
if (hasOption(CONTENT)) {
Set<Module> modules = calcModules();
myModules = ContainerUtil.newTroveSet(modules);
for (Module m : modules) {
for (ContentEntry entry : ModuleRootManager.getInstance(m).getContentEntries()) {
ContainerUtil.addIfNotNull(entry.getFile(), roots);
@@ -100,6 +71,7 @@ public class ModuleWithDependenciesScope extends GlobalSearchScope {
}
}
else {
OrderEnumerator en = getOrderEnumeratorForOptions();
Collections.addAll(roots, en.roots(new NotNullFunction<OrderEntry, OrderRootType>() {
@NotNull
@Override
@@ -116,6 +88,43 @@ public class ModuleWithDependenciesScope extends GlobalSearchScope {
}
}
private OrderEnumerator getOrderEnumeratorForOptions() {
OrderEnumerator en = ModuleRootManager.getInstance(myModule).orderEntries();
en.recursively();
if (hasOption(COMPILE)) {
en.exportedOnly().compileOnly();
}
if (hasOption(RUNTIME)) {
en.runtimeOnly();
}
if (!hasOption(LIBRARIES)) en.withoutLibraries().withoutSdk();
if (!hasOption(MODULES)) en.withoutDepModules();
if (!hasOption(TESTS)) en.productionOnly();
return en;
}
@NotNull
private Set<Module> calcModules() {
// In the case that hasOption(CONTENT), the order of the modules set matters for
// ordering the content roots, so use a LinkedHashSet
final Set<Module> modules = ContainerUtil.newLinkedHashSet();
OrderEnumerator en = getOrderEnumeratorForOptions();
en.forEach(new Processor<OrderEntry>() {
@Override
public boolean process(OrderEntry each) {
if (each instanceof ModuleOrderEntry) {
ContainerUtil.addIfNotNull(modules, ((ModuleOrderEntry)each).getModule());
}
else if (each instanceof ModuleSourceOrderEntry) {
ContainerUtil.addIfNotNull(modules, each.getOwnerModule());
}
return true;
}
});
return modules;
}
@NotNull
public Module getModule() {
return myModule;
@@ -134,7 +143,11 @@ public class ModuleWithDependenciesScope extends GlobalSearchScope {
@Override
public boolean isSearchInModuleContent(@NotNull Module aModule) {
return myModules.contains(aModule);
Set<Module> allModules = myModules;
if (allModules == null) {
myModules = allModules = ContainerUtil.newTroveSet(calcModules());
}
return allModules.contains(aModule);
}
@Override