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

AC/C++: CPP-13395 EA-121798 - assert: OCSearchScope$.contains

Browse Source
This commit is contained in:
Dmitry Semeniouta
2018-06-18 16:11:20 +03:00
parent 2eaed68357
commit ec27f95484
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java
+17 -12
View File
@@ -21,6 +21,7 @@ import com.intellij.openapi.actionSystem.DataKey;
import com.intellij.openapi.actionSystem.DataSink;
import com.intellij.openapi.actionSystem.TypeSafeDataProvider;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
@@ -256,18 +257,22 @@ public class UsageViewManagerImpl extends UsageViewManager {
}
public static boolean isInScope(@NotNull Usage usage, @NotNull SearchScope searchScope) {
PsiElement element = null;
VirtualFile file = usage instanceof UsageInFile ? ((UsageInFile)usage).getFile() :
usage instanceof PsiElementUsage
? PsiUtilCore.getVirtualFile(element = ((PsiElementUsage)usage).getElement())
: null;
if (file != null) {
return isFileInScope(file, searchScope);
}
return element != null &&
(searchScope instanceof EverythingGlobalScope ||
searchScope instanceof ProjectScopeImpl ||
searchScope instanceof ProjectAndLibrariesScope);
Boolean isInScope = ReadAction.compute(() -> {
PsiElement element = null;
VirtualFile file = usage instanceof UsageInFile ? ((UsageInFile)usage).getFile() :
usage instanceof PsiElementUsage
? PsiUtilCore.getVirtualFile(element = ((PsiElementUsage)usage).getElement())
: null;
if (file != null) {
return isFileInScope(file, searchScope);
}
return element != null &&
(searchScope instanceof EverythingGlobalScope ||
searchScope instanceof ProjectScopeImpl ||
searchScope instanceof ProjectAndLibrariesScope);
});
return isInScope == Boolean.TRUE;
}
private static boolean isFileInScope(@NotNull VirtualFile file, @NotNull SearchScope searchScope) {