From e699965ed6fc5c1b61f486cbc03a2449d01a7cca Mon Sep 17 00:00:00 2001 From: Svyatoslav Scherbina Date: Mon, 3 Feb 2020 11:20:01 +0300 Subject: [PATCH] Add infrastructure for Native-specific frontend diagnostics --- ...s.rendering.DefaultErrorMessages$Extension | 3 ++- ...s.rendering.DefaultErrorMessages$Extension | 3 ++- .../diagnostics/DefaultErrorMessagesNative.kt | 19 +++++++++++++++++++ .../resolve/konan/diagnostics/ErrorsNative.kt | 15 +++++++++++++++ 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 native/frontend/src/org/jetbrains/kotlin/resolve/konan/diagnostics/DefaultErrorMessagesNative.kt create mode 100644 native/frontend/src/org/jetbrains/kotlin/resolve/konan/diagnostics/ErrorsNative.kt diff --git a/compiler/cli/resources/META-INF/services/org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages$Extension b/compiler/cli/resources/META-INF/services/org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages$Extension index c8398091c6b..2c9066882b8 100644 --- a/compiler/cli/resources/META-INF/services/org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages$Extension +++ b/compiler/cli/resources/META-INF/services/org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages$Extension @@ -1,4 +1,5 @@ # Note that this file is also present in idea/src/META-INF/services org.jetbrains.kotlin.resolve.jvm.diagnostics.DefaultErrorMessagesJvm org.jetbrains.kotlin.js.resolve.diagnostics.DefaultErrorMessagesJs -org.jetbrains.kotlin.fir.resolve.diagnostics.DefaultErrorMessagesFir \ No newline at end of file +org.jetbrains.kotlin.fir.resolve.diagnostics.DefaultErrorMessagesFir +org.jetbrains.kotlin.resolve.konan.diagnostics.DefaultErrorMessagesNative \ No newline at end of file diff --git a/idea/resources/META-INF/services/org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages$Extension b/idea/resources/META-INF/services/org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages$Extension index 55fd08a1392..6bc5ead4674 100644 --- a/idea/resources/META-INF/services/org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages$Extension +++ b/idea/resources/META-INF/services/org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages$Extension @@ -1,4 +1,5 @@ # Note that this file is also present in compiler/cli/src/META-INF/services org.jetbrains.kotlin.resolve.jvm.diagnostics.DefaultErrorMessagesJvm org.jetbrains.kotlin.js.resolve.diagnostics.DefaultErrorMessagesJs -org.jetbrains.kotlin.fir.resolve.diagnostics.DefaultErrorMessagesFir \ No newline at end of file +org.jetbrains.kotlin.fir.resolve.diagnostics.DefaultErrorMessagesFir +org.jetbrains.kotlin.resolve.konan.diagnostics.DefaultErrorMessagesNative \ No newline at end of file diff --git a/native/frontend/src/org/jetbrains/kotlin/resolve/konan/diagnostics/DefaultErrorMessagesNative.kt b/native/frontend/src/org/jetbrains/kotlin/resolve/konan/diagnostics/DefaultErrorMessagesNative.kt new file mode 100644 index 00000000000..f0e1a127917 --- /dev/null +++ b/native/frontend/src/org/jetbrains/kotlin/resolve/konan/diagnostics/DefaultErrorMessagesNative.kt @@ -0,0 +1,19 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.resolve.konan.diagnostics + +import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages +import org.jetbrains.kotlin.diagnostics.rendering.DiagnosticFactoryToRendererMap + +private val DIAGNOSTIC_FACTORY_TO_RENDERER by lazy { + DiagnosticFactoryToRendererMap("Native").apply { + + } +} + +class DefaultErrorMessagesNative : DefaultErrorMessages.Extension { + override fun getMap(): DiagnosticFactoryToRendererMap = DIAGNOSTIC_FACTORY_TO_RENDERER +} diff --git a/native/frontend/src/org/jetbrains/kotlin/resolve/konan/diagnostics/ErrorsNative.kt b/native/frontend/src/org/jetbrains/kotlin/resolve/konan/diagnostics/ErrorsNative.kt new file mode 100644 index 00000000000..d1dd17dfb5c --- /dev/null +++ b/native/frontend/src/org/jetbrains/kotlin/resolve/konan/diagnostics/ErrorsNative.kt @@ -0,0 +1,15 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.resolve.konan.diagnostics + +import org.jetbrains.kotlin.diagnostics.Errors + +object ErrorsNative { + + init { + Errors.Initializer.initializeFactoryNames(ErrorsNative::class.java) + } +} \ No newline at end of file