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

support production-on-test dependencies in use scopes (IDEA-203841)

Browse Source
This commit is contained in:
peter
2018-12-28 18:30:50 +01:00
parent 52caeb2bc6
commit d1ef8821e2
2 changed files with 41 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/java/psi/search/ClassInheritorsTest.java
+14
View File
@@ -24,6 +24,7 @@ import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.util.StandardProgressIndicatorBase;
import com.intellij.openapi.roots.DependencyScope;
import com.intellij.openapi.roots.ModuleRootModificationUtil;
import com.intellij.openapi.roots.impl.ModuleOrderEntryImpl;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiJavaFile;
import com.intellij.psi.impl.compiled.ClsClassImpl;
@@ -140,6 +141,19 @@ public class ClassInheritorsTest extends JavaCodeInsightFixtureTestCase {
assertSize(2, ClassInheritorsSearch.search(myFixture.findClass("A")).findAll());
}
public void testInheritorsInAnotherModuleWithProductionOnTestDependency() throws IOException {
myFixture.addFileToProject("tests/B.java", "class B {}");
myFixture.addFileToProject("mod2/C.java", "class C extends B {}");
PsiTestUtil.addSourceRoot(myModule, myFixture.getTempDirFixture().findOrCreateDir("tests"), true);
Module mod2 = PsiTestUtil.addModule(getProject(), StdModuleTypes.JAVA, "mod2", myFixture.getTempDirFixture().findOrCreateDir("mod2"));
ModuleRootModificationUtil.updateModel(mod2, model ->
((ModuleOrderEntryImpl)model.addModuleOrderEntry(myModule)).setProductionOnTestDependency(true));
assertSize(1, ClassInheritorsSearch.search(myFixture.findClass("B")).findAll());
}
public void testSpaceBeforeSuperTypeGenerics() {
myFixture.addFileToProject("A.java", "interface A<T> {}");
myFixture.addFileToProject("B.java", "class B implements A <T> {}");
platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependentsScope.java
+27 -18
View File
@@ -22,6 +22,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.*;
import com.intellij.openapi.roots.impl.DirectoryIndex;
import com.intellij.openapi.roots.impl.DirectoryInfo;
import com.intellij.openapi.roots.impl.ModuleOrderEntryImpl;
import com.intellij.openapi.roots.impl.ProjectFileIndexImpl;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.search.GlobalSearchScope;
@@ -44,7 +45,8 @@ class ModuleWithDependentsScope extends GlobalSearchScope {
private final Module myModule;
private final ProjectFileIndexImpl myProjectFileIndex;
private final Set<Module> myModules;
private final Set<Module> myModules = new THashSet<>();
private final Set<Module> myProductionOnTestModules = new THashSet<>();
ModuleWithDependentsScope(@NotNull Module module) {
super(module.getProject());
@@ -52,30 +54,28 @@ class ModuleWithDependentsScope extends GlobalSearchScope {
myProjectFileIndex = (ProjectFileIndexImpl)ProjectRootManager.getInstance(module.getProject()).getFileIndex();
myModules = buildDependents(myModule);
}
@NotNull
private static Set<Module> buildDependents(@NotNull Module module) {
Set<Module> result = new THashSet<>();
result.add(module);
myModules.add(module);
ModuleIndex index = getModuleIndex(module.getProject());
HashSetQueue<Module> walkingQueue = new HashSetQueue<>();
walkingQueue.add(module);
for (Module current : walkingQueue) {
result.addAll(index.plainUsages.get(current));
Collection<Module> exported = index.exportingUsages.get(current);
walkingQueue.addAll(exported);
result.addAll(exported);
Collection<Module> usages = index.allUsages.get(current);
myModules.addAll(usages);
walkingQueue.addAll(index.exportingUsages.get(current));
if (myProductionOnTestModules.contains(current)) {
myProductionOnTestModules.addAll(usages);
}
myProductionOnTestModules.addAll(index.productionOnTestUsages.get(current));
}
return result;
}
private static class ModuleIndex {
final MultiMap<Module, Module> plainUsages = MultiMap.create();
final MultiMap<Module, Module> allUsages = MultiMap.create();
final MultiMap<Module, Module> exportingUsages = MultiMap.create();
final MultiMap<Module, Module> productionOnTestUsages = MultiMap.create();
}
@NotNull
@@ -87,8 +87,13 @@ class ModuleWithDependentsScope extends GlobalSearchScope {
if (orderEntry instanceof ModuleOrderEntry) {
Module referenced = ((ModuleOrderEntry)orderEntry).getModule();
if (referenced != null) {
MultiMap<Module, Module> map = ((ModuleOrderEntry)orderEntry).isExported() ? index.exportingUsages : index.plainUsages;
map.putValue(referenced, module);
index.allUsages.putValue(referenced, module);
if (((ModuleOrderEntry)orderEntry).isExported()) {
index.exportingUsages.putValue(referenced, module);
}
if (orderEntry instanceof ModuleOrderEntryImpl && ((ModuleOrderEntryImpl)orderEntry).isProductionOnTestDependency()) {
index.productionOnTestUsages.putValue(referenced, module);
}
}
}
}
@@ -102,12 +107,16 @@ class ModuleWithDependentsScope extends GlobalSearchScope {
return contains(file, false);
}
boolean contains(@NotNull VirtualFile file, boolean myOnlyTests) {
boolean contains(@NotNull VirtualFile file, boolean fromTests) {
// optimization: fewer calls to getInfoForFileOrDirectory()
DirectoryInfo info = myProjectFileIndex.getInfoForFileOrDirectory(file);
Module moduleOfFile = info.getModule();
if (moduleOfFile == null || !myModules.contains(moduleOfFile)) return false;
if (myOnlyTests && !TestSourcesFilter.isTestSources(file, moduleOfFile.getProject())) return false;
if (fromTests &&
!myProductionOnTestModules.contains(moduleOfFile) &&
!TestSourcesFilter.isTestSources(file, moduleOfFile.getProject())) {
return false;
}
return ProjectFileIndexImpl.isFileInContent(file, info);
}