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

Better presentation of aliases in completion list

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-09-07 16:46:46 +03:00
parent 50a0f9a4a7
commit e41ab2a270
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicLookupElementFactory.kt
+5 -1
View File
@@ -169,7 +169,7 @@ class BasicLookupElementFactory(
element = element.withTypeText(DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(descriptor.type), parametersAndTypeGrayed) element = element.withTypeText(DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(descriptor.type), parametersAndTypeGrayed)
} }
is ClassDescriptor -> { is ClassifierDescriptorWithTypeParameters -> {
val typeParams = descriptor.declaredTypeParameters val typeParams = descriptor.declaredTypeParameters
if (includeClassTypeArguments && typeParams.isNotEmpty()) { if (includeClassTypeArguments && typeParams.isNotEmpty()) {
element = element.appendTailText(typeParams.map { it.name.asString() }.joinToString(", ", "<", ">"), true) element = element.appendTailText(typeParams.map { it.name.asString() }.joinToString(", ", "<", ">"), true)
@@ -192,6 +192,10 @@ class BasicLookupElementFactory(
if (container is PackageFragmentDescriptor || container is ClassDescriptor) { if (container is PackageFragmentDescriptor || container is ClassDescriptor) {
element = element.appendTailText(" (" + DescriptorUtils.getFqName(container) + ")", true) element = element.appendTailText(" (" + DescriptorUtils.getFqName(container) + ")", true)
} }
if (descriptor is TypeAliasDescriptor) {
element = element.withTypeText(DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(descriptor.underlyingType), false)
}
} }
else -> { else -> {
idea/idea-completion/testData/basic/java/StandardKotlinTypeAliasFirst.kt
Vendored
+1 -1
View File
@@ -3,5 +3,5 @@ fun some(e: IllegalArgumentException<caret>) {
// INVOCATION_COUNT: 2 // INVOCATION_COUNT: 2
// WITH_ORDER // WITH_ORDER
// EXIST: { lookupString:"IllegalArgumentException", typeText:"public typealias IllegalArgumentException = IllegalArgumentException defined in kotlin" } // EXIST: { lookupString:"IllegalArgumentException", tailText: " (kotlin)", typeText:"IllegalArgumentException" }
// EXIST: { lookupString:"IllegalArgumentException", tailText:" (java.lang)" } // EXIST: { lookupString:"IllegalArgumentException", tailText:" (java.lang)" }
idea/idea-completion/testData/basic/multifile/ParameterNameAndTypeForNotImportedAlias/ParameterNameAndTypeForNotImportedAlias.kt
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@ package test2
fun foo(ali<caret>) fun foo(ali<caret>)
// EXIST: { lookupString: "alias : MyAlias", itemText: "alias: MyAlias", typeText: "public typealias MyAlias = MyClass defined in test", attributes: "" } // EXIST: { lookupString: "alias : MyAlias", itemText: "alias: MyAlias", tailText: " (test)", typeText: "MyClass", attributes: "" }
idea/idea-completion/testData/basic/multifile/TypeAliases/TypeAliases.kt
Vendored
+3 -3
View File
@@ -5,6 +5,6 @@ private typealias MyPrivateAlias = (String, Char) -> Unit
val test: My<caret> val test: My<caret>
// EXIST: { lookupString: "MySameFileAlias", itemText: "MySameFileAlias", tailText: null, typeText: "public typealias MySameFileAlias = (String) -> Int defined in test", attributes: "" } // EXIST: { lookupString: "MySameFileAlias", itemText: "MySameFileAlias", tailText: " (test)", typeText: "(String) -> Int", attributes: "" }
// EXIST: { lookupString: "MyPrivateAlias", itemText: "MyPrivateAlias", tailText: null, typeText: "private typealias MyPrivateAlias = (String, Char) -> Unit defined in test", attributes: "" } // EXIST: { lookupString: "MyPrivateAlias", itemText: "MyPrivateAlias", tailText: " (test)", typeText: "(String, Char) -> Unit", attributes: "" }
// EXIST: { lookupString: "MyAlias", itemText: "MyAlias", tailText: null, typeText: "public typealias MyAlias = MyClass defined in dependency", attributes: "" } // EXIST: { lookupString: "MyAlias", itemText: "MyAlias", tailText: " (dependency)", typeText: "MyClass", attributes: "" }