[Analysis API] Enhance warning nullability annotated type arguments in KaTypeProvider.augmentedByWarningLevelAnnotations

BlaBlaHuman · Space Team · commit ab248e67017d · 2025-10-23T23:45:15.000Z
^KT-80357 fixed
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KaFe10TypeProvider.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KaFe10TypeProvider.kt
@@ -111,7 +111,7 @@ internal class KaFe10TypeProvider(
     override val KaType.augmentedByWarningLevelAnnotations: KaType
         get() = withValidityAssertion {
             require(this is KaFe10Type)
-            val enhancement = (fe10Type as? TypeWithEnhancement)?.enhancement
+            val enhancement = fe10Type.getEnhancementDeeply()
             return enhancement?.toKtType(analysisContext) ?: this
         }
 
diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KaFirTypeProvider.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KaFirTypeProvider.kt
@@ -151,11 +151,11 @@ internal class KaFirTypeProvider(
             require(this is KaFirType)
             val coneType = coneType
             val substitutor = EnhancedForWarningConeSubstitutor(typeContext)
-            val enhancedConeType = substitutor.substituteType(coneType)
+            val enhancedConeType = substitutor.substituteOrNull(coneType)
 
             return enhancedConeType?.asKaType() ?: this
         }
-    
+
     override val KaClassifierSymbol.defaultType: KaType
         get() = withValidityAssertion {
             with(analysisSession) {
diff --git a/analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/javaEnhancedRecentlyNonNullTypeAsTypeParameter.txt b/analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/javaEnhancedRecentlyNonNullTypeAsTypeParameter.txt
@@ -1,2 +1,2 @@
 expression: a.bar() to "myPair"
-type: kotlin.Pair<kotlin.String!, kotlin.String>
+type: kotlin.Pair<kotlin.String, kotlin.String>
diff --git a/analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/javaEnhancedRecentlyNullableTypeAsTypeParameter.txt b/analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/javaEnhancedRecentlyNullableTypeAsTypeParameter.txt
@@ -1,2 +1,2 @@
 expression: a.bar() to "myPair"
-type: kotlin.Pair<kotlin.String!, kotlin.String>
+type: kotlin.Pair<kotlin.String?, kotlin.String>
diff --git a/analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/javaEnhancedTypeExternalAnnotationAsTypeParameter.descriptors.txt b/analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/javaEnhancedTypeExternalAnnotationAsTypeParameter.descriptors.txt
@@ -0,0 +1,2 @@
+expression: a.externalNotNullMethod() to "myPair"
+type: kotlin.Pair<kotlin.String!, kotlin.String>
diff --git a/analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/javaEnhancedTypeExternalAnnotationAsTypeParameter.txt b/analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/javaEnhancedTypeExternalAnnotationAsTypeParameter.txt
@@ -1,2 +1,2 @@
 expression: a.externalNotNullMethod() to "myPair"
-type: kotlin.Pair<kotlin.String!, kotlin.String>
+type: kotlin.Pair<kotlin.String, kotlin.String>

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ internal class KaFe10TypeProvider(`
`111`	`111`	`override val KaType.augmentedByWarningLevelAnnotations: KaType`
`112`	`112`	`get() = withValidityAssertion {`
`113`	`113`	`require(this is KaFe10Type)`
`114`		`- val enhancement = (fe10Type as? TypeWithEnhancement)?.enhancement`
	`114`	`+ val enhancement = fe10Type.getEnhancementDeeply()`
`115`	`115`	`return enhancement?.toKtType(analysisContext) ?: this`
`116`	`116`	`}`
`117`	`117`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`expression: a.bar() to "myPair"`
`2`		`-type: kotlin.Pair<kotlin.String!, kotlin.String>`
	`2`	`+type: kotlin.Pair<kotlin.String, kotlin.String>`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+expression: a.externalNotNullMethod() to "myPair"`
	`2`	`+type: kotlin.Pair<kotlin.String!, kotlin.String>`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`expression: a.externalNotNullMethod() to "myPair"`
`2`		`-type: kotlin.Pair<kotlin.String!, kotlin.String>`
	`2`	`+type: kotlin.Pair<kotlin.String, kotlin.String>`