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

EA-26819 (fix + support for multi-scoped elements)

Browse Source
This commit is contained in:
Roman Shevchenko
2011-04-11 20:20:28 +02:00
parent 3a6d7668b0
commit df411b59cd
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/search/VariableInIncompleteCodeSearcher.java
+18 -16
View File
@@ -18,9 +18,9 @@ package com.intellij.psi.impl.search;
import com.intellij.openapi.application.QueryExecutorBase;
import com.intellij.psi.*;
import com.intellij.psi.search.LocalSearchScope;
import com.intellij.psi.search.PsiElementProcessor;
import com.intellij.psi.search.SearchScope;
import com.intellij.psi.search.searches.ReferencesSearch;
import com.intellij.psi.util.PsiElementFilter;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.Processor;
import org.jetbrains.annotations.NotNull;
@@ -38,24 +38,26 @@ public class VariableInIncompleteCodeSearcher extends QueryExecutorBase<PsiRefer
final PsiElement refElement = p.getElementToSearch();
if (!(refElement instanceof PsiLocalVariable || refElement instanceof PsiParameter)) return;
final String name = ((PsiVariable)refElement).getName();
if (name == null) return;
final SearchScope scope = refElement.getUseScope();
if (scope instanceof LocalSearchScope) {
final PsiElement[] scopeElements = ((LocalSearchScope)scope).getScope();
if (scopeElements.length == 1) {
final String name = ((PsiVariable)refElement).getName();
PsiTreeUtil.collectElements(scopeElements[0], new PsiElementFilter() {
@Override
public boolean isAccepted(final PsiElement element) {
if (element instanceof PsiJavaCodeReferenceElement) {
final PsiJavaCodeReferenceElement ref = (PsiJavaCodeReferenceElement)element;
if (name.equals(ref.getCanonicalText()) && ref.resolve() == null && ref.advancedResolve(true).getElement() == refElement) {
consumer.process(ref);
}
if (!(scope instanceof LocalSearchScope)) return;
final PsiElement[] scopeElements = ((LocalSearchScope)scope).getScope();
for (PsiElement scopeElement : scopeElements) {
PsiTreeUtil.processElements(scopeElement, new PsiElementProcessor() {
@Override
public boolean execute(final PsiElement element) {
if (element instanceof PsiJavaCodeReferenceElement) {
final PsiJavaCodeReferenceElement ref = (PsiJavaCodeReferenceElement)element;
if (name.equals(ref.getCanonicalText()) && ref.resolve() == null && ref.advancedResolve(true).getElement() == refElement) {
consumer.process(ref);
}
return false;
}
});
}
return true;
}
});
}
}
}