Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 02:58:56 +01: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
1 changed files with 6 additions and 0 deletions
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;
}