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

extract method: find all vars inside to check for name conflicts

Browse Source
This commit is contained in:
Anna Kozlova
2014-12-02 17:19:35 +01:00
parent d11f410802
commit 72515b5403
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java
View File

@@ -509,11 +509,24 @@ public class ExtractMethodProcessor implements MatchProvider {
protected void checkMethodConflicts(MultiMap<PsiElement, String> conflicts) {
super.checkMethodConflicts(conflicts);
final VariableData[] parameters = getChosenParameters();
final PsiResolveHelper resolveHelper = PsiResolveHelper.SERVICE.getInstance(myProject);
final Map<String, PsiLocalVariable> vars = new HashMap<String, PsiLocalVariable>();
for (PsiElement element : myElements) {
element.accept(new JavaRecursiveElementWalkingVisitor() {
@Override
public void visitLocalVariable(PsiLocalVariable variable) {
super.visitLocalVariable(variable);
vars.put(variable.getName(), variable);
}
@Override
public void visitClass(PsiClass aClass) {}
});
}
for (VariableData parameter : parameters) {
final PsiVariable variable = resolveHelper.resolveReferencedVariable(parameter.name, myElements[0]);
if (variable != null && isDeclaredInside(variable)) {
conflicts.putValue(variable, "Variable with name " + parameter.name + " is already defined in the selected scope");
final String paramName = parameter.name;
final PsiLocalVariable variable = vars.get(paramName);
if (variable != null) {
conflicts.putValue(variable, "Variable with name " + paramName + " is already defined in the selected scope");
}
}
}