[AA LC] Map unresolved types according to aliased imports

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirJvmTypeMapper.kt

@@ -19,6 +19,6 @@ internal class KtFirJvmTypeMapper(
 ) : KtJvmTypeMapper(), KtFirAnalysisSessionComponent {
 
     override fun mapTypeToJvmType(type: KtType, mode: TypeMappingMode): Type {
-        return analysisSession.useSiteSession.jvmTypeMapper.mapType(type.coneType, mode, sw = null)
+        return analysisSession.useSiteSession.jvmTypeMapper.mapType(type.coneType, mode, sw = null, unresolvedQualifierRemapper = null)
     }
 }

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirPsiTypeProvider.kt

@@ -20,8 +20,8 @@ import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.api.types.KtTypeMappingMode
 import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade
 import org.jetbrains.kotlin.asJava.elements.KtLightElement
+import org.jetbrains.kotlin.asJava.elements.KtLightParameter
 import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter
-import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.descriptors.java.JavaVisibilities
@@ -37,6 +37,7 @@ import org.jetbrains.kotlin.load.kotlin.getOptimalModeForReturnType
 import org.jetbrains.kotlin.load.kotlin.getOptimalModeForValueParameter
 import org.jetbrains.kotlin.name.SpecialNames
 import org.jetbrains.kotlin.psi
+import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.psiUtil.parents
 import org.jetbrains.kotlin.types.model.SimpleTypeMarker
 import java.text.StringCharacterIterator
@@ -196,7 +197,14 @@ private fun ConeKotlinType.asPsiType(
     val signatureWriter = BothSignatureWriter(BothSignatureWriter.Mode.SKIP_CHECKS)
 
     //TODO Check thread safety
-    session.jvmTypeMapper.mapType(this, mode, signatureWriter)
+    session.jvmTypeMapper.mapType(this, mode, signatureWriter) {
+        val containingFile = useSitePosition.containingKtFile
+        // parameters for default setters does not have kotlin origin, but setter has
+            ?: (useSitePosition as? KtLightParameter)?.parent?.parent?.containingKtFile
+            ?: return@mapType null
+        val correspondingImport = containingFile.findImportByAlias(it) ?: return@mapType null
+        correspondingImport.importPath?.pathStr
+    }
 
     val canonicalSignature = signatureWriter.toString()
     require(!canonicalSignature.contains(SpecialNames.ANONYMOUS_STRING))
@@ -213,6 +221,9 @@ private fun ConeKotlinType.asPsiType(
     return typeElement.type
 }
 
+private val PsiElement.containingKtFile: KtFile?
+    get() = (this as? KtLightElement<*, *>)?.kotlinOrigin?.containingKtFile
+
 private class AnonymousTypesSubstitutor(
     private val session: FirSession,
 ) : AbstractConeSubstitutor(session.typeContext) {

analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java

@@ -258,6 +258,12 @@ public class SymbolLightClassesByPsiForLibraryTestGenerated extends AbstractSymb
         runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.kt");
     }
 
+    @Test
+    @TestMetadata("unresolvedWithAliasedImport.kt")
+    public void testUnresolvedWithAliasedImport() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedWithAliasedImport.kt");
+    }
+
     @Test
     @TestMetadata("wildcardOptimization.kt")
     public void testWildcardOptimization() throws Exception {

analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByPsiForSourceTestGenerated.java

@@ -258,6 +258,12 @@ public class SymbolLightClassesByPsiForSourceTestGenerated extends AbstractSymbo
         runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.kt");
     }
 
+    @Test
+    @TestMetadata("unresolvedWithAliasedImport.kt")
+    public void testUnresolvedWithAliasedImport() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedWithAliasedImport.kt");
+    }
+
     @Test
     @TestMetadata("wildcardOptimization.kt")
     public void testWildcardOptimization() throws Exception {

compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmTypeMapper.kt

@@ -46,19 +46,38 @@ import org.jetbrains.kotlin.types.model.TypeParameterMarker
 import org.jetbrains.kotlin.utils.addToStdlib.runUnless
 import org.jetbrains.org.objectweb.asm.Type
 
-class FirJvmTypeMapper(val session: FirSession) : TypeMappingContext<JvmSignatureWriter>, FirSessionComponent {
+class FirJvmTypeMapper(val session: FirSession) : FirSessionComponent {
     companion object {
         val NON_EXISTENT_ID = ClassId.topLevel(StandardNames.NON_EXISTENT_CLASS)
         private val typeForNonExistentClass = ConeClassLikeLookupTagImpl(NON_EXISTENT_ID)
             .constructClassType(emptyArray(), isNullable = false)
     }
 
-    override val typeContext = ConeTypeSystemCommonBackendContextForTypeMapping(session.typeContext)
+    fun mapType(
+        type: ConeKotlinType,
+        mode: TypeMappingMode = TypeMappingMode.DEFAULT,
+        sw: JvmSignatureWriter? = null,
+        unresolvedQualifierRemapper: ((String) -> String?)? = null
+    ): Type {
+        val context = if (unresolvedQualifierRemapper != null) {
+            Context(unresolvedQualifierRemapper)
+        } else {
+            defaultContext
+        }
+        return AbstractTypeMapper.mapType(context, type, mode, sw)
+    }
 
-    fun mapType(type: ConeKotlinType, mode: TypeMappingMode = TypeMappingMode.DEFAULT, sw: JvmSignatureWriter? = null): Type {
+    private val defaultContext = Context { null }
+    val typeContext: TypeSystemCommonBackendContext
+        get() = defaultContext.typeContext
+
+    private inner class Context(unresolvedQualifierRemapper: (String) -> String?) : TypeMappingContext<JvmSignatureWriter> {
+        private fun mapType(type: ConeKotlinType, mode: TypeMappingMode = TypeMappingMode.DEFAULT, sw: JvmSignatureWriter? = null): Type {
             return AbstractTypeMapper.mapType(this, type, mode, sw)
         }
 
+        override val typeContext = ConeTypeSystemCommonBackendContextForTypeMapping(session.typeContext, unresolvedQualifierRemapper)
+
         override fun getClassInternalName(typeConstructor: TypeConstructorMarker): String {
             require(typeConstructor is ConeClassLikeLookupTag)
             return typeConstructor.classId.asString().replace(".", "$").replace("/", ".")
@@ -145,14 +164,6 @@ class FirJvmTypeMapper(val session: FirSession) : TypeMappingContext<JvmSignatur
             )
         }
 
-    private class PossiblyInnerConeType(
-        val classifier: FirRegularClassSymbol?,
-        val arguments: List<ConeTypeProjection>,
-        private val outerType: PossiblyInnerConeType?
-    ) {
-        fun segments(): List<PossiblyInnerConeType> = outerType?.segments().orEmpty() + this
-    }
-
         private fun writeGenericArguments(
             sw: JvmSignatureWriter,
             type: PossiblyInnerConeType,
@@ -198,8 +209,17 @@ class FirJvmTypeMapper(val session: FirSession) : TypeMappingContext<JvmSignatur
                 writeGenericArguments(sw, innerPart, mode)
             }
         }
+    }
 
-    internal fun getJvmShortName(klass: FirRegularClass): String {
+    private class PossiblyInnerConeType(
+        val classifier: FirRegularClassSymbol?,
+        val arguments: List<ConeTypeProjection>,
+        private val outerType: PossiblyInnerConeType?
+    ) {
+        fun segments(): List<PossiblyInnerConeType> = outerType?.segments().orEmpty() + this
+    }
+
+    fun getJvmShortName(klass: FirRegularClass): String {
         return getJvmShortName(klass.classId)
     }
 
@@ -214,7 +234,8 @@ class FirJvmTypeMapper(val session: FirSession) : TypeMappingContext<JvmSignatur
 val FirSession.jvmTypeMapper: FirJvmTypeMapper by FirSession.sessionComponentAccessor()
 
 class ConeTypeSystemCommonBackendContextForTypeMapping(
-    val context: ConeTypeContext
+    val context: ConeTypeContext,
+    val unresolvedQualifierRemapper: (String) -> String?
 ) : TypeSystemCommonBackendContext by context, TypeSystemCommonBackendContextForTypeMapping {
     private val session = context.session
     private val symbolProvider = session.symbolProvider
@@ -299,6 +320,6 @@ class ConeTypeSystemCommonBackendContextForTypeMapping(
             is ConeUnresolvedTypeQualifierError -> diagnostic.qualifier
             else -> null
         }
-        return result
+        return result?.let { unresolvedQualifierRemapper(it) ?: it }
     }
 }

compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedWithAliasedImport.fir.java

@@ -0,0 +1,9 @@
+public final class Derived /* some.Derived*/ implements other.Unresolved {
+  private final other.Unresolved x = null /* initializer type: null */;
+
+  public  Derived();//  .ctor()
+
+  public final other.Unresolved getX();//  getX()
+
+  public final void takeA(other.Unresolved);//  takeA(other.Unresolved)
+}

compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedWithAliasedImport.java

@@ -0,0 +1,9 @@
+public final class Derived /* some.Derived*/ {
+  private final error.NonExistentClass x;
+
+  public  Derived();//  .ctor()
+
+  public final error.NonExistentClass getX();//  getX()
+
+  public final void takeA(error.NonExistentClass);//  takeA(error.NonExistentClass)
+}

compiler/testData/asJava/lightClasses/lightClassByPsi/unresolvedWithAliasedImport.kt

@@ -0,0 +1,11 @@
+package some
+
+import other.Unresolved as A
+
+class Derived : A {
+    val x: A? = null
+
+    fun takeA(a: A) {}
+}
+
+// COMPILATION_ERRORS