mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 21:09:43 +00:00
The openMergeEditor
command should check the active tab when it is called without an URI (#161072)
https://github.com/microsoft/vscode/issues/160924
This commit is contained in:
parent
3ad265eb02
commit
21a2eca3b7
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue