No need to inherit from java-specific selectioner class

This commit is contained in:
Valentin Kipyatkov
2014-12-15 19:47:02 -07:00
parent 46906fd89c
commit dceeeb2724
5 changed files with 6 additions and 9 deletions
@@ -33,7 +33,7 @@ import com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase
/** /**
* Originally from IDEA platform: CodeBlockOrInitializerSelectioner * Originally from IDEA platform: CodeBlockOrInitializerSelectioner
*/ */
public class KotlinCodeBlockSelectioner : BasicSelectioner() { public class KotlinCodeBlockSelectioner : ExtendWordSelectionHandlerBase() {
override fun canSelect(e: PsiElement) override fun canSelect(e: PsiElement)
= e is JetBlockExpression || e is JetWhenExpression = e is JetBlockExpression || e is JetWhenExpression
@@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.psi.psiUtil.siblings
import com.intellij.psi.PsiComment import com.intellij.psi.PsiComment
import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.PsiWhiteSpace
public class KotlinDeclarationSelectioner : BasicSelectioner() { public class KotlinDeclarationSelectioner : ExtendWordSelectionHandlerBase() {
override fun canSelect(e: PsiElement) override fun canSelect(e: PsiElement)
= e is JetDeclaration = e is JetDeclaration
@@ -28,7 +28,7 @@ import java.util.ArrayList
import com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase import com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase
import org.jetbrains.jet.kdoc.psi.api.KDoc import org.jetbrains.jet.kdoc.psi.api.KDoc
public class KotlinDocCommentSelectioner : BasicSelectioner() { public class KotlinDocCommentSelectioner : ExtendWordSelectionHandlerBase() {
override fun canSelect(e: PsiElement) override fun canSelect(e: PsiElement)
= e is KDoc = e is KDoc
@@ -16,8 +16,6 @@
package org.jetbrains.jet.plugin.editor.wordSelection package org.jetbrains.jet.plugin.editor.wordSelection
import com.intellij.codeInsight.editorActions.wordSelection.BasicSelectioner
import com.intellij.lang.ASTNode
import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.Editor
import com.intellij.openapi.util.TextRange import com.intellij.openapi.util.TextRange
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
@@ -27,10 +25,9 @@ import org.jetbrains.jet.lang.psi.JetTypeArgumentList
import org.jetbrains.jet.lang.psi.JetTypeParameterList import org.jetbrains.jet.lang.psi.JetTypeParameterList
import org.jetbrains.jet.lang.psi.JetValueArgumentList import org.jetbrains.jet.lang.psi.JetValueArgumentList
import org.jetbrains.jet.lexer.JetTokens import org.jetbrains.jet.lexer.JetTokens
import com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase
import java.util.Arrays public class KotlinListSelectioner : ExtendWordSelectionHandlerBase() {
public class KotlinListSelectioner : BasicSelectioner() {
override fun canSelect(e: PsiElement) override fun canSelect(e: PsiElement)
= e is JetParameterList || e is JetValueArgumentList || e is JetTypeParameterList || e is JetTypeArgumentList = e is JetParameterList || e is JetValueArgumentList || e is JetTypeParameterList || e is JetTypeArgumentList
@@ -35,7 +35,7 @@ import org.jetbrains.jet.lang.psi.psiUtil.siblings
/** /**
* Originally from IDEA platform: StatementGroupSelectioner * Originally from IDEA platform: StatementGroupSelectioner
*/ */
public class KotlinStatementGroupSelectioner : BasicSelectioner() { public class KotlinStatementGroupSelectioner : ExtendWordSelectionHandlerBase() {
override fun canSelect(e: PsiElement) override fun canSelect(e: PsiElement)
= e is JetExpression || e is JetWhenEntry = e is JetExpression || e is JetWhenEntry