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

Smart completion: minor changes

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-04-22 14:15:07 +04:00
parent e017f4d952
commit 19aa35ffeb
2 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt
+1 -1
View File
@@ -62,7 +62,7 @@ class StaticMembers(val bindingContext: BindingContext, val resolveSession: Reso
else if (DescriptorUtils.isEnumEntry(descriptor)) { else if (DescriptorUtils.isEnumEntry(descriptor)) {
classifier = { ExpectedInfoClassification.MATCHES } /* we do not need to check type of enum entry because it's taken from proper enum */ classifier = { ExpectedInfoClassification.MATCHES } /* we do not need to check type of enum entry because it's taken from proper enum */
} }
else{ else {
return return
} }
idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt
+1 -5
View File
@@ -96,7 +96,6 @@ fun MutableCollection<LookupElement>.addLookupElements(expectedInfos: Collection
} }
fun MutableCollection<LookupElement>.addLookupElementsForNullable(factory: () -> LookupElement?, matchedInfos: Collection<ExpectedInfo>) { fun MutableCollection<LookupElement>.addLookupElementsForNullable(factory: () -> LookupElement?, matchedInfos: Collection<ExpectedInfo>) {
run {
var lookupElement = factory() var lookupElement = factory()
if (lookupElement != null) { if (lookupElement != null) {
lookupElement = object: LookupElementDecorator<LookupElement>(lookupElement!!) { lookupElement = object: LookupElementDecorator<LookupElement>(lookupElement!!) {
@@ -111,10 +110,8 @@ fun MutableCollection<LookupElement>.addLookupElementsForNullable(factory: () ->
lookupElement = lookupElement!!.suppressAutoInsertion() lookupElement = lookupElement!!.suppressAutoInsertion()
add(lookupElement!!.addTail(matchedInfos)) add(lookupElement!!.addTail(matchedInfos))
} }
}
run { lookupElement = factory()
var lookupElement = factory()
if (lookupElement != null) { if (lookupElement != null) {
lookupElement = object: LookupElementDecorator<LookupElement>(lookupElement!!) { lookupElement = object: LookupElementDecorator<LookupElement>(lookupElement!!) {
override fun renderElement(presentation: LookupElementPresentation) { override fun renderElement(presentation: LookupElementPresentation) {
@@ -128,7 +125,6 @@ fun MutableCollection<LookupElement>.addLookupElementsForNullable(factory: () ->
lookupElement = lookupElement!!.suppressAutoInsertion() lookupElement = lookupElement!!.suppressAutoInsertion()
add(lookupElement!!.addTail(matchedInfos)) add(lookupElement!!.addTail(matchedInfos))
} }
}
} }
fun functionType(function: FunctionDescriptor): JetType? { fun functionType(function: FunctionDescriptor): JetType? {