Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 17:19:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #122385

Browse Source
This commit is contained in:
Logan Ramos
2021-04-27 17:07:55 -04:00
parent e8c5b7bb8b
commit b08c521660
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/services/editor/browser/editorOverrideService.ts
+3 -3
View File
@@ -125,7 +125,7 @@ export class EditorOverrideService extends Disposable implements IEditorOverride
if (conflictingDefault && input) {
// Wait one second to give the user ample time to see the current editor then ask them to configure a default
setTimeout(() => {
this.doHandleConflictingDefaults(input.editor, input.options ?? options, group);
this.doHandleConflictingDefaults(selectedContribution.editorInfo.label, input.editor, input.options ?? options, group);
}, 1200);
}
// Add the group as we might've changed it with the quickpick
@@ -315,7 +315,7 @@ export class EditorOverrideService extends Disposable implements IEditorOverride
return out;
}
private async doHandleConflictingDefaults(currentEditor: IContributedEditorInput, options: IEditorOptions | undefined, group: IEditorGroup) {
private async doHandleConflictingDefaults(editorName: string, currentEditor: IContributedEditorInput, options: IEditorOptions | undefined, group: IEditorGroup) {
const makeCurrentEditorDefault = () => {
const viewType = currentEditor.viewType;
if (viewType) {
@@ -348,7 +348,7 @@ export class EditorOverrideService extends Disposable implements IEditorOverride
}
},
{
label: localize('editorOverride.keepDefault', 'Keep Current'),
label: localize('editorOverride.keepDefault', 'Keep {0}', editorName),
run: makeCurrentEditorDefault
}
]);