From 2b2bc4400e8d067f41a02df84454d88e2ff1654a Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Tue, 16 Nov 2021 18:24:40 +0100 Subject: [PATCH] [CHERRY PICKED FROM IJ] Avoid adding unnecessary intellij.platform.core into JPS classpath just to be able to use DynamicBundle DynamicBundle functionality isn't used actually. com.intellij.AbstractBundle is enough GitOrigin-RevId: 50d30ab3d2cdc5ab8f3e1a1b449ace62e1f0f12b Original commit: https://github.com/JetBrains/intellij-community/commit/88ab1b0a74ceef1756d953a5ef648f45a8a7f32d --- .../org/jetbrains/kotlin/jps/KotlinJpsBundle.kt | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/KotlinJpsBundle.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/KotlinJpsBundle.kt index d8f53c841a4..f9331004bf4 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/KotlinJpsBundle.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/KotlinJpsBundle.kt @@ -1,25 +1,16 @@ // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.kotlin.jps +import com.intellij.AbstractBundle import org.jetbrains.annotations.Nls import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.PropertyKey -import org.jetbrains.kotlin.util.AbstractKotlinBundle @NonNls private const val BUNDLE = "messages.KotlinJpsBundle" -object KotlinJpsBundle : AbstractKotlinBundle(BUNDLE) { +object KotlinJpsBundle : AbstractBundle(BUNDLE) { @Nls @JvmStatic fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params) - - @Nls - @JvmStatic - fun htmlMessage(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = - getMessage(key, *params).withHtml() - - @Nls - @JvmStatic - fun lazyMessage(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): () -> String = { getMessage(key, *params) } -} \ No newline at end of file +}