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

ensure super methods are renamed first (IDEA-165312)

Browse Source
This commit is contained in:
Anna.Kozlova
2016-12-12 19:25:23 +01:00
parent 99446bc8e8
commit 939c1735e3
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/rename/RenameJavaVariableProcessor.java
+1 -4
View File
@@ -40,7 +40,6 @@ import com.intellij.refactoring.util.RefactoringMessageUtil;
import com.intellij.refactoring.util.RefactoringUtil;
import com.intellij.usageView.UsageInfo;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.Processor;
import com.intellij.util.containers.MultiMap;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -254,19 +253,17 @@ public class RenameJavaVariableProcessor extends RenameJavaMemberProcessor {
@NotNull final String oldParameterName,
@NotNull final JavaCodeStyleManager manager,
@NotNull final Map<PsiElement, String> allRenames) {
addGetterOrSetterWithParameter(methodPrototype, newName, newPropertyName, oldParameterName, manager, allRenames);
PsiMethod[] methods = methodPrototype.findDeepestSuperMethods();
if (methods.length == 0) {
methods = new PsiMethod[] {methodPrototype};
}
for (PsiMethod method : methods) {
addGetterOrSetterWithParameter(method, newName, newPropertyName, oldParameterName, manager, allRenames);
OverridingMethodsSearch.search(method).forEach(psiMethod -> {
RenameProcessor.assertNonCompileElement(psiMethod);
addGetterOrSetterWithParameter(psiMethod, newName, newPropertyName, oldParameterName, manager, allRenames);
return true;
});
addGetterOrSetterWithParameter(method, newName, newPropertyName, oldParameterName, manager, allRenames);
}
}
java/java-tests/testData/refactoring/renameField/afterOverridingSetterParameterRenamed.java
+1
View File
@@ -9,6 +9,7 @@ interface Foo {
class Bar implements Foo, I {
int bar;
@Override
public void setBar(int bar) {
this.bar = bar;
}