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

Fixed crash on runtime

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-08-06 23:06:51 +03:00
parent 200c99e722
commit 96109230eb
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletion.kt
+5 -3
View File
@@ -74,13 +74,15 @@ class SmartCompletion(
public fun additionalItems(): Pair<Collection<LookupElement>, InheritanceItemsSearcher?> { public fun additionalItems(): Pair<Collection<LookupElement>, InheritanceItemsSearcher?> {
val (items, inheritanceSearcher) = additionalItemsNoPostProcess() val (items, inheritanceSearcher) = additionalItemsNoPostProcess()
val postProcessedItems = items.map { postProcess(it) } val postProcessedItems = items.map { postProcess(it) }
val postProcessedSearcher = inheritanceSearcher?.let { //TODO: could not use "let" because of KT-8754
val postProcessedSearcher = if (inheritanceSearcher != null)
object : InheritanceItemsSearcher { object : InheritanceItemsSearcher {
override fun search(nameFilter: (String) -> Boolean, consumer: (LookupElement) -> Unit) { override fun search(nameFilter: (String) -> Boolean, consumer: (LookupElement) -> Unit) {
it.search(nameFilter, { consumer(postProcess(it)) }) inheritanceSearcher.search(nameFilter, { consumer(postProcess(it)) })
} }
} }
} else
null
return postProcessedItems to postProcessedSearcher return postProcessedItems to postProcessedSearcher
} }