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

simplify for IDEA-CR-61813

Browse Source 
GitOrigin-RevId: aab261eb2c19f71128e0e1dbee852f56cbe282f3
This commit is contained in:
Alexey Kudravtsev
2020-04-23 22:23:22 +00:00
committed by intellij-monorepo-bot
parent db5add1d1f
commit 80393af2ab
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
+6 -17
View File
@@ -14,7 +14,6 @@ import com.intellij.openapi.application.ex.ApplicationEx;
import com.intellij.openapi.application.ex.ApplicationUtil;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.progress.*;
import com.intellij.openapi.progress.impl.CoreProgressManager;
import com.intellij.openapi.progress.util.ProgressWrapper;
@@ -321,27 +320,17 @@ public class PsiSearchHelperImpl implements PsiSearchHelper {
directories = ContainerUtil.mapNotNull(targets, v -> v.getParent());
GlobalSearchScope directoryNearTargetScope = new GlobalSearchScope() {
@Override
public boolean isSearchInModuleContent(@NotNull Module aModule) {
return scope.isSearchInModuleContent(aModule);
}
@Override
public boolean isSearchInLibraries() {
return scope.isSearchInLibraries();
}
GlobalSearchScope directoryNearTargetScope = new DelegatingGlobalSearchScope(scope) {
@Override
public boolean contains(@NotNull VirtualFile file) {
return scope.contains(file) && directories.contains(file.getParent());
return super.contains(file) && directories.contains(file.getParent());
}
};
Set<VirtualFile> directoryNearTargetFiles = new THashSet<>();
getFilesWithText(directoryNearTargetScope, searchContext, caseSensitively, text, directoryNearTargetFiles);
directoryNearTargetFiles.removeAll(targets);
List<VirtualFile> directoryNearTargetFiles =
ContainerUtil.filter(allFiles, f -> directoryNearTargetScope.contains(f) && !targets.contains(f));
if (!directoryNearTargetFiles.isEmpty()) {
priorities.add(new ArrayList<>(directoryNearTargetFiles));
priorities.add(directoryNearTargetFiles);
allFiles.removeAll(directoryNearTargetFiles);
}
}