Skip to content

Commit 74be13f

Browse files
committed
Fix failing build
1 parent e615299 commit 74be13f

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

src/vs/workbench/services/editor/browser/editorService.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -585,11 +585,9 @@ export class EditorService extends Disposable implements EditorServiceImpl {
585585
}
586586

587587
// Typed editors that cannot convert to untyped will be taken
588-
// as is without override. We still want to resolve a group though.
588+
// as is without override.
589589
if (!untypedEditor) {
590-
const [group, activation] = this.findTargetGroup(editor, preferredGroup);
591-
592-
return [OverrideStatus.NONE, group, activation];
590+
return [OverrideStatus.NONE, undefined, undefined];
593591
}
594592

595593
// We need a `override` for the untyped editor if it is
@@ -601,11 +599,14 @@ export class EditorService extends Disposable implements EditorServiceImpl {
601599
return [OverrideStatus.ABORT, undefined, undefined]; // we could not resolve the editor id
602600
}
603601

604-
untypedEditor.options = untypedEditor.options?.override ? untypedEditor.options : { ...untypedEditor.options, override: DEFAULT_EDITOR_ASSOCIATION.id };
605-
606602
hasConflictingDefaults = populatedInfo.conflictingDefault;
607603
}
608604

605+
// If we didn't get an override just return as none and let the editor continue as normal
606+
if (!untypedEditor.options?.override) {
607+
return [OverrideStatus.NONE, undefined, undefined];
608+
}
609+
609610
// Find the target group for the editor
610611
const [group, activation] = this.findTargetGroup(untypedEditor, preferredGroup);
611612

0 commit comments

Comments
 (0)