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

[NI] Automatically squash equal diagnostics in OI and NI in testdata

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2019-04-18 13:54:47 +03:00
parent 642f8ecaf8
commit e70bdb51c5
30 changed files with 82 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayList.kt
Vendored
+2 -2
View File
@@ -14,10 +14,10 @@ fun foo() {
x[0] = <!TYPE_MISMATCH!>bar()<!>
x[0] = ""
val b1: MutableList<String?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b1: MutableList<String?> = <!TYPE_MISMATCH!>x<!>
val b2: MutableList<String> = x
val b3: List<String?> = x
val b4: Collection<String?> = x
val b6: MutableCollection<String?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b6: MutableCollection<String?> = <!TYPE_MISMATCH!>x<!>
}
compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayListNullable.kt
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ fun foo() {
x[0] = ""
val b1: MutableList<String?> = x
val b2: MutableList<String> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b2: MutableList<String> = <!TYPE_MISMATCH!>x<!>
val b3: List<String?> = x
val b4: Collection<String?> = x
compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.kt
Vendored
+1 -1
View File
@@ -29,5 +29,5 @@ fun foo() {
x.add("")
val b1: Collection<String?> = x
val b2: MutableCollection<String?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b2: MutableCollection<String?> = <!TYPE_MISMATCH!>x<!>
}
compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.kt
Vendored
+2 -2
View File
@@ -32,10 +32,10 @@ fun foo() {
x[0] = <!TYPE_MISMATCH!>bar()<!>
x[0] = ""
val b1: MutableList<String?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b1: MutableList<String?> = <!TYPE_MISMATCH!>x<!>
val b2: MutableList<String> = x
val b3: List<String?> = x
val b4: Collection<String?> = x
val b6: MutableCollection<String?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b6: MutableCollection<String?> = <!TYPE_MISMATCH!>x<!>
}
compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/maps.kt
Vendored
+15 -15
View File
@@ -18,14 +18,14 @@ fun hashMapTest() {
<!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>x[""]<!> = <!NI;TYPE_MISMATCH!>nullableInt<!>
x[""] = 1
val b1: MutableMap<String, Int?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b1: MutableMap<String, Int?> = <!TYPE_MISMATCH!>x<!>
val b2: MutableMap<String, Int> = x
val b3: Map<String?, Int> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b4: Map<String?, Int?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b3: Map<String?, Int> = <!TYPE_MISMATCH!>x<!>
val b4: Map<String?, Int?> = <!TYPE_MISMATCH!>x<!>
val b5: Map<String, Int?> = x
val b6: Int = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x[""]<!>
val b7: Int = <!TYPE_MISMATCH!>x.<!NI;TYPE_MISMATCH!>get("")<!><!>
val b6: Int = <!TYPE_MISMATCH!>x[""]<!>
val b7: Int = <!TYPE_MISMATCH!>x.get("")<!>
val b8: Int? = x.get("")
}
@@ -42,14 +42,14 @@ fun treeMapTest() {
<!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>x[""]<!> = <!NI;TYPE_MISMATCH!>nullableInt<!>
x[""] = 1
val b1: MutableMap<String, Int?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b1: MutableMap<String, Int?> = <!TYPE_MISMATCH!>x<!>
val b2: MutableMap<String, Int> = x
val b3: Map<String?, Int> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b4: Map<String?, Int?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b3: Map<String?, Int> = <!TYPE_MISMATCH!>x<!>
val b4: Map<String?, Int?> = <!TYPE_MISMATCH!>x<!>
val b5: Map<String, Int?> = x
val b6: Int = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x[""]<!>
val b7: Int = <!TYPE_MISMATCH!>x.<!NI;TYPE_MISMATCH!>get("")<!><!>
val b6: Int = <!TYPE_MISMATCH!>x[""]<!>
val b7: Int = <!TYPE_MISMATCH!>x.get("")<!>
val b8: Int? = x.get("")
}
@@ -66,14 +66,14 @@ fun concurrentHashMapTest() {
<!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>x[""]<!> = <!NI;TYPE_MISMATCH!>nullableInt<!>
x[""] = 1
val b1: MutableMap<String, Int?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b1: MutableMap<String, Int?> = <!TYPE_MISMATCH!>x<!>
val b2: MutableMap<String, Int> = x
val b3: Map<String?, Int> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b4: Map<String?, Int?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b3: Map<String?, Int> = <!TYPE_MISMATCH!>x<!>
val b4: Map<String?, Int?> = <!TYPE_MISMATCH!>x<!>
val b5: Map<String, Int?> = x
val b6: Int = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x[""]<!>
val b7: Int = <!TYPE_MISMATCH!>x.<!NI;TYPE_MISMATCH!>get("")<!><!>
val b6: Int = <!TYPE_MISMATCH!>x[""]<!>
val b7: Int = <!TYPE_MISMATCH!>x.get("")<!>
val b8: Int? = x.get("")
}
compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableKey.kt
Vendored
+9 -9
View File
@@ -17,15 +17,15 @@ fun hashMapTest() {
<!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>x[""]<!> = <!NI;TYPE_MISMATCH!>nullableInt<!>
x[""] = 1
val b1: MutableMap<String?, Int?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b1: MutableMap<String?, Int?> = <!TYPE_MISMATCH!>x<!>
val b2: MutableMap<String?, Int> = x
val b3: Map<String?, Int> = x
val b4: Map<String?, Int?> = x
val b5: Map<String, Int?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b5: Map<String, Int?> = <!TYPE_MISMATCH!>x<!>
val b6: Int = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x[""]<!>
val b7: Int = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x[null]<!>
val b8: Int = <!TYPE_MISMATCH!>x.<!NI;TYPE_MISMATCH!>get("")<!><!>
val b6: Int = <!TYPE_MISMATCH!>x[""]<!>
val b7: Int = <!TYPE_MISMATCH!>x[null]<!>
val b8: Int = <!TYPE_MISMATCH!>x.get("")<!>
val b9: Int? = x.get("")
}
@@ -42,14 +42,14 @@ fun treeMapTest() {
<!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>x[""]<!> = <!NI;TYPE_MISMATCH!>nullableInt<!>
x[""] = 1
val b1: MutableMap<String?, Int?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b1: MutableMap<String?, Int?> = <!TYPE_MISMATCH!>x<!>
val b2: MutableMap<String?, Int> = x
val b3: Map<String?, Int> = x
val b4: Map<String?, Int?> = x
val b5: Map<String, Int?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b5: Map<String, Int?> = <!TYPE_MISMATCH!>x<!>
val b6: Int = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x[""]<!>
val b7: Int = <!TYPE_MISMATCH!>x.<!NI;TYPE_MISMATCH!>get("")<!><!>
val b6: Int = <!TYPE_MISMATCH!>x[""]<!>
val b7: Int = <!TYPE_MISMATCH!>x.get("")<!>
val b8: Int? = x.get("")
}
compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableValues.kt
Vendored
+10 -10
View File
@@ -17,14 +17,14 @@ fun hashMapTest() {
x[""] = nullableInt
x[""] = 1
val b1: MutableMap<String, Int> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b1: MutableMap<String, Int> = <!TYPE_MISMATCH!>x<!>
val b2: MutableMap<String, Int?> = x
val b3: Map<String, Int> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b3: Map<String, Int> = <!TYPE_MISMATCH!>x<!>
val b4: Map<String, Int?> = x
val b5: Map<String?, Int?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b5: Map<String?, Int?> = <!TYPE_MISMATCH!>x<!>
val b6: Int = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x[""]<!>
val b7: Int = <!TYPE_MISMATCH!>x.<!NI;TYPE_MISMATCH!>get("")<!><!>
val b6: Int = <!TYPE_MISMATCH!>x[""]<!>
val b7: Int = <!TYPE_MISMATCH!>x.get("")<!>
val b8: Int? = x.get("")
}
@@ -41,14 +41,14 @@ fun treeMapTest() {
x[""] = nullableInt
x[""] = 1
val b1: MutableMap<String, Int> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b1: MutableMap<String, Int> = <!TYPE_MISMATCH!>x<!>
val b2: MutableMap<String, Int?> = x
val b3: Map<String, Int> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b3: Map<String, Int> = <!TYPE_MISMATCH!>x<!>
val b4: Map<String, Int?> = x
val b5: Map<String?, Int?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b5: Map<String?, Int?> = <!TYPE_MISMATCH!>x<!>
val b6: Int = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x[""]<!>
val b7: Int = <!TYPE_MISMATCH!>x.<!NI;TYPE_MISMATCH!>get("")<!><!>
val b6: Int = <!TYPE_MISMATCH!>x[""]<!>
val b7: Int = <!TYPE_MISMATCH!>x.get("")<!>
val b8: Int? = x.get("")
}
compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/sets.kt
Vendored
+6 -6
View File
@@ -10,12 +10,12 @@ fun fooHashSet() {
x.add(<!TYPE_MISMATCH!>bar()<!>)
x.add("")
val b1: MutableSet<String?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b1: MutableSet<String?> = <!TYPE_MISMATCH!>x<!>
val b2: MutableSet<String> = x
val b3: Set<String?> = x
val b4: Collection<String?> = x
val b6: MutableCollection<String?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b6: MutableCollection<String?> = <!TYPE_MISMATCH!>x<!>
}
fun fooTreeSet() {
@@ -24,12 +24,12 @@ fun fooTreeSet() {
x.add(<!TYPE_MISMATCH!>bar()<!>)
x.add("")
val b1: MutableSet<String?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b1: MutableSet<String?> = <!TYPE_MISMATCH!>x<!>
val b2: MutableSet<String> = x
val b3: Set<String?> = x
val b4: Collection<String?> = x
val b6: MutableCollection<String?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b6: MutableCollection<String?> = <!TYPE_MISMATCH!>x<!>
}
fun fooLinkedHashSet() {
@@ -38,10 +38,10 @@ fun fooLinkedHashSet() {
x.add(<!TYPE_MISMATCH!>bar()<!>)
x.add("")
val b1: MutableSet<String?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b1: MutableSet<String?> = <!TYPE_MISMATCH!>x<!>
val b2: MutableSet<String> = x
val b3: Set<String?> = x
val b4: Collection<String?> = x
val b6: MutableCollection<String?> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
val b6: MutableCollection<String?> = <!TYPE_MISMATCH!>x<!>
}