From df9e5dd53328dde53509f1c1cfbb4cb3f8dec1ff Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Thu, 24 Sep 2015 18:54:42 +0300 Subject: [PATCH] isEnabledOnElement: reject vetoed elements --- .../intellij/refactoring/actions/RenameElementAction.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/RenameElementAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/RenameElementAction.java index 929d7090016c..efe8f3fb8f28 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/actions/RenameElementAction.java +++ b/platform/lang-impl/src/com/intellij/refactoring/actions/RenameElementAction.java @@ -24,6 +24,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.PsiNamedElement; import com.intellij.psi.SyntheticElement; import com.intellij.refactoring.RefactoringActionHandler; +import com.intellij.refactoring.rename.PsiElementRenameHandler; import com.intellij.refactoring.rename.RenameHandlerRegistry; import org.jetbrains.annotations.NotNull; @@ -43,7 +44,9 @@ public class RenameElementAction extends BaseRefactoringAction { if (elements.length != 1) return false; PsiElement element = elements[0]; - return element instanceof PsiNamedElement && !(element instanceof SyntheticElement); + return element instanceof PsiNamedElement && + !(element instanceof SyntheticElement) && + !PsiElementRenameHandler.isVetoed(element); } @Override