From e66e8bcd075a6a24384e40d91c80fea1d0983c56 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 26 Dec 2017 16:55:47 +0300 Subject: [PATCH] Use platform types to prepare for nullability check in 181 --- .../idea/editor/wordSelection/KotlinBracketsSelectioner.kt | 2 +- .../KotlinCallExpressionWithLambdaSelectioner.kt | 2 +- .../wordSelection/KotlinInvokedExpressionSelectioner.kt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinBracketsSelectioner.kt b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinBracketsSelectioner.kt index 4b3f0c30ac7..8800b23faf2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinBracketsSelectioner.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinBracketsSelectioner.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.KtNodeTypes import org.jetbrains.kotlin.psi.KtContainerNode class KotlinBracketsSelectioner : ExtendWordSelectionHandlerBase() { - override fun canSelect(e: PsiElement?): Boolean { + override fun canSelect(e: PsiElement): Boolean { return e is KtContainerNode && e.node.elementType == KtNodeTypes.INDICES } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinCallExpressionWithLambdaSelectioner.kt b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinCallExpressionWithLambdaSelectioner.kt index 35819b0d312..01fdc94721f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinCallExpressionWithLambdaSelectioner.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinCallExpressionWithLambdaSelectioner.kt @@ -29,7 +29,7 @@ class KotlinCallExpressionWithLambdaSelectioner : ExtendWordSelectionHandlerBase override fun canSelect(e: PsiElement): Boolean = e is KtCallExpression && e.hasLambda() - override fun select(e: PsiElement?, editorText: CharSequence?, cursorOffset: Int, editor: Editor?): List? { + override fun select(e: PsiElement, editorText: CharSequence, cursorOffset: Int, editor: Editor?): List? { if (e !is KtCallExpression) return null val endOffset = e.valueArgumentList?.endOffset ?: return null diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinInvokedExpressionSelectioner.kt b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinInvokedExpressionSelectioner.kt index e785b35246b..ef59fe1fb2a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinInvokedExpressionSelectioner.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinInvokedExpressionSelectioner.kt @@ -26,11 +26,11 @@ import org.jetbrains.kotlin.psi.psiUtil.endOffset import org.jetbrains.kotlin.psi.psiUtil.startOffset class KotlinInvokedExpressionSelectioner : ExtendWordSelectionHandlerBase() { - override fun canSelect(e: PsiElement?): Boolean { + override fun canSelect(e: PsiElement): Boolean { return e is KtDotQualifiedExpression } - override fun select(e: PsiElement?, editorText: CharSequence?, cursorOffset: Int, editor: Editor): List? { + override fun select(e: PsiElement, editorText: CharSequence, cursorOffset: Int, editor: Editor): List? { if (e !is KtDotQualifiedExpression) return null val endOffset = e.selectorExpression?.children?.firstOrNull { it is KtNameReferenceExpression }?.endOffset ?: return null return listOf(TextRange(e.startOffset, endOffset))