development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 21:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

The openMergeEditor command should check the active tab when it is called without an URI (#161072)

Browse source 
https://github.com/microsoft/vscode/issues/160924
This commit is contained in:
Johannes Rieken 2022-09-16 11:55:06 +02:00 committed by GitHub
parent 3ad265eb02
commit 21a2eca3b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
extensions/git/src/commands.ts
View file

@ -445,6 +445,12 @@ export class CommandCenter {
@command('git.openMergeEditor')
async openMergeEditor(uri: unknown) {
if (uri === undefined) {
// fallback to active editor...
if (window.tabGroups.activeTabGroup.activeTab?.input instanceof TabInputText) {
uri = window.tabGroups.activeTabGroup.activeTab.input.uri;
}
}
if (!(uri instanceof Uri)) {
return;
}