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

Update some testdata according to new inference behaviour

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2019-01-21 14:40:19 +03:00
parent 667f5032b6
commit 42b333f6fd
6 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType.kt
Vendored
+5 -4
View File
@@ -1,4 +1,5 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
// !WITH_NEW_INFERENCE
@Target(AnnotationTarget.TYPE)
@DslMarker
@@ -20,7 +21,7 @@ fun baz4(x: @MyDsl B.() -> Unit) {}
fun @MyDsl A.baz5() {
baz4 {
bar()
<!DSL_SCOPE_VIOLATION_WARNING!>foo<!>()
<!OI;DSL_SCOPE_VIOLATION_WARNING!>foo<!>()
}
}
@@ -35,21 +36,21 @@ fun main() {
baz3 {
baz2 {
bar()
<!DSL_SCOPE_VIOLATION_WARNING!>foo<!>()
<!OI;DSL_SCOPE_VIOLATION_WARNING!>foo<!>()
}
}
baz1 {
baz4 {
bar()
<!DSL_SCOPE_VIOLATION_WARNING!>foo<!>()
<!OI;DSL_SCOPE_VIOLATION_WARNING!>foo<!>()
}
}
baz3 {
baz4 {
bar()
<!DSL_SCOPE_VIOLATION_WARNING!>foo<!>()
<!OI;DSL_SCOPE_VIOLATION_WARNING!>foo<!>()
}
}
compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType_1_4.kt
Vendored
+5 -4
View File
@@ -1,5 +1,6 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
// !LANGUAGE: +DslMarkerOnFunctionTypeReceiver
// !WITH_NEW_INFERENCE
@Target(AnnotationTarget.TYPE)
@DslMarker
@@ -21,7 +22,7 @@ fun baz4(x: @MyDsl B.() -> Unit) {}
fun @MyDsl A.baz5() {
baz4 {
bar()
<!DSL_SCOPE_VIOLATION!>foo<!>()
<!OI;DSL_SCOPE_VIOLATION!>foo<!>()
}
}
@@ -36,21 +37,21 @@ fun main() {
baz3 {
baz2 {
bar()
<!DSL_SCOPE_VIOLATION!>foo<!>()
<!OI;DSL_SCOPE_VIOLATION!>foo<!>()
}
}
baz1 {
baz4 {
bar()
<!DSL_SCOPE_VIOLATION!>foo<!>()
<!OI;DSL_SCOPE_VIOLATION!>foo<!>()
}
}
baz3 {
baz4 {
bar()
<!DSL_SCOPE_VIOLATION!>foo<!>()
<!OI;DSL_SCOPE_VIOLATION!>foo<!>()
}
}