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 peter, r=jeka] correctly build project content scope for searching IDEA-83478

Browse Source
This commit is contained in:
Eugene Zhuravlev
2012-04-04 19:31:12 +02:00
parent 0bf49781b6
commit d010d47abd
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java
+11 -5
View File
@@ -457,7 +457,7 @@ public class FindInProjectUtil {
return (GlobalSearchScope)scope;
}
if (scope == null) {
return GlobalSearchScope.projectScope(project);
return projectContentScope(project);
}
Set<VirtualFile> files = new HashSet<VirtualFile>();
for (PsiElement element : ((LocalSearchScope)scope).getScope()) {
@@ -554,6 +554,15 @@ public class FindInProjectUtil {
return new Pair<Boolean, Collection<PsiFile>>(fast, resultFiles);
}
private static GlobalSearchScope projectContentScope(final Project project) {
GlobalSearchScope result = null;
for (Module module : ModuleManager.getInstance(project).getModules()) {
GlobalSearchScope moduleContent = moduleContentScope(module);
result = result == null ? moduleContent : result.uniteWith(moduleContent);
}
return result == null ? GlobalSearchScope.EMPTY_SCOPE : result;
}
@Nullable
private static GlobalSearchScope moduleContentScope(@NotNull final Module module) {
VirtualFile[] contentRoots = ModuleRootManager.getInstance(module).getContentRoots();
@@ -566,10 +575,7 @@ public class FindInProjectUtil {
result = result == null ? moduleContent : result.uniteWith(moduleContent);
}
}
if (result == null) {
result = GlobalSearchScope.EMPTY_SCOPE;
}
return result;
return result == null ? GlobalSearchScope.EMPTY_SCOPE : result;
}
private static void filterMaskedFiles(@NotNull final Set<PsiFile> resultFiles, @Nullable final Pattern fileMaskRegExp) {