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

Added parameters and type text (grayed) to "::xxx" items in smart completion

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-10-01 22:33:43 +03:00
parent 58bcb576a1
commit f58f5dd82a
3 changed files with 5 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/smart/SmartCompletion.kt
+3 -6
View File
@@ -324,16 +324,13 @@ class SmartCompletion(
if (matchedExpectedInfos.isEmpty()) return null if (matchedExpectedInfos.isEmpty()) return null
var lookupElement = lookupElementFactory.createLookupElement(descriptor, useReceiverTypes = false, parametersAndTypeGrayed = true) var lookupElement = lookupElementFactory.createLookupElement(descriptor, useReceiverTypes = false, parametersAndTypeGrayed = true)
val text = "::" + (if (descriptor is ConstructorDescriptor) descriptor.getContainingDeclaration().getName() else descriptor.getName())
lookupElement = object: LookupElementDecorator<LookupElement>(lookupElement) { lookupElement = object: LookupElementDecorator<LookupElement>(lookupElement) {
override fun getLookupString() = text override fun getLookupString() = "::" + delegate.lookupString
override fun getAllLookupStrings() = setOf(text) override fun getAllLookupStrings() = setOf(lookupString)
override fun renderElement(presentation: LookupElementPresentation) { override fun renderElement(presentation: LookupElementPresentation) {
super.renderElement(presentation) super.renderElement(presentation)
presentation.setItemText(text) presentation.itemText = "::" + presentation.itemText
presentation.clearTail()
presentation.setTypeText(null)
} }
override fun handleInsert(context: InsertionContext) { override fun handleInsert(context: InsertionContext) {
idea/idea-completion/testData/smart/callableReference/NoQualifier1.kt
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ fun bar() {
fun f1(){} fun f1(){}
fun f2(i: Int){} fun f2(i: Int){}
// EXIST: { lookupString:"::f1", itemText:"::f1", tailText:null, typeText:null } // EXIST: { lookupString: "::f1", itemText: "::f1", tailText: "() (<root>)", typeText: "Unit" }
// ABSENT: ::f2 // ABSENT: ::f2
// ABSENT: ::Unit // ABSENT: ::Unit
// ABSENT: ::Nothing // ABSENT: ::Nothing
idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ExpectedCompletionUtils.kt
+1 -3
View File
@@ -64,9 +64,7 @@ public object ExpectedCompletionUtils {
throw RuntimeException("Invalid json property '$key'") throw RuntimeException("Invalid json property '$key'")
} }
val value = entry.value val value = entry.value
if (value !is JsonNull) { map.put(key, if (value !is JsonNull) value.asString else null)
map.put(key, value.asString)
}
} }
} }