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

don't search for dynamic groovy usages in non-source content

Browse Source 
don't rename them automatically
This commit is contained in:
peter
2010-04-12 19:31:22 +04:00
parent 9cc579cd4d
commit fc2bab3a4d
3 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandler.java
+2 -1
View File
@@ -633,7 +633,8 @@ public class JavaFindUsagesHandler extends FindUsagesHandler{
public static boolean addResult(Processor<UsageInfo> results, PsiReference ref, FindUsagesOptions options, PsiElement refElement) {
if (filterUsage(ref.getElement(), options, refElement)){
TextRange rangeInElement = ref.getRangeInElement();
return results.process(new UsageInfo(ref.getElement(), rangeInElement.getStartOffset(), rangeInElement.getEndOffset(), false));
final boolean validRef = ref.isReferenceTo(refElement);
return results.process(new UsageInfo(ref.getElement(), rangeInElement.getStartOffset(), rangeInElement.getEndOffset(), !validRef));
}
return true;
}
platform/lang-impl/src/com/intellij/refactoring/rename/RenameUtil.java
+1 -1
View File
@@ -69,7 +69,7 @@ public class RenameUtil {
PsiElement referenceElement = ref.getElement();
result.add(new MoveRenameUsageInfo(referenceElement, ref, ref.getRangeInElement().getStartOffset(),
ref.getRangeInElement().getEndOffset(), element,
false));
!ref.isReferenceTo(element)));
}
processor.findCollisions(element, newName, allRenames, result);
plugins/groovy/src/org/jetbrains/plugins/groovy/findUsages/MethodLateBoundReferencesSearcher.java
+20 -8
View File
@@ -18,11 +18,11 @@ package org.jetbrains.plugins.groovy.findUsages;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.util.Computable;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiManager;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiReference;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.SearchScope;
import com.intellij.psi.search.TextOccurenceProcessor;
import com.intellij.psi.search.UsageSearchContext;
@@ -30,8 +30,10 @@ import com.intellij.psi.search.searches.MethodReferencesSearch;
import com.intellij.psi.util.PropertyUtil;
import com.intellij.util.Processor;
import com.intellij.util.QueryExecutor;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElement;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrReferenceExpression;
import org.jetbrains.plugins.groovy.lang.psi.impl.search.GrSourceFilterScope;
import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil;
/**
@@ -61,23 +63,33 @@ public class MethodLateBoundReferencesSearcher implements QueryExecutor<PsiRefer
return true;
}
private SearchScope getUseScopeInReadAction(final PsiMethod method) {
private static SearchScope getUseScopeInReadAction(final PsiMethod method) {
return ApplicationManager.getApplication().runReadAction(new Computable<SearchScope>() {
public SearchScope compute() {
return method.getUseScope();
final SearchScope scope = method.getUseScope();
final PsiFile file = method.getContainingFile();
if (file != null && scope instanceof GlobalSearchScope) {
final VirtualFile vfile = file.getOriginalFile().getVirtualFile();
final Project project = method.getProject();
if (vfile != null && ProjectRootManager.getInstance(project).getFileIndex().isInSource(vfile)) {
return new GrSourceFilterScope((GlobalSearchScope)scope, project);
}
}
return scope;
}
});
}
private String getPropertyName(final PsiMethod method) {
private static String getPropertyName(final PsiMethod method) {
return ApplicationManager.getApplication().runReadAction(new Computable<String>(){
@Nullable
public String compute() {
return PropertyUtil.getPropertyName(method);
}
});
}
private boolean processTextOccurrences(SearchScope searchScope, final String name, final Processor<PsiReference> consumer, Project project) {
private static boolean processTextOccurrences(SearchScope searchScope, final String name, final Processor<PsiReference> consumer, Project project) {
final TextOccurenceProcessor processor = new TextOccurenceProcessor() {
public boolean execute(PsiElement element, int offsetInElement) {
PsiReference ref = element.getReference();