From feda8eeecd21b37763bd6a0eb332bb011fa8b11a Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 19 Oct 2015 15:14:48 +0200 Subject: [PATCH] inplace rename: ensure restart on invalid identifier is possible (EA-74691 - NPE: VariableInplaceRenamer$.run) --- .../refactoring/rename/inplace/MemberInplaceRenamer.java | 1 + .../refactoring/rename/inplace/VariableInplaceRenamer.java | 1 + 2 files changed, 2 insertions(+) diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java index 221aba54295a..5626bfaf89d4 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java @@ -78,6 +78,7 @@ public class MemberInplaceRenamer extends VariableInplaceRenamer { showDialogAdvertisement("RenameElement"); } + @NotNull @Override protected VariableInplaceRenamer createInplaceRenamerToRestart(PsiNamedElement variable, Editor editor, String initialName) { return new MemberInplaceRenamer(variable, getSubstituted(), editor, initialName, myOldName); diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java index 2349a723232f..b03621fb276f 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java @@ -186,6 +186,7 @@ public class VariableInplaceRenamer extends InplaceRefactoring { return selectAll != null && selectAll.booleanValue(); } + @NotNull protected VariableInplaceRenamer createInplaceRenamerToRestart(PsiNamedElement variable, Editor editor, String initialName) { return new VariableInplaceRenamer(variable, editor, myProject, initialName, myOldName); }