@theia/plugin-ext 1.67.0-next.3 → 1.67.0-next.56

package/README.md

@@ -41,7 +41,7 @@ for example the plugin manifest scanners (e.g. `scanner-theia.ts`) are in the `h
 
 ## Additional Information
 
-- [API documentation for `@theia/plugin-ext`](https://eclipse-theia.github.io/theia/docs/next/modules/plugin_ext.html)
+- [API documentation for `@theia/plugin-ext`](https://eclipse-theia.github.io/theia/docs/next/modules/_theia_plugin-ext.html)
 - [Theia - GitHub](https://github.com/eclipse-theia/theia)
 - [Theia - Website](https://theia-ide.org/)
 

package/package.json

@@ -1,38 +1,38 @@
 {
   "name": "@theia/plugin-ext",
-  "version": "1.67.0-next.3+7946ca874",
+  "version": "1.67.0-next.56+d8f18cc386c",
   "description": "Theia - Plugin Extension",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
   "dependencies": {
-    "@theia/ai-mcp": "1.67.0-next.3+7946ca874",
-    "@theia/bulk-edit": "1.67.0-next.3+7946ca874",
-    "@theia/callhierarchy": "1.67.0-next.3+7946ca874",
-    "@theia/console": "1.67.0-next.3+7946ca874",
-    "@theia/core": "1.67.0-next.3+7946ca874",
-    "@theia/debug": "1.67.0-next.3+7946ca874",
-    "@theia/editor": "1.67.0-next.3+7946ca874",
-    "@theia/editor-preview": "1.67.0-next.3+7946ca874",
-    "@theia/file-search": "1.67.0-next.3+7946ca874",
-    "@theia/filesystem": "1.67.0-next.3+7946ca874",
-    "@theia/markers": "1.67.0-next.3+7946ca874",
-    "@theia/messages": "1.67.0-next.3+7946ca874",
-    "@theia/monaco": "1.67.0-next.3+7946ca874",
+    "@theia/ai-mcp": "1.67.0-next.56+d8f18cc386c",
+    "@theia/bulk-edit": "1.67.0-next.56+d8f18cc386c",
+    "@theia/callhierarchy": "1.67.0-next.56+d8f18cc386c",
+    "@theia/console": "1.67.0-next.56+d8f18cc386c",
+    "@theia/core": "1.67.0-next.56+d8f18cc386c",
+    "@theia/debug": "1.67.0-next.56+d8f18cc386c",
+    "@theia/editor": "1.67.0-next.56+d8f18cc386c",
+    "@theia/editor-preview": "1.67.0-next.56+d8f18cc386c",
+    "@theia/file-search": "1.67.0-next.56+d8f18cc386c",
+    "@theia/filesystem": "1.67.0-next.56+d8f18cc386c",
+    "@theia/markers": "1.67.0-next.56+d8f18cc386c",
+    "@theia/messages": "1.67.0-next.56+d8f18cc386c",
+    "@theia/monaco": "1.67.0-next.56+d8f18cc386c",
     "@theia/monaco-editor-core": "1.96.302",
-    "@theia/navigator": "1.67.0-next.3+7946ca874",
-    "@theia/notebook": "1.67.0-next.3+7946ca874",
-    "@theia/output": "1.67.0-next.3+7946ca874",
-    "@theia/plugin": "1.67.0-next.3+7946ca874",
-    "@theia/preferences": "1.67.0-next.3+7946ca874",
-    "@theia/scm": "1.67.0-next.3+7946ca874",
-    "@theia/search-in-workspace": "1.67.0-next.3+7946ca874",
-    "@theia/task": "1.67.0-next.3+7946ca874",
-    "@theia/terminal": "1.67.0-next.3+7946ca874",
-    "@theia/test": "1.67.0-next.3+7946ca874",
-    "@theia/timeline": "1.67.0-next.3+7946ca874",
-    "@theia/typehierarchy": "1.67.0-next.3+7946ca874",
-    "@theia/variable-resolver": "1.67.0-next.3+7946ca874",
-    "@theia/workspace": "1.67.0-next.3+7946ca874",
+    "@theia/navigator": "1.67.0-next.56+d8f18cc386c",
+    "@theia/notebook": "1.67.0-next.56+d8f18cc386c",
+    "@theia/output": "1.67.0-next.56+d8f18cc386c",
+    "@theia/plugin": "1.67.0-next.56+d8f18cc386c",
+    "@theia/preferences": "1.67.0-next.56+d8f18cc386c",
+    "@theia/scm": "1.67.0-next.56+d8f18cc386c",
+    "@theia/search-in-workspace": "1.67.0-next.56+d8f18cc386c",
+    "@theia/task": "1.67.0-next.56+d8f18cc386c",
+    "@theia/terminal": "1.67.0-next.56+d8f18cc386c",
+    "@theia/test": "1.67.0-next.56+d8f18cc386c",
+    "@theia/timeline": "1.67.0-next.56+d8f18cc386c",
+    "@theia/typehierarchy": "1.67.0-next.56+d8f18cc386c",
+    "@theia/variable-resolver": "1.67.0-next.56+d8f18cc386c",
+    "@theia/workspace": "1.67.0-next.56+d8f18cc386c",
     "@types/mime": "^2.0.1",
     "@vscode/debugprotocol": "^1.51.0",
     "@vscode/proxy-agent": "^0.13.2",
@@ -97,5 +97,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "7946ca874b04e6249d883e9a586f193194df1365"
+  "gitHead": "d8f18cc386c45a736cd193d42eab02c8f64c6b10"
 }

package/src/common/plugin-api-rpc.ts

@@ -1829,7 +1829,8 @@ export interface LanguagesMain {
     $registerDocumentSemanticTokensProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[],
         legend: theia.SemanticTokensLegend, eventHandle: number | undefined): void;
     $emitDocumentSemanticTokensEvent(eventHandle: number): void;
-    $registerDocumentRangeSemanticTokensProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[], legend: theia.SemanticTokensLegend): void;
+    $registerDocumentRangeSemanticTokensProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[],
+        legend: theia.SemanticTokensLegend, eventHandle: number | undefined): void;
     $registerCallHierarchyProvider(handle: number, selector: SerializedDocumentFilter[]): void;
     $registerLinkedEditingRangeProvider(handle: number, selector: SerializedDocumentFilter[]): void;
     $registerTypeHierarchyProvider(handle: number, selector: SerializedDocumentFilter[]): void;
@@ -1871,7 +1872,6 @@ export interface WebviewsMain {
     $reveal(handle: string, showOptions: theia.WebviewPanelShowOptions): void;
     $setTitle(handle: string, value: string): void;
     $setIconPath(handle: string, value: IconUrl | undefined): void;
-    $setBadge(handle: string, badge: theia.ViewBadge | undefined): void;
     $setHtml(handle: string, value: string): void;
     $setOptions(handle: string, options: theia.WebviewOptions): void;
     $postMessage(handle: string, value: any): Thenable<boolean>;

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

@@ -1176,14 +1176,23 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
         }
     }
 
-    $registerDocumentRangeSemanticTokensProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[], legend: theia.SemanticTokensLegend): void {
+    $registerDocumentRangeSemanticTokensProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[], legend: theia.SemanticTokensLegend,
+        eventHandle: number | undefined): void {
         const languageSelector = this.toLanguageSelector(selector);
-        const provider = this.createDocumentRangeSemanticTokensProvider(handle, legend);
+        let event: Event<void> | undefined = undefined;
+        if (typeof eventHandle === 'number') {
+            const emitter = new Emitter<void>();
+            this.register(eventHandle, emitter);
+            event = emitter.event;
+        }
+        const provider = this.createDocumentRangeSemanticTokensProvider(handle, legend, event);
         this.register(handle, (monaco.languages.registerDocumentRangeSemanticTokensProvider as RegistrationFunction<monaco.languages.DocumentRangeSemanticTokensProvider>)
             (languageSelector, provider));
     }
 
-    protected createDocumentRangeSemanticTokensProvider(handle: number, legend: theia.SemanticTokensLegend): monaco.languages.DocumentRangeSemanticTokensProvider {
+    protected createDocumentRangeSemanticTokensProvider(
+        handle: number, legend: theia.SemanticTokensLegend, _onDidChangeEvent?: Event<void>
+    ): monaco.languages.DocumentRangeSemanticTokensProvider {
         return {
             getLegend: () => legend,
             provideDocumentRangeSemanticTokens: async (model, range, token) => {
@@ -1202,7 +1211,8 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
                     };
                 }
                 throw new Error('Unexpected');
-            }
+            },
+            // @monaco-uplift onDidChange property is not yet available with the current monaco version, probably with the next monaco update then
         };
     }
 

package/src/main/browser/notebooks/notebook-editors-main.ts

@@ -58,14 +58,14 @@ export class NotebookEditorsMainImpl implements NotebookEditorsMain {
             throw new Error('Editor not found');
         }
         const editor = this.mainThreadEditors.get(id);
-        editor?.model?.setSelectedCell(editor.model.cells[range[0].start]);
+        editor?.viewModel.setSelectedCell(editor.model!.cells[range[0].start]);
     }
 
     async handleEditorsAdded(editors: readonly NotebookEditorWidget[]): Promise<void> {
         for (const editor of editors) {
             this.mainThreadEditors.set(editor.id, editor);
             const model = await editor.ready;
-            model.onDidChangeSelectedCell(e => {
+            editor.viewModel.onDidChangeSelectedCell(e => {
                 const newCellIndex = e.cell ? model.cells.indexOf(e.cell) : -1;
                 this.proxy.$acceptEditorPropertiesChanged(editor.id, {
                     selections: {

package/src/main/browser/notebooks/renderers/cell-output-webview.tsx

@@ -526,7 +526,7 @@ export class CellOutputWebviewImpl implements CellOutputWebview, Disposable {
             case 'cellFocusChanged':
                 const selectedCell = this.notebook.getCellByHandle(message.cellHandle);
                 if (selectedCell) {
-                    this.notebook.setSelectedCell(selectedCell);
+                    this.editor.viewModel.setSelectedCell(selectedCell);
                 }
                 break;
             case 'webviewFocusChanged':

package/src/main/browser/view/plugin-view-registry.ts

@@ -491,14 +491,6 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
             get description(): string | undefined { return _description; },
             set description(value: string | undefined) { _description = value; },
 
-            get badge(): number | undefined { return webview.badge; },
-            set badge(badge: number | undefined) { webview.badge = badge; },
-
-            get badgeTooltip(): string | undefined { return webview.badgeTooltip; },
-            set badgeTooltip(badgeTooltip: string | undefined) { webview.badgeTooltip = badgeTooltip; },
-            onDidChangeBadge: webview.onDidChangeBadge,
-            onDidChangeBadgeTooltip: webview.onDidChangeBadgeTooltip,
-
             dispose: () => {
                 _resolved = false;
                 webview.dispose();
@@ -969,4 +961,3 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
         }
     }
 }
-

package/src/main/browser/view/plugin-view-widget.ts

@@ -21,7 +21,7 @@ import { CommandRegistry } from '@theia/core/lib/common/command';
 import { StatefulWidget } from '@theia/core/lib/browser/shell/shell-layout-restorer';
 import { Message } from '@theia/core/shared/@lumino/messaging';
 import { TreeViewWidget } from './tree-view-widget';
-import { BadgeWidget, DescriptionWidget, DynamicToolbarWidget } from '@theia/core/lib/browser/view-container';
+import { DescriptionWidget, DynamicToolbarWidget } from '@theia/core/lib/browser/view-container';
 import { DisposableCollection, Emitter, Event } from '@theia/core/lib/common';
 import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
 
@@ -32,20 +32,16 @@ export class PluginViewWidgetIdentifier {
 }
 
 @injectable()
-export class PluginViewWidget extends Panel implements StatefulWidget, DescriptionWidget, BadgeWidget, DynamicToolbarWidget {
+export class PluginViewWidget extends Panel implements StatefulWidget, DescriptionWidget, DynamicToolbarWidget {
 
     currentViewContainerId?: string;
 
     protected _message?: string;
     protected _description: string = '';
-    protected _badge?: number | undefined;
-    protected _badgeTooltip?: string | undefined;
     protected _suppressUpdateViewVisibility = false;
     protected updatingViewVisibility = false;
     protected onDidChangeDescriptionEmitter = new Emitter<void>();
-    protected onDidChangeBadgeEmitter = new Emitter<void>();
-    protected onDidChangeBadgeTooltipEmitter = new Emitter<void>();
-    protected toDispose = new DisposableCollection(this.onDidChangeDescriptionEmitter, this.onDidChangeBadgeEmitter, this.onDidChangeBadgeTooltipEmitter);
+    protected toDispose = new DisposableCollection(this.onDidChangeDescriptionEmitter);
     protected readonly onDidChangeToolbarItemsEmitter = new Emitter<void>();
 
     get onDidChangeToolbarItems(): Event<void> {
@@ -81,14 +77,6 @@ export class PluginViewWidget extends Panel implements StatefulWidget, Descripti
         return this.onDidChangeDescriptionEmitter.event;
     }
 
-    get onDidChangeBadge(): Event<void> {
-        return this.onDidChangeBadgeEmitter.event;
-    }
-
-    get onDidChangeBadgeTooltip(): Event<void> {
-        return this.onDidChangeBadgeTooltipEmitter.event;
-    }
-
     protected override onActivateRequest(msg: Message): void {
         super.onActivateRequest(msg);
         const widget = this.widgets[0];
@@ -154,32 +142,6 @@ export class PluginViewWidget extends Panel implements StatefulWidget, Descripti
         this.onDidChangeDescriptionEmitter.fire();
     }
 
-    get badge(): number | undefined {
-        const widget = this.widgets[0];
-        if (BadgeWidget.is(widget)) {
-            return widget.badge;
-        }
-        return this._badge;
-    }
-
-    set badge(badge: number | undefined) {
-        this._badge = badge;
-        this.onDidChangeBadgeEmitter.fire();
-    }
-
-    get badgeTooltip(): string | undefined {
-        const widget = this.widgets[0];
-        if (BadgeWidget.is(widget)) {
-            return widget.badgeTooltip;
-        }
-        return this._badgeTooltip;
-    }
-
-    set badgeTooltip(badgeTooltip: string | undefined) {
-        this._badgeTooltip = badgeTooltip;
-        this.onDidChangeBadgeTooltipEmitter.fire();
-    }
-
     private updateWidgetMessage(): void {
         const widget = this.widgets[0];
         if (widget) {
@@ -191,10 +153,6 @@ export class PluginViewWidget extends Panel implements StatefulWidget, Descripti
 
     override addWidget(widget: Widget): void {
         super.addWidget(widget);
-        if (BadgeWidget.is(widget)) {
-            widget.onDidChangeBadge(() => this.onDidChangeBadgeEmitter.fire());
-            widget.onDidChangeBadgeTooltip(() => this.onDidChangeBadgeTooltipEmitter.fire());
-        }
         this.updateWidgetMessage();
         this.onDidChangeToolbarItemsEmitter.fire();
     }

package/src/main/browser/view/tree-views-main.ts

@@ -22,7 +22,8 @@ import {
     SelectableTreeNode,
     ExpandableTreeNode,
     CompositeTreeNode,
-    WidgetManager
+    WidgetManager,
+    BadgeService
 } from '@theia/core/lib/browser';
 import { Disposable, DisposableCollection } from '@theia/core';
 import { TreeViewWidget, TreeViewNode, PluginTreeModel, TreeViewWidgetOptions } from './tree-view-widget';
@@ -37,6 +38,7 @@ export class TreeViewsMainImpl implements TreeViewsMain, Disposable {
     private readonly viewRegistry: PluginViewRegistry;
     private readonly widgetManager: WidgetManager;
     private readonly fileContentStore: DnDFileContentStore;
+    private readonly badgeService: BadgeService;
 
     private readonly treeViewProviders = new Map<string, Disposable>();
 
@@ -50,6 +52,7 @@ export class TreeViewsMainImpl implements TreeViewsMain, Disposable {
 
         this.widgetManager = this.container.get(WidgetManager);
         this.fileContentStore = this.container.get(DnDFileContentStore);
+        this.badgeService = this.container.get(BadgeService);
     }
 
     dispose(): void {
@@ -176,8 +179,7 @@ export class TreeViewsMainImpl implements TreeViewsMain, Disposable {
     async $setBadge(treeViewId: string, badge: ViewBadge | undefined): Promise<void> {
         const viewPanel = await this.viewRegistry.getView(treeViewId);
         if (viewPanel) {
-            viewPanel.badge = badge?.value;
-            viewPanel.badgeTooltip = badge?.tooltip;
+            this.badgeService.showBadge(viewPanel, badge);
         }
     }
 

package/src/main/browser/webview/webview.ts

@@ -33,7 +33,7 @@ import { IconUrl } from '../../../common/plugin-protocol';
 import { Deferred } from '@theia/core/lib/common/promise-util';
 import { WebviewEnvironment } from './webview-environment';
 import URI from '@theia/core/lib/common/uri';
-import { Emitter, Event } from '@theia/core/lib/common/event';
+import { Emitter } from '@theia/core/lib/common/event';
 import { open, OpenerService } from '@theia/core/lib/browser/opener-service';
 import { KeybindingRegistry } from '@theia/core/lib/browser/keybinding';
 import { Schemes } from '../../../common/uri-components';
@@ -48,7 +48,6 @@ import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { FileOperationError, FileOperationResult } from '@theia/filesystem/lib/common/files';
 import { BinaryBufferReadableStream } from '@theia/core/lib/common/buffer';
 import { ExtractableWidget } from '@theia/core/lib/browser/widgets/extractable-widget';
-import { BadgeWidget } from '@theia/core/lib/browser/view-container';
 import { MenuPath } from '@theia/core';
 import { ContextMenuRenderer } from '@theia/core/lib/browser';
 import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
@@ -102,7 +101,7 @@ export class WebviewWidgetIdentifier {
 export const WebviewWidgetExternalEndpoint = Symbol('WebviewWidgetExternalEndpoint');
 
 @injectable()
-export class WebviewWidget extends BaseWidget implements StatefulWidget, ExtractableWidget, BadgeWidget {
+export class WebviewWidget extends BaseWidget implements StatefulWidget, ExtractableWidget {
 
     private static readonly standardSupportedLinkSchemes = new Set([
         Schemes.http,
@@ -199,11 +198,6 @@ export class WebviewWidget extends BaseWidget implements StatefulWidget, Extract
     isExtractable: boolean = true;
     secondaryWindow: Window | undefined = undefined;
 
-    protected _badge?: number | undefined;
-    protected _badgeTooltip?: string | undefined;
-    protected onDidChangeBadgeEmitter = new Emitter<void>();
-    protected onDidChangeBadgeTooltipEmitter = new Emitter<void>();
-
     @postConstruct()
     protected init(): void {
         this.node.tabIndex = 0;
@@ -212,8 +206,6 @@ export class WebviewWidget extends BaseWidget implements StatefulWidget, Extract
         this.addClass(WebviewWidget.Styles.WEBVIEW);
 
         this.toDispose.push(this.onMessageEmitter);
-        this.toDispose.push(this.onDidChangeBadgeEmitter);
-        this.toDispose.push(this.onDidChangeBadgeTooltipEmitter);
 
         this.transparentOverlay = document.createElement('div');
         this.transparentOverlay.classList.add(TRANSPARENT_OVERLAY_STYLE);
@@ -232,32 +224,6 @@ export class WebviewWidget extends BaseWidget implements StatefulWidget, Extract
         }));
     }
 
-    get onDidChangeBadge(): Event<void> {
-        return this.onDidChangeBadgeEmitter.event;
-    }
-
-    get onDidChangeBadgeTooltip(): Event<void> {
-        return this.onDidChangeBadgeTooltipEmitter.event;
-    }
-
-    get badge(): number | undefined {
-        return this._badge;
-    }
-
-    set badge(badge: number | undefined) {
-        this._badge = badge;
-        this.onDidChangeBadgeEmitter.fire();
-    }
-
-    get badgeTooltip(): string | undefined {
-        return this._badgeTooltip;
-    }
-
-    set badgeTooltip(badgeTooltip: string | undefined) {
-        this._badgeTooltip = badgeTooltip;
-        this.onDidChangeBadgeTooltipEmitter.fire();
-    }
-
     protected override onBeforeAttach(msg: Message): void {
         super.onBeforeAttach(msg);
         this.doShow();

package/src/main/browser/webview-views/webview-views-main.ts

@@ -26,9 +26,10 @@ import { Disposable, DisposableCollection, ILogger } from '@theia/core';
 import { WebviewView } from './webview-views';
 import { CancellationToken } from '@theia/core/lib/common/cancellation';
 import { WebviewsMainImpl } from '../webviews-main';
-import { Widget, WidgetManager } from '@theia/core/lib/browser';
+import { BadgeService, Widget, WidgetManager } from '@theia/core/lib/browser';
 import { PluginViewRegistry } from '../view/plugin-view-registry';
 import { ViewBadge } from '@theia/plugin';
+import { PluginViewWidget } from '../view/plugin-view-widget';
 
 export class WebviewViewsMainImpl implements WebviewViewsMain, Disposable {
 
@@ -41,6 +42,7 @@ export class WebviewViewsMainImpl implements WebviewViewsMain, Disposable {
     protected readonly webviewViewProviders = new Map<string, Disposable>();
     protected readonly widgetManager: WidgetManager;
     protected readonly pluginViewRegistry: PluginViewRegistry;
+    protected readonly badgeService: BadgeService;
 
     @inject(ILogger)
     protected readonly logger: ILogger;
@@ -52,6 +54,7 @@ export class WebviewViewsMainImpl implements WebviewViewsMain, Disposable {
         this.proxy = rpc.getProxy(MAIN_RPC_CONTEXT.WEBVIEW_VIEWS_EXT);
         this.widgetManager = container.get(WidgetManager);
         this.pluginViewRegistry = container.get(PluginViewRegistry);
+        this.badgeService = container.get(BadgeService);
     }
 
     dispose(): void {
@@ -133,8 +136,10 @@ export class WebviewViewsMainImpl implements WebviewViewsMain, Disposable {
     async $setBadge(handle: string, badge: ViewBadge | undefined): Promise<void> {
         const webviewView = this.getWebviewView(handle);
         if (webviewView) {
-            webviewView.badge = badge?.value;
-            webviewView.badgeTooltip = badge?.tooltip;
+            if (!(webviewView.webview.parent instanceof PluginViewWidget)) {
+                throw new Error('Unexpected parent of WebviewViewWidget');
+            }
+            this.badgeService.showBadge(webviewView.webview.parent, badge);
         }
     }
 

package/src/main/browser/webview-views/webview-views.ts

@@ -25,13 +25,9 @@ import { WebviewWidget } from '../webview/webview';
 export interface WebviewView {
     title?: string;
     description?: string;
-    badge?: number | undefined;
-    badgeTooltip?: string | undefined;
     readonly webview: WebviewWidget;
     readonly onDidChangeVisibility: Event<boolean>;
     readonly onDidDispose: Event<void>;
-    readonly onDidChangeBadge: Event<void>;
-    readonly onDidChangeBadgeTooltip: Event<void>;
 
     dispose(): void;
     show(preserveFocus: boolean): void;

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

@@ -19,7 +19,7 @@ import { URI } from '@theia/core/shared/vscode-uri';
 import { interfaces } from '@theia/core/shared/inversify';
 import { WebviewsMain, MAIN_RPC_CONTEXT, WebviewsExt, WebviewPanelViewState } from '../../common/plugin-api-rpc';
 import { RPCProtocol } from '../../common/rpc-protocol';
-import { ViewBadge, WebviewOptions, WebviewPanelOptions, WebviewPanelShowOptions } from '@theia/plugin';
+import { WebviewOptions, WebviewPanelOptions, WebviewPanelShowOptions } from '@theia/plugin';
 import { ApplicationShell } from '@theia/core/lib/browser/shell/application-shell';
 import { WebviewWidget, WebviewWidgetIdentifier } from './webview/webview';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
@@ -160,14 +160,6 @@ export class WebviewsMainImpl implements WebviewsMain, Disposable {
         webview.title.label = value;
     }
 
-    async $setBadge(handle: string, badge: ViewBadge | undefined): Promise<void> {
-        const webview = await this.getWebview(handle);
-        if (webview) {
-            webview.badge = badge?.value;
-            webview.badgeTooltip = badge?.tooltip;
-        }
-    }
-
     async $setIconPath(handle: string, iconUrl: IconUrl | undefined): Promise<void> {
         const webview = await this.getWebview(handle);
         webview.setIconUrl(iconUrl);

package/src/plugin/authentication-ext.ts

@@ -126,6 +126,7 @@ export class AuthenticationExtImpl implements AuthenticationExt {
             return sessions.map(session => ({
                 id: session.id,
                 accessToken: session.accessToken,
+                idToken: session.idToken,
                 account: { id: session.account.id, label: session.account.label },
                 scopes: session.scopes
             }));

package/src/plugin/languages.ts

@@ -850,19 +850,16 @@ export class LanguagesExtImpl implements LanguagesExt {
 
     registerDocumentSemanticTokensProvider(selector: theia.DocumentSelector, provider: theia.DocumentSemanticTokensProvider, legend: theia.SemanticTokensLegend,
         pluginInfo: PluginInfo): theia.Disposable {
-        const eventHandle = (typeof provider.onDidChangeSemanticTokens === 'function' ? this.nextCallId() : undefined);
-
         const handle = this.addNewAdapter(new DocumentSemanticTokensAdapter(this.documents, provider));
-        this.proxy.$registerDocumentSemanticTokensProvider(handle, pluginInfo, this.transformDocumentSelector(selector), legend, eventHandle);
-        let result = this.createDisposable(handle);
-
-        if (eventHandle) {
-            // eslint-disable-next-line no-unsanitized/method
-            const subscription = provider.onDidChangeSemanticTokens!(_ => this.proxy.$emitDocumentSemanticTokensEvent(eventHandle));
-            result = Disposable.from(result, subscription);
+        const unregister = this.createDisposable(handle);
+        if (typeof provider.onDidChangeSemanticTokens === 'function') {
+            const eventHandle = this.nextCallId();
+            const subscription = provider.onDidChangeSemanticTokens!(_ => this.proxy.$emitDocumentSemanticTokensEvent(handle));
+            this.proxy.$registerDocumentSemanticTokensProvider(handle, pluginInfo, this.transformDocumentSelector(selector), legend, eventHandle);
+            return Disposable.from(unregister, subscription);
         }
-
-        return result;
+        this.proxy.$registerDocumentSemanticTokensProvider(handle, pluginInfo, this.transformDocumentSelector(selector), legend, undefined);
+        return unregister;
     }
 
     $provideDocumentSemanticTokens(handle: number, resource: UriComponents, previousResultId: number, token: theia.CancellationToken): Promise<BinaryBuffer | null> {
@@ -876,8 +873,15 @@ export class LanguagesExtImpl implements LanguagesExt {
     registerDocumentRangeSemanticTokensProvider(selector: theia.DocumentSelector, provider: theia.DocumentRangeSemanticTokensProvider,
         legend: theia.SemanticTokensLegend, pluginInfo: PluginInfo): theia.Disposable {
         const handle = this.addNewAdapter(new DocumentRangeSemanticTokensAdapter(this.documents, provider));
-        this.proxy.$registerDocumentRangeSemanticTokensProvider(handle, pluginInfo, this.transformDocumentSelector(selector), legend);
-        return this.createDisposable(handle);
+        const unregister = this.createDisposable(handle);
+        if (typeof provider.onDidChangeSemanticTokens === 'function') {
+            const eventHandle = this.nextCallId();
+            const subscription = provider.onDidChangeSemanticTokens!(_ => this.proxy.$emitDocumentSemanticTokensEvent(handle));
+            this.proxy.$registerDocumentRangeSemanticTokensProvider(handle, pluginInfo, this.transformDocumentSelector(selector), legend, eventHandle);
+            return Disposable.from(unregister, subscription);
+        }
+        this.proxy.$registerDocumentRangeSemanticTokensProvider(handle, pluginInfo, this.transformDocumentSelector(selector), legend, undefined);
+        return unregister;
     }
 
     $provideDocumentRangeSemanticTokens(handle: number, resource: UriComponents, range: Range, token: theia.CancellationToken): Promise<BinaryBuffer | null> {

package/src/plugin/plugin-context.ts

@@ -227,6 +227,7 @@ import {
     LanguageModelChatMessage,
     LanguageModelChatMessageRole,
     LanguageModelChatToolMode,
+    LanguageModelDataPart,
     LanguageModelError,
     LanguageModelPromptTsxPart,
     LanguageModelTextPart,
@@ -237,6 +238,7 @@ import {
     PortAttributes,
     DebugVisualization,
     TerminalShellExecutionCommandLineConfidence,
+    TerminalCompletionItem,
     TerminalCompletionItemKind,
     TerminalCompletionList,
     McpHttpServerDefinition,
@@ -686,7 +688,7 @@ export function createAPIFactory(
             },
             /** @stubbed TerminalCompletionProvider */
             registerTerminalCompletionProvider<T extends theia.TerminalCompletionItem>(
-                id: string, provider: theia.TerminalCompletionProvider<T>, ...triggerCharacters: string[]): theia.Disposable {
+                provider: theia.TerminalCompletionProvider<T>, ...triggerCharacters: string[]): Disposable {
                 return Disposable.NULL;
             },
             /** @stubbed TerminalQuickFixProvider */
@@ -1607,6 +1609,7 @@ export function createAPIFactory(
             ChatResultFeedbackKind,
             LanguageModelChatMessage,
             LanguageModelChatMessageRole,
+            LanguageModelDataPart,
             LanguageModelError,
             LanguageModelChatToolMode,
             LanguageModelPromptTsxPart,
@@ -1618,6 +1621,7 @@ export function createAPIFactory(
             PortAttributes,
             DebugVisualization,
             TerminalShellExecutionCommandLineConfidence,
+            TerminalCompletionItem,
             TerminalCompletionItemKind,
             TerminalCompletionList,
             McpHttpServerDefinition,

package/src/plugin/timeline.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 import { Plugin, PLUGIN_RPC_CONTEXT, TimelineCommandArg, TimelineExt, TimelineMain } from '../common';
 import { RPCProtocol } from '../common/rpc-protocol';
-import { Disposable, URI } from './types-impl';
+import { Disposable, ThemeIcon, URI } from './types-impl';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
 import { CommandRegistryImpl } from './command-registry';
 import type {
@@ -28,6 +28,8 @@ import type {
 import * as theia from '@theia/plugin';
 import { CancellationToken } from '@theia/core/lib/common/cancellation';
 import { UriComponents } from '../common/uri-components';
+import { convertIconPath } from './type-converters';
+import { PluginIconPath } from './plugin-icon-path';
 
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
@@ -65,7 +67,7 @@ export class TimelineExtImpl implements TimelineExt {
     registerTimelineProvider(plugin: Plugin, scheme: string | string[], provider: theia.TimelineProvider): Disposable {
         const timelineDisposables = new DisposableCollection();
 
-        const convertTimelineItem = this.convertTimelineItem(provider.id, timelineDisposables).bind(this);
+        const convertTimelineItem = this.convertTimelineItem(plugin, provider.id, timelineDisposables).bind(this);
 
         let disposable: Disposable | undefined;
         if (provider.onDidChange) {
@@ -115,7 +117,8 @@ export class TimelineExtImpl implements TimelineExt {
         });
     }
 
-    private convertTimelineItem(source: string, disposables: DisposableCollection): (uri: URI, options?: InternalTimelineOptions) => (item: theia.TimelineItem) => TimelineItem {
+    private convertTimelineItem(plugin: Plugin, source: string, disposables: DisposableCollection):
+        (uri: URI, options?: InternalTimelineOptions) => (item: theia.TimelineItem) => TimelineItem {
         return (uri: URI, options?: InternalTimelineOptions) => {
             let items: Map<string, theia.TimelineItem> | undefined;
             if (options?.cacheResults) {
@@ -148,6 +151,7 @@ export class TimelineExtImpl implements TimelineExt {
                     handle: handle,
                     source: source,
                     command: item.command ? this.commands.converter.toSafeCommand(item.command, disposables) : undefined,
+                    icon: ThemeIcon.get(iconPath) ?? PluginIconPath.toUrl(convertIconPath(iconPath), plugin)
                 };
             };
         };