diff --git a/compiler/testData/asJava/lightClasses/AnnotatedParameterInInnerClassConstructor.java b/compiler/testData/asJava/lightClasses/AnnotatedParameterInInnerClassConstructor.java index 09263b278b3..33ba73f3221 100644 --- a/compiler/testData/asJava/lightClasses/AnnotatedParameterInInnerClassConstructor.java +++ b/compiler/testData/asJava/lightClasses/AnnotatedParameterInInnerClassConstructor.java @@ -7,6 +7,6 @@ public final class Inner /* test.AnnotatedParameterInInnerClassConstructor.Inner public Inner(@org.jetbrains.annotations.NotNull() @test.Anno(x = "a") java.lang.String, @org.jetbrains.annotations.NotNull() @test.Anno(x = "b") java.lang.String);// .ctor(java.lang.String, java.lang.String) }public final class InnerGeneric /* test.AnnotatedParameterInInnerClassConstructor.InnerGeneric*/ { - public InnerGeneric(@test.Anno(x = "a") T, @org.jetbrains.annotations.NotNull() @test.Anno(x = "b") java.lang.String);// .ctor(T, java.lang.String) + public InnerGeneric(@org.jetbrains.annotations.Nullable() @test.Anno(x = "a") T, @org.jetbrains.annotations.NotNull() @test.Anno(x = "b") java.lang.String);// .ctor(T, java.lang.String) -}} \ No newline at end of file +}} diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/types/FirKtType.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/types/FirKtType.kt index c190ae6b240..c119b846977 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/types/FirKtType.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/types/FirKtType.kt @@ -43,7 +43,7 @@ internal class KtFirUsualClassType( } } - override val nullability: KtTypeNullability get() = withValidityAssertion { KtTypeNullability.create(coneType.isNullable) } + override val nullability: KtTypeNullability get() = withValidityAssertion { KtTypeNullability.create(coneType.canBeNull) } override fun asStringForDebugging(): String = withValidityAssertion { coneType.render() } } @@ -66,7 +66,7 @@ internal class KtFirFunctionalType( } } - override val nullability: KtTypeNullability get() = withValidityAssertion { KtTypeNullability.create(coneType.isNullable) } + override val nullability: KtTypeNullability get() = withValidityAssertion { KtTypeNullability.create(coneType.canBeNull) } override val isSuspend: Boolean get() = withValidityAssertion { coneType.isSuspendFunctionType(builder.rootSession) } override val arity: Int @@ -129,8 +129,6 @@ internal class KtFirDefinitelyNotNullType( override fun asStringForDebugging(): String = withValidityAssertion { coneType.render() } } - - internal class KtFirTypeParameterType( _coneType: ConeTypeParameterType, override val token: ValidityToken, @@ -145,7 +143,7 @@ internal class KtFirTypeParameterType( ?: error("Type parameter ${coneType.lookupTag} was not found") } - override val nullability: KtTypeNullability get() = withValidityAssertion { KtTypeNullability.create(coneType.isNullable) } + override val nullability: KtTypeNullability get() = withValidityAssertion { KtTypeNullability.create(coneType.canBeNull) } override fun asStringForDebugging(): String = withValidityAssertion { coneType.render() } }