FIR IDE: null out for erroneous PsiType conversion

analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/FirLightFieldEnumEntry.kt

@@ -67,6 +67,7 @@ internal class FirLightFieldForEnumEntry(
     private val _type: PsiType by lazyPub {
         analyzeWithSymbolAsContext(enumEntrySymbol) {
             enumEntrySymbol.annotatedType.type.asPsiType(this@FirLightFieldForEnumEntry)
+                ?: this@FirLightFieldForEnumEntry.nonExistentType()
         }
     }
 

analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/FirLightFieldForObjectSymbol.kt

@@ -41,6 +41,7 @@ internal class FirLightFieldForObjectSymbol(
     private val _type: PsiType by lazyPub {
         analyzeWithSymbolAsContext(objectSymbol) {
             objectSymbol.buildSelfClassType().asPsiType(this@FirLightFieldForObjectSymbol)
+                ?: this@FirLightFieldForObjectSymbol.nonExistentType()
         }
     }
 

analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/FirLightFieldForPropertySymbol.kt

@@ -30,6 +30,7 @@ internal class FirLightFieldForPropertySymbol(
     private val _returnedType: PsiType by lazyPub {
         analyzeWithSymbolAsContext(propertySymbol) {
             propertySymbol.annotatedType.type.asPsiType(this@FirLightFieldForPropertySymbol)
+                ?: this@FirLightFieldForPropertySymbol.nonExistentType()
         }
     }
 

analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/lightClassUtils.kt

@@ -6,7 +6,9 @@
 package org.jetbrains.kotlin.light.classes.symbol
 
 import com.intellij.openapi.project.Project
+import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiType
 import org.jetbrains.kotlin.idea.frontend.api.InvalidWayOfUsingAnalysisSession
 import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
 import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSessionProvider
@@ -32,3 +34,6 @@ internal inline fun <R> Project.analyzeWithSymbolAsContext(
 ): R {
     return KtAnalysisSessionProvider.getInstance(this).analyzeWithSymbolAsContext(contextSymbol, action)
 }
+
+internal fun PsiElement.nonExistentType(): PsiType =
+    JavaPsiFacade.getElementFactory(project).createTypeFromText("error.NonExistentClass", this)

analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/FirLightAccessorMethodForSymbol.kt

@@ -149,14 +149,15 @@ internal class FirLightAccessorMethodForSymbol(
 
     override fun getNameIdentifier(): PsiIdentifier = _identifier
 
-    private val _returnedType: PsiType? by lazyPub {
+    private val _returnedType: PsiType by lazyPub {
         if (!isGetter) return@lazyPub PsiType.VOID
         analyzeWithSymbolAsContext(containingPropertySymbol) {
             containingPropertySymbol.annotatedType.type.asPsiType(this@FirLightAccessorMethodForSymbol)
+                ?: this@FirLightAccessorMethodForSymbol.nonExistentType()
         }
     }
 
-    override fun getReturnType(): PsiType? = _returnedType
+    override fun getReturnType(): PsiType = _returnedType
 
     override fun equals(other: Any?): Boolean =
         this === other ||

analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/FirLightSimpleMethodForSymbol.kt

@@ -131,6 +131,7 @@ internal class FirLightSimpleMethodForSymbol(
         if (isVoidReturnType) return@lazyPub PsiType.VOID
         analyzeWithSymbolAsContext(functionSymbol) {
             functionSymbol.annotatedType.type.asPsiType(this@FirLightSimpleMethodForSymbol)
+                ?: this@FirLightSimpleMethodForSymbol.nonExistentType()
         }
     }
 

analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/FirLightParameterBaseForSymbol.kt

@@ -48,6 +48,7 @@ internal abstract class FirLightParameterBaseForSymbol(
     private val _type by lazyPub {
         val convertedType = analyzeWithSymbolAsContext(parameterSymbol) {
             parameterSymbol.annotatedType.type.asPsiType(this@FirLightParameterBaseForSymbol)
+                ?: this@FirLightParameterBaseForSymbol.nonExistentType()
         }
         if (convertedType is PsiArrayType && parameterSymbol.isVararg) {
             PsiEllipsisType(convertedType.componentType, convertedType.annotationProvider)

analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/FirLightParameterForReceiver.kt

@@ -72,6 +72,7 @@ internal class FirLightParameterForReceiver private constructor(
     private val _type: PsiType by lazyPub {
         analyzeWithSymbolAsContext(context) {
             receiverTypeAndAnnotations.type.asPsiType(this@FirLightParameterForReceiver)
+                ?: this@FirLightParameterForReceiver.nonExistentType()
         }
     }
 

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

@@ -11,13 +11,21 @@ import org.jetbrains.kotlin.idea.frontend.api.types.KtType
 import org.jetbrains.kotlin.load.kotlin.TypeMappingMode
 
 public abstract class KtPsiTypeProvider : KtAnalysisSessionComponent() {
-    public abstract fun asPsiType(type: KtType, context: PsiElement, mode: TypeMappingMode): PsiType
+    public abstract fun asPsiType(type: KtType, context: PsiElement, mode: TypeMappingMode): PsiType?
 }
 
 public interface KtPsiTypeProviderMixIn : KtAnalysisSessionMixIn {
+    /**
+     * Converts the given [KtType] to [PsiType].
+     *
+     * Returns `null` if the conversion encounters any erroneous cases, e.g., errors in type arguments.
+     * A client can handle such case in its own way. For instance,
+     *   * UAST will return `UastErrorType` as a default error type.
+     *   * LC will return `NonExistentClass` from the [context].
+     */
     public fun KtType.asPsiType(
         context: PsiElement,
-        mode: TypeMappingMode = TypeMappingMode.DEFAULT
+        mode: TypeMappingMode = TypeMappingMode.DEFAULT,
-    ): PsiType =
+    ): PsiType? =
         analysisSession.psiTypeProvider.asPsiType(this, context, mode)
 }

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

@@ -43,15 +43,15 @@ internal class KtFirPsiTypeProvider(
     override val token: ValidityToken,
 ) : KtPsiTypeProvider(), KtFirAnalysisSessionComponent {
 
-    override fun asPsiType(type: KtType, context: PsiElement, mode: TypeMappingMode): PsiType = withValidityAssertion {
+    override fun asPsiType(
+        type: KtType,
+        context: PsiElement,
+        mode: TypeMappingMode,
+    ): PsiType? = withValidityAssertion {
         type.coneType.asPsiType(rootModuleSession, analysisSession.firResolveState, mode, context)
     }
 }
 
-private fun PsiElement.nonExistentType() = JavaPsiFacade.getElementFactory(project)
-    .createTypeFromText("error.NonExistentClass", this)
-
-
 private fun ConeKotlinType.simplifyType(session: FirSession, state: FirModuleResolveState): ConeKotlinType {
     val substitutor = AnonymousTypesSubstitutor(session, state)
     var currentType = this
@@ -70,11 +70,12 @@ internal fun ConeKotlinType.asPsiType(
     state: FirModuleResolveState,
     mode: TypeMappingMode,
     psiContext: PsiElement,
-): PsiType {
+): PsiType? {
     val correctedType = simplifyType(session, state)
 
-    if (correctedType is ConeClassErrorType || correctedType !is SimpleTypeMarker) return psiContext.nonExistentType()
+    if (correctedType is ConeClassErrorType || correctedType !is SimpleTypeMarker) return null
-    if (correctedType.typeArguments.any { it is ConeClassErrorType }) return psiContext.nonExistentType()
+
+    if (correctedType.typeArguments.any { it is ConeClassErrorType }) return null
 
     val signatureWriter = BothSignatureWriter(BothSignatureWriter.Mode.SKIP_CHECKS)
 
@@ -83,13 +84,14 @@ internal fun ConeKotlinType.asPsiType(
 
     val canonicalSignature = signatureWriter.toString()
 
-    if (canonicalSignature.contains("L<error>")) return psiContext.nonExistentType()
+    if (canonicalSignature.contains("L<error>")) return null
+
     require(!canonicalSignature.contains(SpecialNames.ANONYMOUS_STRING))
 
     val signature = StringCharacterIterator(canonicalSignature)
     val javaType = SignatureParsing.parseTypeString(signature, StubBuildingVisitor.GUESSING_MAPPER)
     val typeInfo = TypeInfo.fromString(javaType, false)
-    val typeText = TypeInfo.createTypeText(typeInfo) ?: return psiContext.nonExistentType()
+    val typeText = TypeInfo.createTypeText(typeInfo) ?: return null
 
     val typeElement = ClsTypeElementImpl(psiContext, typeText, '\u0000')
     return typeElement.type