From 404ecb047d0988f7e7708b5c1fc64286401a4844 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Wed, 6 Feb 2019 19:27:19 +0300 Subject: [PATCH] lst: escape mnemonics in changelist names --- .../actions/diff/lst/SimpleLocalChangeListDiffViewer.java | 2 +- .../intellij/openapi/vcs/ex/PartialLocalLineStatusTracker.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/lst/SimpleLocalChangeListDiffViewer.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/lst/SimpleLocalChangeListDiffViewer.java index 73877b2bc5c8..e58e3db44060 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/lst/SimpleLocalChangeListDiffViewer.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/lst/SimpleLocalChangeListDiffViewer.java @@ -345,7 +345,7 @@ public class SimpleLocalChangeListDiffViewer extends SimpleDiffViewer { protected String getText(@NotNull List selectedChanges) { if (!selectedChanges.isEmpty() && ContainerUtil.and(selectedChanges, change -> !change.isFromActiveChangelist())) { String shortChangeListName = StringUtil.trimMiddle(myChangelistName, 40); - return String.format("Move to '%s' Changelist", shortChangeListName); + return String.format("Move to '%s' Changelist", StringUtil.escapeMnemonics(shortChangeListName)); } else { return ActionsBundle.message("action.ChangesView.Move.text"); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/PartialLocalLineStatusTracker.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/PartialLocalLineStatusTracker.kt index 7966adf683e7..8bd213e98e89 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/PartialLocalLineStatusTracker.kt +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/PartialLocalLineStatusTracker.kt @@ -608,7 +608,7 @@ class ChangelistsLocalLineStatusTracker(project: Project, private inner class MoveToChangeListAction(editor: Editor, range: Range, val mousePosition: Point?, val changelist: LocalChangeList) : RangeMarkerAction(editor, range, null) { init { - templatePresentation.text = StringUtil.trimMiddle(changelist.name, 60) + templatePresentation.setText(StringUtil.trimMiddle(changelist.name, 60), false) } override fun isEnabled(editor: Editor, range: Range): Boolean = range is LocalRange