From 0a4060fd553a36e865a950ee5df3eb6bdb723fc2 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Tue, 23 Nov 2010 15:09:27 +0300 Subject: [PATCH] IDEA-60809 ActionScript refactoring actions should not be suggested for plain Javascript --- .../actions/BasePlatformRefactoringAction.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/BasePlatformRefactoringAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/BasePlatformRefactoringAction.java index beb4c62c1e73..a74ccd064db5 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/actions/BasePlatformRefactoringAction.java +++ b/platform/lang-impl/src/com/intellij/refactoring/actions/BasePlatformRefactoringAction.java @@ -61,8 +61,8 @@ public abstract class BasePlatformRefactoringAction extends BaseRefactoringActio @Override protected final RefactoringActionHandler getHandler(DataContext dataContext) { - PsiElement element; + PsiElement element = null; Editor editor = LangDataKeys.EDITOR.getData(dataContext); PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); if (editor != null && file != null) { @@ -75,14 +75,18 @@ public abstract class BasePlatformRefactoringAction extends BaseRefactoringActio } } - element = LangDataKeys.PSI_ELEMENT.getData(dataContext); - if (element != null) { - RefactoringActionHandler handler = getHandler(element.getLanguage(), element); + PsiElement referenced = LangDataKeys.PSI_ELEMENT.getData(dataContext); + if (referenced != null) { + RefactoringActionHandler handler = getHandler(referenced.getLanguage(), referenced); if (handler != null) { return handler; } } + if (element == null) { + element = referenced; + } + final Language[] languages = LangDataKeys.CONTEXT_LANGUAGES.getData(dataContext); if (languages != null) { for (Language language : languages) {