diff --git a/jvm/jvm-analysis-impl/resources/messages/JvmAnalysisBundle.properties b/jvm/jvm-analysis-impl/resources/messages/JvmAnalysisBundle.properties index f0c53cb6727f..5c31689244ab 100644 --- a/jvm/jvm-analysis-impl/resources/messages/JvmAnalysisBundle.properties +++ b/jvm/jvm-analysis-impl/resources/messages/JvmAnalysisBundle.properties @@ -226,6 +226,8 @@ jvm.inspections.assertnotequals.between.inconvertible.types.problem.descriptor=P jvm.inspections.system.get.property.display.name=Call to 'System.getProperty(str)' could be simplified jvm.inspections.system.get.property.problem.descriptor=Call #ref can be simplified for ''{0}'' +jvm.options.general.color.descriptor.logging.string.placeholder = Log string//Placeholder + can.t.build.uast.tree.for.file=Can't build UAST tree for file title.uast=UAST current.version=Current version diff --git a/jvm/jvm-analysis-impl/src/com/intellij/analysis/JvmAnalysisBundle.java b/jvm/jvm-analysis-impl/src/com/intellij/analysis/JvmAnalysisBundle.java index 1b947ffcab00..352f502167f5 100644 --- a/jvm/jvm-analysis-impl/src/com/intellij/analysis/JvmAnalysisBundle.java +++ b/jvm/jvm-analysis-impl/src/com/intellij/analysis/JvmAnalysisBundle.java @@ -7,11 +7,18 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.PropertyKey; +import java.util.function.Supplier; + public final class JvmAnalysisBundle extends DynamicBundle { public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return ourInstance.getMessage(key, params); } + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, + Object @NotNull ... params) { + return ourInstance.getLazyMessage(key, params); + } + @NonNls public static final String BUNDLE = "messages.JvmAnalysisBundle"; private static final JvmAnalysisBundle ourInstance = new JvmAnalysisBundle(); diff --git a/jvm/jvm-analysis-impl/src/com/intellij/analysis/customization/console/ClassFinderConsoleColorsPage.java b/jvm/jvm-analysis-impl/src/com/intellij/analysis/customization/console/ClassFinderConsoleColorsPage.java index 9f9b0d9b5f00..e885e63c212e 100644 --- a/jvm/jvm-analysis-impl/src/com/intellij/analysis/customization/console/ClassFinderConsoleColorsPage.java +++ b/jvm/jvm-analysis-impl/src/com/intellij/analysis/customization/console/ClassFinderConsoleColorsPage.java @@ -1,6 +1,7 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.analysis.customization.console; +import com.intellij.analysis.JvmAnalysisBundle; import com.intellij.execution.impl.ConsoleViewUtil; import com.intellij.java.JavaBundle; import com.intellij.openapi.editor.colors.EditorColorsScheme; @@ -41,7 +42,7 @@ public final class ClassFinderConsoleColorsPage implements ColorSettingsPage, Di new AttributesDescriptor(OptionsBundle.messagePointer("options.language.defaults.class.name"), TERMINAL_CLASS_NAME_LOG_REFERENCE); private static final AttributesDescriptor LOG_STRING_PLACEHOLDER_NAME = - new AttributesDescriptor(OptionsBundle.messagePointer("options.general.color.descriptor.logging.string.placeholder"), + new AttributesDescriptor(JvmAnalysisBundle.messagePointer("jvm.options.general.color.descriptor.logging.string.placeholder"), LOG_STRING_PLACEHOLDER); private static final AttributesDescriptor[] ATTRS = {LOG_CLASS_NAME, LOG_STRING_PLACEHOLDER_NAME,}; diff --git a/platform/ide-core/resources/messages/OptionsBundle.properties b/platform/ide-core/resources/messages/OptionsBundle.properties index 419a0ca4e058..3e36506e77f4 100644 --- a/platform/ide-core/resources/messages/OptionsBundle.properties +++ b/platform/ide-core/resources/messages/OptionsBundle.properties @@ -132,7 +132,6 @@ options.general.color.descriptor.hyperlink.new=Hyperlinks//Unfollowed options.general.color.descriptor.hyperlink.followed=Hyperlinks//Followed options.general.color.descriptor.reference.hyperlink=Hyperlinks//Reference options.general.color.descriptor.hyperlink.inactive=Hyperlinks//Inactive -options.general.color.descriptor.logging.string.placeholder = Log string//Placeholder options.general.color.descriptor.todo.defaults=Code//TODO defaults options.general.color.descriptor.bookmarks=Editor//Bookmarks options.general.color.soft.wrap.sign=Text//Soft wrap sign