@theia/plugin-ext 1.55.0 → 1.56.0

package/src/main/browser/notebooks/renderers/output-webview-internal.ts

@@ -159,7 +159,7 @@ export async function outputWebviewPreload(ctx: PreloadContext): Promise<void> {
                 theia.postMessage({ type: 'cellFocusChanged', cellHandle: cellHandle });
             });
 
-            if (cellIndex && cellIndex < container.children.length) {
+            if (cellIndex !== undefined && cellIndex < container.children.length) {
                 container.insertBefore(this.element, container.children[cellIndex]);
             } else {
                 container.appendChild(this.element);
@@ -174,7 +174,7 @@ export async function outputWebviewPreload(ctx: PreloadContext): Promise<void> {
         }
 
         calcTotalOutputHeight(): number {
-            return this.outputElements.reduce((acc, output) => acc + output.element.clientHeight, 0) + 5;
+            return this.outputElements.reduce((acc, output) => acc + output.element.getBoundingClientRect().height, 0) + 5;
         }
 
         createOutputElement(index: number, output: webviewCommunication.Output, items: rendererApi.OutputItem[]): OutputContainer {
@@ -216,9 +216,11 @@ export async function outputWebviewPreload(ctx: PreloadContext): Promise<void> {
         public outputVisibilityChanged(visible: boolean): void {
             this.outputElements.forEach(output => {
                 output.element.style.display = visible ? 'initial' : 'none';
+                output.containerElement.style.minHeight = visible ? '20px' : '0px';
             });
             if (visible) {
                 this.element.getElementsByClassName('output-hidden')?.[0].remove();
+                window.requestAnimationFrame(() => this.outputElements.forEach(output => sendDidRenderMessage(this, output)));
             } else {
                 const outputHiddenElement = document.createElement('div');
                 outputHiddenElement.classList.add('output-hidden');
@@ -290,6 +292,7 @@ export async function outputWebviewPreload(ctx: PreloadContext): Promise<void> {
         private createHtmlElement(): void {
             this.containerElement = document.createElement('div');
             this.containerElement.classList.add('output-container');
+            this.containerElement.style.minHeight = '20px';
             this.element = document.createElement('div');
             this.element.id = this.outputId;
             this.element.classList.add('output');
@@ -489,26 +492,16 @@ export async function outputWebviewPreload(ctx: PreloadContext): Promise<void> {
                         img.dataset.waiting = 'true'; // mark to avoid overriding onload a second time
                         return new Promise(resolve => { img.onload = img.onerror = resolve; });
                     })).then(() => {
-                        this.sendDidRenderMessage(cell, output);
-                        new ResizeObserver(() => this.sendDidRenderMessage(cell, output)).observe(cell.element);
+                        sendDidRenderMessage(cell, output);
+                        new ResizeObserver(() => sendDidRenderMessage(cell, output)).observe(cell.element);
                     });
             } else {
-                this.sendDidRenderMessage(cell, output);
-                new ResizeObserver(() => this.sendDidRenderMessage(cell, output)).observe(cell.element);
+                sendDidRenderMessage(cell, output);
+                new ResizeObserver(() => sendDidRenderMessage(cell, output)).observe(cell.element);
             }
 
         }
 
-        private sendDidRenderMessage(cell: OutputCell, output: OutputContainer): void {
-            theia.postMessage(<webviewCommunication.OnDidRenderOutput>{
-                type: 'didRenderOutput',
-                cellHandle: cell.cellHandle,
-                outputId: output.outputId,
-                outputHeight: cell.calcTotalOutputHeight(),
-                bodyHeight: document.body.clientHeight
-            });
-        }
-
         private async doRender(item: rendererApi.OutputItem, element: HTMLElement, renderer: Renderer, signal: AbortSignal): Promise<{ continue: boolean }> {
             try {
                 await (await renderer.getOrLoad())?.renderOutputItem(item, element, signal);
@@ -565,6 +558,16 @@ export async function outputWebviewPreload(ctx: PreloadContext): Promise<void> {
         }
     }();
 
+    function sendDidRenderMessage(cell: OutputCell, output: OutputContainer): void {
+        theia.postMessage(<webviewCommunication.OnDidRenderOutput>{
+            type: 'didRenderOutput',
+            cellHandle: cell.cellHandle,
+            outputId: output.outputId,
+            outputHeight: cell.calcTotalOutputHeight(),
+            bodyHeight: document.body.clientHeight
+        });
+    }
+
     const kernelPreloads = new class {
         private readonly preloads = new Map<string /* uri */, Promise<unknown>>();
 

package/src/main/browser/text-editor-main.ts

@@ -388,11 +388,16 @@ export class TextEditorPropertiesMain {
         if (editor && editor instanceof MonacoEditor) {
             result = editor.getControl().getSelections() || undefined;
         } else if (editor && editor instanceof SimpleMonacoEditor) {
-            result = editor.getControl().getSelections()?.map(selection => new monaco.Selection(
-                selection.startLineNumber,
-                selection.startColumn,
-                selection.positionLineNumber,
-                selection.positionColumn));
+            result = editor.getControl().getSelections()?.map(selection => {
+                const monacoSelection = new monaco.Selection(
+                    selection.selectionStartLineNumber,
+                    selection.selectionStartColumn,
+                    selection.positionLineNumber,
+                    selection.positionColumn);
+                monacoSelection.setStartPosition(selection.startLineNumber, selection.startColumn);
+                monacoSelection.setEndPosition(selection.endLineNumber, selection.endColumn);
+                return monacoSelection;
+            });
         }
 
         if (!result && prevProperties) {

package/src/main/browser/view/tree-view-widget.tsx

@@ -45,7 +45,6 @@ import { View } from '../../../common/plugin-protocol';
 import { URI } from '@theia/core/lib/common/uri';
 import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
 import { MarkdownString } from '@theia/core/lib/common/markdown-rendering';
-import { LabelParser } from '@theia/core/lib/browser/label-parser';
 import { AccessibilityInformation } from '@theia/plugin';
 import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
 import { DecoratedTreeNode } from '@theia/core/lib/browser/tree/tree-decorator';
@@ -456,9 +455,6 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
     @inject(HoverService)
     protected readonly hoverService: HoverService;
 
-    @inject(LabelParser)
-    protected readonly labelParser: LabelParser;
-
     @inject(ColorRegistry)
     protected readonly colorRegistry: ColorRegistry;
 

package/src/main/node/plugin-deployer-proxy-entry-impl.ts

@@ -13,7 +13,7 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
-import { injectable } from '@theia/core/shared/inversify';
+import { injectable, unmanaged } from '@theia/core/shared/inversify';
 import { PluginDeployerEntry, PluginDeployerEntryType, PluginType } from '../../common/plugin-protocol';
 import { PluginDeployerEntryImpl } from './plugin-deployer-entry-impl';
 
@@ -25,7 +25,10 @@ export class ProxyPluginDeployerEntry<T> implements PluginDeployerEntry {
 
     private readonly deployerName: string;
 
-    constructor(readonly deployer: T, readonly delegate: PluginDeployerEntryImpl) {
+    constructor(
+        @unmanaged() readonly deployer: T,
+        @unmanaged() readonly delegate: PluginDeployerEntryImpl
+    ) {
         this.deployerName = (this.deployer as {}).constructor.name;
     }
 

package/src/plugin/notebook/notebooks.ts

@@ -20,7 +20,7 @@
 
 import { CancellationToken, Disposable, DisposableCollection, Emitter, Event, URI } from '@theia/core';
 import { URI as TheiaURI } from '../types-impl';
-import * as theia from '@theia/plugin';
+import type * as theia from '@theia/plugin';
 import {
     NotebookCellStatusBarListDto, NotebookDataDto,
     NotebookDocumentsAndEditorsDelta, NotebookDocumentShowOptions, NotebookDocumentsMain, NotebookEditorAddData, NotebookEditorsMain, NotebooksExt, NotebooksMain, Plugin,
@@ -337,12 +337,14 @@ export class NotebooksExtImpl implements NotebooksExt {
                 console.error(`FAILED to find active notebook editor ${delta.newActiveEditor}`);
             }
             this.activeNotebookEditor = this.editors.get(delta.newActiveEditor);
-            if (this.textDocumentsAndEditors.activeEditor()?.document.uri.path !== this.activeNotebookEditor?.notebookData.uri.path) {
-                this.textDocumentsAndEditors.acceptEditorsAndDocumentsDelta({
-                    newActiveEditor: null
-                });
-            }
             this.onDidChangeActiveNotebookEditorEmitter.fire(this.activeNotebookEditor?.apiEditor);
+
+            const newActiveCell = this.activeApiNotebookEditor?.notebook.cellAt(this.activeApiNotebookEditor.selection.start);
+            this.textDocumentsAndEditors.acceptEditorsAndDocumentsDelta({
+                newActiveEditor: newActiveCell?.kind === 2 /* code cell */ ?
+                    this.textDocumentsAndEditors.allEditors().find(editor => editor.document.uri.toString() === newActiveCell.document.uri.toString())?.id ?? null :
+                    null
+            });
         }
     }
 

package/src/plugin/plugin-context.ts

@@ -226,7 +226,13 @@ import {
     ChatResultFeedbackKind,
     LanguageModelChatMessage,
     LanguageModelChatMessageRole,
+    LanguageModelChatToolMode,
     LanguageModelError,
+    LanguageModelPromptTsxPart,
+    LanguageModelTextPart,
+    LanguageModelToolCallPart,
+    LanguageModelToolResult,
+    LanguageModelToolResultPart,
     PortAutoForwardAction,
     PortAttributes,
     DebugVisualization,
@@ -1325,7 +1331,17 @@ export function createAPIFactory(
                 return Promise.resolve([]);
             },
             /** @stubbed LanguageModelChat */
-            onDidChangeChatModels: (listener, thisArgs?, disposables?) => Event.None(listener, thisArgs, disposables)
+            onDidChangeChatModels: (listener, thisArgs?, disposables?) => Event.None(listener, thisArgs, disposables),
+            /** @stubbed LanguageModelTool */
+            invokeTool(name: string, options: theia.LanguageModelToolInvocationOptions<object>, token?: CancellationToken): Thenable<theia.LanguageModelToolResult> {
+                return Promise.resolve({ content: [] });
+            },
+            /** @stubbed LanguageModelTool */
+            registerTool<T>(name: string, tool: theia.LanguageModelTool<T>): Disposable {
+                return Disposable.NULL;
+            },
+            /** @stubbed LanguageModelTool */
+            tools: []
         };
 
         return <typeof theia>{
@@ -1545,6 +1561,12 @@ export function createAPIFactory(
             LanguageModelChatMessage,
             LanguageModelChatMessageRole,
             LanguageModelError,
+            LanguageModelChatToolMode,
+            LanguageModelPromptTsxPart,
+            LanguageModelTextPart,
+            LanguageModelToolCallPart,
+            LanguageModelToolResult,
+            LanguageModelToolResultPart,
             PortAutoForwardAction,
             PortAttributes,
             DebugVisualization,

package/src/plugin/types-impl.ts

@@ -725,7 +725,7 @@ export class SnippetString {
 
 @es5ClassCompat
 export class ThemeColor {
-    constructor(public id: string) { }
+    constructor(public readonly id: string) { }
 }
 
 @es5ClassCompat
@@ -3868,19 +3868,29 @@ export class TerminalQuickFixOpener {
 }
 
 // #region Chat
+
+/**
+ * @stubbed
+ */
 export class ChatRequestTurn {
     readonly prompt: string;
     readonly participant: string;
     readonly command?: string;
     readonly references: theia.ChatPromptReference[];
-    private constructor(prompt: string, command: string | undefined, references: theia.ChatPromptReference[], participant: string) {
+    readonly toolReferences: readonly theia.ChatLanguageModelToolReference[];
+    private constructor(prompt: string, command: string | undefined, references: theia.ChatPromptReference[], participant: string,
+        toolReferences: theia.ChatLanguageModelToolReference[]) {
         this.prompt = prompt;
         this.command = command;
         this.participant = participant;
         this.references = references;
+        this.toolReferences = toolReferences;
     };
 }
 
+/**
+ * @stubbed
+ */
 export class ChatResponseTurn {
     readonly command?: string;
 
@@ -3888,6 +3898,9 @@ export class ChatResponseTurn {
         | theia.ChatResponseCommandButtonPart>, readonly result: theia.ChatResult, readonly participant: string) { }
 }
 
+/**
+ * @stubbed
+ */
 export class ChatResponseAnchorPart {
     value: URI | Location;
     title?: string;
@@ -3895,12 +3908,18 @@ export class ChatResponseAnchorPart {
     constructor(value: URI | Location, title?: string) { }
 }
 
+/**
+ * @stubbed
+ */
 export class ChatResponseProgressPart {
     value: string;
 
     constructor(value: string) { }
 }
 
+/**
+ * @stubbed
+ */
 export class ChatResponseReferencePart {
     value: URI | Location;
     iconPath?: URI | ThemeIcon | { light: URI; dark: URI; };
@@ -3910,12 +3929,19 @@ export class ChatResponseReferencePart {
         dark: URI;
     }) { }
 }
+
+/**
+ * @stubbed
+ */
 export class ChatResponseCommandButtonPart {
     value: theia.Command;
 
     constructor(value: theia.Command) { }
 }
 
+/**
+ * @stubbed
+ */
 export class ChatResponseMarkdownPart {
     value: theia.MarkdownString;
 
@@ -3923,6 +3949,9 @@ export class ChatResponseMarkdownPart {
     }
 }
 
+/**
+ * @stubbed
+ */
 export class ChatResponseFileTreePart {
     value: theia.ChatResponseFileTree[];
     baseUri: URI;
@@ -3943,17 +3972,20 @@ export enum LanguageModelChatMessageRole {
     Assistant = 2
 }
 
+/**
+ * @stubbed
+ */
 export class LanguageModelChatMessage {
-
-    static User(content: string, name?: string): LanguageModelChatMessage {
+    static User(content: string | (LanguageModelTextPart | LanguageModelToolResultPart)[], name?: string): LanguageModelChatMessage {
         return new LanguageModelChatMessage(LanguageModelChatMessageRole.User, content, name);
     }
 
-    static Assistant(content: string, name?: string): LanguageModelChatMessage {
+    static Assistant(content: string | (LanguageModelTextPart | LanguageModelToolResultPart)[], name?: string): LanguageModelChatMessage {
         return new LanguageModelChatMessage(LanguageModelChatMessageRole.Assistant, content, name);
     }
 
-    constructor(public role: LanguageModelChatMessageRole, public content: string, public name?: string) { }
+    constructor(public role: LanguageModelChatMessageRole, public content: string | (LanguageModelTextPart | LanguageModelToolResultPart | LanguageModelToolCallPart)[],
+        public name?: string) { }
 }
 
 export class LanguageModelError extends Error {
@@ -3978,6 +4010,58 @@ export class LanguageModelError extends Error {
         this.code = code ?? '';
     }
 }
+
+export enum LanguageModelChatToolMode {
+    Auto = 1,
+    Required = 2
+}
+
+/**
+ * @stubbed
+ */
+export class LanguageModelToolCallPart {
+    callId: string;
+    name: string;
+    input: object;
+
+    constructor(callId: string, name: string, input: object) { }
+}
+
+/**
+ * @stubbed
+ */
+export class LanguageModelToolResultPart {
+    callId: string;
+    content: (theia.LanguageModelTextPart | theia.LanguageModelPromptTsxPart | unknown)[];
+
+    constructor(callId: string, content: (theia.LanguageModelTextPart | theia.LanguageModelPromptTsxPart | unknown)[]) { }
+}
+
+/**
+ * @stubbed
+ */
+export class LanguageModelTextPart {
+    value: string;
+    constructor(value: string) { }
+}
+
+/**
+ * @stubbed
+ */
+export class LanguageModelToolResult {
+    content: (theia.LanguageModelTextPart | theia.LanguageModelPromptTsxPart | unknown)[];
+
+    constructor(content: (theia.LanguageModelTextPart | theia.LanguageModelPromptTsxPart)[]) { }
+}
+
+/**
+ * @stubbed
+ */
+export class LanguageModelPromptTsxPart {
+    value: unknown;
+
+    constructor(value: unknown) { }
+}
 // #endregion
 
 // #region Port Attributes