IDEA-63358 (references search in incomplete code)

This commit is contained in:
Roman Shevchenko
2011-01-27 10:34:47 +01:00
parent 2e31eda298
commit c8bcece45f
7 changed files with 97 additions and 0 deletions

View File

@@ -0,0 +1,61 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
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.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;
/**
* Looks for references to local variable or method parameter in invalid (incomplete) code.
*/
public class VariableInIncompleteCodeSearcher extends QueryExecutorBase<PsiReference, ReferencesSearch.SearchParameters> {
public VariableInIncompleteCodeSearcher() {
super(true);
}
@Override
public void processQuery(@NotNull final ReferencesSearch.SearchParameters p, @NotNull final Processor<PsiReference> consumer) {
final PsiElement refElement = p.getElementToSearch();
if (!(refElement instanceof PsiLocalVariable || refElement instanceof PsiParameter)) 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);
}
}
return false;
}
});
}
}
}
}

View File

@@ -0,0 +1,7 @@
public class RenameLocalIncomplete {
public void test() {
Integer <caret>integer = 0;
integer.
Double x = 3;
}
}

View File

@@ -0,0 +1,7 @@
public class RenameLocalIncomplete {
public void test() {
Integer _i = 0;
_i.
Double x = 3;
}
}

View File

@@ -0,0 +1,6 @@
public class RenameLocalIncomplete {
public void test(Integer <caret>integer) {
integer.
Double x = 3;
}
}

View File

@@ -0,0 +1,6 @@
public class RenameLocalIncomplete {
public void test(Integer _i) {
_i.
Double x = 3;
}
}

View File

@@ -42,6 +42,14 @@ public class RenameLocalTest extends LightCodeInsightTestCase {
doTest("i");
}
public void testRenameLocalIncomplete() throws Exception {
doTest("_i");
}
public void testRenameParamIncomplete() throws Exception {
doTest("_i");
}
private void doTest(final String newName) throws Exception {
configureByFile(BASE_PATH + getTestName(false) + ".java");
PsiElement element = TargetElementUtilBase

View File

@@ -207,6 +207,8 @@
<referencesSearch implementation="com.intellij.psi.impl.search.SimpleAccessorReferenceSearcher"/>
<referencesSearch implementation="com.intellij.psi.impl.search.VariableInIncompleteCodeSearcher"/>
<superMethodsSearch implementation="com.intellij.psi.impl.search.MethodSuperSearcher"/>
<annotatedElementsSearch implementation="com.intellij.psi.impl.search.AnnotatedElementsSearcher"/>
<annotatedPackagesSearch implementation="com.intellij.psi.impl.search.AnnotatedPackagesSearcher"/>