From 548f82d20af65d6618a27d2f92cc995bc738510e Mon Sep 17 00:00:00 2001 From: anna Date: Mon, 21 Mar 2011 17:27:40 +0100 Subject: [PATCH] rename: check if element after substitution still can be renamed (EA-25778 - IOE: ClsElementImpl.replace) --- .../intellij/refactoring/rename/PsiElementRenameHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/PsiElementRenameHandler.java b/platform/lang-impl/src/com/intellij/refactoring/rename/PsiElementRenameHandler.java index 9f184dab1168..7a0f441be601 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/PsiElementRenameHandler.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/PsiElementRenameHandler.java @@ -135,7 +135,7 @@ public class PsiElementRenameHandler implements RenameHandler { private static void rename(PsiElement element, final Project project, PsiElement nameSuggestionContext, Editor editor, String defaultName) { RenamePsiElementProcessor processor = RenamePsiElementProcessor.forElement(element); element = processor.substituteElementToRename(element, editor); - if (element == null) return; + if (element == null || !canRename(project, editor, element)) return; final RenameDialog dialog = processor.createRenameDialog(project, element, nameSuggestionContext, editor);