azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIR IDE: fix nullability of KtType variants

Browse Source
This commit is contained in:
Jinseong Jeon
2021-08-03 21:09:23 -07:00
committed by Ilya Kirillov
parent 46a0c4be4b
commit 4396482fed
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/asJava/lightClasses/AnnotatedParameterInInnerClassConstructor.java
Vendored
+2 -2
View File
@@ -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*/<T> {
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)
}}
}}
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/types/FirKtType.kt
+3 -5
View File
@@ -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() }
}