azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AbstractKotlinBundle: introduce withHtml

Browse Source 
#KT-37483
This commit is contained in:
Dmitry Gridin
2020-03-16 15:15:10 +07:00
parent c7a21a094f
commit f12ed33a70
6 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/ide-common/src/org/jetbrains/kotlin/util/AbstractKotlinBundle.kt
+3 -1
View File
@@ -7,4 +7,6 @@ package org.jetbrains.kotlin.util
import com.intellij.AbstractBundle import com.intellij.AbstractBundle
abstract class AbstractKotlinBundle protected constructor(pathToBundle: String) : AbstractBundle(pathToBundle) abstract class AbstractKotlinBundle protected constructor(pathToBundle: String) : AbstractBundle(pathToBundle) {
protected fun String.withHtml(): String = "<html>$this</html>"
}
idea/ide-common/src/org/jetbrains/kotlin/util/AbstractKotlinBundle.kt.192
-10
View File
@@ -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)
idea/ide-common/src/org/jetbrains/kotlin/util/AbstractKotlinBundle.kt.201
+3 -1
View File
@@ -7,4 +7,6 @@ package org.jetbrains.kotlin.util
import com.intellij.DynamicBundle import com.intellij.DynamicBundle
abstract class AbstractKotlinBundle protected constructor(pathToBundle: String) : DynamicBundle(pathToBundle) abstract class AbstractKotlinBundle protected constructor(pathToBundle: String) : DynamicBundle(pathToBundle) {
protected fun String.withHtml(): String = "<html>$this</html>"
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIdeaAnalysisBundle.kt
+1 -1
View File
@@ -17,7 +17,7 @@ object KotlinIdeaAnalysisBundle : AbstractKotlinBundle(BUNDLE) {
@JvmStatic @JvmStatic
fun htmlMessage(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = fun htmlMessage(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String =
"<html>" + getMessage(key, *params) + "</html>" getMessage(key, *params).withHtml()
@JvmStatic @JvmStatic
fun lazyMessage(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): () -> String = { getMessage(key, *params) } fun lazyMessage(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): () -> String = { getMessage(key, *params) }
idea/idea-jvm/src/org/jetbrains/kotlin/idea/KotlinJvmBundle.kt
+4
View File
@@ -15,4 +15,8 @@ private const val BUNDLE = "messages.KotlinJvmBundle"
object KotlinJvmBundle : AbstractKotlinBundle(BUNDLE) { object KotlinJvmBundle : AbstractKotlinBundle(BUNDLE) {
@JvmStatic @JvmStatic
fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params) 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()
} }
idea/src/org/jetbrains/kotlin/idea/KotlinBundle.kt
+4
View File
@@ -15,6 +15,10 @@ object KotlinBundle : AbstractKotlinBundle(BUNDLE) {
@JvmStatic @JvmStatic
fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params) 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 @JvmStatic
fun lazyMessage(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): () -> String = { getMessage(key, *params) } fun lazyMessage(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): () -> String = { getMessage(key, *params) }
} }