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

[FE 1.0] Make "Unit conversions" accessible experimental feature

Browse Source
This commit is contained in:
Victor Petukhov
2022-05-16 11:07:52 +02:00
parent 88d35067e3
commit bbf52e8b90
22 changed files with 82 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
Generated
+6
View File
@@ -32690,6 +32690,12 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
runTest("compiler/testData/diagnostics/tests/unitConversion/chainedUnitSuspendConversion.kt");
}
@Test
@TestMetadata("kt49394.kt")
public void testKt49394() throws Exception {
runTest("compiler/testData/diagnostics/tests/unitConversion/kt49394.kt");
}
@Test
@TestMetadata("noUnitConversionForGenericTypeFromArrow.kt")
public void testNoUnitConversionForGenericTypeFromArrow() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -32690,6 +32690,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
runTest("compiler/testData/diagnostics/tests/unitConversion/chainedUnitSuspendConversion.kt");
}
@Test
@TestMetadata("kt49394.kt")
public void testKt49394() throws Exception {
runTest("compiler/testData/diagnostics/tests/unitConversion/kt49394.kt");
}
@Test
@TestMetadata("noUnitConversionForGenericTypeFromArrow.kt")
public void testNoUnitConversionForGenericTypeFromArrow() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
Generated
+6
View File
@@ -32690,6 +32690,12 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
runTest("compiler/testData/diagnostics/tests/unitConversion/chainedUnitSuspendConversion.kt");
}
@Test
@TestMetadata("kt49394.kt")
public void testKt49394() throws Exception {
runTest("compiler/testData/diagnostics/tests/unitConversion/kt49394.kt");
}
@Test
@TestMetadata("noUnitConversionForGenericTypeFromArrow.kt")
public void testNoUnitConversionForGenericTypeFromArrow() throws Exception {
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/UnitConversionCallChecker.kt
+2 -2
View File
@@ -16,7 +16,7 @@ object UnitConversionCallChecker : CallChecker {
override fun check(resolvedCall: ResolvedCall<*>, reportOn: PsiElement, context: CallCheckerContext) {
if (resolvedCall !is NewResolvedCallImpl<*>) return
if (context.languageVersionSettings.supportsFeature(LanguageFeature.UnitConversion)) return
if (context.languageVersionSettings.supportsFeature(LanguageFeature.UnitConversionsOnArbitraryExpressions)) return
// lambdas are working since 1.0, callable references are handled as part of reference adaptation
// => here we're checking only simple argument
@@ -26,7 +26,7 @@ object UnitConversionCallChecker : CallChecker {
context.trace.report(
Errors.UNSUPPORTED_FEATURE.on(
argumentWithUnitConversion.psiCallArgument.valueArgument.asElement(),
LanguageFeature.UnitConversion to context.languageVersionSettings
LanguageFeature.UnitConversionsOnArbitraryExpressions to context.languageVersionSettings
)
)
}
compiler/testData/diagnostics/tests/unitConversion/chainedFunSuspendUnitConversion.fir.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +UnitConversion +SuspendConversion
// !LANGUAGE: +UnitConversionsOnArbitraryExpressions +SuspendConversion
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION
fun interface SuspendRunnable {
compiler/testData/diagnostics/tests/unitConversion/chainedFunSuspendUnitConversion.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +UnitConversion +SuspendConversion
// !LANGUAGE: +UnitConversionsOnArbitraryExpressions +SuspendConversion
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION
fun interface SuspendRunnable {
compiler/testData/diagnostics/tests/unitConversion/chainedFunUnitConversion.fir.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +UnitConversion
// !LANGUAGE: +UnitConversionsOnArbitraryExpressions
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION
fun interface KRunnable {
compiler/testData/diagnostics/tests/unitConversion/chainedFunUnitConversion.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +UnitConversion
// !LANGUAGE: +UnitConversionsOnArbitraryExpressions
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION
fun interface KRunnable {
compiler/testData/diagnostics/tests/unitConversion/chainedUnitSuspendConversion.fir.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +UnitConversion +SuspendConversion
// !LANGUAGE: +UnitConversionsOnArbitraryExpressions +SuspendConversion
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION
fun foo(f: suspend () -> Unit) {}
compiler/testData/diagnostics/tests/unitConversion/chainedUnitSuspendConversion.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +UnitConversion +SuspendConversion
// !LANGUAGE: +UnitConversionsOnArbitraryExpressions +SuspendConversion
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION
fun foo(f: suspend () -> Unit) {}
compiler/testData/diagnostics/tests/unitConversion/kt49394.fir.kt
Vendored
+15
View File
@@ -0,0 +1,15 @@
fun interface Run {
fun run()
}
fun handle(run: Run) {
//...
}
val x = {
"STRING"
}
fun test() {
handle(<!ARGUMENT_TYPE_MISMATCH!>x<!>)
}
compiler/testData/diagnostics/tests/unitConversion/kt49394.kt
Vendored
+15
View File
@@ -0,0 +1,15 @@
fun interface Run {
fun run()
}
fun handle(run: Run) {
//...
}
val x = {
"STRING"
}
fun test() {
handle(<!UNSUPPORTED_FEATURE("The feature "unit conversions on arbitrary expressions" is experimental and should be enabled explicitly")!>x<!>)
}
compiler/testData/diagnostics/tests/unitConversion/kt49394.txt
Vendored
+12
View File
@@ -0,0 +1,12 @@
package
public val x: () -> kotlin.String
public fun handle(/*0*/ run: Run): kotlin.Unit
public fun test(): kotlin.Unit
public fun interface Run {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public abstract fun run(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/unitConversion/unitConversionDisabledForSimpleArguments.fir.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: -UnitConversion
// !LANGUAGE: -UnitConversionsOnArbitraryExpressions
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION
fun foo(f: () -> Unit) {}
compiler/testData/diagnostics/tests/unitConversion/unitConversionDisabledForSimpleArguments.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: -UnitConversion
// !LANGUAGE: -UnitConversionsOnArbitraryExpressions
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION
fun foo(f: () -> Unit) {}
compiler/testData/diagnostics/tests/unitConversion/unitConversionForAllKinds.fir.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +UnitConversion
// !LANGUAGE: +UnitConversionsOnArbitraryExpressions
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION
fun foo(f: () -> Unit) {}
compiler/testData/diagnostics/tests/unitConversion/unitConversionForAllKinds.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +UnitConversion
// !LANGUAGE: +UnitConversionsOnArbitraryExpressions
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION
fun foo(f: () -> Unit) {}
compiler/testData/diagnostics/tests/unitConversion/unitConversionForSubtypes.fir.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +UnitConversion
// !LANGUAGE: +UnitConversionsOnArbitraryExpressions
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION
fun foo(f: (Int, String) -> Unit) {}
compiler/testData/diagnostics/tests/unitConversion/unitConversionForSubtypes.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// !LANGUAGE: +UnitConversion
// !LANGUAGE: +UnitConversionsOnArbitraryExpressions
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION
fun foo(f: (Int, String) -> Unit) {}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+6
View File
@@ -32780,6 +32780,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/unitConversion/chainedUnitSuspendConversion.kt");
}
@Test
@TestMetadata("kt49394.kt")
public void testKt49394() throws Exception {
runTest("compiler/testData/diagnostics/tests/unitConversion/kt49394.kt");
}
@Test
@TestMetadata("noUnitConversionForGenericTypeFromArrow.kt")
public void testNoUnitConversionForGenericTypeFromArrow() throws Exception {
compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
+1 -1
View File
@@ -142,7 +142,6 @@ enum class LanguageFeature(
SamConversionForKotlinFunctions(KOTLIN_1_4),
SamConversionPerArgument(KOTLIN_1_4),
FunctionReferenceWithDefaultValueAsOtherType(KOTLIN_1_4),
UnitConversion(KOTLIN_1_4, defaultState = State.DISABLED),
OverloadResolutionByLambdaReturnType(KOTLIN_1_4),
ContractsOnCallsWithImplicitReceiver(KOTLIN_1_4),
BooleanElvisBoundSmartCasts(KOTLIN_1_3, defaultState = State.DISABLED), // see KT-26357 for details
@@ -299,6 +298,7 @@ enum class LanguageFeature(
GenericInlineClassParameter(sinceVersion = null, defaultState = State.ENABLED_WITH_WARNING, kind = UNSTABLE_FEATURE),
ValueClasses(sinceVersion = null, defaultState = State.DISABLED, kind = UNSTABLE_FEATURE),
JavaSamConversionEqualsHashCode(sinceVersion = null, defaultState = State.DISABLED, kind = UNSTABLE_FEATURE),
UnitConversionsOnArbitraryExpressions(sinceVersion = null, defaultState = State.DISABLED),
;
val presentableName: String
kotlin-native/backend.native/tests/debugger/src/test/kotlin/org/jetbrains/kotlin/native/test/debugger/LldbTests.kt
+1 -1
View File
@@ -343,7 +343,7 @@ class LldbTests {
v()
}
""".feedOutput("kt42208-3.kt")
val binary = arrayOf(kt42208One, kt42208Two, kt42208Three).binary("kt42208", "-g", "-XXLanguage:+UnitConversion")
val binary = arrayOf(kt42208One, kt42208Two, kt42208Three).binary("kt42208", "-g", "-XXLanguage:+UnitConversionsOnArbitraryExpressions")
"""
> b kt42208-2.kt:5
> ${lldbCommandRunOrContinue()}