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

[NI] Preserve annotations during type substitution

Browse Source 
#KT-31346 Fixed
This commit is contained in:
Mikhail Zarechenskiy
2019-05-07 17:55:03 +03:00
parent 2c26dc3af6
commit c283e15425
14 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/controlStructures/lambdasInExclExclAndElvis.kt
Vendored
+2 -2
View File
@@ -9,8 +9,8 @@ fun test() {
// KT-KT-9070
<!TYPE_MISMATCH!>{ }<!> <!USELESS_ELVIS!>?: 1<!>
use(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>{ 2 }<!> <!USELESS_ELVIS!>?: 1<!>);
use({ 2 } <!USELESS_ELVIS!>?: 1<!>);
1 <!USELESS_ELVIS!>?: <!TYPE_MISMATCH, UNUSED_LAMBDA_EXPRESSION!>{ }<!><!>
use(1 <!USELESS_ELVIS!>?: <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>{ }<!><!>)
use(1 <!USELESS_ELVIS!>?: { }<!>)
}
compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType.kt
Vendored
+4 -4
View File
@@ -21,7 +21,7 @@ fun baz4(x: @MyDsl B.() -> Unit) {}
fun @MyDsl A.baz5() {
baz4 {
bar()
<!OI;DSL_SCOPE_VIOLATION_WARNING!>foo<!>()
<!DSL_SCOPE_VIOLATION_WARNING!>foo<!>()
}
}
@@ -36,21 +36,21 @@ fun main() {
baz3 {
baz2 {
bar()
<!OI;DSL_SCOPE_VIOLATION_WARNING!>foo<!>()
<!DSL_SCOPE_VIOLATION_WARNING!>foo<!>()
}
}
baz1 {
baz4 {
bar()
<!OI;DSL_SCOPE_VIOLATION_WARNING!>foo<!>()
<!DSL_SCOPE_VIOLATION_WARNING!>foo<!>()
}
}
baz3 {
baz4 {
bar()
<!OI;DSL_SCOPE_VIOLATION_WARNING!>foo<!>()
<!DSL_SCOPE_VIOLATION_WARNING!>foo<!>()
}
}
compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType_1_4.kt
Vendored
+4 -4
View File
@@ -22,7 +22,7 @@ fun baz4(x: @MyDsl B.() -> Unit) {}
fun @MyDsl A.baz5() {
baz4 {
bar()
<!OI;DSL_SCOPE_VIOLATION!>foo<!>()
<!DSL_SCOPE_VIOLATION!>foo<!>()
}
}
@@ -37,21 +37,21 @@ fun main() {
baz3 {
baz2 {
bar()
<!OI;DSL_SCOPE_VIOLATION!>foo<!>()
<!DSL_SCOPE_VIOLATION!>foo<!>()
}
}
baz1 {
baz4 {
bar()
<!OI;DSL_SCOPE_VIOLATION!>foo<!>()
<!DSL_SCOPE_VIOLATION!>foo<!>()
}
}
baz3 {
baz4 {
bar()
<!OI;DSL_SCOPE_VIOLATION!>foo<!>()
<!DSL_SCOPE_VIOLATION!>foo<!>()
}
}
compiler/testData/diagnostics/tests/resolve/dslMarker/markersIntersection.kt
Vendored
+2 -2
View File
@@ -60,7 +60,7 @@ fun test() {
bar1t(this) {
a()
bar1 {
<!OI;DSL_SCOPE_VIOLATION!>a<!>()
<!DSL_SCOPE_VIOLATION!>a<!>()
b()
}
@@ -76,7 +76,7 @@ fun test() {
foo2 {
bar1t(this) {
a()
<!OI;DSL_SCOPE_VIOLATION!>b<!>()
<!DSL_SCOPE_VIOLATION!>b<!>()
}
}
}
compiler/testData/diagnostics/tests/resolve/dslMarker/substitutedReceiverAnnotatedType.kt
Vendored
+1 -1
View File
@@ -19,7 +19,7 @@ fun test() {
foo<A> {
a()
bar<B> {
<!OI;DSL_SCOPE_VIOLATION!>a<!>()
<!DSL_SCOPE_VIOLATION!>a<!>()
this@foo.a()
b()
}
compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.kt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ fun test() {
<!OI;CONSTANT_EXPECTED_TYPE_MISMATCH!>2<!>
}<!>)
bar(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!><!OI;CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!> ?: <!OI;CONSTANT_EXPECTED_TYPE_MISMATCH!>2<!><!>)
bar(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!><!CONSTANT_EXPECTED_TYPE_MISMATCH, NI;CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!> ?: <!CONSTANT_EXPECTED_TYPE_MISMATCH, NI;CONSTANT_EXPECTED_TYPE_MISMATCH!>2<!><!>)
}
fun bar(s: String) = s