Use abbreviatedType explicitly

now that AA expand types.
google · Jun 25, 2024 · 82c69dc · 82c69dc
1 parent 3f6b549
commit 82c69dc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt
@@ -245,13 +245,6 @@ class KotlinSymbolProcessing(
             createPackagePartProvider,
         )
 
-        // kotlinCoreProjectEnvironment.project.apply {
-        //     registerService(
-        //         KotlinPsiDeclarationProviderFactory::class.java,
-        //         KotlinStaticPsiDeclarationProviderFactory(this)
-        //     )
-        // }
-        //
         project.registerService(
             LLFirLibrarySymbolProviderFactory::class.java,
             LLFirStandaloneLibrarySymbolProviderFactory::class.java

diff --git a/...nalysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSTypeAliasImpl.kt b/...nalysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSTypeAliasImpl.kt
@@ -41,7 +41,10 @@ class KSTypeAliasImpl private constructor(private val ktTypeAliasSymbol: KtTypeA
     }
 
     override val type: KSTypeReference by lazy {
-        KSTypeReferenceResolvedImpl.getCached(ktTypeAliasSymbol.expandedType, this)
+        KSTypeReferenceResolvedImpl.getCached(
+            ktTypeAliasSymbol.expandedType.let { it.abbreviatedType ?: it },
+            this
+        )
     }
 
     override val simpleName: KSName

diff --git a/...sis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSTypeReferenceImpl.kt b/...sis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSTypeReferenceImpl.kt
@@ -50,7 +50,9 @@ class KSTypeReferenceImpl(
 
     // Remember to recordLookup if the usage is beyond a type reference.
     private val ktType: KtType by lazy {
-        analyze { ktTypeReference.getKtType() }
+        analyze {
+            ktTypeReference.getKtType().let { it.abbreviatedType ?: it }
+        }
     }
     override val element: KSReferenceElement? by lazy {
         var typeElement = ktTypeReference.typeElement

diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/util.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/util.kt
@@ -611,6 +611,7 @@ fun ClassId.toKSName() = KSNameImpl.getCached(asSingleFqName().toString())
 // or kotlin functional type (in the case of Java functional type).
 internal fun KtClassLikeSymbol.shouldMapToKotlinForAssignabilityCheck(): Boolean {
     return this.origin == KtSymbolOrigin.JAVA_SOURCE ||
+        this.origin == KtSymbolOrigin.JAVA_LIBRARY ||
         this.classIdIfNonLocal?.packageFqName?.asString() == "kotlin.jvm.functions"
 }