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 SearchParameters#getScopeDeterminedByUser in PyKeywordArgumentSearchExecutor

Browse Source 
Also added missing read action for ScopeUtil#getScopeOwner(element).
This commit is contained in:
Mikhail Golubev
2014-12-05 16:09:36 +03:00
parent f1f4efb944
commit c236371f2c
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/search/PyKeywordArgumentSearchExecutor.java
+7 -9
View File
@@ -20,7 +20,6 @@ import com.intellij.openapi.application.QueryExecutorBase;
import com.intellij.openapi.util.Computable;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiReference;
import com.intellij.psi.search.SearchScope;
import com.intellij.psi.search.searches.ReferencesSearch;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.Processor;
@@ -39,17 +38,16 @@ public class PyKeywordArgumentSearchExecutor extends QueryExecutorBase<PsiRefere
if (!(element instanceof PyNamedParameter)) {
return;
}
final ScopeOwner owner = ScopeUtil.getScopeOwner(element);
final ScopeOwner owner = ApplicationManager.getApplication().runReadAction(new Computable<ScopeOwner>() {
@Override
public ScopeOwner compute() {
return ScopeUtil.getScopeOwner(element);
}
});
if (!(owner instanceof PyFunction)) {
return;
}
SearchScope scope = ApplicationManager.getApplication().runReadAction(new Computable<SearchScope>() {
@Override
public SearchScope compute() {
return queryParameters.getEffectiveSearchScope();
}
});
ReferencesSearch.search(owner, scope).forEach(new Processor<PsiReference>() {
ReferencesSearch.search(owner, queryParameters.getScopeDeterminedByUser()).forEach(new Processor<PsiReference>() {
@Override
public boolean process(PsiReference reference) {
final PsiElement refElement = reference.getElement();