From 13d9d3ac7b96fed4e37f9b8f8d807ee01591a424 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Tue, 19 Sep 2017 10:06:51 +0300 Subject: [PATCH] rename: don't suggest to rename non-physical getters/setters (IDEA-178990) --- .../refactoring/rename/RenameJavaVariableProcessor.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaVariableProcessor.java b/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaVariableProcessor.java index 30c0218c56c2..402214938a8e 100644 --- a/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaVariableProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaVariableProcessor.java @@ -27,7 +27,6 @@ import com.intellij.psi.codeStyle.VariableKind; import com.intellij.psi.controlFlow.ControlFlowUtil; import com.intellij.psi.search.searches.ClassInheritorsSearch; import com.intellij.psi.search.searches.OverridingMethodsSearch; -import com.intellij.psi.util.PropertyUtil; import com.intellij.psi.util.PropertyUtilBase; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtil; @@ -244,6 +243,9 @@ public class RenameJavaVariableProcessor extends RenameJavaMemberProcessor { private static boolean askToRenameAccesors(PsiMethod getter, PsiMethod setter, String newName, final Project project) { if (ApplicationManager.getApplication().isUnitTestMode()) return false; + boolean physicalGetter = getter != null && getter.isPhysical(); + boolean physicalSetter = setter != null && setter.isPhysical(); + if (!physicalGetter && !physicalSetter) return false; String text = RefactoringMessageUtil.getGetterSetterMessage(newName, RefactoringBundle.message("rename.title"), getter, setter); return Messages.showYesNoDialog(project, text, RefactoringBundle.message("rename.title"), Messages.getQuestionIcon()) != Messages.YES; }