From f22e14571fdcbcdb38892bbbcfa174ead3037e08 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Wed, 1 Oct 2014 20:50:25 +0400 Subject: [PATCH] Minor code improvement --- .../editor/wordSelection/JetListSelectioner.kt | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/JetListSelectioner.kt b/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/JetListSelectioner.kt index 30fdd2a7057..230003ab596 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/JetListSelectioner.kt +++ b/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/JetListSelectioner.kt @@ -31,19 +31,13 @@ import org.jetbrains.jet.lexer.JetTokens import java.util.Arrays public class JetListSelectioner : BasicSelectioner() { - override fun canSelect(e: PsiElement): Boolean { - return e is JetParameterList || e is JetValueArgumentList || e is JetTypeParameterList || e is JetTypeArgumentList - } + override fun canSelect(e: PsiElement) + = e is JetParameterList || e is JetValueArgumentList || e is JetTypeParameterList || e is JetTypeArgumentList override fun select(e: PsiElement, editorText: CharSequence, cursorOffset: Int, editor: Editor): List { val node = e.getNode()!! - val startNode = node.findChildByType(TokenSet.create(JetTokens.LPAR, JetTokens.LT)) - val endNode = node.findChildByType(TokenSet.create(JetTokens.RPAR, JetTokens.GT)) - if (startNode != null && endNode != null) { - return Arrays.asList(TextRange(startNode.getStartOffset() + 1, endNode.getStartOffset())) - } - else { - return Arrays.asList() - } + val startNode = node.findChildByType(TokenSet.create(JetTokens.LPAR, JetTokens.LT)) ?: return listOf() + val endNode = node.findChildByType(TokenSet.create(JetTokens.RPAR, JetTokens.GT)) ?: return listOf() + return listOf(TextRange(startNode.getStartOffset() + 1, endNode.getStartOffset())) } }