@theia/plugin-ext 1.74.0-next.9 → 1.74.0

package/src/main/browser/custom-editors/custom-editor-widget.ts

@@ -17,21 +17,33 @@
 import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
 import URI from '@theia/core/lib/common/uri';
 import { FileOperation } from '@theia/filesystem/lib/common/files';
-import { ApplicationShell, DelegatingSaveable, Message, NavigatableWidget, Saveable, SaveableSource } from '@theia/core/lib/browser';
+import { ApplicationShell, DelegatingSaveable, Message, NavigatableWidget, Saveable, SaveableSource, TabBarTracker } from '@theia/core/lib/browser';
 import { SaveableService } from '@theia/core/lib/browser/saveable-service';
-import { Disposable, SelectionService } from '@theia/core/lib/common';
+import { Disposable, Event, SelectionService } from '@theia/core/lib/common';
 import { Reference } from '@theia/core/lib/common/reference';
+import { PreviewTabWidget, PreviewTabSupport } from '@theia/editor-preview/lib/browser/preview-tab-widget';
 import { WebviewWidget } from '../webview/webview';
 import { CustomEditorModel } from './custom-editors-main';
 import { CustomEditorWidget as CustomEditorWidgetShape } from '@theia/editor/lib/browser';
 
 @injectable()
-export class CustomEditorWidget extends WebviewWidget implements CustomEditorWidgetShape, SaveableSource, NavigatableWidget {
+export class CustomEditorWidget extends WebviewWidget implements CustomEditorWidgetShape, SaveableSource, NavigatableWidget, PreviewTabWidget {
     static override FACTORY_ID = 'plugin-custom-editor';
     static readonly SIDE_BY_SIDE_FACTORY_ID = CustomEditorWidget.FACTORY_ID + '.side-by-side';
 
     resource: URI;
 
+    protected previewSupport: PreviewTabSupport;
+    protected tabBarTracker: TabBarTracker;
+
+    get isPreview(): boolean {
+        return this.previewSupport.isPreview;
+    }
+
+    get onDidChangePreviewState(): Event<void> {
+        return this.previewSupport.onDidChangePreviewState;
+    }
+
     protected _modelRef: Reference<CustomEditorModel | undefined> = { object: undefined, dispose: () => { } };
     get modelRef(): Reference<CustomEditorModel | undefined> {
         return this._modelRef;
@@ -62,6 +74,15 @@ export class CustomEditorWidget extends WebviewWidget implements CustomEditorWid
     protected override init(): void {
         super.init();
         this.id = CustomEditorWidget.FACTORY_ID + ':' + this.identifier.id;
+        this.previewSupport = new PreviewTabSupport({
+            title: this.title,
+            saveable: this.saveable,
+            toDispose: this.toDispose,
+            // This tracker exists only to promote the preview on a tab-bar move; once promoted it has no further use.
+            onConvertToNonPreview: () => this.tabBarTracker.dispose()
+        });
+        this.tabBarTracker = new TabBarTracker(this, (oldTabBar, newTabBar) => this.previewSupport.handleTabBarChange(oldTabBar, newTabBar));
+        this.toDispose.push(this.tabBarTracker);
         this.toDispose.push(this.fileService.onDidRunOperation(e => {
             if (e.isOperation(FileOperation.MOVE)) {
                 this.doMove(e.target.resource);
@@ -74,11 +95,24 @@ export class CustomEditorWidget extends WebviewWidget implements CustomEditorWid
         }));
     }
 
+    initializePreview(): void {
+        this.previewSupport.initializePreview();
+    }
+
+    convertToNonPreview(): void {
+        this.previewSupport.convertToNonPreview();
+    }
+
     protected override onActivateRequest(msg: Message): void {
         super.onActivateRequest(msg);
         this.selectionService.selection = this;
     }
 
+    protected override onAfterAttach(msg: Message): void {
+        super.onAfterAttach(msg);
+        this.tabBarTracker.check();
+    }
+
     updateID(): void {
         this.id = CustomEditorWidget.FACTORY_ID + `:${this.resource.toString()}:${this.identifier.id}`;
     }
@@ -103,13 +137,17 @@ export class CustomEditorWidget extends WebviewWidget implements CustomEditorWid
         return {
             ...super.storeState(),
             strResource: this.resource.toString(),
+            isPreview: this.isPreview
         };
     }
 
     override restoreState(oldState: CustomEditorWidget.State): void {
-        const { strResource } = oldState;
+        const { strResource, isPreview } = oldState;
         this.resource = new URI(strResource);
         super.restoreState(oldState);
+        if (isPreview) {
+            this.initializePreview();
+        }
     }
 
     onMove(handler: (newResource: URI) => Promise<void>): void {
@@ -128,5 +166,6 @@ export class CustomEditorWidget extends WebviewWidget implements CustomEditorWid
 export namespace CustomEditorWidget {
     export interface State extends WebviewWidget.State {
         strResource: string
+        isPreview?: boolean
     }
 }

package/src/main/browser/preference-registry-main.ts

@@ -36,8 +36,16 @@ import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposa
 
 export function getPreferences(preferenceProviderProvider: PreferenceProviderProvider, rootFolders: FileStat[]): PreferenceData {
     const folders = rootFolders.map(root => root.resource.toString());
+    // Session-scoped values are process-lifetime CLI overrides (see PreferenceScope.Session).
+    // The plugin-side `parse()` in `preference-registry.ts` only reads up to Folder, so
+    // shipping session data across would leak potentially security-sensitive overrides
+    // (e.g. AI tool auto-approval) into the plugin host without any consumer on the other
+    // side. Exclude the scope explicitly until plugins can opt in to session values.
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     return PreferenceScope.getScopes().reduce((result: { [key: number]: any }, scope: PreferenceScope) => {
+        if (scope === PreferenceScope.Session) {
+            return result;
+        }
         result[scope] = {};
         const provider = preferenceProviderProvider(scope);
         if (provider) {

package/src/main/browser/tabs/tabs-main.ts

@@ -27,6 +27,7 @@ import { DisposableCollection } from '@theia/core';
 import { NotebookEditorWidget } from '@theia/notebook/lib/browser';
 import { Deferred } from '@theia/core/lib/common/promise-util';
 import { MergeEditor } from '@theia/scm/lib/browser/merge-editor/merge-editor';
+import { CustomEditorWidget } from '../custom-editors/custom-editor-widget';
 
 interface TabInfo {
     tab: TabDto;
@@ -181,7 +182,7 @@ export class TabsMainImpl implements TabsMain, Disposable {
         const oldDto = this.tabGroupModel.get(tabBar);
         const groupId = oldDto?.groupId ?? this.groupIdCounter++;
         const tabs = tabBar.titles.map(title => this.createTabDto(title, groupId));
-        const viewColumn = 0; // TODO: Implement correct viewColumn handling
+        const viewColumn = Math.max(0, this.applicationShell.mainAreaTabBars.indexOf(tabBar));
         return {
             groupId,
             tabs,
@@ -225,6 +226,12 @@ export class TabsMainImpl implements TabsMain, Disposable {
                     uri: toUriComponents(widget.editor.uri.toString())
                 };
             }
+        } else if (widget instanceof CustomEditorWidget) {
+            return {
+                kind: TabInputKind.CustomEditorInput,
+                viewType: widget.viewType,
+                uri: toUriComponents(widget.resource.toString())
+            };
         } else if (widget instanceof ViewContainer) {
             return {
                 kind: TabInputKind.WebviewEditorInput,

package/src/main/node/plugin-http-resolver.spec.ts

@@ -0,0 +1,41 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { expect } from 'chai';
+import { HttpPluginDeployerResolver } from './plugin-http-resolver';
+import { PluginDeployerResolverContext } from '../../common';
+
+describe('HttpPluginDeployerResolver', () => {
+
+    function createContext(originId: string): PluginDeployerResolverContext {
+        return {
+            getOriginId: () => originId
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        } as any as PluginDeployerResolverContext;
+    }
+
+    it('should reject a malformed link URI', async () => {
+        const resolver = new HttpPluginDeployerResolver();
+        let error: Error | undefined;
+        try {
+            await resolver.resolve(createContext(':::not a url'));
+        } catch (e) {
+            error = e as Error;
+        }
+        expect(error).to.be.an.instanceOf(Error);
+        expect(error!.message).to.contain('invalid link URI');
+    });
+});

package/src/main/node/plugin-http-resolver.ts

@@ -19,7 +19,6 @@ import { inject, injectable } from '@theia/core/shared/inversify';
 import { Deferred } from '@theia/core/lib/common/promise-util';
 import { promises as fs } from 'fs';
 import * as path from 'path';
-import * as url from 'url';
 import { PluginDeployerResolver, PluginDeployerResolverContext } from '../../common';
 import { getTempDirPathAsync } from './temp-dir-util';
 
@@ -56,8 +55,10 @@ export class HttpPluginDeployerResolver implements PluginDeployerResolver {
         // download the file
         // keep filename of the url
         const urlPath = pluginResolverContext.getOriginId();
-        const link = url.parse(urlPath);
-        if (!link.pathname) {
+        let link: URL;
+        try {
+            link = new URL(urlPath);
+        } catch {
             throw new Error('invalid link URI' + urlPath);
         }
 

package/src/main/node/plugin-service.ts

@@ -16,7 +16,6 @@
 
 import * as http from 'http';
 import * as path from 'path';
-import * as url from 'url';
 const vhost = require('vhost');
 import * as express from '@theia/core/shared/express';
 import { BackendApplicationContribution } from '@theia/core/lib/node/backend-application';
@@ -63,8 +62,13 @@ export class PluginApiContribution implements BackendApplicationContribution, Ws
 
     allowWsUpgrade(request: http.IncomingMessage): MaybePromise<boolean> {
         if (request.headers.origin && !this.serveSameOrigin) {
-            const origin = url.parse(request.headers.origin);
-            if (origin.host && this.webviewExternalEndpointRegExp.test(origin.host)) {
+            let host: string | undefined;
+            try {
+                host = new URL(request.headers.origin).host;
+            } catch {
+                host = undefined;
+            }
+            if (host && this.webviewExternalEndpointRegExp.test(host)) {
                 // If the origin comes from the WebViews, refuse:
                 return false;
             }

package/src/plugin/telemetry-ext.spec.ts

@@ -0,0 +1,61 @@
+// *****************************************************************************
+// Copyright (C) 2026 suzunn 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as chai from 'chai';
+import { TelemetryExtImpl } from './telemetry-ext';
+
+const expect = chai.expect;
+
+describe('TelemetryLogger', () => {
+    const sender = {
+        sendEventData: () => { },
+        sendErrorData: () => { }
+    };
+
+    it('reflects the current telemetry enabled state', () => {
+        const telemetry = new TelemetryExtImpl();
+        const logger = telemetry.createTelemetryLogger(sender);
+
+        expect(logger.telemetryEnabled).to.equal(false);
+        expect(logger.isUsageEnabled).to.equal(false);
+        expect(logger.isErrorsEnabled).to.equal(false);
+
+        telemetry.isTelemetryEnabled = true;
+
+        expect(logger.telemetryEnabled).to.equal(true);
+        expect(logger.isUsageEnabled).to.equal(true);
+        expect(logger.isErrorsEnabled).to.equal(true);
+
+        telemetry.isTelemetryEnabled = false;
+
+        expect(logger.telemetryEnabled).to.equal(false);
+        expect(logger.isUsageEnabled).to.equal(false);
+        expect(logger.isErrorsEnabled).to.equal(false);
+    });
+
+    it('emits enable-state changes when telemetry is toggled', () => {
+        const telemetry = new TelemetryExtImpl();
+        const logger = telemetry.createTelemetryLogger(sender);
+        let changes = 0;
+
+        logger.onDidChangeEnableStates(() => changes++);
+
+        telemetry.isTelemetryEnabled = true;
+        telemetry.isTelemetryEnabled = false;
+
+        expect(changes).to.equal(2);
+    });
+});

package/src/plugin/telemetry-ext.ts

@@ -49,7 +49,7 @@ export class TelemetryLogger {
     readonly options: TelemetryLoggerOptions | undefined;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     readonly commonProperties: Record<string, any>;
-    telemetryEnabled: boolean;
+    private _telemetryEnabled: boolean;
 
     private readonly onDidChangeEnableStatesEmitter: Emitter<TelemetryLogger> = new Emitter();
     readonly onDidChangeEnableStates: Event<TelemetryLogger> = this.onDidChangeEnableStatesEmitter.event;
@@ -60,9 +60,20 @@ export class TelemetryLogger {
         this.sender = sender;
         this.options = options;
         this.commonProperties = this.getCommonProperties();
-        this._isErrorsEnabled = true;
-        this._isUsageEnabled = true;
-        this.telemetryEnabled = telemetryEnabled;
+        this._telemetryEnabled = telemetryEnabled;
+        this._isErrorsEnabled = telemetryEnabled;
+        this._isUsageEnabled = telemetryEnabled;
+    }
+
+    get telemetryEnabled(): boolean {
+        return this._telemetryEnabled;
+    }
+
+    set telemetryEnabled(telemetryEnabled: boolean) {
+        if (this._telemetryEnabled !== telemetryEnabled) {
+            this._telemetryEnabled = telemetryEnabled;
+            this.updateEnableStates(telemetryEnabled, telemetryEnabled);
+        }
     }
 
     get isUsageEnabled(): boolean {
@@ -87,6 +98,14 @@ export class TelemetryLogger {
         }
     }
 
+    private updateEnableStates(isUsageEnabled: boolean, isErrorsEnabled: boolean): void {
+        if (this._isUsageEnabled !== isUsageEnabled || this._isErrorsEnabled !== isErrorsEnabled) {
+            this._isUsageEnabled = isUsageEnabled;
+            this._isErrorsEnabled = isErrorsEnabled;
+            this.onDidChangeEnableStatesEmitter.fire(this);
+        }
+    }
+
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     logUsage(eventName: string, data?: Record<string, any | TelemetryTrustedValue<any>>): void {
         if (!this.telemetryEnabled || !this.isUsageEnabled) {