FIR IDE: render short names as for completion lookup element types

idea/idea-completion/testData/basic/common/ImportedMemberFromObject.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 package a
 
 import a.O.uniqueName

idea/idea-completion/testData/basic/common/NoTopLevelCompletionInQualifiedUserTypes.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class Test : java.lang.A<caret>
 
 // ABSENT: Annotation

idea/idea-completion/testData/basic/common/annotations/AfterPackageName.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 @kotlin.concurrent.<caret>
 
 // INVOCATION_COUNT: 2

idea/idea-completion/testData/basic/common/annotations/TypeAliasToAnnotation.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 annotation class Anno
 typealias TypedAnno = Anno
 

idea/idea-completion/testData/basic/common/extensionFunctionTypeValues/ImplicitReceiver.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class C
 
 fun C.test(foo: C.() -> Unit) {

idea/idea-completion/testData/basic/common/shadowing/InInitializer1.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun foo(xxx: String) {
     var xxx: Int = xx<caret>
 }

idea/idea-completion/testData/basic/common/shadowing/InInitializer3.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun foo(xxx: Int) {
     val xxx: Any = run {
         xx<caret>

idea/idea-completion/testData/basic/common/shadowing/Locals1.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class C {
     val xxx = 1
 

idea/idea-completion/testData/basic/common/shadowing/Locals2.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class C {
     val xxx = 1
 

idea/idea-completion/testData/basic/common/shadowing/PreferCloserMember.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class C {
     inner class Inner {
         fun foo() {

idea/idea-completion/testData/basic/common/shadowing/PreferCloserReceiverGeneric.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 interface I<T> {
     fun xxx(): T
 }

idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature2.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 open class C<T> {
     fun foo(t: T): T = t
 }

idea/idea-completion/testData/handlers/basic/SuperMethod.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 open class Base {
     open fun foo(p: Int){}
 }

idea/idea-completion/testData/handlers/basic/SuperMethod.kt.after

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 open class Base {
     open fun foo(p: Int){}
 }

idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirLookupElementFactory.kt

@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.idea.completion.handlers.isTextAt
 import org.jetbrains.kotlin.idea.core.asFqNameWithRootPrefixIfNeeded
 import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
 import org.jetbrains.kotlin.idea.frontend.api.analyse
+import org.jetbrains.kotlin.idea.frontend.api.components.KtTypeRendererOptions
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.addImportToFile
 import org.jetbrains.kotlin.idea.frontend.api.symbols.*
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtNamedSymbol
@@ -119,7 +120,7 @@ private class VariableLookupElementFactory {
         )
 
         return LookupElementBuilder.create(lookupObject, symbol.name.asString())
-            .withTypeText(symbol.annotatedType.type.render())
+            .withTypeText(symbol.annotatedType.type.render(WITH_TYPE_RENDERING_OPTIONS))
             .markIfSyntheticJavaProperty(symbol)
             .withInsertHandler(VariableInsertionHandler)
     }
@@ -163,7 +164,7 @@ private class FunctionLookupElementFactory {
         return try {
             LookupElementBuilder.create(lookupObject, symbol.name.asString())
                 .withTailText(getTailText(symbol), true)
-                .withTypeText(symbol.annotatedType.type.render())
+                .withTypeText(symbol.annotatedType.type.render(WITH_TYPE_RENDERING_OPTIONS))
                 .withInsertHandler(FunctionInsertionHandler)
         } catch (e: Throwable) {
             if (e is ControlFlowException) throw e
@@ -198,6 +199,8 @@ private class FunctionLookupElementFactory {
     }
 }
 
+private val WITH_TYPE_RENDERING_OPTIONS = KtTypeRendererOptions.SHORT_NAMES
+
 /**
  * The simplest implementation of the insertion handler for a classifiers.
  */
@@ -399,7 +402,7 @@ private object ShortNamesRenderer {
         function.valueParameters.joinToString(", ", "(", ")") { renderFunctionParameter(it) }
 
     private fun KtAnalysisSession.renderFunctionParameter(param: KtValueParameterSymbol): String =
-        "${if (param.isVararg) "vararg " else ""}${param.name.asString()}: ${param.annotatedType.type.render()}"
+        "${if (param.isVararg) "vararg " else ""}${param.name.asString()}: ${param.annotatedType.type.render(WITH_TYPE_RENDERING_OPTIONS)}"
 }