From 26abc19aa6266b54929368e4e88b13c45ef3e9d4 Mon Sep 17 00:00:00 2001 From: Alexey Andreev Date: Mon, 23 Jan 2017 16:15:05 +0300 Subject: [PATCH] JS: replace `noImpl` with `definedExternally` in diagnostics and their messages --- .../diagnostics/testsWithJsStdLib/noImpl.kt | 18 +++++++++--------- .../diagnostics/DefaultErrorMessagesJs.kt | 9 +++++---- .../js/resolve/diagnostics/ErrorsJs.java | 2 +- .../JsDefinedExternallyCallChecker.kt | 2 +- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/noImpl.kt b/compiler/testData/diagnostics/testsWithJsStdLib/noImpl.kt index 9aaf6e7c276..9b434ae7d72 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/noImpl.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/noImpl.kt @@ -1,29 +1,29 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNREACHABLE_CODE -val prop: String = definedExternally +val prop: String = definedExternally val prop2: String - get() = definedExternally + get() = definedExternally -fun foo(x: Int, y: String = definedExternally) { +fun foo(x: Int, y: String = definedExternally) { println("Hello") println("world") object { - fun bar(): Any = definedExternally + fun bar(): Any = definedExternally } listOf() - .map { definedExternally } - .filter(fun(x: String): Boolean { definedExternally }) + .map { definedExternally } + .filter(fun(x: String): Boolean { definedExternally }) - definedExternally + definedExternally } open class A(val x: Int) -open class B() : A(definedExternally) { +open class B() : A(definedExternally) { constructor(y: String) : this() - constructor(y: String, z: String) : this(y + z + definedExternally) + constructor(y: String, z: String) : this(y + z + definedExternally) } diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/DefaultErrorMessagesJs.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/DefaultErrorMessagesJs.kt index 77ce6572543..1df34e4b22f 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/DefaultErrorMessagesJs.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/DefaultErrorMessagesJs.kt @@ -85,16 +85,17 @@ private val DIAGNOSTIC_FACTORY_TO_RENDERER by lazy { put(ErrorsJs.NON_ABSTRACT_MEMBER_OF_EXTERNAL_INTERFACE, "Only nullable properties of external interfaces are allowed to be non-abstract") - put(ErrorsJs.WRONG_BODY_OF_EXTERNAL_DECLARATION, "Wrong body of external declaration. Must be either ' = noImpl' or { noImpl }") - put(ErrorsJs.WRONG_INITIALIZER_OF_EXTERNAL_DECLARATION, "Wrong initializer of external declaration. Must be ' = noImpl'") + put(ErrorsJs.WRONG_BODY_OF_EXTERNAL_DECLARATION, + "Wrong body of external declaration. Must be either ' = definedExternally' or { definedExternally }") + put(ErrorsJs.WRONG_INITIALIZER_OF_EXTERNAL_DECLARATION, "Wrong initializer of external declaration. Must be ' = definedExternally'") put(ErrorsJs.WRONG_DEFAULT_VALUE_FOR_EXTERNAL_FUN_PARAMETER, - "Wrong default value for parameter of external function. Must be ' = noImpl'") + "Wrong default value for parameter of external function. Must be ' = definedExternally'") put(ErrorsJs.EXTERNAL_DELEGATED_CONSTRUCTOR_CALL, "Delegated constructor call in external class is not allowed") put(ErrorsJs.EXTERNAL_DELEGATION, "Can't use delegate on external declaration") put(ErrorsJs.EXTERNAL_ANONYMOUS_INITIALIZER, "Anonymous initializer is not allowed in external classes") put(ErrorsJs.EXTERNAL_ENUM_ENTRY_WITH_BODY, "Entry of external enum class can't have body") put(ErrorsJs.EXTERNAL_CLASS_CONSTRUCTOR_PROPERTY_PARAMETER, "External class constructor cannot have a property parameter") - put(ErrorsJs.CALL_TO_NO_IMPL_FROM_NON_EXTERNAL_DECLARATION, "This property can only be used from external declarations") + put(ErrorsJs.CALL_TO_DEFINED_EXTERNALLY_FROM_NON_EXTERNAL_DECLARATION, "This property can only be used from external declarations") this } diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/ErrorsJs.java b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/ErrorsJs.java index d1c72ae9b01..7da64c8dd40 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/ErrorsJs.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/ErrorsJs.java @@ -97,7 +97,7 @@ public interface ErrorsJs { DiagnosticFactory0 EXTERNAL_ANONYMOUS_INITIALIZER = DiagnosticFactory0.create(ERROR); DiagnosticFactory0 EXTERNAL_ENUM_ENTRY_WITH_BODY = DiagnosticFactory0.create(ERROR); DiagnosticFactory0 EXTERNAL_CLASS_CONSTRUCTOR_PROPERTY_PARAMETER = DiagnosticFactory0.create(ERROR); - DiagnosticFactory0 CALL_TO_NO_IMPL_FROM_NON_EXTERNAL_DECLARATION = DiagnosticFactory0.create(ERROR); + DiagnosticFactory0 CALL_TO_DEFINED_EXTERNALLY_FROM_NON_EXTERNAL_DECLARATION = DiagnosticFactory0.create(ERROR); @SuppressWarnings("UnusedDeclaration") Object _initializer = new Object() { diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsDefinedExternallyCallChecker.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsDefinedExternallyCallChecker.kt index 20fd0e3fd09..57f9007cee0 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsDefinedExternallyCallChecker.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsDefinedExternallyCallChecker.kt @@ -30,7 +30,7 @@ object JsDefinedExternallyCallChecker : CallChecker { val ownerDescriptor = context.scope.ownerDescriptor if (!AnnotationsUtils.isNativeObject(ownerDescriptor) && !AnnotationsUtils.isPredefinedObject(ownerDescriptor)) { - context.trace.report(ErrorsJs.CALL_TO_NO_IMPL_FROM_NON_EXTERNAL_DECLARATION.on(reportOn)) + context.trace.report(ErrorsJs.CALL_TO_DEFINED_EXTERNALLY_FROM_NON_EXTERNAL_DECLARATION.on(reportOn)) } } }