diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java index bd2d1c1cdeb..ffced010554 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java @@ -261,7 +261,7 @@ public class DefaultErrorMessages { MAP.put(NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS, "Actual class ''{0}'' has no corresponding members for expected class members:{1}", NAME, IncompatibleExpectedActualClassScopesRenderer.TEXT); - MAP.put(ACTUAL_MISSING, "Declaration should be marked with 'actual' (suppress with -Xno-check-actual)"); + MAP.put(ACTUAL_MISSING, "Declaration must be marked with 'actual'"); MAP.put(PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT, "Projections are not allowed on type arguments of functions and properties"); MAP.put(SUPERTYPE_NOT_INITIALIZED, "This type has a constructor, and thus must be initialized here"); diff --git a/compiler/testData/multiplatform/simpleNoImplKeywordOnTopLevelFunction/output.txt b/compiler/testData/multiplatform/simpleNoImplKeywordOnTopLevelFunction/output.txt index b4da3aa3e89..882a3f447a7 100644 --- a/compiler/testData/multiplatform/simpleNoImplKeywordOnTopLevelFunction/output.txt +++ b/compiler/testData/multiplatform/simpleNoImplKeywordOnTopLevelFunction/output.txt @@ -5,6 +5,6 @@ Output: -- JVM -- Exit code: COMPILATION_ERROR Output: -compiler/testData/multiplatform/simpleNoImplKeywordOnTopLevelFunction/jvm.kt:3:5: error: declaration should be marked with 'actual' (suppress with -Xno-check-actual) +compiler/testData/multiplatform/simpleNoImplKeywordOnTopLevelFunction/jvm.kt:3:5: error: declaration must be marked with 'actual' fun foo(s: String): Array = arrayOf(s) ^ diff --git a/idea/testData/multiModuleQuickFix/addActualToClass/jvm/jvm.kt b/idea/testData/multiModuleQuickFix/addActualToClass/jvm/jvm.kt index 9b309e97108..6363bbf98c7 100644 --- a/idea/testData/multiModuleQuickFix/addActualToClass/jvm/jvm.kt +++ b/idea/testData/multiModuleQuickFix/addActualToClass/jvm/jvm.kt @@ -1,4 +1,4 @@ // "Add 'actual' modifier" "true" -// ERROR: Declaration should be marked with 'actual' (suppress with -Xno-check-actual) +// ERROR: Declaration must be marked with 'actual' class Foo diff --git a/idea/testData/multiModuleQuickFix/addActualToClass/jvm/jvm.kt.after b/idea/testData/multiModuleQuickFix/addActualToClass/jvm/jvm.kt.after index 35ba8a5b671..db4eac458c4 100644 --- a/idea/testData/multiModuleQuickFix/addActualToClass/jvm/jvm.kt.after +++ b/idea/testData/multiModuleQuickFix/addActualToClass/jvm/jvm.kt.after @@ -1,4 +1,4 @@ // "Add 'actual' modifier" "true" -// ERROR: Declaration should be marked with 'actual' (suppress with -Xno-check-actual) +// ERROR: Declaration must be marked with 'actual' actual class Foo diff --git a/idea/testData/multiModuleQuickFix/addActualToClassMember/jvm/jvm.kt b/idea/testData/multiModuleQuickFix/addActualToClassMember/jvm/jvm.kt index 77c8881cde4..e91f23d5b08 100644 --- a/idea/testData/multiModuleQuickFix/addActualToClassMember/jvm/jvm.kt +++ b/idea/testData/multiModuleQuickFix/addActualToClassMember/jvm/jvm.kt @@ -1,5 +1,5 @@ // "Add 'actual' modifier" "true" -// ERROR: Declaration should be marked with 'actual' (suppress with -Xno-check-actual) +// ERROR: Declaration must be marked with 'actual' actual class Foo { fun foo() {} diff --git a/idea/testData/multiModuleQuickFix/addActualToClassMember/jvm/jvm.kt.after b/idea/testData/multiModuleQuickFix/addActualToClassMember/jvm/jvm.kt.after index fc95413ae61..f61e8cdc580 100644 --- a/idea/testData/multiModuleQuickFix/addActualToClassMember/jvm/jvm.kt.after +++ b/idea/testData/multiModuleQuickFix/addActualToClassMember/jvm/jvm.kt.after @@ -1,5 +1,5 @@ // "Add 'actual' modifier" "true" -// ERROR: Declaration should be marked with 'actual' (suppress with -Xno-check-actual) +// ERROR: Declaration must be marked with 'actual' actual class Foo { actual fun foo() {} diff --git a/idea/testData/multiModuleQuickFix/addActualToTopLevelMember/jvm/jvm.kt b/idea/testData/multiModuleQuickFix/addActualToTopLevelMember/jvm/jvm.kt index 5e347ce8e07..7916673db6a 100644 --- a/idea/testData/multiModuleQuickFix/addActualToTopLevelMember/jvm/jvm.kt +++ b/idea/testData/multiModuleQuickFix/addActualToTopLevelMember/jvm/jvm.kt @@ -1,4 +1,4 @@ // "Add 'actual' modifier" "true" -// ERROR: Declaration should be marked with 'actual' (suppress with -Xno-check-actual) +// ERROR: Declaration must be marked with 'actual' fun foo() {} diff --git a/idea/testData/multiModuleQuickFix/addActualToTopLevelMember/jvm/jvm.kt.after b/idea/testData/multiModuleQuickFix/addActualToTopLevelMember/jvm/jvm.kt.after index 6aefcbd3230..b7ecabfd9ef 100644 --- a/idea/testData/multiModuleQuickFix/addActualToTopLevelMember/jvm/jvm.kt.after +++ b/idea/testData/multiModuleQuickFix/addActualToTopLevelMember/jvm/jvm.kt.after @@ -1,4 +1,4 @@ // "Add 'actual' modifier" "true" -// ERROR: Declaration should be marked with 'actual' (suppress with -Xno-check-actual) +// ERROR: Declaration must be marked with 'actual' actual fun foo() {}