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

FIR: initial support of suspend conversion for function reference

Browse Source
This commit is contained in:
Jinseong Jeon
2020-07-24 15:19:28 -07:00
committed by Mikhail Glukhikh
parent b9243aad24
commit 5a3367e09c
21 changed files with 230 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/suspendConversion/basicSuspendConversionForCallableReference.fir.kt
Vendored
+3 -3
View File
@@ -9,10 +9,10 @@ fun bar2(x: Int) {}
fun bar2(s: String) {}
fun test() {
<!INAPPLICABLE_CANDIDATE!>foo1<!>(::bar1)
foo1(::bar1)
<!INAPPLICABLE_CANDIDATE!>foo2<!>(42, <!UNRESOLVED_REFERENCE!>::bar2<!>)
<!INAPPLICABLE_CANDIDATE!>foo2<!>("str", <!UNRESOLVED_REFERENCE!>::bar2<!>)
foo2(42, ::bar2)
foo2("str", ::bar2)
<!INAPPLICABLE_CANDIDATE!>foo2<!>(42, ::bar1)
}
compiler/testData/diagnostics/tests/suspendConversion/suspendConversionCompatibility.fir.kt
Vendored
+1 -1
View File
@@ -22,7 +22,7 @@ object Test2 {
fun test() {
val result = foo(::bar)
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int")!>result<!>
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String")!>result<!>
}
}
}
compiler/testData/diagnostics/tests/suspendConversion/suspendConversionCompatibilityInDisabledMode.fir.kt
Vendored
+2 -2
View File
@@ -11,7 +11,7 @@ object Test1 {
fun test() {
val result = foo(::bar)
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int")!>result<!>
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String")!>result<!>
}
}
}
@@ -29,7 +29,7 @@ object Test2 {
fun test() {
val result = foo(::bar)
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Double")!>result<!>
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String")!>result<!>
}
}
}
compiler/testData/diagnostics/tests/suspendConversion/suspendConversionDisabled.fir.kt
Vendored
+1 -1
View File
@@ -20,7 +20,7 @@ fun test(
<!INAPPLICABLE_CANDIDATE!>foo2<!>(f2)
<!INAPPLICABLE_CANDIDATE!>foo3<!>(f3)
<!INAPPLICABLE_CANDIDATE!>foo1<!>(::bar)
foo1(::bar)
<!INAPPLICABLE_CANDIDATE!>foo1<!>(f2)
<!INAPPLICABLE_CANDIDATE!>foo1<!>(f3)
compiler/testData/diagnostics/tests/suspendConversion/suspendConversionWithFunInterfaces.fir.kt
Vendored
-21
View File
@@ -1,21 +0,0 @@
// !LANGUAGE: +SuspendConversion
// !DIAGNOSTICS: -UNUSED_PARAMETER
fun interface SuspendRunnable {
suspend fun invoke()
}
fun foo1(s: SuspendRunnable) {}
fun bar1() {}
fun bar2(s: String = ""): Int = 0
fun bar3() {}
suspend fun bar3(s: String = ""): Int = 0
fun test() {
<!INAPPLICABLE_CANDIDATE!>foo1<!>(::bar1)
<!INAPPLICABLE_CANDIDATE!>foo1<!>(::bar2)
foo1(::bar3) // Should be ambiguity
}
compiler/testData/diagnostics/tests/suspendConversion/suspendConversionWithFunInterfaces.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !LANGUAGE: +SuspendConversion
// !DIAGNOSTICS: -UNUSED_PARAMETER
compiler/testData/diagnostics/tests/suspendConversion/suspendConversionWithReferenceAdaptation.fir.kt
Vendored
+3 -3
View File
@@ -14,8 +14,8 @@ fun unitCoercionAndDefaults(f: suspend () -> Unit) {}
fun all(s: String = ""): Int = 0
fun test() {
<!INAPPLICABLE_CANDIDATE!>unitCoercion<!>(::foo)
<!INAPPLICABLE_CANDIDATE!>defaults<!>(::bar)
unitCoercion(::foo)
defaults(::bar)
<!INAPPLICABLE_CANDIDATE!>varargs<!>(::baz)
<!INAPPLICABLE_CANDIDATE!>unitCoercionAndDefaults<!>(::all)
unitCoercionAndDefaults(::all)
}
compiler/testData/diagnostics/tests/unitConversion/chainedFunSuspendUnitConversion.fir.kt
Vendored
+1 -1
View File
@@ -14,5 +14,5 @@ abstract class SubInt : () -> Int
fun test(f: () -> String, s: SubInt) {
<!INAPPLICABLE_CANDIDATE!>foo<!>(f)
<!INAPPLICABLE_CANDIDATE!>foo<!>(s)
<!INAPPLICABLE_CANDIDATE!>foo<!>(::bar)
foo(::bar)
}
compiler/testData/diagnostics/tests/unitConversion/chainedUnitSuspendConversion.fir.kt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ fun bar(): String = ""
abstract class SubInt : () -> Int
fun test(g: () -> Double, s: SubInt) {
<!INAPPLICABLE_CANDIDATE!>foo<!>(::bar)
foo(::bar)
<!INAPPLICABLE_CANDIDATE!>foo<!>(g)
<!INAPPLICABLE_CANDIDATE!>foo<!>(s)
}