prefer to create global search scopes in AnalysisScope.toSearchScope

This commit is contained in:
Dmitry Batkovich
2017-12-26 12:37:35 +03:00
parent f995c08eae
commit 856cd760e2
@@ -653,18 +653,14 @@ public class AnalysisScope {
case DIRECTORY:
return GlobalSearchScopesCore.directoryScope((PsiDirectory)myElement, true);
case FILE:
return new LocalSearchScope(myElement);
return GlobalSearchScope.fileScope((PsiFile)myElement);
case INVALID:
return LocalSearchScope.EMPTY;
return GlobalSearchScope.EMPTY_SCOPE;
case MODULE:
GlobalSearchScope moduleScope = GlobalSearchScope.moduleScope(myModule);
return myIncludeTestSource ? moduleScope : GlobalSearchScope.notScope(GlobalSearchScopesCore.projectTestScope(myModule.getProject())).intersectWith(moduleScope);
case MODULES:
SearchScope scope = GlobalSearchScope.EMPTY_SCOPE;
for (Module module : myModules) {
scope = scope.union(GlobalSearchScope.moduleScope(module));
}
return scope;
return GlobalSearchScope.union(myModules.stream().map(m -> GlobalSearchScope.moduleScope(m)).toArray(GlobalSearchScope[]::new));
case PROJECT:
return myIncludeTestSource ? GlobalSearchScope.projectScope(myProject) : GlobalSearchScopesCore.projectProductionScope(myProject);
case VIRTUAL_FILES: