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

[Tests] Make build green again

Browse Source
This commit is contained in:
Anastasiya Shadrina
2021-07-26 20:59:49 +07:00
committed by TeamCityServer
parent 8ec418e90f
commit f9e6365461
11 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/extensionFunctions/contextReceivers/contextAndExtensionSameName.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// TARGET_BACKEND: JVM_IR
// IGNORE_BACKEND_FIR: JVM_IR
class A {
val ok = "OK"
compiler/testData/diagnostics/tests/extensions/contextReceivers/ambiguityInGroup.fir.kt
Vendored
+4 -4
View File
@@ -17,9 +17,9 @@ fun supertypeContextual() {}
context(C1, C2)
fun test() {
supertypeMember()
member()
supertypeExtension()
supertypeExtensionGeneric()
<!UNRESOLVED_REFERENCE!>supertypeMember<!>()
<!UNRESOLVED_REFERENCE!>member<!>()
<!UNRESOLVED_REFERENCE!>supertypeExtension<!>()
<!UNRESOLVED_REFERENCE!>supertypeExtensionGeneric<!>()
supertypeContextual()
}
compiler/testData/diagnostics/tests/extensions/contextReceivers/lazy.fir.kt
Vendored
+10 -10
View File
@@ -13,36 +13,36 @@ fun <T> f(lazy1: Lazy<Int>, lazy2: Lazy<CharSequence>, lazyT: Lazy<T>, lazyLazyT
with(lazy1) {
with(lazy2) {
test1()
test2()
test3()
<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test2<!>()
<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test3<!>()
}
}
with(lazy2) {
with(lazy1) {
test1()
test2()
test3()
<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test2<!>()
<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test3<!>()
}
}
with(lazyT) {
with(lazy1) {
test1()
test2()
test3()
<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test2<!>()
<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test3<!>()
}
}
with(lazyLazyT) {
with(lazy1) {
test1()
test2()
test3()
<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test2<!>()
<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test3<!>()
}
}
with(lazy1) {
with(lazyLazyT) {
test1()
test2()
test3()
<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test2<!>()
<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test3<!>()
}
}
}
compiler/testData/diagnostics/tests/extensions/contextReceivers/localDeclaration.fir.kt
Vendored
+2 -2
View File
@@ -6,7 +6,7 @@ class B : A
fun testLocalFunction() {
context(A)
fun local() {
f()
<!UNRESOLVED_REFERENCE!>f<!>()
}
with(B()) {
local()
@@ -18,7 +18,7 @@ fun testLocalClass() {
context(A)
class Local {
fun local() {
f()
<!UNRESOLVED_REFERENCE!>f<!>()
}
}
with(B()) {
compiler/testData/diagnostics/tests/extensions/contextReceivers/syntaxError.fir.kt
Vendored
-3
View File
@@ -1,3 +0,0 @@
context(
<!SYNTAX!><!>fun foo() {
}
compiler/testData/diagnostics/tests/extensions/contextReceivers/syntaxError.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
context(
<!SYNTAX!><!>fun foo() {
}
compiler/testData/diagnostics/tests/extensions/contextReceivers/thisIdentifierInfo.fir.kt
Vendored
+1 -1
View File
@@ -2,5 +2,5 @@ class A(val a: String?)
context(A) fun f() {
if (<!UNRESOLVED_LABEL!>this@A<!>.<!UNRESOLVED_REFERENCE!>a<!> == null) return
<!UNRESOLVED_LABEL!>this@A<!>.<!UNRESOLVED_REFERENCE!>a<!>.<!UNRESOLVED_REFERENCE!>length<!>
<!UNRESOLVED_LABEL!>this@A<!>.<!UNRESOLVED_REFERENCE!>a<!>.length
}
compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithCustomLabel.fir.kt
Vendored
+4 -4
View File
@@ -3,16 +3,16 @@ class B(val b: Any)
class C(val c: Any)
context(labelAInt@A<Int>, A<String>, labelB@B) fun f() {
<!UNRESOLVED_LABEL!>this@labelAInt<!>.<!UNRESOLVED_REFERENCE!>a<!>.<!UNRESOLVED_REFERENCE!>toFloat<!>()
<!UNRESOLVED_LABEL!>this@A<!>.<!UNRESOLVED_REFERENCE!>a<!>.<!UNRESOLVED_REFERENCE!>length<!>
<!UNRESOLVED_LABEL!>this@labelAInt<!>.<!UNRESOLVED_REFERENCE!>a<!>.toFloat()
<!UNRESOLVED_LABEL!>this@A<!>.<!UNRESOLVED_REFERENCE!>a<!>.length
<!UNRESOLVED_LABEL!>this@labelB<!>.<!UNRESOLVED_REFERENCE!>b<!>
<!UNRESOLVED_LABEL!>this@B<!>
}
context(labelAInt@A<Int>, A<String>, labelB@B) val C.p: Int
get() {
<!UNRESOLVED_LABEL!>this@labelAInt<!>.<!UNRESOLVED_REFERENCE!>a<!>.<!UNRESOLVED_REFERENCE!>toFloat<!>()
<!UNRESOLVED_LABEL!>this@A<!>.<!UNRESOLVED_REFERENCE!>a<!>.<!UNRESOLVED_REFERENCE!>length<!>
<!UNRESOLVED_LABEL!>this@labelAInt<!>.<!UNRESOLVED_REFERENCE!>a<!>.toFloat()
<!UNRESOLVED_LABEL!>this@A<!>.<!UNRESOLVED_REFERENCE!>a<!>.length
<!UNRESOLVED_LABEL!>this@B<!>
<!UNRESOLVED_LABEL!>this@labelB<!>.<!UNRESOLVED_REFERENCE!>b<!>
<!UNRESOLVED_LABEL!>this@C<!>.<!UNRESOLVED_REFERENCE!>c<!>
compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithReceiverLabelsFunctions.fir.kt
Vendored
+2 -2
View File
@@ -3,13 +3,13 @@ class B(val b: Any)
class C(val c: Any)
context(A<Int>, A<String>, B) fun f() {
<!UNRESOLVED_LABEL!>this@A<!>.<!UNRESOLVED_REFERENCE!>a<!>.<!UNRESOLVED_REFERENCE!>length<!>
<!UNRESOLVED_LABEL!>this@A<!>.<!UNRESOLVED_REFERENCE!>a<!>.length
<!UNRESOLVED_LABEL!>this@B<!>.<!UNRESOLVED_REFERENCE!>b<!>
<!NO_THIS!>this<!>
}
context(A<Int>, A<String>, B) fun C.f() {
<!UNRESOLVED_LABEL!>this@A<!>.<!UNRESOLVED_REFERENCE!>a<!>.<!UNRESOLVED_REFERENCE!>length<!>
<!UNRESOLVED_LABEL!>this@A<!>.<!UNRESOLVED_REFERENCE!>a<!>.length
<!UNRESOLVED_LABEL!>this@B<!>.<!UNRESOLVED_REFERENCE!>b<!>
<!UNRESOLVED_LABEL!>this@C<!>.<!UNRESOLVED_REFERENCE!>c<!>
this@f.c
compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithReceiverLabelsProperties.fir.kt
Vendored
+5 -5
View File
@@ -2,16 +2,16 @@ class A<T>(val a: T)
class B(val b: Any)
class C(val c: Any)
context(A<Int>, A<String>, B) var p: Int
<!MUST_BE_INITIALIZED!>context(A<Int>, A<String>, B) var p: Int<!>
get() {
<!UNRESOLVED_LABEL!>this@A<!>.<!UNRESOLVED_REFERENCE!>a<!>.<!UNRESOLVED_REFERENCE!>toDouble<!>()
<!UNRESOLVED_LABEL!>this@A<!>.<!UNRESOLVED_REFERENCE!>a<!>.<!UNRESOLVED_REFERENCE!>length<!>
<!UNRESOLVED_LABEL!>this@A<!>.<!UNRESOLVED_REFERENCE!>a<!>.toDouble()
<!UNRESOLVED_LABEL!>this@A<!>.<!UNRESOLVED_REFERENCE!>a<!>.length
<!UNRESOLVED_LABEL!>this@B<!>.<!UNRESOLVED_REFERENCE!>b<!>
<!NO_THIS!>this<!>
return 1
}
set(value) {
<!UNRESOLVED_LABEL!>this@A<!>.<!UNRESOLVED_REFERENCE!>a<!>.<!UNRESOLVED_REFERENCE!>length<!>
<!UNRESOLVED_LABEL!>this@A<!>.<!UNRESOLVED_REFERENCE!>a<!>.length
<!UNRESOLVED_LABEL!>this@B<!>.<!UNRESOLVED_REFERENCE!>b<!>
<!NO_THIS!>this<!>
field = value
@@ -19,7 +19,7 @@ context(A<Int>, A<String>, B) var p: Int
context(A<Int>, A<String>, B) val C.p: Int
get() {
<!UNRESOLVED_LABEL!>this@A<!>.<!UNRESOLVED_REFERENCE!>a<!>.<!UNRESOLVED_REFERENCE!>length<!>
<!UNRESOLVED_LABEL!>this@A<!>.<!UNRESOLVED_REFERENCE!>a<!>.length
<!UNRESOLVED_LABEL!>this@B<!>.<!UNRESOLVED_REFERENCE!>b<!>
<!UNRESOLVED_LABEL!>this@C<!>.<!UNRESOLVED_REFERENCE!>c<!>
this@p.c
compiler/testData/diagnostics/tests/extensions/contextReceivers/typeParameterized.fir.kt
Vendored
+1 -1
View File
@@ -7,5 +7,5 @@ context(T)
fun <T> T.f(t: B<T>) {}
fun Int.main(a: A, b: B<String>) {
a.<!INAPPLICABLE_CANDIDATE!>f<!>(b)
a.f(<!ARGUMENT_TYPE_MISMATCH!>b<!>)
}