@theia/editor-preview 1.34.2 → 1.34.3

package/lib/package.spec.js

@@ -1,26 +1,26 @@
-// *****************************************************************************
-// Copyright (C) 2018 Google and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-/* note: this bogus test file is required so that
-   we are able to run mocha unit tests on this
-   package, without having any actual unit tests in it.
-   This way a coverage report will be generated,
-   showing 0% coverage, instead of no report.
-   This file can be removed once we have real unit
-   tests in place. */
-describe('editor package', () => {
-    it('support code coverage statistics', () => true);
-});
+// *****************************************************************************
+// Copyright (C) 2018 Google and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+/* note: this bogus test file is required so that
+   we are able to run mocha unit tests on this
+   package, without having any actual unit tests in it.
+   This way a coverage report will be generated,
+   showing 0% coverage, instead of no report.
+   This file can be removed once we have real unit
+   tests in place. */
+describe('editor package', () => {
+    it('support code coverage statistics', () => true);
+});
 //# sourceMappingURL=package.spec.js.map

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@theia/editor-preview",
-  "version": "1.34.2",
+  "version": "1.34.3",
   "description": "Theia - Editor Preview Extension",
   "dependencies": {
-    "@theia/core": "1.34.2",
-    "@theia/editor": "1.34.2",
-    "@theia/navigator": "1.34.2"
+    "@theia/core": "1.34.3",
+    "@theia/editor": "1.34.3",
+    "@theia/navigator": "1.34.3"
   },
   "publishConfig": {
     "access": "public"
@@ -40,10 +40,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.34.2"
+    "@theia/ext-scripts": "1.34.3"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "dba940bd8c0f9f4b324dad0e90d570d499456f60"
+  "gitHead": "a6cf9fe96b1624d6e27a11dce2ebdeae820478e5"
 }

package/src/browser/editor-preview-contribution.ts

@@ -1,67 +1,67 @@
-// *****************************************************************************
-// Copyright (C) 2021 Ericsson and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { ApplicationShell, CommonCommands, KeybindingContribution, KeybindingRegistry, SHELL_TABBAR_CONTEXT_PIN, Widget } from '@theia/core/lib/browser';
-import { nls } from '@theia/core/lib/common/nls';
-import { Command, CommandContribution, CommandRegistry, MenuContribution, MenuModelRegistry } from '@theia/core/lib/common';
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { EditorPreviewWidget } from './editor-preview-widget';
-import { CurrentWidgetCommandAdapter } from '@theia/core/lib/browser/shell/current-widget-command-adapter';
-
-export namespace EditorPreviewCommands {
-    export const PIN_PREVIEW_COMMAND = Command.toDefaultLocalizedCommand({
-        id: 'workbench.action.keepEditor',
-        category: CommonCommands.VIEW_CATEGORY,
-        label: 'Keep Editor',
-    });
-}
-
-@injectable()
-export class EditorPreviewContribution implements CommandContribution, MenuContribution, KeybindingContribution {
-    @inject(ApplicationShell) protected readonly shell: ApplicationShell;
-
-    registerCommands(registry: CommandRegistry): void {
-        registry.registerCommand(EditorPreviewCommands.PIN_PREVIEW_COMMAND, new CurrentWidgetCommandAdapter(this.shell, {
-            execute: async title => {
-                if (title?.owner instanceof EditorPreviewWidget) {
-                    title.owner.convertToNonPreview();
-                    await this.shell.activateWidget(title.owner.id);
-                }
-            },
-            isEnabled: title => title?.owner instanceof EditorPreviewWidget && title.owner.isPreview,
-            isVisible: title => title?.owner instanceof EditorPreviewWidget,
-        }));
-    }
-
-    registerKeybindings(registry: KeybindingRegistry): void {
-        registry.registerKeybinding({
-            command: EditorPreviewCommands.PIN_PREVIEW_COMMAND.id,
-            keybinding: 'ctrlcmd+k enter'
-        });
-    }
-
-    registerMenus(registry: MenuModelRegistry): void {
-        registry.registerMenuAction(SHELL_TABBAR_CONTEXT_PIN, {
-            commandId: EditorPreviewCommands.PIN_PREVIEW_COMMAND.id,
-            label: nls.localizeByDefault('Keep Open'),
-            order: '6',
-        });
-    }
-
-    protected getTargetWidget(event?: Event): Widget | undefined {
-        return event ? this.shell.findTargetedWidget(event) : this.shell.activeWidget;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2021 Ericsson and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { ApplicationShell, CommonCommands, KeybindingContribution, KeybindingRegistry, SHELL_TABBAR_CONTEXT_PIN, Widget } from '@theia/core/lib/browser';
+import { nls } from '@theia/core/lib/common/nls';
+import { Command, CommandContribution, CommandRegistry, MenuContribution, MenuModelRegistry } from '@theia/core/lib/common';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { EditorPreviewWidget } from './editor-preview-widget';
+import { CurrentWidgetCommandAdapter } from '@theia/core/lib/browser/shell/current-widget-command-adapter';
+
+export namespace EditorPreviewCommands {
+    export const PIN_PREVIEW_COMMAND = Command.toDefaultLocalizedCommand({
+        id: 'workbench.action.keepEditor',
+        category: CommonCommands.VIEW_CATEGORY,
+        label: 'Keep Editor',
+    });
+}
+
+@injectable()
+export class EditorPreviewContribution implements CommandContribution, MenuContribution, KeybindingContribution {
+    @inject(ApplicationShell) protected readonly shell: ApplicationShell;
+
+    registerCommands(registry: CommandRegistry): void {
+        registry.registerCommand(EditorPreviewCommands.PIN_PREVIEW_COMMAND, new CurrentWidgetCommandAdapter(this.shell, {
+            execute: async title => {
+                if (title?.owner instanceof EditorPreviewWidget) {
+                    title.owner.convertToNonPreview();
+                    await this.shell.activateWidget(title.owner.id);
+                }
+            },
+            isEnabled: title => title?.owner instanceof EditorPreviewWidget && title.owner.isPreview,
+            isVisible: title => title?.owner instanceof EditorPreviewWidget,
+        }));
+    }
+
+    registerKeybindings(registry: KeybindingRegistry): void {
+        registry.registerKeybinding({
+            command: EditorPreviewCommands.PIN_PREVIEW_COMMAND.id,
+            keybinding: 'ctrlcmd+k enter'
+        });
+    }
+
+    registerMenus(registry: MenuModelRegistry): void {
+        registry.registerMenuAction(SHELL_TABBAR_CONTEXT_PIN, {
+            commandId: EditorPreviewCommands.PIN_PREVIEW_COMMAND.id,
+            label: nls.localizeByDefault('Keep Open'),
+            order: '6',
+        });
+    }
+
+    protected getTargetWidget(event?: Event): Widget | undefined {
+        return event ? this.shell.findTargetedWidget(event) : this.shell.activeWidget;
+    }
+}

package/src/browser/editor-preview-frontend-module.ts

@@ -1,46 +1,46 @@
-// *****************************************************************************
-// Copyright (C) 2018-2021 Google and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import '../../src/browser/style/index.css';
-import { FrontendApplicationContribution, KeybindingContribution, WidgetFactory } from '@theia/core/lib/browser';
-import { ContainerModule } from '@theia/core/shared/inversify';
-import { bindEditorPreviewPreferences } from './editor-preview-preferences';
-import { EditorPreviewManager } from './editor-preview-manager';
-import { EditorManager } from '@theia/editor/lib/browser';
-import { EditorPreviewWidgetFactory } from './editor-preview-widget-factory';
-import { EditorPreviewContribution } from './editor-preview-contribution';
-import { CommandContribution, MenuContribution } from '@theia/core/lib/common';
-import { OpenEditorsTreeDecorator } from '@theia/navigator/lib/browser/open-editors-widget/navigator-open-editors-decorator-service';
-import { EditorPreviewTreeDecorator } from './editor-preview-tree-decorator';
-
-export default new ContainerModule((bind, unbind, isBound, rebind) => {
-
-    bind(EditorPreviewWidgetFactory).toSelf().inSingletonScope();
-    bind(WidgetFactory).toService(EditorPreviewWidgetFactory);
-
-    bind(EditorPreviewManager).toSelf().inSingletonScope();
-    rebind(EditorManager).toService(EditorPreviewManager);
-
-    bind(EditorPreviewContribution).toSelf().inSingletonScope();
-    bind(CommandContribution).toService(EditorPreviewContribution);
-    bind(KeybindingContribution).toService(EditorPreviewContribution);
-    bind(MenuContribution).toService(EditorPreviewContribution);
-
-    bind(EditorPreviewTreeDecorator).toSelf().inSingletonScope();
-    bind(OpenEditorsTreeDecorator).toService(EditorPreviewTreeDecorator);
-    bind(FrontendApplicationContribution).toService(EditorPreviewTreeDecorator);
-    bindEditorPreviewPreferences(bind);
-});
+// *****************************************************************************
+// Copyright (C) 2018-2021 Google and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import '../../src/browser/style/index.css';
+import { FrontendApplicationContribution, KeybindingContribution, WidgetFactory } from '@theia/core/lib/browser';
+import { ContainerModule } from '@theia/core/shared/inversify';
+import { bindEditorPreviewPreferences } from './editor-preview-preferences';
+import { EditorPreviewManager } from './editor-preview-manager';
+import { EditorManager } from '@theia/editor/lib/browser';
+import { EditorPreviewWidgetFactory } from './editor-preview-widget-factory';
+import { EditorPreviewContribution } from './editor-preview-contribution';
+import { CommandContribution, MenuContribution } from '@theia/core/lib/common';
+import { OpenEditorsTreeDecorator } from '@theia/navigator/lib/browser/open-editors-widget/navigator-open-editors-decorator-service';
+import { EditorPreviewTreeDecorator } from './editor-preview-tree-decorator';
+
+export default new ContainerModule((bind, unbind, isBound, rebind) => {
+
+    bind(EditorPreviewWidgetFactory).toSelf().inSingletonScope();
+    bind(WidgetFactory).toService(EditorPreviewWidgetFactory);
+
+    bind(EditorPreviewManager).toSelf().inSingletonScope();
+    rebind(EditorManager).toService(EditorPreviewManager);
+
+    bind(EditorPreviewContribution).toSelf().inSingletonScope();
+    bind(CommandContribution).toService(EditorPreviewContribution);
+    bind(KeybindingContribution).toService(EditorPreviewContribution);
+    bind(MenuContribution).toService(EditorPreviewContribution);
+
+    bind(EditorPreviewTreeDecorator).toSelf().inSingletonScope();
+    bind(OpenEditorsTreeDecorator).toService(EditorPreviewTreeDecorator);
+    bind(FrontendApplicationContribution).toService(EditorPreviewTreeDecorator);
+    bindEditorPreviewPreferences(bind);
+});

package/src/browser/editor-preview-manager.ts

@@ -1,125 +1,125 @@
-// *****************************************************************************
-// Copyright (C) 2018-2021 Google and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { EditorManager, EditorOpenerOptions, EditorWidget } from '@theia/editor/lib/browser';
-import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
-import { EditorPreviewPreferences } from './editor-preview-preferences';
-import { MaybePromise } from '@theia/core/lib/common';
-import URI from '@theia/core/lib/common/uri';
-import { EditorPreviewWidgetFactory, EditorPreviewOptions } from './editor-preview-widget-factory';
-import { EditorPreviewWidget } from './editor-preview-widget';
-import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
-
-@injectable()
-export class EditorPreviewManager extends EditorManager {
-    override readonly id = EditorPreviewWidgetFactory.ID;
-
-    @inject(EditorPreviewPreferences) protected readonly preferences: EditorPreviewPreferences;
-    @inject(FrontendApplicationStateService) protected readonly stateService: FrontendApplicationStateService;
-
-    /**
-     * Until the layout has been restored, widget state is not reliable, so we ignore creation events.
-     */
-    protected layoutIsSet = false;
-
-    @postConstruct()
-    protected override init(): void {
-        super.init();
-        // All editors are created, but not all are opened. This sets up the logic to swap previews when the editor is attached.
-        this.onCreated((widget: EditorPreviewWidget) => {
-            if (this.layoutIsSet && widget.isPreview) {
-                const oneTimeDisposable = widget.onDidChangeVisibility(() => {
-                    this.handleNewPreview(widget);
-                    oneTimeDisposable.dispose();
-                });
-            }
-        });
-
-        this.preferences.onPreferenceChanged(change => {
-            if (change.preferenceName === 'editor.enablePreview' && !change.newValue) {
-                this.all.forEach((editor: EditorPreviewWidget) => {
-                    if (editor.isPreview) {
-                        editor.convertToNonPreview();
-                    }
-                });
-            };
-        });
-
-        this.stateService.reachedState('initialized_layout').then(() => {
-            const editors = this.all as EditorPreviewWidget[];
-            const currentPreview = editors.find(editor => editor.isPreview);
-            if (currentPreview) {
-                this.handleNewPreview(currentPreview);
-            }
-            this.layoutIsSet = true;
-        });
-
-        document.addEventListener('dblclick', this.convertEditorOnDoubleClick.bind(this));
-    }
-
-    protected override async doOpen(widget: EditorPreviewWidget, options?: EditorOpenerOptions): Promise<void> {
-        const { preview, widgetOptions = { area: 'main' }, mode = 'activate' } = options ?? {};
-        if (!widget.isAttached) {
-            this.shell.addWidget(widget, widgetOptions);
-        } else if (!preview && widget.isPreview) {
-            widget.convertToNonPreview();
-        }
-
-        if (mode === 'activate') {
-            await this.shell.activateWidget(widget.id);
-        } else if (mode === 'reveal') {
-            await this.shell.revealWidget(widget.id);
-        }
-    }
-
-    protected handleNewPreview(newPreviewWidget: EditorPreviewWidget): void {
-        if (newPreviewWidget.isPreview) {
-            const tabbar = this.shell.getTabBarFor(newPreviewWidget);
-            if (tabbar) {
-                for (const title of tabbar.titles) {
-                    if (title.owner !== newPreviewWidget && title.owner instanceof EditorPreviewWidget && title.owner.isPreview) {
-                        title.owner.dispose();
-                    }
-                }
-            }
-        }
-    }
-
-    protected override tryGetPendingWidget(uri: URI, options?: EditorOpenerOptions): MaybePromise<EditorWidget> | undefined {
-        return super.tryGetPendingWidget(uri, { ...options, preview: true }) ?? super.tryGetPendingWidget(uri, { ...options, preview: false });
-    }
-
-    protected override async getWidget(uri: URI, options?: EditorOpenerOptions): Promise<EditorWidget | undefined> {
-        return (await super.getWidget(uri, { ...options, preview: true })) ?? super.getWidget(uri, { ...options, preview: false });
-    }
-
-    protected override async getOrCreateWidget(uri: URI, options?: EditorOpenerOptions): Promise<EditorWidget> {
-        return this.tryGetPendingWidget(uri, options) ?? super.getOrCreateWidget(uri, options);
-    }
-
-    protected override createWidgetOptions(uri: URI, options?: EditorOpenerOptions): EditorPreviewOptions {
-        const navigatableOptions = super.createWidgetOptions(uri, options) as EditorPreviewOptions;
-        navigatableOptions.preview = !!(options?.preview && this.preferences['editor.enablePreview']);
-        return navigatableOptions;
-    }
-
-    protected convertEditorOnDoubleClick(event: Event): void {
-        const widget = this.shell.findTargetedWidget(event);
-        if (widget instanceof EditorPreviewWidget && widget.isPreview) {
-            widget.convertToNonPreview();
-        }
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2018-2021 Google and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { EditorManager, EditorOpenerOptions, EditorWidget } from '@theia/editor/lib/browser';
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import { EditorPreviewPreferences } from './editor-preview-preferences';
+import { MaybePromise } from '@theia/core/lib/common';
+import URI from '@theia/core/lib/common/uri';
+import { EditorPreviewWidgetFactory, EditorPreviewOptions } from './editor-preview-widget-factory';
+import { EditorPreviewWidget } from './editor-preview-widget';
+import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
+
+@injectable()
+export class EditorPreviewManager extends EditorManager {
+    override readonly id = EditorPreviewWidgetFactory.ID;
+
+    @inject(EditorPreviewPreferences) protected readonly preferences: EditorPreviewPreferences;
+    @inject(FrontendApplicationStateService) protected readonly stateService: FrontendApplicationStateService;
+
+    /**
+     * Until the layout has been restored, widget state is not reliable, so we ignore creation events.
+     */
+    protected layoutIsSet = false;
+
+    @postConstruct()
+    protected override init(): void {
+        super.init();
+        // All editors are created, but not all are opened. This sets up the logic to swap previews when the editor is attached.
+        this.onCreated((widget: EditorPreviewWidget) => {
+            if (this.layoutIsSet && widget.isPreview) {
+                const oneTimeDisposable = widget.onDidChangeVisibility(() => {
+                    this.handleNewPreview(widget);
+                    oneTimeDisposable.dispose();
+                });
+            }
+        });
+
+        this.preferences.onPreferenceChanged(change => {
+            if (change.preferenceName === 'editor.enablePreview' && !change.newValue) {
+                this.all.forEach((editor: EditorPreviewWidget) => {
+                    if (editor.isPreview) {
+                        editor.convertToNonPreview();
+                    }
+                });
+            };
+        });
+
+        this.stateService.reachedState('initialized_layout').then(() => {
+            const editors = this.all as EditorPreviewWidget[];
+            const currentPreview = editors.find(editor => editor.isPreview);
+            if (currentPreview) {
+                this.handleNewPreview(currentPreview);
+            }
+            this.layoutIsSet = true;
+        });
+
+        document.addEventListener('dblclick', this.convertEditorOnDoubleClick.bind(this));
+    }
+
+    protected override async doOpen(widget: EditorPreviewWidget, options?: EditorOpenerOptions): Promise<void> {
+        const { preview, widgetOptions = { area: 'main' }, mode = 'activate' } = options ?? {};
+        if (!widget.isAttached) {
+            this.shell.addWidget(widget, widgetOptions);
+        } else if (!preview && widget.isPreview) {
+            widget.convertToNonPreview();
+        }
+
+        if (mode === 'activate') {
+            await this.shell.activateWidget(widget.id);
+        } else if (mode === 'reveal') {
+            await this.shell.revealWidget(widget.id);
+        }
+    }
+
+    protected handleNewPreview(newPreviewWidget: EditorPreviewWidget): void {
+        if (newPreviewWidget.isPreview) {
+            const tabbar = this.shell.getTabBarFor(newPreviewWidget);
+            if (tabbar) {
+                for (const title of tabbar.titles) {
+                    if (title.owner !== newPreviewWidget && title.owner instanceof EditorPreviewWidget && title.owner.isPreview) {
+                        title.owner.dispose();
+                    }
+                }
+            }
+        }
+    }
+
+    protected override tryGetPendingWidget(uri: URI, options?: EditorOpenerOptions): MaybePromise<EditorWidget> | undefined {
+        return super.tryGetPendingWidget(uri, { ...options, preview: true }) ?? super.tryGetPendingWidget(uri, { ...options, preview: false });
+    }
+
+    protected override async getWidget(uri: URI, options?: EditorOpenerOptions): Promise<EditorWidget | undefined> {
+        return (await super.getWidget(uri, { ...options, preview: true })) ?? super.getWidget(uri, { ...options, preview: false });
+    }
+
+    protected override async getOrCreateWidget(uri: URI, options?: EditorOpenerOptions): Promise<EditorWidget> {
+        return this.tryGetPendingWidget(uri, options) ?? super.getOrCreateWidget(uri, options);
+    }
+
+    protected override createWidgetOptions(uri: URI, options?: EditorOpenerOptions): EditorPreviewOptions {
+        const navigatableOptions = super.createWidgetOptions(uri, options) as EditorPreviewOptions;
+        navigatableOptions.preview = !!(options?.preview && this.preferences['editor.enablePreview']);
+        return navigatableOptions;
+    }
+
+    protected convertEditorOnDoubleClick(event: Event): void {
+        const widget = this.shell.findTargetedWidget(event);
+        if (widget instanceof EditorPreviewWidget && widget.isPreview) {
+            widget.convertToNonPreview();
+        }
+    }
+}