MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-04 17:20:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

return empty scope when search target has become invalid (PIEAE EA-113928, EA-111728)

Browse Source
This commit is contained in:
peter
2018-11-12 12:09:28 +01:00
parent dda2cf8bca
commit ac8f3431da
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-indexing-api/src/com/intellij/psi/search/searches/MethodReferencesSearch.java
View File

@@ -88,6 +88,8 @@ public class MethodReferencesSearch extends ExtensibleQueryFactory<PsiReference,
public SearchScope getEffectiveSearchScope () {
SearchScope scope = myEffectiveScope;
if (scope == null) {
if (!myMethod.isValid()) return GlobalSearchScope.EMPTY_SCOPE;
myEffectiveScope = scope = myScope.intersectWith(PsiSearchHelper.getInstance(myMethod.getProject()).getUseScope(myMethod));
}
return scope;

2
platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java
View File

@@ -99,6 +99,8 @@ public class ReferencesSearch extends ExtensibleQueryFactory<PsiReference, Refer
SearchScope scope = myEffectiveScope;
if (scope == null) {
if (!myElementToSearch.isValid()) return GlobalSearchScope.EMPTY_SCOPE;
SearchScope useScope = PsiSearchHelper.getInstance(myElementToSearch.getProject()).getUseScope(myElementToSearch);
myEffectiveScope = scope = myScope.intersectWith(useScope);
}