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

Cleanup: smart casts of safe call receiver applied (do NOT cherry-pick to 1.0.X)

Browse Source
This commit is contained in:
Mikhail Glukhikh
2016-07-22 16:37:34 +03:00
parent 26c8bc87fd
commit 692623cb55
9 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt
+2 -2
View File
@@ -168,7 +168,7 @@ class KotlinCompletionContributor : CompletionContributor() {
val classOrObject = tokenBefore?.parents?.firstIsInstanceOrNull<KtClassOrObject>() ?: return false
val name = classOrObject.nameIdentifier ?: return false
val body = classOrObject.getBody() ?: return false
val offset = tokenBefore!!.startOffset
val offset = tokenBefore.startOffset
return name.endOffset <= offset && offset <= body.startOffset
}
@@ -180,7 +180,7 @@ class KotlinCompletionContributor : CompletionContributor() {
val lambda = leaf?.parents?.firstOrNull { it is KtFunctionLiteral } ?: return null
val lambdaChild = leaf!!.parents.takeWhile { it != lambda }.lastOrNull()
val lambdaChild = leaf.parents.takeWhile { it != lambda }.lastOrNull()
return if (lambdaChild is KtParameterList)
CompletionUtilCore.DUMMY_IDENTIFIER_TRIMMED