Editor override has inconsistent options handling between normal editor and untitled/diff

[bpasero]

Uncomment these 2 lines to see test failures:

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

Line 697 in 94a29c1

// assert.strictEqual(pane.group.isSticky(pane.input), true); https://github.com/microsoft/vscode/issues/127314

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

Line 767 in 94a29c1

// assert.strictEqual(pane.group.isSticky(pane.input), true); https://github.com/microsoft/vscode/issues/127314

It looks like the options that are passed into the editor override service are only preserved when returning a normal editor input but not for diff or untitled:

vscode/src/vs/workbench/services/editor/browser/editorOverrideService.ts

Line 350 in d0ca6c7

options = inputWithOptions.options ?? options;

vs

vscode/src/vs/workbench/services/editor/browser/editorOverrideService.ts

Line 331 in d0ca6c7

const inputWithOptions = selectedEditor.createDiffEditorInput(editor, group);

and

vscode/src/vs/workbench/services/editor/browser/editorOverrideService.ts

Line 339 in d0ca6c7

const inputWithOptions = selectedEditor.createUntitledEditorInput(editor, group);