Update FIR parsing to prefer abbreviated type

This ensures we continue to get typealias names, rather than their expanded type names.

Author: JakeWharton

zipline-api-validator/src/main/kotlin/app/cash/zipline/api/validator/fir/FirZiplineApiReader.kt

@@ -27,14 +27,20 @@ import org.jetbrains.kotlin.fir.declarations.utils.isInterface
 import org.jetbrains.kotlin.fir.declarations.utils.isSuspend
 import org.jetbrains.kotlin.fir.pipeline.FirResult
 import org.jetbrains.kotlin.fir.resolve.providers.symbolProvider
+import org.jetbrains.kotlin.fir.resolve.toSymbol
+import org.jetbrains.kotlin.fir.symbols.ConeClassifierLookupTag
 import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
+import org.jetbrains.kotlin.fir.types.ConeLookupTagBasedType
 import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
 import org.jetbrains.kotlin.fir.types.FirStarProjection
 import org.jetbrains.kotlin.fir.types.FirTypeProjection
 import org.jetbrains.kotlin.fir.types.FirTypeProjectionWithVariance
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.fir.types.FirUserTypeRef
+import org.jetbrains.kotlin.fir.types.abbreviatedTypeOrSelf
+import org.jetbrains.kotlin.fir.types.coneType
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
@@ -131,24 +137,33 @@ internal class FirZiplineApiReader(
     val signature = buildString {
       if (isSuspend) append("suspend ")
       append("fun ${symbol.name.identifier}(")
-      append(valueParameters.joinToString { it.returnTypeRef.asString() })
+      valueParameters.joinTo(this) { it.returnTypeRef.asString() }
       append("): ${returnTypeRef.asString()}")
     }
 
     return FirZiplineFunction(signature)
   }
 
   private fun FirProperty.asDeclaredZiplineFunction(): FirZiplineFunction {
-    val signature = when {
-      isVar -> "var ${symbol.name.identifier}: ${returnTypeRef.asString()}"
-      else -> "val ${symbol.name.identifier}: ${returnTypeRef.asString()}"
-    }
+    val valOrVar = if (isVar) "var" else "val"
+    val signature = "$valOrVar ${symbol.name.identifier}: ${returnTypeRef.asString()}"
     return FirZiplineFunction(signature)
   }
 
+  // TODO This available natively in Kotlin 2.1.0 or newer and can be deleted after upgrading.
+  val ConeKotlinType.lookupTagIfAny: ConeClassifierLookupTag?
+    get() = (this as? ConeLookupTagBasedType)?.lookupTag
+
+  // TODO This available natively in Kotlin 2.1.0 or newer and can be deleted after upgrading.
+  fun ConeClassifierLookupTag.toClassLikeSymbol(useSiteSession: FirSession): FirClassLikeSymbol<*>? {
+    return toSymbol(useSiteSession) as? FirClassLikeSymbol<*>
+  }
+
   /** See [app.cash.zipline.kotlin.asString]. */
   private fun FirTypeRef.asString(): String {
-    val classLikeSymbol = toClassLikeSymbol(session) ?: error("unexpected class: $this")
+    // Abbreviated type gets us the name of typealiases rather than what they expand to.
+    val classLikeSymbol = coneType.abbreviatedTypeOrSelf.lookupTagIfAny
+      ?.toClassLikeSymbol(session) ?: error("unexpected class: $this")
 
     val typeRef = when (this) {
       is FirResolvedTypeRef -> delegatedTypeRef ?: this