maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix unnecessary option

Browse source
This commit is contained in:
Logan Ramos 2021-06-28 14:58:02 -04:00
parent 8ab8d2ae95
commit b4261b4671
No known key found for this signature in database
GPG key ID: D9CCFF14F0B18183
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/vs/workbench/services/editor/browser/editorService.ts
View file

@ -572,11 +572,10 @@ export class EditorService extends Disposable implements EditorServiceImpl {
untypedEditor = editor.editor.toUntyped(undefined, UntypedEditorContext.Default);
if (untypedEditor) {
const override = editor.options?.override ?? untypedEditor.options?.override;
// Preserve original options: specifically it is
// possible that a `override` was defined from
// the outside and we do not want to loose it.
untypedEditor.options = { ...untypedEditor.options, ...editor.options, override };
untypedEditor.options = { ...untypedEditor.options, ...editor.options };
}
}