From ddcee6b1315007c5b40ddf2918c83cacb6b76b2b Mon Sep 17 00:00:00 2001 From: Daniil Ovchinnikov Date: Tue, 24 Mar 2015 19:15:03 +0300 Subject: [PATCH] IDEA-138027 disable Groovy rename method handler from within non-groovy files --- .../rename/inplace/GrMethodInplaceRenameHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/inplace/GrMethodInplaceRenameHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/inplace/GrMethodInplaceRenameHandler.java index 2bad31412d5a..a7b7fe1240c4 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/inplace/GrMethodInplaceRenameHandler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/inplace/GrMethodInplaceRenameHandler.java @@ -22,6 +22,7 @@ import com.intellij.psi.PsiNameIdentifierOwner; import com.intellij.refactoring.rename.inplace.MemberInplaceRenameHandler; import com.intellij.refactoring.rename.inplace.MemberInplaceRenamer; import org.jetbrains.annotations.NotNull; +import org.jetbrains.plugins.groovy.lang.psi.GroovyFile; import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod; /** @@ -31,8 +32,7 @@ public class GrMethodInplaceRenameHandler extends MemberInplaceRenameHandler { @Override protected boolean isAvailable(PsiElement element, Editor editor, PsiFile file) { if (!editor.getSettings().isVariableInplaceRenameEnabled()) return false; - - return element instanceof GrMethod; + return element instanceof GrMethod && file instanceof GroovyFile; } @NotNull