Merge remote-tracking branch 'origin/main' into tyriar/126243_group_service

This commit is contained in:
Daniel Imms
2021-06-18 10:07:51 -07:00
29 changed files with 139 additions and 69 deletions

View File

@@ -144,7 +144,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,
override: EditorOverride.DISABLED
override: EditorOverride.EXCLUSIVE_ONLY
};
const input: IResourceEditorInput = {