Fix a pair of multi-platform messages #KT-20327 Fixed

2017-09-19 17:52:19 +03:00
parent ee4d790f43
commit f348ee9381
6 changed files with 6 additions and 6 deletions
@@ -276,7 +276,7 @@ public class DefaultErrorMessages {
        MAP.put(ACTUAL_TYPE_ALIAS_WITH_USE_SITE_VARIANCE, "Right-hand side of actual type alias cannot contain use-site variance or star projections");
        MAP.put(ACTUAL_TYPE_ALIAS_WITH_COMPLEX_SUBSTITUTION, "Type arguments in the right-hand side of actual type alias should be its type parameters in the same order, e.g. 'actual typealias Foo<A, B> = Bar<A, B>'");

-        MAP.put(NO_ACTUAL_FOR_EXPECT, "Expected {0} has no actual in module{1}{2}", DECLARATION_NAME_WITH_KIND,
+        MAP.put(NO_ACTUAL_FOR_EXPECT, "Expected {0} has no actual declaration in module{1}{2}", DECLARATION_NAME_WITH_KIND,
                PLATFORM, PlatformIncompatibilityDiagnosticRenderer.TEXT);
        MAP.put(ACTUAL_WITHOUT_EXPECT, "Actual {0} has no corresponding expected declaration{1}", DECLARATION_NAME_WITH_KIND,
                PlatformIncompatibilityDiagnosticRenderer.TEXT);
@@ -101,7 +101,7 @@ private fun StringBuilder.renderIncompatibilityInformation(

        if (incompatibility is Incompatible.ClassScopes) {
            append(indent)
-            append("No actuals are found for expected members listed below:")
+            append("No actual members are found for expected members listed below:")
            mode.newLine(this)
            renderIncompatibleClassScopes(incompatibility.unfulfilled, indent, context, mode)
        }
@@ -5,7 +5,7 @@ Output:
 -- JVM --
 Exit code: COMPILATION_ERROR
 Output:
-compiler/testData/multiplatform/missingOverload/common.kt:7:1: error: expected function 'g' has no actual in module
+compiler/testData/multiplatform/missingOverload/common.kt:7:1: error: expected function 'g' has no actual declaration in module
 The following declaration is incompatible because parameter types are different:
    public actual fun g(a: Any): Unit

@@ -175,7 +175,7 @@ public class IdeErrorMessages {
        MAP.put(EXPERIMENTAL_FEATURE_WARNING, "<html>{0}</html>", new LanguageFeatureMessageRenderer(LanguageFeatureMessageRenderer.Type.WARNING, true));
        MAP.put(EXPERIMENTAL_FEATURE_ERROR, "<html>{0}</html>", new LanguageFeatureMessageRenderer(LanguageFeatureMessageRenderer.Type.ERROR, true));

-        MAP.put(NO_ACTUAL_FOR_EXPECT, "<html>Expected {0} has no actual in module{1}{2}</html>", DECLARATION_NAME_WITH_KIND,
+        MAP.put(NO_ACTUAL_FOR_EXPECT, "<html>Expected {0} has no actual declaration in module{1}{2}</html>", DECLARATION_NAME_WITH_KIND,
                PLATFORM, new PlatformIncompatibilityDiagnosticRenderer(IdeMultiplatformDiagnosticRenderingMode.INSTANCE));
        MAP.put(ACTUAL_WITHOUT_EXPECT, "<html>Actual {0} has no corresponding expected declaration{1}</html>", DECLARATION_NAME_WITH_KIND,
                new PlatformIncompatibilityDiagnosticRenderer(IdeMultiplatformDiagnosticRenderingMode.INSTANCE));
@@ -1,6 +1,6 @@
 // "Implement members" "true"
 // ENABLE_MULTIPLATFORM
-// ERROR: Expected interface 'InterfaceWithFuns' has no actual in module light_idea_test_case for JVM
+// ERROR: Expected interface 'InterfaceWithFuns' has no actual declaration in module light_idea_test_case for JVM

 fun TODO(s: String): Nothing = null!!

@@ -1,6 +1,6 @@
 // "Implement members" "true"
 // ENABLE_MULTIPLATFORM
-// ERROR: Expected interface 'InterfaceWithFuns' has no actual in module light_idea_test_case for JVM
+// ERROR: Expected interface 'InterfaceWithFuns' has no actual declaration in module light_idea_test_case for JVM

 fun TODO(s: String): Nothing = null!!