diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/CollectionBreakpointPropertiesPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/CollectionBreakpointPropertiesPanel.java index 8fe1bc3b5bfe..b5e6561b1684 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/CollectionBreakpointPropertiesPanel.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/CollectionBreakpointPropertiesPanel.java @@ -14,7 +14,7 @@ import com.intellij.xdebugger.XDebuggerManager; import com.intellij.xdebugger.breakpoints.XLineBreakpoint; import com.intellij.xdebugger.breakpoints.ui.XBreakpointCustomPropertiesPanel; import com.intellij.xdebugger.impl.breakpoints.XBreakpointBase; -import com.intellij.xdebugger.impl.messages.XDebuggerImplBundle; +import com.intellij.idea.ActionsBundle; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -39,7 +39,7 @@ public class CollectionBreakpointPropertiesPanel mySaveCollectionHistoryCheckBox = new JCheckBox(JavaDebuggerBundle.message("label.collection.breakpoint.properties.save.history")); AnActionLink button = - new AnActionLink(XDebuggerImplBundle.message("action.Debugger.ShowCollectionHistory.text"), new MyShowCollectionHistoryAction()); + new AnActionLink(ActionsBundle.message("action.Debugger.ShowCollectionHistory.text"), new MyShowCollectionHistoryAction()); JBBox box = JBBox.createVerticalBox(); diff --git a/java/debugger/shared/resources/messages/JavaDebuggerSharedBundle.properties b/java/debugger/shared/resources/messages/JavaDebuggerSharedBundle.properties index e0d39efe5e27..cb552a5cea46 100644 --- a/java/debugger/shared/resources/messages/JavaDebuggerSharedBundle.properties +++ b/java/debugger/shared/resources/messages/JavaDebuggerSharedBundle.properties @@ -10,4 +10,5 @@ action.freeze.thread.text=Freeze action.Debugger.XThreadsView.ResumeThread.text=Resume action.Debugger.XThreadsView.FreezeThread.text=Freeze action.Debugger.XThreadsView.InterruptThread.text=Interrupt -action.Debugger.StepOutOfBlock.text=Step Out of Code Block \ No newline at end of file +action.Debugger.StepOutOfBlock.text=Step Out of Code Block +action.Debugger.ViewEditText.text=View/Edit Text \ No newline at end of file diff --git a/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/actions/ViewTextActionBase.java b/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/actions/ViewTextActionBase.java index 7cb3cd800109..ce6cf1cc15b8 100644 --- a/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/actions/ViewTextActionBase.java +++ b/java/debugger/shared/src/com/intellij/java/debugger/impl/shared/actions/ViewTextActionBase.java @@ -13,8 +13,8 @@ import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.NlsContexts; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.components.BorderLayoutPanel; +import com.intellij.java.debugger.impl.shared.JavaDebuggerSharedBundle; import com.intellij.xdebugger.impl.breakpoints.XExpressionImpl; -import com.intellij.xdebugger.impl.messages.XDebuggerImplBundle; import com.intellij.xdebugger.impl.ui.DebuggerUIUtil; import com.intellij.xdebugger.impl.ui.TextViewer; import com.intellij.xdebugger.impl.ui.tree.actions.XFetchValueSplitActionBase; @@ -46,7 +46,7 @@ public abstract class ViewTextActionBase extends XFetchValueSplitActionBase { String text = value; //StringUtil.unquoteString(value); if (dialog == null) { dialog = new MyDialog(project, text, node); - dialog.setTitle(node != null ? XDebuggerImplBundle.message("action.Debugger.ViewEditText.text") + dialog.setTitle(node != null ? JavaDebuggerSharedBundle.message("action.Debugger.ViewEditText.text") : ActionsBundle.message("action.Debugger.ViewText.text")); dialog.show(); } @@ -59,7 +59,7 @@ public abstract class ViewTextActionBase extends XFetchValueSplitActionBase { public void update(@NotNull AnActionEvent e) { super.update(e); if (getStringNode(e) != null) { - e.getPresentation().setText(XDebuggerImplBundle.lazyMessage("action.Debugger.ViewEditText.text")); + e.getPresentation().setText(JavaDebuggerSharedBundle.lazyMessage("action.Debugger.ViewEditText.text")); } } diff --git a/platform/xdebugger-impl/resources/messages/XDebuggerImplBundle.properties b/platform/xdebugger-impl/resources/messages/XDebuggerImplBundle.properties index c8e34cec9e8a..32d1a0d54a50 100644 --- a/platform/xdebugger-impl/resources/messages/XDebuggerImplBundle.properties +++ b/platform/xdebugger-impl/resources/messages/XDebuggerImplBundle.properties @@ -1,65 +1,13 @@ -action.XDebugger.SetValue.text=Set Value\u2026 -action.XDebugger.SetValue.description=Modify the value of the selected node -action.XDebugger.CopyValue.text=Copy Value -action.XDebugger.CopyValue.description=Copy the value of the selected node to the clipboard -action.XDebugger.CompareValueWithClipboard.text=Compare Value with Clipboard -action.XDebugger.CompareValueWithClipboard.description=Compare the value of the selected node with clipboard text -action.XDebugger.CopyName.text=Copy Name -action.XDebugger.CopyName.description=Copy the name of the selected node to the clipboard -action.XDebugger.JumpToSource.text=Jump To Source -action.XDebugger.JumpToSource.description=Open source of the selected item -action.XDebugger.JumpToTypeSource.text=Jump To Type Source -action.XDebugger.JumpToTypeSource.description=Open source of the selected value's type -action.XDebugger.Inspect.text=Inspect\u2026 -action.Debugger.Tree.EvaluateInConsole.text=Evaluate In Console -action.XDebugger.RemoveWatch.text=Remove Watch -action.XDebugger.RemoveAllWatches.text=Remove All Watches -action.XDebugger.NewWatch.text=New Watch\u2026 -action.XDebugger.EditWatch.text=Edit\u2026 -action.XDebugger.CopyWatch.text=Duplicate Watch -action.XDebugger.SeparateWatches.text=Separate Watches -action.XDebugger.ToggleEvaluateExpressionField.text=Show Evaluate Expression Field -action.XDebugger.PreviewTab.text=Open Files in Preview Tab -action.XDebugger.Inline.text=Show Variable Values in Editor -action.XDebugger.Inline.description=Show available debugger session values inside editor -action.XDebugger.ToggleSortValues.text=Sort Variables Alphabetically -action.XDebugger.ToggleSortValues.description=Sort values alphabetically in debugger views -action.XDebugger.UnmuteOnStop.text=Unmute Breakpoints on Session Finish -action.XDebugger.RemoveAllButThisBreakpoint.text=Remove other breakpoints -action.XDebugger.RemoveAllButThisBreakpoint.description=Removes all breakpoints except on lines with carets -action.XDebugger.DisableAllButThisBreakpoint.text=Disable other breakpoints -action.XDebugger.DisableAllButThisBreakpoint.description=Disables all breakpoints except on lines with carets -action.XDebugger.PinToTop.text=Pin to Top -action.XDebugger.Show.Breakpoints.Over.Line.Numbers.text=Breakpoints Over Line Numbers -action.Debugger.AddToWatch.text=Add to Watches -action.Debugger.AddInlineWatch.text=Add Inline Watch -action.Debugger.EvaluateInConsole.text=Evaluate in Console -action.Debugger.ShowLibraryFrames.text=Show/Hide Library Frames action.Debugger.FocusOnBreakpoint.text=Focus On Breakpoint action.Debugger.FocusOnBreakpoint.description=Focus this view by default when a breakpoint is reached action.Debugger.FocusOnFinish.text=Focus On Finish action.Debugger.FocusOnFinish.description=Focus this view by default when the debug session ends -action.Debugger.ShowReferring.text=Show Referring Objects\u2026 action.Debugger.RemoveAllBreakpoints.text=Remove All Breakpoints action.Debugger.RemoveAllBreakpointsInFile.text=Remove All Breakpoints In The Current File -action.Debugger.CopyStack.text=Copy Stack action.ActivateDebugToolWindow.text=Debug -action.AddBreakpoint.text=Add Breakpoint -action.AddConditionalBreakpoint.text=Add Conditional Breakpoint\u2026 -action.AddLoggingBreakpoint.text=Add Logging Breakpoint\u2026 action.MemoryView.ShowOnlyWithDiff.text=Show Non-Zero Diff Only action.MemoryView.SwitchUpdateMode.text=Update Loaded Classes On Debugger Stop action.MemoryView.SwitchUpdateMode.description=Load classes on debugger pause (may increase overhead on debugger stepping) -action.XDebugger.MuteBreakpoints.text=Mute Breakpoints -action.XDebugger.MoveWatchUp.text=Move Watch Up -action.XDebugger.MoveWatchDown.text=Move Watch Down -action.XDebugger.PauseWatch.text=Pause Watch - -group.XDebugger.settings.text=Debugger Settings - -action.Debugger.MarkObject.text=Mark Object\u2026 -action.Debugger.MarkObject.unmark.text=Unmark Object -action.Debugger.MarkObject.description=Mark/unmark the object so that it can be visually distinguished in debugger views action.Debugger.FreezeActiveThreadAction.text=Suspend Thread action.Debugger.FreezeActiveThreadAction.synonym=Freeze Thread @@ -89,8 +37,5 @@ group.DebugToolbarQuickActions.text=Add to Debugger Toolbar RunToolbarMainMoreActionGroupDebuggerPart.separator.text=Debug AdditionalRunningOptionsGroupMainDebuggerPart.separator.text=Debug -action.Debugger.ViewEditText.text=View/Edit Text -action.Debugger.XDebuggerTextPopup.ShowAsObject.text=Show as Object - action.RunToolbarResumeAction.text=Resume -action.RunToolbarPauseAction.text=Pause \ No newline at end of file +action.RunToolbarPauseAction.text=Pause diff --git a/platform/xdebugger-impl/ui/resources/intellij.platform.debugger.impl.ui.xml b/platform/xdebugger-impl/ui/resources/intellij.platform.debugger.impl.ui.xml index 8b8510201483..7ef4838d82ff 100644 --- a/platform/xdebugger-impl/ui/resources/intellij.platform.debugger.impl.ui.xml +++ b/platform/xdebugger-impl/ui/resources/intellij.platform.debugger.impl.ui.xml @@ -88,7 +88,7 @@ - + diff --git a/platform/xdebugger-impl/ui/resources/messages/XDebuggerUiBundle.properties b/platform/xdebugger-impl/ui/resources/messages/XDebuggerUiBundle.properties new file mode 100644 index 000000000000..1400e9068b10 --- /dev/null +++ b/platform/xdebugger-impl/ui/resources/messages/XDebuggerUiBundle.properties @@ -0,0 +1,54 @@ +action.XDebugger.SetValue.text=Set Value… +action.XDebugger.SetValue.description=Modify the value of the selected node +action.XDebugger.CopyValue.text=Copy Value +action.XDebugger.CopyValue.description=Copy the value of the selected node to the clipboard +action.XDebugger.CompareValueWithClipboard.text=Compare Value with Clipboard +action.XDebugger.CompareValueWithClipboard.description=Compare the value of the selected node with clipboard text +action.XDebugger.CopyName.text=Copy Name +action.XDebugger.CopyName.description=Copy the name of the selected node to the clipboard +action.XDebugger.JumpToSource.text=Jump To Source +action.XDebugger.JumpToSource.description=Open source of the selected item +action.XDebugger.JumpToTypeSource.text=Jump To Type Source +action.XDebugger.JumpToTypeSource.description=Open source of the selected value's type +action.XDebugger.Inspect.text=Inspect… +action.Debugger.Tree.EvaluateInConsole.text=Evaluate In Console +action.XDebugger.RemoveWatch.text=Remove Watch +action.XDebugger.RemoveAllWatches.text=Remove All Watches +action.XDebugger.NewWatch.text=New Watch… +action.XDebugger.EditWatch.text=Edit… +action.XDebugger.CopyWatch.text=Duplicate Watch +action.XDebugger.SeparateWatches.text=Separate Watches +action.XDebugger.ToggleEvaluateExpressionField.text=Show Evaluate Expression Field +action.XDebugger.PreviewTab.text=Open Files in Preview Tab +action.XDebugger.Inline.text=Show Variable Values in Editor +action.XDebugger.Inline.description=Show available debugger session values inside editor +action.XDebugger.ToggleSortValues.text=Sort Variables Alphabetically +action.XDebugger.ToggleSortValues.description=Sort values alphabetically in debugger views +action.XDebugger.UnmuteOnStop.text=Unmute Breakpoints on Session Finish +action.XDebugger.RemoveAllButThisBreakpoint.text=Remove other breakpoints +action.XDebugger.RemoveAllButThisBreakpoint.description=Removes all breakpoints except on lines with carets +action.XDebugger.DisableAllButThisBreakpoint.text=Disable other breakpoints +action.XDebugger.DisableAllButThisBreakpoint.description=Disables all breakpoints except on lines with carets +action.XDebugger.PinToTop.text=Pin to Top +action.XDebugger.Show.Breakpoints.Over.Line.Numbers.text=Breakpoints Over Line Numbers +action.Debugger.AddToWatch.text=Add to Watches +action.Debugger.AddInlineWatch.text=Add Inline Watch +action.Debugger.EvaluateInConsole.text=Evaluate in Console +action.Debugger.ShowLibraryFrames.text=Show/Hide Library Frames +action.Debugger.ShowReferring.text=Show Referring Objects… +action.Debugger.CopyStack.text=Copy Stack +action.AddBreakpoint.text=Add Breakpoint +action.AddConditionalBreakpoint.text=Add Conditional Breakpoint… +action.AddLoggingBreakpoint.text=Add Logging Breakpoint… +action.XDebugger.MuteBreakpoints.text=Mute Breakpoints +action.XDebugger.MoveWatchUp.text=Move Watch Up +action.XDebugger.MoveWatchDown.text=Move Watch Down +action.XDebugger.PauseWatch.text=Pause Watch + +group.XDebugger.settings.text=Debugger Settings + +action.Debugger.MarkObject.text=Mark Object… +action.Debugger.MarkObject.unmark.text=Unmark Object +action.Debugger.MarkObject.description=Mark/unmark the object so that it can be visually distinguished in debugger views + +action.Debugger.XDebuggerTextPopup.ShowAsObject.text=Show as Object diff --git a/platform/xdebugger-impl/ui/src/com/intellij/platform/debugger/impl/ui/XDebuggerUiBundle.kt b/platform/xdebugger-impl/ui/src/com/intellij/platform/debugger/impl/ui/XDebuggerUiBundle.kt new file mode 100644 index 000000000000..9e7d03bf9e81 --- /dev/null +++ b/platform/xdebugger-impl/ui/src/com/intellij/platform/debugger/impl/ui/XDebuggerUiBundle.kt @@ -0,0 +1,25 @@ +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.platform.debugger.impl.ui + +import com.intellij.DynamicBundle +import org.jetbrains.annotations.ApiStatus +import org.jetbrains.annotations.Nls +import org.jetbrains.annotations.PropertyKey +import java.util.function.Supplier + +private const val BUNDLE = "messages.XDebuggerUiBundle" + +@ApiStatus.Internal +object XDebuggerUiBundle { + private val instance = DynamicBundle(XDebuggerUiBundle::class.java, BUNDLE) + + @JvmStatic + fun message(key: @PropertyKey(resourceBundle = BUNDLE) String, vararg params: Any?): @Nls String { + return instance.getMessage(key, *params) + } + + @JvmStatic + fun lazyMessage(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): Supplier<@Nls String> { + return instance.getLazyMessage(key, *params) + } +} diff --git a/platform/xdebugger-impl/ui/src/com/intellij/xdebugger/impl/actions/MarkObjectAction.java b/platform/xdebugger-impl/ui/src/com/intellij/xdebugger/impl/actions/MarkObjectAction.java index f99bd5bbf330..7412fc01a8df 100644 --- a/platform/xdebugger-impl/ui/src/com/intellij/xdebugger/impl/actions/MarkObjectAction.java +++ b/platform/xdebugger-impl/ui/src/com/intellij/xdebugger/impl/actions/MarkObjectAction.java @@ -8,7 +8,7 @@ import com.intellij.openapi.project.Project; import com.intellij.platform.debugger.impl.shared.SplitDebuggerAction; import com.intellij.xdebugger.impl.DebuggerSupport; import com.intellij.xdebugger.impl.actions.handlers.XMarkObjectActionHandler; -import com.intellij.xdebugger.impl.messages.XDebuggerImplBundle; +import com.intellij.platform.debugger.impl.ui.XDebuggerUiBundle; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -27,10 +27,10 @@ public class MarkObjectAction extends XDebuggerActionBase implements SplitDebugg hidden = ourHandler.isHidden(project, event); String text; if (ourHandler.isMarked(project, event)) { - text = XDebuggerImplBundle.message("action.Debugger.MarkObject.unmark.text"); + text = XDebuggerUiBundle.message("action.Debugger.MarkObject.unmark.text"); } else { - text = XDebuggerImplBundle.message("action.Debugger.MarkObject.text"); + text = XDebuggerUiBundle.message("action.Debugger.MarkObject.text"); } presentation.setText(text); } diff --git a/platform/xdebugger-impl/ui/src/com/intellij/xdebugger/impl/evaluate/quick/common/XDebuggerTextPopup.java b/platform/xdebugger-impl/ui/src/com/intellij/xdebugger/impl/evaluate/quick/common/XDebuggerTextPopup.java index 04a19e6e5c70..7e2ef50f744d 100644 --- a/platform/xdebugger-impl/ui/src/com/intellij/xdebugger/impl/evaluate/quick/common/XDebuggerTextPopup.java +++ b/platform/xdebugger-impl/ui/src/com/intellij/xdebugger/impl/evaluate/quick/common/XDebuggerTextPopup.java @@ -33,7 +33,7 @@ import com.intellij.xdebugger.frame.XValueTextModificationPreparator; import com.intellij.xdebugger.frame.presentation.XValuePresentation; import com.intellij.xdebugger.impl.breakpoints.XExpressionImpl; import com.intellij.xdebugger.impl.frame.XValueTextModificationPreparatorProviders; -import com.intellij.xdebugger.impl.messages.XDebuggerImplBundle; +import com.intellij.platform.debugger.impl.ui.XDebuggerUiBundle; import com.intellij.xdebugger.impl.ui.DebuggerUIUtil; import com.intellij.xdebugger.impl.ui.XValueTextProvider; import com.intellij.xdebugger.impl.ui.tree.XDebuggerTree; @@ -337,7 +337,7 @@ public class XDebuggerTextPopup extends XDebuggerPopupPanel { private class ShowAsObject extends AnAction { private ShowAsObject() { - super(XDebuggerImplBundle.message("action.Debugger.XDebuggerTextPopup.ShowAsObject.text")); + super(XDebuggerUiBundle.message("action.Debugger.XDebuggerTextPopup.ShowAsObject.text")); } @Override diff --git a/platform/xdebugger-impl/ui/src/com/intellij/xdebugger/impl/frame/XWatchesViewImpl.java b/platform/xdebugger-impl/ui/src/com/intellij/xdebugger/impl/frame/XWatchesViewImpl.java index cfea81b677f2..46533c9825f3 100644 --- a/platform/xdebugger-impl/ui/src/com/intellij/xdebugger/impl/frame/XWatchesViewImpl.java +++ b/platform/xdebugger-impl/ui/src/com/intellij/xdebugger/impl/frame/XWatchesViewImpl.java @@ -72,7 +72,7 @@ import com.intellij.xdebugger.impl.inline.InlineWatch; import com.intellij.xdebugger.impl.inline.InlineWatchNode; import com.intellij.xdebugger.impl.inline.InlineWatchesRootNode; import com.intellij.xdebugger.impl.inline.XInlineWatchesView; -import com.intellij.xdebugger.impl.messages.XDebuggerImplBundle; +import com.intellij.platform.debugger.impl.ui.XDebuggerUiBundle; import com.intellij.xdebugger.impl.ui.DebuggerSessionTabBase; import com.intellij.xdebugger.impl.ui.DebuggerUIUtil; import com.intellij.xdebugger.impl.ui.XDebugSessionTab; @@ -249,7 +249,7 @@ public class XWatchesViewImpl extends XVariablesView implements DnDNativeTarget, @Override protected ComboBox createComboBox(CollectionComboBoxModel model, int width) { AnAction addToWatchesAction = - new DumbAwareAction(XDebuggerImplBundle.message("action.Debugger.AddToWatch.text"), null, AllIcons.Debugger.AddToWatch) { + new DumbAwareAction(XDebuggerUiBundle.message("action.Debugger.AddToWatch.text"), null, AllIcons.Debugger.AddToWatch) { @Override public void actionPerformed(@NotNull AnActionEvent e) { myEvaluateComboBox.saveTextInHistory(); diff --git a/platform/xdebugger-impl/ui/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java b/platform/xdebugger-impl/ui/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java index 689c0ee14ee8..88406883eb5d 100644 --- a/platform/xdebugger-impl/ui/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java +++ b/platform/xdebugger-impl/ui/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java @@ -62,7 +62,7 @@ import com.intellij.xdebugger.impl.frame.XVariablesView; import com.intellij.xdebugger.impl.frame.XVariablesViewBase; import com.intellij.xdebugger.impl.frame.XWatchesView; import com.intellij.xdebugger.impl.frame.XWatchesViewImpl; -import com.intellij.xdebugger.impl.messages.XDebuggerImplBundle; +import com.intellij.platform.debugger.impl.ui.XDebuggerUiBundle; import com.intellij.xdebugger.settings.XDebuggerSettingsManager; import com.intellij.xdebugger.ui.XDebugTabLayouter; import org.jetbrains.annotations.ApiStatus; @@ -482,7 +482,7 @@ public class XDebugSessionTab extends DebuggerSessionTabBase { leftToolbar.add(myUi.getOptions().getLayoutActions()); final AnAction[] commonSettings = myUi.getOptions().getSettingsActionsList(); - DefaultActionGroup settings = DefaultActionGroup.createPopupGroup(XDebuggerImplBundle.lazyMessage("group.XDebugger.settings.text")); + DefaultActionGroup settings = DefaultActionGroup.createPopupGroup(XDebuggerUiBundle.lazyMessage("group.XDebugger.settings.text")); settings.getTemplatePresentation().setIcon(myUi.getOptions().getSettingsActions().getTemplatePresentation().getIcon()); settings.addAll(commonSettings); leftToolbar.add(settings); diff --git a/platform/xdebugger-impl/ui/src/com/intellij/xdebugger/impl/ui/XDebugSessionTabNewUI.kt b/platform/xdebugger-impl/ui/src/com/intellij/xdebugger/impl/ui/XDebugSessionTabNewUI.kt index 2578b21b888b..3f53cfe910c8 100644 --- a/platform/xdebugger-impl/ui/src/com/intellij/xdebugger/impl/ui/XDebugSessionTabNewUI.kt +++ b/platform/xdebugger-impl/ui/src/com/intellij/xdebugger/impl/ui/XDebugSessionTabNewUI.kt @@ -31,7 +31,7 @@ import com.intellij.openapi.wm.impl.content.SingleContentSupplier import com.intellij.platform.debugger.impl.shared.proxy.XDebugSessionProxy import com.intellij.xdebugger.XDebuggerBundle import com.intellij.xdebugger.impl.actions.XDebuggerActions -import com.intellij.xdebugger.impl.messages.XDebuggerImplBundle +import com.intellij.platform.debugger.impl.ui.XDebuggerUiBundle import org.jetbrains.annotations.ApiStatus.Internal import java.util.function.Supplier import javax.swing.Icon @@ -120,7 +120,7 @@ open class XDebugSessionTabNewUI( more.addSeparator() val gear = DefaultActionGroup().apply { - templatePresentation.text = XDebuggerImplBundle.message("group.XDebugger.settings.text") + templatePresentation.text = XDebuggerUiBundle.message("group.XDebugger.settings.text") templatePresentation.icon = AllIcons.General.Settings isPopup = true addAll(*myUi.options.settingsActionsList) diff --git a/plugins/ide-features-trainer/src/training/learn/lesson/general/run/CommonDebugLesson.kt b/plugins/ide-features-trainer/src/training/learn/lesson/general/run/CommonDebugLesson.kt index 5faba91dc238..3fd977b74e4e 100644 --- a/plugins/ide-features-trainer/src/training/learn/lesson/general/run/CommonDebugLesson.kt +++ b/plugins/ide-features-trainer/src/training/learn/lesson/general/run/CommonDebugLesson.kt @@ -28,7 +28,7 @@ import com.intellij.xdebugger.impl.XDebugSessionImpl import com.intellij.xdebugger.impl.XDebuggerUtilImpl import com.intellij.xdebugger.impl.breakpoints.XBreakpointUtil import com.intellij.xdebugger.impl.evaluate.XDebuggerEvaluationDialog -import com.intellij.xdebugger.impl.messages.XDebuggerImplBundle +import com.intellij.platform.debugger.impl.ui.XDebuggerUiBundle import com.intellij.xdebugger.impl.ui.XDebuggerEmbeddedComboBox import com.intellij.xdebugger.impl.ui.tree.XDebuggerTree import com.intellij.xdebugger.impl.ui.tree.nodes.WatchNodeImpl @@ -236,7 +236,7 @@ abstract class CommonDebugLesson(id: String) : KLesson(id, LessonsBundle.message icon(AllIcons.Debugger.AddToWatch))) text(LessonsBundle.message("debug.workflow.use.watches.shortcut", action(it), strong(LessonsBundle.message("debug.workflow.debugger.watches")), shortcut)) - val addToWatchActionText = XDebuggerImplBundle.message("action.Debugger.AddToWatch.text") + val addToWatchActionText = XDebuggerUiBundle.message("action.Debugger.AddToWatch.text") triggerAndFullHighlight { usePulsation = true }.component { ui: ActionButton -> ui.action.templatePresentation.text == addToWatchActionText }