From d9d565d8b0f7817b059c34da6feb1f9f186d3d77 Mon Sep 17 00:00:00 2001 From: Alexey Andreev Date: Mon, 16 Oct 2017 19:15:28 +0300 Subject: [PATCH] JS: use 'external' word instead of 'native' in diagnostic messages See KT-20639 --- .../native/rtti/castToNativeInterface.kt | 2 +- .../native/rtti/checkForNativeInterface.kt | 2 +- .../native/rtti/nativeInterfaceAsReifiedTypeArgument.kt | 6 +++--- .../native/rtti/nativeInterfaceClassLiteral.kt | 2 +- .../native/rtti/whenIsNativeInterface.kt | 4 ++-- .../js/resolve/diagnostics/DefaultErrorMessagesJs.kt | 8 ++++---- .../jetbrains/kotlin/js/resolve/diagnostics/ErrorsJs.java | 8 ++++---- .../kotlin/js/resolve/diagnostics/JsNativeRttiChecker.kt | 6 +++--- .../js/resolve/diagnostics/JsReifiedNativeChecker.kt | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/castToNativeInterface.kt b/compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/castToNativeInterface.kt index bf198c2f57b..42f814fe033 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/castToNativeInterface.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/castToNativeInterface.kt @@ -1,5 +1,5 @@ external interface I fun box(a: Any, b: Any): Pair { - return Pair(a as I, b as? I) + return Pair(a as I, b as? I) } \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/checkForNativeInterface.kt b/compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/checkForNativeInterface.kt index 3cdffaccc03..ce787a56e8b 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/checkForNativeInterface.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/checkForNativeInterface.kt @@ -1,5 +1,5 @@ external interface I fun box(a: Any, b: Any): Boolean { - return a is I && b !is I + return a is I && b !is I } \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/nativeInterfaceAsReifiedTypeArgument.kt b/compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/nativeInterfaceAsReifiedTypeArgument.kt index 6094c98a61e..8965f25192c 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/nativeInterfaceAsReifiedTypeArgument.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/nativeInterfaceAsReifiedTypeArgument.kt @@ -14,8 +14,8 @@ fun bar() { foo(C()) val c: I = C() - foo(c) - foo<I>(C()) + foo(c) + foo<I>(C()) - C() + c + C() + c } \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/nativeInterfaceClassLiteral.kt b/compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/nativeInterfaceClassLiteral.kt index 1ee34e36e04..f2dff344961 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/nativeInterfaceClassLiteral.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/nativeInterfaceClassLiteral.kt @@ -1,5 +1,5 @@ external interface I fun box() { - println(I::class) + println(I::class) } \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/whenIsNativeInterface.kt b/compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/whenIsNativeInterface.kt index ed4d85e987f..db9c72bcd1f 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/whenIsNativeInterface.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/whenIsNativeInterface.kt @@ -3,7 +3,7 @@ external interface I external interface J fun box(a: Any) = when (a) { - is I -> 0 - !is J -> 1 + is I -> 0 + !is J -> 1 else -> 2 } \ No newline at end of file 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 2c91181b1a0..0b1e1f73106 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 @@ -69,10 +69,10 @@ private val DIAGNOSTIC_FACTORY_TO_RENDERER by lazy { "Can''t put non-external declarations in file marked with {0} annotation", RENDER_TYPE) put(ErrorsJs.WRONG_JS_QUALIFIER, "Qualifier contains illegal characters") - put(ErrorsJs.CANNOT_CHECK_FOR_NATIVE_INTERFACE, "Cannot check for native interface: {0}", RENDER_TYPE) - put(ErrorsJs.UNCHECKED_CAST_TO_NATIVE_INTERFACE, "Unchecked cast to native interface: {0} to {1}", RENDER_TYPE, RENDER_TYPE) - put(ErrorsJs.NATIVE_INTERFACE_AS_REIFIED_TYPE_ARGUMENT, "Cannot pass native interface {0} for reified type parameter", RENDER_TYPE) - put(ErrorsJs.NATIVE_INTERFACE_AS_CLASS_LITERAL, "Can't refer to native interface from class literal") + put(ErrorsJs.CANNOT_CHECK_FOR_EXTERNAL_INTERFACE, "Cannot check for external interface: {0}", RENDER_TYPE) + put(ErrorsJs.UNCHECKED_CAST_TO_EXTERNAL_INTERFACE, "Unchecked cast to external interface: {0} to {1}", RENDER_TYPE, RENDER_TYPE) + put(ErrorsJs.EXTERNAL_INTERFACE_AS_REIFIED_TYPE_ARGUMENT, "Cannot pass external interface {0} for reified type parameter", RENDER_TYPE) + put(ErrorsJs.EXTERNAL_INTERFACE_AS_CLASS_LITERAL, "Can't refer to external interface from class literal") put(ErrorsJs.EXTERNAL_TYPE_EXTENDS_NON_EXTERNAL_TYPE, "External type extends non-external type") put(ErrorsJs.WRONG_OPERATION_WITH_DYNAMIC, "Wrong operation with dynamic value: {0}", Renderers.STRING) 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 cc5cf0bff08..19d593e8afb 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 @@ -71,10 +71,10 @@ public interface ErrorsJs { DiagnosticFactory1.create(ERROR, PositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT); DiagnosticFactory0 WRONG_JS_QUALIFIER = DiagnosticFactory0.create(ERROR, PositioningStrategies.DEFAULT); - DiagnosticFactory1 CANNOT_CHECK_FOR_NATIVE_INTERFACE = DiagnosticFactory1.create(ERROR); - DiagnosticFactory2 UNCHECKED_CAST_TO_NATIVE_INTERFACE = DiagnosticFactory2.create(WARNING); - DiagnosticFactory1 NATIVE_INTERFACE_AS_REIFIED_TYPE_ARGUMENT = DiagnosticFactory1.create(ERROR); - DiagnosticFactory0 NATIVE_INTERFACE_AS_CLASS_LITERAL = DiagnosticFactory0.create(ERROR); + DiagnosticFactory1 CANNOT_CHECK_FOR_EXTERNAL_INTERFACE = DiagnosticFactory1.create(ERROR); + DiagnosticFactory2 UNCHECKED_CAST_TO_EXTERNAL_INTERFACE = DiagnosticFactory2.create(WARNING); + DiagnosticFactory1 EXTERNAL_INTERFACE_AS_REIFIED_TYPE_ARGUMENT = DiagnosticFactory1.create(ERROR); + DiagnosticFactory0 EXTERNAL_INTERFACE_AS_CLASS_LITERAL = DiagnosticFactory0.create(ERROR); DiagnosticFactory0 EXTERNAL_TYPE_EXTENDS_NON_EXTERNAL_TYPE = DiagnosticFactory0.create( ERROR, PositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT); diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsNativeRttiChecker.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsNativeRttiChecker.kt index af2babe649d..bcb2be7c7b3 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsNativeRttiChecker.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsNativeRttiChecker.kt @@ -36,10 +36,10 @@ class JsNativeRttiChecker : RttiExpressionChecker, ClassLiteralChecker { if (sourceType != null && targetDescriptor != null && AnnotationsUtils.isNativeInterface(targetDescriptor)) { when (rttiInformation.operation) { RttiOperation.IS, - RttiOperation.NOT_IS -> trace.report(ErrorsJs.CANNOT_CHECK_FOR_NATIVE_INTERFACE.on(reportOn, targetType)) + RttiOperation.NOT_IS -> trace.report(ErrorsJs.CANNOT_CHECK_FOR_EXTERNAL_INTERFACE.on(reportOn, targetType)) RttiOperation.AS, - RttiOperation.SAFE_AS -> trace.report(ErrorsJs.UNCHECKED_CAST_TO_NATIVE_INTERFACE.on(reportOn, sourceType, targetType)) + RttiOperation.SAFE_AS -> trace.report(ErrorsJs.UNCHECKED_CAST_TO_EXTERNAL_INTERFACE.on(reportOn, sourceType, targetType)) } } } @@ -47,7 +47,7 @@ class JsNativeRttiChecker : RttiExpressionChecker, ClassLiteralChecker { override fun check(expression: KtClassLiteralExpression, type: KotlinType, context: ResolutionContext<*>) { val descriptor = type.constructor.declarationDescriptor as? ClassDescriptor ?: return if (AnnotationsUtils.isNativeInterface(descriptor)) { - context.trace.report(ErrorsJs.NATIVE_INTERFACE_AS_CLASS_LITERAL.on(expression)) + context.trace.report(ErrorsJs.EXTERNAL_INTERFACE_AS_CLASS_LITERAL.on(expression)) } } } diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsReifiedNativeChecker.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsReifiedNativeChecker.kt index 4625e013047..a86264e1d1e 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsReifiedNativeChecker.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsReifiedNativeChecker.kt @@ -37,7 +37,7 @@ class JsReifiedNativeChecker : CallChecker { resolvedCall.call.callElement } - context.trace.report(ErrorsJs.NATIVE_INTERFACE_AS_REIFIED_TYPE_ARGUMENT.on(typeArgumentPsi!!, typeArg)) + context.trace.report(ErrorsJs.EXTERNAL_INTERFACE_AS_REIFIED_TYPE_ARGUMENT.on(typeArgumentPsi!!, typeArg)) } } }