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

Null-aware types introduced

Browse Source 
Flexible types should drive their own conversions to nullable/not-null
This commit is contained in:
Andrey Breslav
2014-08-26 16:07:23 +04:00
parent 969beb7898
commit 220c360081
10 changed files with 122 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/platformTypes/commonSupertype/collectionOrNull.kt
+19
View File
@@ -0,0 +1,19 @@
// FILE: p/Utils.java
package p;
public class Utils {
public static java.util.Collection<String> c() { return null; }
}
// FILE: k.kt
import p.*
fun <T : Any> T.foo() {}
fun test<D>(b: Boolean) {
val c = if (b) Utils.c() else null
c?.foo()
}
compiler/testData/diagnostics/tests/platformTypes/methodCall/inferenceWithBound.kt → compiler/testData/diagnostics/tests/platformTypes/commonSupertype/inferenceWithBound.kt
View File
compiler/testData/diagnostics/tests/platformTypes/commonSupertype/stringOrNull.kt
+19
View File
@@ -0,0 +1,19 @@
// FILE: p/Utils.java
package p;
public class Utils {
public static String str() { return null; }
}
// FILE: k.kt
import p.*
fun <T : Any> T.foo() {}
fun test<D>(b: Boolean) {
val str = if (b) Utils.str() else null
str?.foo()
}
compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+43 -14
View File
@@ -6157,7 +6157,8 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("GenericsInSupertypes.kt")
public void testGenericsInSupertypes() throws Exception {
doTest("compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.kt");
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.kt");
doTest(fileName);
}
@TestMetadata("inheritAbstractSamAdapter.kt")
@@ -6168,7 +6169,8 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("InheritedGenericFunction.kt")
public void testInheritedGenericFunction() throws Exception {
doTest("compiler/testData/diagnostics/tests/j+k/InheritedGenericFunction.kt");
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/InheritedGenericFunction.kt");
doTest(fileName);
}
@TestMetadata("innerNestedClassFromJava.kt")
@@ -7698,7 +7700,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/platformTypes")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({PlatformTypes.MethodCall.class})
@InnerTestClasses({PlatformTypes.CommonSupertype.class, PlatformTypes.MethodCall.class})
@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
public static class PlatformTypes extends AbstractJetDiagnosticsTest {
public void testAllFilesPresentInPlatformTypes() throws Exception {
@@ -7719,7 +7721,8 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("getParentOfType.kt")
public void testGetParentOfType() throws Exception {
doTest("compiler/testData/diagnostics/tests/platformTypes/getParentOfType.kt");
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/getParentOfType.kt");
doTest(fileName);
}
@TestMetadata("inference.kt")
@@ -7728,15 +7731,44 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
doTest(fileName);
}
@TestMetadata("override.kt")
public void testOverride() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/override.kt");
doTest(fileName);
}
@TestMetadata("safeCall.kt")
public void testSafeCall() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/safeCall.kt");
doTest(fileName);
}
@TestMetadata("override.kt")
public void testOverride() throws Exception {
doTest("compiler/testData/diagnostics/tests/platformTypes/override.kt");
@TestMetadata("compiler/testData/diagnostics/tests/platformTypes/commonSupertype")
@TestDataPath("$PROJECT_ROOT")
@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
public static class CommonSupertype extends AbstractJetDiagnosticsTest {
public void testAllFilesPresentInCommonSupertype() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/platformTypes/commonSupertype"), Pattern.compile("^(.+)\\.kt$"), true);
}
@TestMetadata("collectionOrNull.kt")
public void testCollectionOrNull() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/commonSupertype/collectionOrNull.kt");
doTest(fileName);
}
@TestMetadata("inferenceWithBound.kt")
public void testInferenceWithBound() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/commonSupertype/inferenceWithBound.kt");
doTest(fileName);
}
@TestMetadata("stringOrNull.kt")
public void testStringOrNull() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/commonSupertype/stringOrNull.kt");
doTest(fileName);
}
}
@TestMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall")
@@ -7747,11 +7779,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/platformTypes/methodCall"), Pattern.compile("^(.+)\\.kt$"), true);
}
@TestMetadata("inferenceWithBound.kt")
public void testInferenceWithBound() throws Exception {
doTest("compiler/testData/diagnostics/tests/platformTypes/methodCall/inferenceWithBound.kt");
}
@TestMetadata("int.kt")
public void testInt() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/int.kt");
@@ -7802,7 +7829,8 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("singleton.kt")
public void testSingleton() throws Exception {
doTest("compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.kt");
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.kt");
doTest(fileName);
}
@TestMetadata("string.kt")
@@ -7813,7 +7841,8 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("visitor.kt")
public void testVisitor() throws Exception {
doTest("compiler/testData/diagnostics/tests/platformTypes/methodCall/visitor.kt");
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/visitor.kt");
doTest(fileName);
}
}