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

KT-36336 @EnhancedNullability and null checks

Browse Source 
Don't insert implicit null check on a value of @EnhancedNullability type
used where @EnhancedNullability type is expected.

This uncovers a bunch of other problems in FE and BE.
KT-36343 and KT-36347 are bugs in StrictJavaNullabilityAssertions
implementation which should most likely be fixed in next major language
version (with proper breaking change notice).
KT-36344 is a design problem which should be addressed after 1.4 issues
are resolved.
This commit is contained in:
Dmitry Petrov
2020-02-04 15:27:00 +03:00
parent 6489b56fb0
commit ee020ef290
35 changed files with 1216 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/ir/IrTextTestCaseGenerated.java
Generated
+48 -25
View File
@@ -1806,26 +1806,11 @@ public class IrTextTestCaseGenerated extends AbstractIrTextTestCase {
runTest("compiler/testData/ir/irText/types/asOnPlatformType.kt");
}
@TestMetadata("enhancedNullability.kt")
public void testEnhancedNullability() throws Exception {
runTest("compiler/testData/ir/irText/types/enhancedNullability.kt");
}
@TestMetadata("explicitEqualsAndCompareToCallsOnPlatformTypeReceiver.kt")
public void testExplicitEqualsAndCompareToCallsOnPlatformTypeReceiver() throws Exception {
runTest("compiler/testData/ir/irText/types/explicitEqualsAndCompareToCallsOnPlatformTypeReceiver.kt");
}
@TestMetadata("genericPropertyReferenceType.kt")
public void testGenericPropertyReferenceType() throws Exception {
runTest("compiler/testData/ir/irText/types/genericPropertyReferenceType.kt");
}
@TestMetadata("implicitNotNullOnPlatformType.kt")
public void testImplicitNotNullOnPlatformType() throws Exception {
runTest("compiler/testData/ir/irText/types/implicitNotNullOnPlatformType.kt");
}
@TestMetadata("intersectionType1_NI.kt")
public void testIntersectionType1_NI() throws Exception {
runTest("compiler/testData/ir/irText/types/intersectionType1_NI.kt");
@@ -1861,16 +1846,6 @@ public class IrTextTestCaseGenerated extends AbstractIrTextTestCase {
runTest("compiler/testData/ir/irText/types/localVariableOfIntersectionType_NI.kt");
}
@TestMetadata("nullabilityAssertionOnExtensionReceiver.kt")
public void testNullabilityAssertionOnExtensionReceiver() throws Exception {
runTest("compiler/testData/ir/irText/types/nullabilityAssertionOnExtensionReceiver.kt");
}
@TestMetadata("platformTypeReceiver.kt")
public void testPlatformTypeReceiver() throws Exception {
runTest("compiler/testData/ir/irText/types/platformTypeReceiver.kt");
}
@TestMetadata("smartCastOnFakeOverrideReceiver.kt")
public void testSmartCastOnFakeOverrideReceiver() throws Exception {
runTest("compiler/testData/ir/irText/types/smartCastOnFakeOverrideReceiver.kt");
@@ -1885,5 +1860,53 @@ public class IrTextTestCaseGenerated extends AbstractIrTextTestCase {
public void testSmartCastOnReceiverOfGenericType() throws Exception {
runTest("compiler/testData/ir/irText/types/smartCastOnReceiverOfGenericType.kt");
}
@TestMetadata("compiler/testData/ir/irText/types/nullChecks")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class NullChecks extends AbstractIrTextTestCase {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInNullChecks() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/types/nullChecks"), Pattern.compile("^(.+)\\.kt$"), null, true);
}
@TestMetadata("enhancedNullability.kt")
public void testEnhancedNullability() throws Exception {
runTest("compiler/testData/ir/irText/types/nullChecks/enhancedNullability.kt");
}
@TestMetadata("enhancedNullabilityInDestructuringAssignment.kt")
public void testEnhancedNullabilityInDestructuringAssignment() throws Exception {
runTest("compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.kt");
}
@TestMetadata("enhancedNullabilityInForLoop.kt")
public void testEnhancedNullabilityInForLoop() throws Exception {
runTest("compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.kt");
}
@TestMetadata("explicitEqualsAndCompareToCallsOnPlatformTypeReceiver.kt")
public void testExplicitEqualsAndCompareToCallsOnPlatformTypeReceiver() throws Exception {
runTest("compiler/testData/ir/irText/types/nullChecks/explicitEqualsAndCompareToCallsOnPlatformTypeReceiver.kt");
}
@TestMetadata("implicitNotNullOnPlatformType.kt")
public void testImplicitNotNullOnPlatformType() throws Exception {
runTest("compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.kt");
}
@TestMetadata("nullabilityAssertionOnExtensionReceiver.kt")
public void testNullabilityAssertionOnExtensionReceiver() throws Exception {
runTest("compiler/testData/ir/irText/types/nullChecks/nullabilityAssertionOnExtensionReceiver.kt");
}
@TestMetadata("platformTypeReceiver.kt")
public void testPlatformTypeReceiver() throws Exception {
runTest("compiler/testData/ir/irText/types/nullChecks/platformTypeReceiver.kt");
}
}
}
}