From ac5591282f6d3ef49fd0b518d17b95584b95f162 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Thu, 8 Sep 2022 11:33:19 +0200 Subject: [PATCH] send uris for `git.mergeChanges` context as objects (#160390) That way they undergo uri transformation and the setContext-command will stringify them so that everything works, fixes https://github.com/microsoft/vscode/issues/159837 --- extensions/git/src/repository.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts index dd2eb143e12c8..d95ed760807d6 100644 --- a/extensions/git/src/repository.ts +++ b/extensions/git/src/repository.ts @@ -2081,7 +2081,7 @@ export class Repository implements Disposable { this.setCountBadge(); // set mergeChanges context - commands.executeCommand('setContext', 'git.mergeChanges', merge.map(item => item.resourceUri.toString())); + commands.executeCommand('setContext', 'git.mergeChanges', merge.map(item => item.resourceUri)); this._onDidChangeStatus.fire();