From f8616b9a2bb54bba3a9de9ebd480601a50f83155 Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Mon, 8 Jan 2024 10:59:49 +0100 Subject: [PATCH] Git - rename "Open Stash" to "Preview Stash" (#201973) * Git - rename "Open Stash" to "Preview Stash" * Add Preview Stash command to the "..." menu --- extensions/git/package.json | 11 ++++++++--- extensions/git/package.nls.json | 2 +- extensions/git/src/commands.ts | 6 +++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/extensions/git/package.json b/extensions/git/package.json index fbdcb00b462..3e4137d36e4 100644 --- a/extensions/git/package.json +++ b/extensions/git/package.json @@ -675,8 +675,8 @@ "enablement": "!operationInProgress" }, { - "command": "git.stashOpen", - "title": "%command.stashOpen%", + "command": "git.stashPreview", + "title": "%command.stashPreview%", "category": "Git", "enablement": "!operationInProgress" }, @@ -1264,7 +1264,7 @@ "when": "config.git.enabled && !git.missing && git.parentRepositoryCount != 0" }, { - "command": "git.openStash", + "command": "git.stashPreview", "when": "config.git.enabled && !git.missing && config.multiDiffEditor.experimental.enabled" }, { @@ -2103,6 +2103,11 @@ { "command": "git.stashDropAll", "group": "4_drop@2" + }, + { + "command": "git.stashPreview", + "when": "config.multiDiffEditor.experimental.enabled", + "group": "5_preview@1" } ], "git.tags": [ diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json index 3c6a721b804..627b6195828 100644 --- a/extensions/git/package.nls.json +++ b/extensions/git/package.nls.json @@ -104,7 +104,7 @@ "command.stashApplyLatest": "Apply Latest Stash", "command.stashDrop": "Drop Stash...", "command.stashDropAll": "Drop All Stashes...", - "command.stashOpen": "Open Stash...", + "command.stashPreview": "Preview Stash...", "command.timelineOpenDiff": "Open Changes", "command.timelineOpenCommit": "Open Commit", "command.timelineCopyCommitId": "Copy Commit ID", diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts index 78b52187a50..892e3698e56 100644 --- a/extensions/git/src/commands.ts +++ b/extensions/git/src/commands.ts @@ -3535,9 +3535,9 @@ export class CommandCenter { await repository.dropStash(); } - @command('git.stashOpen', { repository: true }) - async stashOpen(repository: Repository): Promise { - const placeHolder = l10n.t('Pick a stash to open'); + @command('git.stashPreview', { repository: true }) + async stashPreview(repository: Repository): Promise { + const placeHolder = l10n.t('Pick a stash to preview'); const stash = await this.pickStash(repository, placeHolder); if (!stash) {