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

IDEA-125781 ReadAction in GroovyTraitFieldSearcher

Browse Source
This commit is contained in:
Max Medvedev
2014-06-04 07:24:18 +02:00
parent d946471aee
commit 59aef31c8e
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GroovyScopeUtil.java
+1 -1
View File
@@ -34,7 +34,7 @@ public class GroovyScopeUtil {
public static SearchScope restrictScopeToGroovyFiles(SearchScope originalScope, SearchScope effectiveScope) {
SearchScope restricted = restrictScopeToGroovyFiles(originalScope);
return originalScope.intersectWith(effectiveScope);
return restricted.intersectWith(effectiveScope);
}
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GroovyTraitFieldSearcher.java
+9 -16
View File
@@ -15,9 +15,7 @@
*/
package org.jetbrains.plugins.groovy.findUsages;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.QueryExecutorBase;
import com.intellij.openapi.util.Computable;
import com.intellij.psi.*;
import com.intellij.psi.search.RequestResultProcessor;
import com.intellij.psi.search.UsageSearchContext;
@@ -33,26 +31,21 @@ import org.jetbrains.plugins.groovy.lang.psi.util.GrTraitUtil;
* Created by Max Medvedev on 15/04/14
*/
public class GroovyTraitFieldSearcher extends QueryExecutorBase<PsiReference, ReferencesSearch.SearchParameters> {
public GroovyTraitFieldSearcher() {
super(true);
}
@Override
public void processQuery(@NotNull ReferencesSearch.SearchParameters p, @NotNull Processor<PsiReference> consumer) {
final PsiElement target = p.getElementToSearch();
String traitFieldName = ApplicationManager.getApplication().runReadAction(new Computable<String>() {
@Override
public String compute() {
if (target instanceof GrField && !(target instanceof GrTraitField)) {
PsiClass aClass = ((GrField)target).getContainingClass();
if (GrTraitUtil.isTrait(aClass)) {
return GrTraitUtil.getTraitFieldPrefix(aClass) + ((GrField)target).getName();
}
}
if (target instanceof GrField && !(target instanceof GrTraitField)) {
PsiClass aClass = ((GrField)target).getContainingClass();
if (GrTraitUtil.isTrait(aClass)) {
String traitFieldName = GrTraitUtil.getTraitFieldPrefix(aClass) + ((GrField)target).getName();
return null;
p.getOptimizer().searchWord(traitFieldName, p.getEffectiveSearchScope(), UsageSearchContext.IN_CODE, true, target, new MyProcessor(target));
}
});
if (traitFieldName != null) {
p.getOptimizer().searchWord(traitFieldName, p.getEffectiveSearchScope(), UsageSearchContext.IN_CODE, true, target, new MyProcessor(target));
}
}