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

Warn about suspend extension functional types as supertypes

Browse Source 
They will become error in 2.0

 #KT-58529 Fixed
 #KT-49175 Fixed
This commit is contained in:
Ilmir Usmanov
2023-05-15 20:24:53 +02:00
parent b19116d3af
commit f3a22e0ac4
12 changed files with 145 additions and 0 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/DiagnosticCompilerTestFE10TestdataTestGenerated.java
Generated
+12
View File
@@ -32016,6 +32016,18 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
runTest("compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.kt");
}
@Test
@TestMetadata("suspendExtFunctionTypeAsSuperType.kt")
public void testSuspendExtFunctionTypeAsSuperType() throws Exception {
runTest("compiler/testData/diagnostics/tests/subtyping/suspendExtFunctionTypeAsSuperType.kt");
}
@Test
@TestMetadata("suspendExtFunctionTypeAsSuperTypeRestrictionLifted.kt")
public void testSuspendExtFunctionTypeAsSuperTypeRestrictionLifted() throws Exception {
runTest("compiler/testData/diagnostics/tests/subtyping/suspendExtFunctionTypeAsSuperTypeRestrictionLifted.kt");
}
@Test
@TestMetadata("topLevelAnonymousObjects.kt")
public void testTopLevelAnonymousObjects() throws Exception {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
Generated
+12
View File
@@ -32016,6 +32016,18 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
runTest("compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.kt");
}
@Test
@TestMetadata("suspendExtFunctionTypeAsSuperType.kt")
public void testSuspendExtFunctionTypeAsSuperType() throws Exception {
runTest("compiler/testData/diagnostics/tests/subtyping/suspendExtFunctionTypeAsSuperType.kt");
}
@Test
@TestMetadata("suspendExtFunctionTypeAsSuperTypeRestrictionLifted.kt")
public void testSuspendExtFunctionTypeAsSuperTypeRestrictionLifted() throws Exception {
runTest("compiler/testData/diagnostics/tests/subtyping/suspendExtFunctionTypeAsSuperTypeRestrictionLifted.kt");
}
@Test
@TestMetadata("topLevelAnonymousObjects.kt")
public void testTopLevelAnonymousObjects() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
Generated
+12
View File
@@ -32016,6 +32016,18 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
runTest("compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.kt");
}
@Test
@TestMetadata("suspendExtFunctionTypeAsSuperType.kt")
public void testSuspendExtFunctionTypeAsSuperType() throws Exception {
runTest("compiler/testData/diagnostics/tests/subtyping/suspendExtFunctionTypeAsSuperType.kt");
}
@Test
@TestMetadata("suspendExtFunctionTypeAsSuperTypeRestrictionLifted.kt")
public void testSuspendExtFunctionTypeAsSuperTypeRestrictionLifted() throws Exception {
runTest("compiler/testData/diagnostics/tests/subtyping/suspendExtFunctionTypeAsSuperTypeRestrictionLifted.kt");
}
@Test
@TestMetadata("topLevelAnonymousObjects.kt")
public void testTopLevelAnonymousObjects() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
Generated
+12
View File
@@ -32112,6 +32112,18 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
runTest("compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.kt");
}
@Test
@TestMetadata("suspendExtFunctionTypeAsSuperType.kt")
public void testSuspendExtFunctionTypeAsSuperType() throws Exception {
runTest("compiler/testData/diagnostics/tests/subtyping/suspendExtFunctionTypeAsSuperType.kt");
}
@Test
@TestMetadata("suspendExtFunctionTypeAsSuperTypeRestrictionLifted.kt")
public void testSuspendExtFunctionTypeAsSuperTypeRestrictionLifted() throws Exception {
runTest("compiler/testData/diagnostics/tests/subtyping/suspendExtFunctionTypeAsSuperTypeRestrictionLifted.kt");
}
@Test
@TestMetadata("topLevelAnonymousObjects.kt")
public void testTopLevelAnonymousObjects() throws Exception {
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
+2
View File
@@ -390,6 +390,8 @@ public interface Errors {
DiagnosticFactory0<KtTypeReference> SUPERTYPE_NOT_A_CLASS_OR_INTERFACE = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<KtTypeReference> SUPERTYPE_IS_EXTENSION_FUNCTION_TYPE = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<KtTypeReference> SUPERTYPE_IS_SUSPEND_EXTENSION_FUNCTION_TYPE = DiagnosticFactory0.create(WARNING);
DiagnosticFactory0<KtTypeReference> SUPERTYPE_IS_SUSPEND_FUNCTION_TYPE = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<KtTypeReference> SUPERTYPE_IS_KSUSPEND_FUNCTION_TYPE = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<PsiElement> MIXING_SUSPEND_AND_NON_SUSPEND_SUPERTYPES = DiagnosticFactory0.create(ERROR);
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
+1
View File
@@ -741,6 +741,7 @@ public class DefaultErrorMessages {
MAP.put(MANY_CLASSES_IN_SUPERTYPE_LIST, "Only one class may appear in a supertype list");
MAP.put(SUPERTYPE_NOT_A_CLASS_OR_INTERFACE, "Only classes and interfaces may serve as supertypes");
MAP.put(SUPERTYPE_IS_EXTENSION_FUNCTION_TYPE, "Extension function type is not allowed as supertypes");
MAP.put(SUPERTYPE_IS_SUSPEND_EXTENSION_FUNCTION_TYPE, "Suspend extension function type is not allowed as supertypes. Such code will become error in future releases.");
MAP.put(SUPERTYPE_INITIALIZED_IN_INTERFACE, "Interfaces cannot initialize supertypes");
MAP.put(SUPERTYPE_IS_SUSPEND_FUNCTION_TYPE, "Suspend function type is allowed as a supertype only since version 1.6");
MAP.put(SUPERTYPE_IS_KSUSPEND_FUNCTION_TYPE, "KSuspendFunctionN interfaces are not allowed as supertypes");
compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java
+5
View File
@@ -591,6 +591,11 @@ public class BodyResolver {
) {
trace.report(SUPERTYPE_IS_EXTENSION_FUNCTION_TYPE.on(typeReference));
}
else if (FunctionTypesKt.isSuspendExtensionFunctionType(supertype) &&
!languageVersionSettings.supportsFeature(LanguageFeature.FunctionalTypeWithExtensionAsSupertype) &&
languageVersionSettings.supportsFeature(LanguageFeature.SuspendFunctionAsSupertype)) {
trace.report(SUPERTYPE_IS_SUSPEND_EXTENSION_FUNCTION_TYPE.on(typeReference));
}
else if (FunctionTypesKt.isSuspendFunctionType(supertype) &&
!languageVersionSettings.supportsFeature(LanguageFeature.SuspendFunctionAsSupertype)
) {
compiler/testData/diagnostics/tests/subtyping/suspendExtFunctionTypeAsSuperType.fir.kt
Vendored
+24
View File
@@ -0,0 +1,24 @@
class A : <!SUPERTYPE_IS_EXTENSION_FUNCTION_TYPE!>suspend Double.() -> Unit<!> {
override suspend fun invoke(p1: Double) {}
}
class B : <!SUPERTYPE_IS_EXTENSION_FUNCTION_TYPE!>suspend Int.(Double) -> Unit<!> {
override suspend fun invoke(p1: Int, p2: Double) {}
}
open class C {}
abstract class A0 : <!SUPERTYPE_IS_EXTENSION_FUNCTION_TYPE!>suspend C.() -> Int<!>
abstract class A1 : <!SUPERTYPE_IS_EXTENSION_FUNCTION_TYPE!>suspend C.(Int) -> Int<!>
abstract class A2 : <!SUPERTYPE_IS_EXTENSION_FUNCTION_TYPE!>suspend C.(Int, String) -> Int<!>
open class D<T> {}
abstract class B0<T> : <!SUPERTYPE_IS_EXTENSION_FUNCTION_TYPE!>suspend D<T>.() -> Int<!>
abstract class B1<T> : <!SUPERTYPE_IS_EXTENSION_FUNCTION_TYPE!>suspend D<T>.(C) -> Int<!>
abstract class B2<T> : <!SUPERTYPE_IS_EXTENSION_FUNCTION_TYPE!>suspend D<T>.(T, C) -> T<!>
interface E<T> {}
abstract class C0: C(), <!SUPERTYPE_IS_EXTENSION_FUNCTION_TYPE!>suspend Int.() -> Double<!>
abstract class C1<T>: C(), E<T>, <!SUPERTYPE_IS_EXTENSION_FUNCTION_TYPE!>suspend Int.(C) -> Double<!>
compiler/testData/diagnostics/tests/subtyping/suspendExtFunctionTypeAsSuperType.kt
Vendored
+24
View File
@@ -0,0 +1,24 @@
class A : <!SUPERTYPE_IS_SUSPEND_EXTENSION_FUNCTION_TYPE!>suspend Double.() -> Unit<!> {
override suspend fun invoke(p1: Double) {}
}
class B : <!SUPERTYPE_IS_SUSPEND_EXTENSION_FUNCTION_TYPE!>suspend Int.(Double) -> Unit<!> {
override suspend fun invoke(p1: Int, p2: Double) {}
}
open class C {}
abstract class A0 : <!SUPERTYPE_IS_SUSPEND_EXTENSION_FUNCTION_TYPE!>suspend C.() -> Int<!>
abstract class A1 : <!SUPERTYPE_IS_SUSPEND_EXTENSION_FUNCTION_TYPE!>suspend C.(Int) -> Int<!>
abstract class A2 : <!SUPERTYPE_IS_SUSPEND_EXTENSION_FUNCTION_TYPE!>suspend C.(Int, String) -> Int<!>
open class D<T> {}
abstract class B0<T> : <!SUPERTYPE_IS_SUSPEND_EXTENSION_FUNCTION_TYPE!>suspend D<T>.() -> Int<!>
abstract class B1<T> : <!SUPERTYPE_IS_SUSPEND_EXTENSION_FUNCTION_TYPE!>suspend D<T>.(C) -> Int<!>
abstract class B2<T> : <!SUPERTYPE_IS_SUSPEND_EXTENSION_FUNCTION_TYPE!>suspend D<T>.(T, C) -> T<!>
interface E<T> {}
abstract class C0: C(), <!SUPERTYPE_IS_SUSPEND_EXTENSION_FUNCTION_TYPE!>suspend Int.() -> Double<!>
abstract class C1<T>: C(), E<T>, <!SUPERTYPE_IS_SUSPEND_EXTENSION_FUNCTION_TYPE!>suspend Int.(C) -> Double<!>
compiler/testData/diagnostics/tests/subtyping/suspendExtFunctionTypeAsSuperTypeRestrictionLifted.kt
Vendored
+26
View File
@@ -0,0 +1,26 @@
// FIR_IDENTICAL
// !LANGUAGE: +FunctionalTypeWithExtensionAsSupertype
class A : suspend Double.() -> Unit {
override suspend fun invoke(p1: Double) {}
}
class B : suspend Int.(Double) -> Unit {
override suspend fun invoke(p1: Int, p2: Double) {}
}
open class C {}
abstract class A0 : suspend C.() -> Int
abstract class A1 : suspend C.(Int) -> Int
abstract class A2 : suspend C.(Int, String) -> Int
open class D<T> {}
abstract class B0<T> : suspend D<T>.() -> Int
abstract class B1<T> : suspend D<T>.(C) -> Int
abstract class B2<T> : suspend D<T>.(T, C) -> T
interface E<T> {}
abstract class C0: C(), suspend Int.() -> Double
abstract class C1<T>: C(), E<T>, suspend Int.(C) -> Double
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+12
View File
@@ -32884,6 +32884,18 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.kt");
}
@Test
@TestMetadata("suspendExtFunctionTypeAsSuperType.kt")
public void testSuspendExtFunctionTypeAsSuperType() throws Exception {
runTest("compiler/testData/diagnostics/tests/subtyping/suspendExtFunctionTypeAsSuperType.kt");
}
@Test
@TestMetadata("suspendExtFunctionTypeAsSuperTypeRestrictionLifted.kt")
public void testSuspendExtFunctionTypeAsSuperTypeRestrictionLifted() throws Exception {
runTest("compiler/testData/diagnostics/tests/subtyping/suspendExtFunctionTypeAsSuperTypeRestrictionLifted.kt");
}
@Test
@TestMetadata("topLevelAnonymousObjects.kt")
public void testTopLevelAnonymousObjects() throws Exception {
core/descriptors/src/org/jetbrains/kotlin/builtins/functionTypes.kt
+3
View File
@@ -104,6 +104,9 @@ val KotlinType.isNonExtensionFunctionType: Boolean
val KotlinType.isExtensionFunctionType: Boolean
get() = isFunctionType && isTypeAnnotatedWithExtensionFunctionType
val KotlinType.isSuspendExtensionFunctionType: Boolean
get() = isSuspendFunctionType && isTypeAnnotatedWithExtensionFunctionType
val KotlinType.isBuiltinExtensionFunctionalType: Boolean
get() = isBuiltinFunctionalType && isTypeAnnotatedWithExtensionFunctionType