From ff75a30d9f7e54d468ea2ac195fcf18f18c20126 Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Mon, 10 Jan 2022 15:08:39 +0100 Subject: [PATCH] Revert "SCM - Introduce another open changes command got editor/command palette (#138293)" This reverts commit af8b6ad9f060e9e6bfe12fa02ac4d61644a30d88. --- extensions/git/package.json | 12 +----------- extensions/git/src/commands.ts | 1 - 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/extensions/git/package.json b/extensions/git/package.json index f5608879a1b..8ecbeffe76a 100644 --- a/extensions/git/package.json +++ b/extensions/git/package.json @@ -84,12 +84,6 @@ "command": "git.openChange", "title": "%command.openChange%", "category": "Git", - "icon": "$(compare-changes)" - }, - { - "command": "git.openChangeEditor", - "title": "%command.openChange%", - "category": "Git", "icon": "$(compare-changes)", "enablement": "scmActiveResourceHasChanges" }, @@ -613,10 +607,6 @@ }, { "command": "git.openChange", - "when": "false" - }, - { - "command": "git.openChangeEditor", "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0" }, { @@ -1378,7 +1368,7 @@ "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInNotebookTextDiffEditor && resourceScheme =~ /^git$|^file$/" }, { - "command": "git.openChangeEditor", + "command": "git.openChange", "group": "navigation", "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && !isInDiffEditor && resourceScheme == file" }, diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts index 458a31fcb35..297b1c1c692 100644 --- a/extensions/git/src/commands.ts +++ b/extensions/git/src/commands.ts @@ -764,7 +764,6 @@ export class CommandCenter { } @command('git.openChange') - @command('git.openChangeEditor') async openChange(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise { let resources: Resource[] | undefined = undefined;