[FIR IDE] Improve handling aliased types in KtFirImportOptimizer

idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirImportOptimizer.kt

@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
 import org.jetbrains.kotlin.fir.declarations.utils.isOperator
 import org.jetbrains.kotlin.fir.expressions.*
 import org.jetbrains.kotlin.fir.psi
-import org.jetbrains.kotlin.fir.references.FirResolvedCallableReference
 import org.jetbrains.kotlin.fir.symbols.ensureResolved
 import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
 import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
@@ -171,12 +170,12 @@ internal class KtFirImportOptimizer(
                 val mostOuterTypeQualifier = generateSequence(qualifier) { it.outerTypeQualifier }.last()
                 if (mostOuterTypeQualifier.isQualified) return
 
-                saveType(mostOuterTypeQualifier.classId)
+                 saveType(mostOuterTypeQualifier)
             }
 
-            private fun saveType(classId: ClassId) {
+            private fun saveType(qualifier: TypeQualifier) {
-                val importableName = classId.asSingleFqName()
+                val importableName = qualifier.referencedClassId.asSingleFqName()
-                val referencedByName = classId.shortClassName
+                val referencedByName = qualifier.referencedByName
 
                 saveReferencedItem(importableName, referencedByName)
             }
@@ -230,7 +229,14 @@ private val FirFunctionCall.isInvokeOperatorImplicitCall: Boolean
  * to correctly reason about long qualifiers.
  */
 private sealed interface TypeQualifier {
-    val classId: ClassId
+    val referencedClassId: ClassId
+
+    /**
+     * Type can be imported with alias, and thus can be referenced by the name different from its actual name.
+     *
+     * We cannot use [ClassId.getShortClassName] for this, since it is not affected by the alias.
+     */
+    val referencedByName: Name
 
     /**
      * Must be `true` if the PSI qualifier is itself qualified with the package or some other type, and `false` otherwise.
@@ -246,39 +252,48 @@ private sealed interface TypeQualifier {
     val outerTypeQualifier: TypeQualifier?
 
     private class KtDotExpressionTypeQualifier(
-        override val classId: ClassId,
+        override val referencedClassId: ClassId,
-        private val qualifier: KtElement,
+        qualifier: KtElement,
     ) : TypeQualifier {
 
-        init {
+        private val dotQualifier: KtDotQualifiedExpression? = qualifier as? KtDotQualifiedExpression
-            require(qualifier is KtDotQualifiedExpression || qualifier is KtNameReferenceExpression) {
+
-                "Unexpected type of qualifier: ${qualifier::class}"
+        private val typeNameReference: KtNameReferenceExpression = when (qualifier) {
-            }
+            is KtDotQualifiedExpression -> qualifier.selectorExpression as? KtNameReferenceExpression
-        }
+            is KtNameReferenceExpression -> qualifier
+            else -> null
+        } ?: error("Cannot get referenced name from '${qualifier.text}'")
+
+        override val referencedByName: Name
+            get() = typeNameReference.getReferencedNameAsName()
 
         override val isQualified: Boolean
-            get() = qualifier is KtDotQualifiedExpression
+            get() = dotQualifier != null
 
         override val outerTypeQualifier: TypeQualifier?
             get() {
-                val outerClassId = classId.outerClassId ?: return null
+                val outerClassId = referencedClassId.outerClassId ?: return null
-                val outerQualifier = (qualifier as? KtDotQualifiedExpression)?.receiverExpression ?: return null
+                val outerQualifier = dotQualifier?.receiverExpression ?: return null
 
                 return KtDotExpressionTypeQualifier(outerClassId, outerQualifier)
             }
     }
 
     private class KtUserTypeQualifier(
-        override val classId: ClassId,
+        override val referencedClassId: ClassId,
         private val qualifier: KtUserType,
     ) : TypeQualifier {
 
+        override val referencedByName: Name
+            get() = qualifier.referenceExpression?.getReferencedNameAsName()
+                ?: error("Cannot get referenced name from '${qualifier.text}'")
+
         override val isQualified: Boolean
             get() = qualifier.qualifier != null
 
         override val outerTypeQualifier: TypeQualifier?
             get() {
-                val outerClassId = classId.outerClassId ?: return null
+                val outerClassId = referencedClassId.outerClassId ?: return null
                 val outerQualifier = qualifier.qualifier ?: return null
 
                 return KtUserTypeQualifier(outerClassId, outerQualifier)

idea/idea-frontend-fir/testData/components/importOptimizer/unusedAliasedTypeImport.imports

@@ -0,0 +1 @@
+dependency.Bar as BarAlias

idea/idea-frontend-fir/testData/components/importOptimizer/unusedAliasedTypeImport.kt

@@ -0,0 +1,12 @@
+// FILE: main.kt
+package test
+
+import dependency.Bar
+import dependency.Bar as BarAlias
+
+fun usage(p: Bar) {}
+
+// FILE: dependency.kt
+package dependency
+
+class Bar

idea/idea-frontend-fir/testData/components/importOptimizer/usedAliasedTypeImport.kt

@@ -0,0 +1,11 @@
+// FILE: main.kt
+package test
+
+import dependency.Bar as BarAlias
+
+fun usage(p: BarAlias) {}
+
+// FILE: dependency.kt
+package dependency
+
+class Bar

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/HLImportOptimizerTestGenerated.java

@@ -24,12 +24,24 @@ public class HLImportOptimizerTestGenerated extends AbstractHLImportOptimizerTes
         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/idea-frontend-fir/testData/components/importOptimizer"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
     }
 
+    @Test
+    @TestMetadata("unusedAliasedTypeImport.kt")
+    public void testUnusedAliasedTypeImport() throws Exception {
+        runTest("idea/idea-frontend-fir/testData/components/importOptimizer/unusedAliasedTypeImport.kt");
+    }
+
     @Test
     @TestMetadata("unusedFunctionImports.kt")
     public void testUnusedFunctionImports() throws Exception {
         runTest("idea/idea-frontend-fir/testData/components/importOptimizer/unusedFunctionImports.kt");
     }
 
+    @Test
+    @TestMetadata("usedAliasedTypeImport.kt")
+    public void testUsedAliasedTypeImport() throws Exception {
+        runTest("idea/idea-frontend-fir/testData/components/importOptimizer/usedAliasedTypeImport.kt");
+    }
+
     @Test
     @TestMetadata("usedFunctionImport.kt")
     public void testUsedFunctionImport() throws Exception {