Fix microsoft#127310

Author: lramos15

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

@@ -137,8 +137,8 @@ export class EditorOverrideService extends Disposable implements IEditorOverride
 		// If it's the currently active editor we shouldn't do anything
 		const activeEditor = group.activeEditor;
 		const isActive = activeEditor ? activeEditor.editorId === selectedEditor.editorInfo.id && isEqual(activeEditor.resource, resource) : false;
-		if (isActive) {
-			return OverrideStatus.NONE;
+		if (activeEditor && isActive) {
+			return { editor: activeEditor, options };
 		}
 		const input = await this.doOverrideEditorInput(editor, group, selectedEditor);
 		if (conflictingDefault && input) {

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

@@ -1036,7 +1036,7 @@ suite('EditorService', () => {
 		pane = await service.openEditor({ resource: URI.file('file.editor-service-override-tests') });
 		pane = await service.openEditor({ resource: URI.file('file.editor-service-override-tests'), options: { sticky: true, preserveFocus: true } });
 
-		assert.ok(pane instanceof TestTextFileEditor);
+		assert.ok(pane instanceof TestEditorWithOptions);
 		assert.strictEqual(pane.lastSetOptions?.sticky, true);
 		assert.strictEqual(pane.lastSetOptions?.preserveFocus, true);
 	});