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

Fix error message for SUPERTYPE_IS_SUSPEND_FUNCTION_TYPE

Browse Source 
#KT-48907 Fixed
This commit is contained in:
Mikhail Glukhikh
2022-01-10 19:07:29 +03:00
parent 1402bb2d45
commit 0f2f6334c2
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
+1 -1
View File
@@ -660,7 +660,7 @@ public class DefaultErrorMessages {
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_INITIALIZED_IN_INTERFACE, "Interfaces cannot initialize supertypes");
MAP.put(SUPERTYPE_IS_SUSPEND_FUNCTION_TYPE, "Suspend function type is not allowed as 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");
MAP.put(MIXING_SUSPEND_AND_NON_SUSPEND_SUPERTYPES, "Mixing suspend and non-suspend supertypes is not allowed");
MAP.put(CLASS_IN_SUPERTYPE_FOR_ENUM, "Enum class cannot inherit from classes");
compiler/testData/integration/ant/jvm/languageVersion/build.log.expected
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ Buildfile: [TestData]/build.xml
build:
[kotlinc] Compiling [[TestData]/main.kt] => [[Temp]/hello.jar]
[kotlinc] [TestData]/main.kt:1:15: error: suspend function type is not allowed as supertypes
[kotlinc] [TestData]/main.kt:1:15: error: suspend function type is allowed as a supertype only since version 1.6
[kotlinc] interface A : suspend () -> Unit
[kotlinc] ^
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt
+1 -1
View File
@@ -68,7 +68,7 @@ class SimpleKotlinGradleIT : KGPBaseTest() {
fun testLanguageVersion(gradleVersion: GradleVersion) {
project("languageVersion", gradleVersion) {
buildAndFail("build") {
assertOutputContains("Suspend function type is not allowed as supertypes")
assertOutputContains("Suspend function type is allowed as a supertype only since version 1.6")
}
}
}
libraries/tools/kotlin-maven-plugin-test/src/it/test-languageVersion/verify.bsh
+1 -1
View File
@@ -1,4 +1,4 @@
source(new File(basedir, "../../../verify-common.bsh").getAbsolutePath());
assertBuildLogHasLine("[INFO] BUILD FAILURE");
assertBuildLogHasLineThatContains("Suspend function type is not allowed as supertypes");
assertBuildLogHasLineThatContains("Suspend function type is allowed as a supertype only since version 1.6");