From 0c01c63d92dfb448c4f8c5143e9e48220f54886d Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Mon, 19 Mar 2018 14:26:37 +0100 Subject: [PATCH] show actions in the right editor only --- extensions/git/package.json | 6 +++--- .../editor/browser/widget/diffEditorWidget.ts | 19 ++++++++++++++----- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/extensions/git/package.json b/extensions/git/package.json index fc2d5a91681..9d8ce0fbbf3 100644 --- a/extensions/git/package.json +++ b/extensions/git/package.json @@ -838,17 +838,17 @@ { "command": "git.stageSelectedRanges", "group": "2_git@1", - "when": "config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/" + "when": "isInDiffRightEditor && config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/" }, { "command": "git.unstageSelectedRanges", "group": "2_git@2", - "when": "config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/" + "when": "isInDiffRightEditor && config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/" }, { "command": "git.revertSelectedRanges", "group": "2_git@3", - "when": "config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/" + "when": "isInDiffRightEditor && config.git.enabled && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/" } ], "scm/change/title": [ diff --git a/src/vs/editor/browser/widget/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditorWidget.ts index 372b1c539a9..8bd844fdf8e 100644 --- a/src/vs/editor/browser/widget/diffEditorWidget.ts +++ b/src/vs/editor/browser/widget/diffEditorWidget.ts @@ -284,13 +284,22 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE this._lineChanges = null; - const services = new ServiceCollection(); - services.set(IContextKeyService, this._contextKeyService); + const leftContextKeyService = this._contextKeyService.createScoped(); + leftContextKeyService.createKey('isInDiffLeftEditor', true); - const scopedInstantiationService = instantiationService.createChild(services); + const leftServices = new ServiceCollection(); + leftServices.set(IContextKeyService, leftContextKeyService); + const leftScopedInstantiationService = instantiationService.createChild(leftServices); - this._createLeftHandSideEditor(options, scopedInstantiationService); - this._createRightHandSideEditor(options, scopedInstantiationService); + const rightContextKeyService = this._contextKeyService.createScoped(); + rightContextKeyService.createKey('isInDiffRightEditor', true); + + const rightServices = new ServiceCollection(); + rightServices.set(IContextKeyService, rightContextKeyService); + const rightScopedInstantiationService = instantiationService.createChild(rightServices); + + this._createLeftHandSideEditor(options, leftScopedInstantiationService); + this._createRightHandSideEditor(options, rightScopedInstantiationService); this._reviewPane = new DiffReview(this); this._containerDomElement.appendChild(this._reviewPane.domNode.domNode); -- GitLab