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

FIR Completion: Add UniqueLookupElement to the lookup elements

Browse Source 
- It is done to differentiate overloads of the same function
This commit is contained in:
Roman Golyshev
2020-08-06 00:50:27 +03:00
parent b6ee478190
commit 582b00f5b2
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/completion/HighLevelApiLookupElementFactory.kt
+8 -3
View File
@@ -36,15 +36,20 @@ internal class HighLevelApiLookupElementFactory {
} }
} }
/**
* This is a temporary hack to prevent clash of the lookup elements with same names.
*/
private class UniqueLookupObject
private class ClassLookupElementFactory { private class ClassLookupElementFactory {
fun createLookup(symbol: KtClassLikeSymbol): LookupElementBuilder { fun createLookup(symbol: KtClassLikeSymbol): LookupElementBuilder {
return LookupElementBuilder.create(symbol.name.asString()) return LookupElementBuilder.create(UniqueLookupObject(), symbol.name.asString())
} }
} }
private class VariableLookupElementFactory { private class VariableLookupElementFactory {
fun createLookup(symbol: KtVariableLikeSymbol): LookupElementBuilder { fun createLookup(symbol: KtVariableLikeSymbol): LookupElementBuilder {
return LookupElementBuilder.create(symbol.name.asString()) return LookupElementBuilder.create(UniqueLookupObject(), symbol.name.asString())
.withTypeText(ShortNamesRenderer.renderType(symbol.type)) .withTypeText(ShortNamesRenderer.renderType(symbol.type))
.withInsertHandler(createInsertHandler(symbol)) .withInsertHandler(createInsertHandler(symbol))
} }
@@ -56,7 +61,7 @@ private class VariableLookupElementFactory {
private class FunctionLookupElementFactory { private class FunctionLookupElementFactory {
fun createLookup(symbol: KtFunctionSymbol): LookupElementBuilder { fun createLookup(symbol: KtFunctionSymbol): LookupElementBuilder {
return LookupElementBuilder.create(symbol.name.asString()) return LookupElementBuilder.create(UniqueLookupObject(), symbol.name.asString())
.appendTailText(ShortNamesRenderer.renderFunctionParameters(symbol), true) .appendTailText(ShortNamesRenderer.renderFunctionParameters(symbol), true)
.withTypeText(ShortNamesRenderer.renderType(symbol.type)) .withTypeText(ShortNamesRenderer.renderType(symbol.type))
.withInsertHandler(createInsertHandler(symbol)) .withInsertHandler(createInsertHandler(symbol))