From 09047b97f217aa9492085545644883a9e404c50f Mon Sep 17 00:00:00 2001 From: "Maxim.Medvedev" Date: Fri, 3 Aug 2012 17:48:18 +0400 Subject: [PATCH] java word selection handlers should not work in Groovy --- .../editorActions/wordSelection/FieldSelectioner.java | 7 ++++--- .../wordSelection/MethodOrClassSelectioner.java | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/FieldSelectioner.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/FieldSelectioner.java index 8cc70bfa1300..01f45e734eb0 100644 --- a/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/FieldSelectioner.java +++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/FieldSelectioner.java @@ -15,18 +15,19 @@ */ package com.intellij.codeInsight.editorActions.wordSelection; +import com.intellij.lang.java.JavaLanguage; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiField; import com.intellij.psi.PsiIdentifier; -import com.intellij.openapi.util.TextRange; -import com.intellij.openapi.editor.Editor; import java.util.List; public class FieldSelectioner extends WordSelectioner { @Override public boolean canSelect(PsiElement e) { - return e instanceof PsiField; + return e instanceof PsiField && e.getLanguage() == JavaLanguage.INSTANCE; } private static void addRangeElem(final List result, diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/MethodOrClassSelectioner.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/MethodOrClassSelectioner.java index d727b850ff20..3c04dfc5f3ae 100644 --- a/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/MethodOrClassSelectioner.java +++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/MethodOrClassSelectioner.java @@ -15,6 +15,7 @@ */ package com.intellij.codeInsight.editorActions.wordSelection; +import com.intellij.lang.java.JavaLanguage; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; @@ -32,7 +33,8 @@ import java.util.List; public class MethodOrClassSelectioner extends BasicSelectioner { @Override public boolean canSelect(PsiElement e) { - return e instanceof PsiClass && !(e instanceof PsiTypeParameter) || e instanceof PsiMethod; + return (e instanceof PsiClass && !(e instanceof PsiTypeParameter) || e instanceof PsiMethod) && + e.getLanguage() == JavaLanguage.INSTANCE; } @Override