Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-30 21:41:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revisit duplication of ignoreOverrides and overrideId between inputs and options (fix #99123)

Browse Source
This commit is contained in:
Benjamin Pasero
2020-06-08 12:36:16 +02:00
parent ed5d0be845
commit 20107ba262
9 changed files with 44 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/workbench/api/browser/mainThreadEditors.ts
View File

@@ -125,7 +125,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
// preserve pre 1.38 behaviour to not make group active when preserveFocus: true
// but make sure to restore the editor to fix https://github.com/microsoft/vscode/issues/79633
activation: options.preserveFocus ? EditorActivation.RESTORE : undefined,
ignoreOverrides: true
override: false
};
const input: IResourceEditorInput = {
@@ -306,7 +306,7 @@ CommandsRegistry.registerCommand('_workbench.openWith', (accessor: ServicesAcces
const [resource, id, options, position] = args;
const group = editorGroupsService.getGroup(viewColumnToEditorGroup(editorGroupsService, position)) ?? editorGroupsService.activeGroup;
const textOptions = options ? { ...options, ignoreOverrides: true } : { ignoreOverrides: true };
const textOptions: ITextEditorOptions = options ? { ...options, override: false } : { override: false };
const input = editorService.createEditorInput({ resource });
return openEditorWith(input, id, textOptions, group, editorService, configurationService, quickInputService);