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

Enable suspend conversions by default in 1.6

Browse Source 
^KT-48618 Fixed
This commit is contained in:
Victor Petukhov
2021-09-06 18:46:38 +03:00
parent 86d8468b8b
commit ce02cd4729
10 changed files with 71 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -41576,6 +41576,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/suspendConversion/basicSuspendConversion.kt");
}
@Test
@TestMetadata("basicSuspendConversionDefault.kt")
public void testBasicSuspendConversionDefault() throws Exception {
runTest("compiler/testData/codegen/box/suspendConversion/basicSuspendConversionDefault.kt");
}
@Test
@TestMetadata("basicSuspendConversionForCallableReference.kt")
public void testBasicSuspendConversionForCallableReference() throws Exception {
compiler/testData/codegen/box/suspendConversion/basicSuspendConversionDefault.kt
Vendored
+27
View File
@@ -0,0 +1,27 @@
// IGNORE_BACKEND: JVM
// IGNORE_BACKEND: WASM
// !DIAGNOSTICS: -UNUSED_PARAMETER
fun foo1(f: suspend () -> String) {}
fun foo2(f: suspend (Int) -> String) {}
fun foo3(f: suspend () -> Unit) {}
fun test(
f0: suspend () -> String,
f1: () -> String,
f2: (Int) -> String,
f3: () -> Unit,
) {
foo1 { "str" }
foo1(f0)
foo1(f1)
foo2(f2)
foo3(f3)
}
fun box(): String {
test({ "" }, { "" }, { it.toString() }, {})
return "OK"
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -41426,6 +41426,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/suspendConversion/basicSuspendConversion.kt");
}
@Test
@TestMetadata("basicSuspendConversionDefault.kt")
public void testBasicSuspendConversionDefault() throws Exception {
runTest("compiler/testData/codegen/box/suspendConversion/basicSuspendConversionDefault.kt");
}
@Test
@TestMetadata("basicSuspendConversionForCallableReference.kt")
public void testBasicSuspendConversionForCallableReference() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -41576,6 +41576,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/suspendConversion/basicSuspendConversion.kt");
}
@Test
@TestMetadata("basicSuspendConversionDefault.kt")
public void testBasicSuspendConversionDefault() throws Exception {
runTest("compiler/testData/codegen/box/suspendConversion/basicSuspendConversionDefault.kt");
}
@Test
@TestMetadata("basicSuspendConversionForCallableReference.kt")
public void testBasicSuspendConversionForCallableReference() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -33294,6 +33294,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/suspendConversion/basicSuspendConversion.kt");
}
@TestMetadata("basicSuspendConversionDefault.kt")
public void ignoreBasicSuspendConversionDefault() throws Exception {
runTest("compiler/testData/codegen/box/suspendConversion/basicSuspendConversionDefault.kt");
}
@TestMetadata("basicSuspendConversionGenerics.kt")
public void ignoreBasicSuspendConversionGenerics() throws Exception {
runTest("compiler/testData/codegen/box/suspendConversion/basicSuspendConversionGenerics.kt");
compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
+1 -1
View File
@@ -143,7 +143,6 @@ enum class LanguageFeature(
SamConversionForKotlinFunctions(KOTLIN_1_4),
SamConversionPerArgument(KOTLIN_1_4),
FunctionReferenceWithDefaultValueAsOtherType(KOTLIN_1_4),
SuspendConversion(KOTLIN_1_4, defaultState = State.DISABLED),
UnitConversion(KOTLIN_1_4, defaultState = State.DISABLED),
OverloadResolutionByLambdaReturnType(KOTLIN_1_4),
ContractsOnCallsWithImplicitReceiver(KOTLIN_1_4),
@@ -215,6 +214,7 @@ enum class LanguageFeature(
RepeatableAnnotations(KOTLIN_1_6),
RepeatableAnnotationContainerConstraints(KOTLIN_1_6, kind = BUG_FIX),
UseBuilderInferenceOnlyIfNeeded(KOTLIN_1_6),
SuspendConversion(KOTLIN_1_6),
// 1.7
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
Generated
+5
View File
@@ -27857,6 +27857,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
runTest("compiler/testData/codegen/box/suspendConversion/basicSuspendConversion.kt");
}
@TestMetadata("basicSuspendConversionDefault.kt")
public void testBasicSuspendConversionDefault() throws Exception {
runTest("compiler/testData/codegen/box/suspendConversion/basicSuspendConversionDefault.kt");
}
@TestMetadata("basicSuspendConversionForCallableReference.kt")
public void testBasicSuspendConversionForCallableReference() throws Exception {
runTest("compiler/testData/codegen/box/suspendConversion/basicSuspendConversionForCallableReference.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -27263,6 +27263,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/suspendConversion/basicSuspendConversion.kt");
}
@TestMetadata("basicSuspendConversionDefault.kt")
public void testBasicSuspendConversionDefault() throws Exception {
runTest("compiler/testData/codegen/box/suspendConversion/basicSuspendConversionDefault.kt");
}
@TestMetadata("basicSuspendConversionForCallableReference.kt")
public void testBasicSuspendConversionForCallableReference() throws Exception {
runTest("compiler/testData/codegen/box/suspendConversion/basicSuspendConversionForCallableReference.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -27203,6 +27203,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/suspendConversion/basicSuspendConversion.kt");
}
@TestMetadata("basicSuspendConversionDefault.kt")
public void testBasicSuspendConversionDefault() throws Exception {
runTest("compiler/testData/codegen/box/suspendConversion/basicSuspendConversionDefault.kt");
}
@TestMetadata("basicSuspendConversionForCallableReference.kt")
public void testBasicSuspendConversionForCallableReference() throws Exception {
runTest("compiler/testData/codegen/box/suspendConversion/basicSuspendConversionForCallableReference.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
Generated
+5
View File
@@ -15248,6 +15248,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
runTest("compiler/testData/codegen/box/suspendConversion/basicSuspendConversion.kt");
}
@TestMetadata("basicSuspendConversionDefault.kt")
public void testBasicSuspendConversionDefault() throws Exception {
runTest("compiler/testData/codegen/box/suspendConversion/basicSuspendConversionDefault.kt");
}
@TestMetadata("basicSuspendConversionForCallableReference.kt")
public void testBasicSuspendConversionForCallableReference() throws Exception {
runTest("compiler/testData/codegen/box/suspendConversion/basicSuspendConversionForCallableReference.kt");