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

inline: tweak search scope for conflicts replacement

Browse Source
This commit is contained in:
anna
2010-07-16 13:25:46 +04:00
parent 83b1df153e
commit 9d736f9820
5 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java
View File

@@ -33,6 +33,7 @@ import com.intellij.psi.controlFlow.*;
import com.intellij.psi.impl.source.codeStyle.CodeEditUtil;
import com.intellij.psi.infos.MethodCandidateInfo;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.LocalSearchScope;
import com.intellij.psi.search.searches.ReferencesSearch;
import com.intellij.psi.util.InheritanceUtil;
import com.intellij.psi.util.PsiTreeUtil;
@@ -592,7 +593,7 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor {
if (!name.equals(parmName)) {
name = myJavaCodeStyle.suggestUniqueVariableName(name, block.getFirstChild(), true);
}
RefactoringUtil.renameVariableReferences(parm, name, GlobalSearchScope.projectScope(myProject));
RefactoringUtil.renameVariableReferences(parm, name, new LocalSearchScope(myMethodCopy.getBody()), true);
PsiType paramType = parm.getType();
@NonNls String defaultValue;
if (paramType instanceof PsiEllipsisType) {
@@ -687,7 +688,7 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor {
name = newName;
}
if (!name.equals(oldName)) {
RefactoringUtil.renameVariableReferences(var, name, GlobalSearchScope.projectScope(myProject));
RefactoringUtil.renameVariableReferences(var, name, new LocalSearchScope(myMethodCopy.getBody()), true);
var.getNameIdentifier().replace(myFactory.createIdentifier(name));
}
}
@@ -1313,4 +1314,4 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor {
return myReference == null ? Collections.singletonList(myMethod) : Arrays.asList(myReference, myMethod);
}
}
}
}

9
java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
View File

@@ -402,7 +402,14 @@ public class RefactoringUtil {
}
public static void renameVariableReferences(PsiVariable variable, String newName, SearchScope scope) throws IncorrectOperationException {
for (PsiReference reference : ReferencesSearch.search(variable, scope)) {
renameVariableReferences(variable, newName, scope, false);
}
public static void renameVariableReferences(PsiVariable variable,
String newName,
SearchScope scope,
final boolean ignoreAccessScope) throws IncorrectOperationException {
for (PsiReference reference : ReferencesSearch.search(variable, scope, ignoreAccessScope)) {
reference.handleElementRename(newName);
}
}

14
java/java-tests/testData/refactoring/inlineMethod/ParamNameConflictsWithLocalVar.java Normal file
View File

@@ -0,0 +1,14 @@
public class ABl {
void foo(int fe) {
System.out.println(fe);
}
void bar(boolean br) {
int fe = 0;
if (br) {
foo(fe);
} else {
f<caret>oo(11);
}
}
}

11
java/java-tests/testData/refactoring/inlineMethod/ParamNameConflictsWithLocalVar.java.after Normal file
View File

@@ -0,0 +1,11 @@
public class ABl {
void bar(boolean br) {
int fe = 0;
if (br) {
System.out.println(fe);
} else {
System.out.println(11);
}
}
}

4
java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java
View File

@@ -157,6 +157,10 @@ public class InlineMethodTest extends LightCodeInsightTestCase {
doTest();
}
public void testParamNameConflictsWithLocalVar() throws Exception {
doTest();
}
@Override
protected Sdk getProjectJDK() {
return JavaSdkImpl.getMockJdk17("java 1.5");