diff --git a/idea/ide-common/src/org/jetbrains/kotlin/util/AbstractKotlinBundle.kt b/idea/ide-common/src/org/jetbrains/kotlin/util/AbstractKotlinBundle.kt index 1e95516c99d..b7670d34e5d 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/util/AbstractKotlinBundle.kt +++ b/idea/ide-common/src/org/jetbrains/kotlin/util/AbstractKotlinBundle.kt @@ -7,4 +7,6 @@ package org.jetbrains.kotlin.util import com.intellij.AbstractBundle -abstract class AbstractKotlinBundle protected constructor(pathToBundle: String) : AbstractBundle(pathToBundle) \ No newline at end of file +abstract class AbstractKotlinBundle protected constructor(pathToBundle: String) : AbstractBundle(pathToBundle) { + protected fun String.withHtml(): String = "$this" +} \ No newline at end of file diff --git a/idea/ide-common/src/org/jetbrains/kotlin/util/AbstractKotlinBundle.kt.192 b/idea/ide-common/src/org/jetbrains/kotlin/util/AbstractKotlinBundle.kt.192 deleted file mode 100644 index 1e95516c99d..00000000000 --- a/idea/ide-common/src/org/jetbrains/kotlin/util/AbstractKotlinBundle.kt.192 +++ /dev/null @@ -1,10 +0,0 @@ -/* - * 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.util - -import com.intellij.AbstractBundle - -abstract class AbstractKotlinBundle protected constructor(pathToBundle: String) : AbstractBundle(pathToBundle) \ No newline at end of file diff --git a/idea/ide-common/src/org/jetbrains/kotlin/util/AbstractKotlinBundle.kt.201 b/idea/ide-common/src/org/jetbrains/kotlin/util/AbstractKotlinBundle.kt.201 index 8f662177a85..c54005698d5 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/util/AbstractKotlinBundle.kt.201 +++ b/idea/ide-common/src/org/jetbrains/kotlin/util/AbstractKotlinBundle.kt.201 @@ -7,4 +7,6 @@ package org.jetbrains.kotlin.util import com.intellij.DynamicBundle -abstract class AbstractKotlinBundle protected constructor(pathToBundle: String) : DynamicBundle(pathToBundle) \ No newline at end of file +abstract class AbstractKotlinBundle protected constructor(pathToBundle: String) : DynamicBundle(pathToBundle) { + protected fun String.withHtml(): String = "$this" +} \ No newline at end of file diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIdeaAnalysisBundle.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIdeaAnalysisBundle.kt index cc68fa46de6..bf7572dde7b 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIdeaAnalysisBundle.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIdeaAnalysisBundle.kt @@ -17,7 +17,7 @@ object KotlinIdeaAnalysisBundle : AbstractKotlinBundle(BUNDLE) { @JvmStatic fun htmlMessage(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = - "" + getMessage(key, *params) + "" + getMessage(key, *params).withHtml() @JvmStatic fun lazyMessage(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): () -> String = { getMessage(key, *params) } diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/KotlinJvmBundle.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/KotlinJvmBundle.kt index 9abec2ff2c0..30a2e42d2fa 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/KotlinJvmBundle.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/KotlinJvmBundle.kt @@ -15,4 +15,8 @@ private const val BUNDLE = "messages.KotlinJvmBundle" object KotlinJvmBundle : AbstractKotlinBundle(BUNDLE) { @JvmStatic fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params) + + @JvmStatic + fun htmlMessage(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = + getMessage(key, *params).withHtml() } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinBundle.kt b/idea/src/org/jetbrains/kotlin/idea/KotlinBundle.kt index aa181c0c0a0..403794cc86e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/KotlinBundle.kt +++ b/idea/src/org/jetbrains/kotlin/idea/KotlinBundle.kt @@ -15,6 +15,10 @@ object KotlinBundle : AbstractKotlinBundle(BUNDLE) { @JvmStatic fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params) + @JvmStatic + fun htmlMessage(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = + getMessage(key, *params).withHtml() + @JvmStatic fun lazyMessage(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): () -> String = { getMessage(key, *params) } } \ No newline at end of file