azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use platform types to prepare for nullability check in 181

Browse Source
This commit is contained in:
Nikolay Krasko
2017-12-26 16:55:47 +03:00
parent 809cc220ed
commit e66e8bcd07
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinBracketsSelectioner.kt
+1 -1
View File
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.KtNodeTypes
import org.jetbrains.kotlin.psi.KtContainerNode import org.jetbrains.kotlin.psi.KtContainerNode
class KotlinBracketsSelectioner : ExtendWordSelectionHandlerBase() { class KotlinBracketsSelectioner : ExtendWordSelectionHandlerBase() {
override fun canSelect(e: PsiElement?): Boolean { override fun canSelect(e: PsiElement): Boolean {
return e is KtContainerNode && e.node.elementType == KtNodeTypes.INDICES return e is KtContainerNode && e.node.elementType == KtNodeTypes.INDICES
} }
} }
idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinCallExpressionWithLambdaSelectioner.kt
+1 -1
View File
@@ -29,7 +29,7 @@ class KotlinCallExpressionWithLambdaSelectioner : ExtendWordSelectionHandlerBase
override fun canSelect(e: PsiElement): Boolean override fun canSelect(e: PsiElement): Boolean
= e is KtCallExpression && e.hasLambda() = e is KtCallExpression && e.hasLambda()
override fun select(e: PsiElement?, editorText: CharSequence?, cursorOffset: Int, editor: Editor?): List<TextRange>? { override fun select(e: PsiElement, editorText: CharSequence, cursorOffset: Int, editor: Editor?): List<TextRange>? {
if (e !is KtCallExpression) return null if (e !is KtCallExpression) return null
val endOffset = e.valueArgumentList?.endOffset ?: return null val endOffset = e.valueArgumentList?.endOffset ?: return null
idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinInvokedExpressionSelectioner.kt
+2 -2
View File
@@ -26,11 +26,11 @@ import org.jetbrains.kotlin.psi.psiUtil.endOffset
import org.jetbrains.kotlin.psi.psiUtil.startOffset import org.jetbrains.kotlin.psi.psiUtil.startOffset
class KotlinInvokedExpressionSelectioner : ExtendWordSelectionHandlerBase() { class KotlinInvokedExpressionSelectioner : ExtendWordSelectionHandlerBase() {
override fun canSelect(e: PsiElement?): Boolean { override fun canSelect(e: PsiElement): Boolean {
return e is KtDotQualifiedExpression return e is KtDotQualifiedExpression
} }
override fun select(e: PsiElement?, editorText: CharSequence?, cursorOffset: Int, editor: Editor): List<TextRange>? { override fun select(e: PsiElement, editorText: CharSequence, cursorOffset: Int, editor: Editor): List<TextRange>? {
if (e !is KtDotQualifiedExpression) return null if (e !is KtDotQualifiedExpression) return null
val endOffset = e.selectorExpression?.children?.firstOrNull { it is KtNameReferenceExpression }?.endOffset ?: return null val endOffset = e.selectorExpression?.children?.firstOrNull { it is KtNameReferenceExpression }?.endOffset ?: return null
return listOf(TextRange(e.startOffset, endOffset)) return listOf(TextRange(e.startOffset, endOffset))