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

use module / project content scope

Browse Source
This commit is contained in:
Maxim.Mossienko
2012-05-21 10:48:01 +04:00
parent 4c9d8243ff
commit c8d582d406
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java
+2 -17
View File
@@ -480,12 +480,12 @@ public class FindInProjectUtil {
GlobalSearchScope scope = psiDirectory != null
? GlobalSearchScopes.directoryScope(psiDirectory, true)
: module != null
? moduleContentScope(module)
? module.getModuleContentScope()
: customScope instanceof GlobalSearchScope
? (GlobalSearchScope)customScope
: toGlobal(project, customScope);
if (scope == null) {
scope = GlobalSearchScope.projectScope(project);
scope = ProjectScope.getContentScope(project);
}
Set<Integer> keys = new THashSet<Integer>(30);
@@ -553,21 +553,6 @@ public class FindInProjectUtil {
return new Pair<Boolean, Collection<PsiFile>>(fast, resultFiles);
}
@NotNull
private static GlobalSearchScope moduleContentScope(@NotNull final Module module) {
VirtualFile[] contentRoots = ModuleRootManager.getInstance(module).getContentRoots();
GlobalSearchScope result = null;
PsiManager psiManager = PsiManager.getInstance(module.getProject());
for (VirtualFile root : contentRoots) {
PsiDirectory directory = psiManager.findDirectory(root);
if (directory != null) {
GlobalSearchScope moduleContent = GlobalSearchScopes.directoryScope(directory, true);
result = result == null ? moduleContent : result.uniteWith(moduleContent);
}
}
return result == null ? GlobalSearchScope.EMPTY_SCOPE : result;
}
private static void filterMaskedFiles(@NotNull final Set<PsiFile> resultFiles, @Nullable final Pattern fileMaskRegExp) {
if (fileMaskRegExp != null) {
for (Iterator<PsiFile> iterator = resultFiles.iterator(); iterator.hasNext();) {