diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt index 7d9db664102..a662cde93ef 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt @@ -53,7 +53,7 @@ class JavaSymbolProvider( session = session, psi = null, type = ConeClassTypeImpl(FirClassSymbol(classId!!), emptyArray()), - isNullable = true, + isMarkedNullable = true, annotations = emptyList() ) ).apply { @@ -102,7 +102,7 @@ class JavaSymbolProvider( } return FirResolvedTypeImpl( session, psi = null, type = coneType, - isNullable = false, annotations = annotations.map { it.toFirAnnotationCall() } + isMarkedNullable = false, annotations = annotations.map { it.toFirAnnotationCall() } ) } @@ -110,7 +110,7 @@ class JavaSymbolProvider( if (this is JavaClassifierType) return toFirResolvedType() return FirResolvedTypeImpl( session, psi = null, type = ConeClassErrorType("Unexpected JavaType: $this"), - isNullable = false, annotations = emptyList() + isMarkedNullable = false, annotations = emptyList() ) } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt index 784039b04f9..5587114d215 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt @@ -121,7 +121,7 @@ open class FirTypeResolveTransformer( return FirResolvedFunctionTypeImpl( functionType.psi, functionType.session, - functionType.isNullable, + functionType.isMarkedNullable, functionType.annotations as MutableList, functionType.receiverType, functionType.valueParameters as MutableList, diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt index cd2179e6d84..1924a8d59cf 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt @@ -142,7 +142,7 @@ fun FirType.withReplacedConeType(newType: ConeKotlinType?): FirResolvedType { return FirResolvedTypeImpl( session, psi, newType, - isNullable, + isMarkedNullable, annotations ) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt index 31ee36a8c7c..81041413c1e 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt @@ -583,7 +583,7 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() { } override fun visitTypeWithNullability(typeWithNullability: FirTypeWithNullability) { - if (typeWithNullability.isNullable) { + if (typeWithNullability.isMarkedNullable) { print("?") } } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeWithNullability.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeWithNullability.kt index 46e80f00276..9b8356b49b2 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeWithNullability.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeWithNullability.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.types import org.jetbrains.kotlin.fir.visitors.FirVisitor interface FirTypeWithNullability : FirType { - val isNullable: Boolean + val isMarkedNullable: Boolean override fun accept(visitor: FirVisitor, data: D): R = visitor.visitTypeWithNullability(this, data) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirAbstractAnnotatedType.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirAbstractAnnotatedType.kt index f10600b8b9c..43dcc17b066 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirAbstractAnnotatedType.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirAbstractAnnotatedType.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.FirTransformer abstract class FirAbstractAnnotatedType( final override val session: FirSession, final override val psi: PsiElement?, - final override val isNullable: Boolean + final override val isMarkedNullable: Boolean ) : FirTypeWithNullability { override val annotations = mutableListOf() diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirResolvedFunctionTypeImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirResolvedFunctionTypeImpl.kt index ac0aea0d45e..7e1db045f82 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirResolvedFunctionTypeImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirResolvedFunctionTypeImpl.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.FirTransformer class FirResolvedFunctionTypeImpl( override val psi: PsiElement?, override val session: FirSession, - override val isNullable: Boolean, + override val isMarkedNullable: Boolean, override val annotations: MutableList, override var receiverType: FirType?, override val valueParameters: MutableList, diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeImpl.kt index 0254f2b09ca..13aff9b96bc 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeImpl.kt @@ -15,6 +15,6 @@ class FirResolvedTypeImpl( override val session: FirSession, override val psi: PsiElement?, override val type: ConeKotlinType, - override val isNullable: Boolean, + override val isMarkedNullable: Boolean, override val annotations: List ) : FirResolvedType \ No newline at end of file