@theia/plugin-ext 1.46.1 → 1.47.0

package/src/plugin/notebook/notebook-kernels.ts

@@ -18,14 +18,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from '@theia/plugin';
 import {
-    CellExecuteUpdateDto, NotebookKernelDto, NotebookKernelsExt, NotebookKernelsMain, NotebookKernelSourceActionDto, NotebookOutputDto, PLUGIN_RPC_CONTEXT
+    CellExecuteUpdateDto, NotebookKernelDto, NotebookKernelsExt, NotebookKernelsMain,
+    NotebookKernelSourceActionDto, NotebookOutputDto, PluginModel, PluginPackage, PLUGIN_RPC_CONTEXT
 } from '../../common';
 import { RPCProtocol } from '../../common/rpc-protocol';
 import { UriComponents } from '../../common/uri-components';
-import * as theia from '@theia/plugin';
-import { CancellationTokenSource, Disposable, DisposableCollection, Emitter } from '@theia/core';
+import { CancellationTokenSource, Disposable, DisposableCollection, Emitter, Path } from '@theia/core';
 import { Cell } from './notebook-document';
 import { NotebooksExtImpl } from './notebooks';
 import { NotebookCellOutputConverter, NotebookCellOutputItem, NotebookKernelSourceAction } from '../type-converters';
@@ -33,6 +32,8 @@ import { timeout, Deferred } from '@theia/core/lib/common/promise-util';
 import { CellExecutionUpdateType, NotebookCellExecutionState } from '@theia/notebook/lib/common';
 import { CommandRegistryImpl } from '../command-registry';
 import { NotebookCellOutput, NotebookRendererScript, URI } from '../types-impl';
+import { toUriComponents } from '../../main/browser/hierarchy/hierarchy-types-converters';
+import type * as theia from '@theia/plugin';
 
 interface KernelData {
     extensionId: string;
@@ -62,18 +63,18 @@ export class NotebookKernelsExtImpl implements NotebookKernelsExt {
     constructor(
         rpc: RPCProtocol,
         private readonly notebooks: NotebooksExtImpl,
-        private readonly commands: CommandRegistryImpl
+        private readonly commands: CommandRegistryImpl,
     ) {
         this.proxy = rpc.getProxy(PLUGIN_RPC_CONTEXT.NOTEBOOK_KERNELS_MAIN);
     }
 
     private currentHandle = 0;
 
-    createNotebookController(extensionId: string, id: string, viewType: string, label: string, handler?: (cells: theia.NotebookCell[],
+    createNotebookController(extension: PluginModel, id: string, viewType: string, label: string, handler?: (cells: theia.NotebookCell[],
         notebook: theia.NotebookDocument, controller: theia.NotebookController) => void | Thenable<void>, rendererScripts?: NotebookRendererScript[]): theia.NotebookController {
 
         for (const kernelData of this.kernelData.values()) {
-            if (kernelData.controller.id === id && extensionId === kernelData.extensionId) {
+            if (kernelData.controller.id === id && extension.id === kernelData.extensionId) {
                 throw new Error(`notebook controller with id '${id}' ALREADY exist`);
             }
         }
@@ -81,9 +82,9 @@ export class NotebookKernelsExtImpl implements NotebookKernelsExt {
         const handle = this.currentHandle++;
         const that = this;
 
-        console.debug(`NotebookController[${handle}], CREATED by ${extensionId}, ${id}`);
+        console.debug(`NotebookController[${handle}], CREATED by ${extension.id}, ${id}`);
 
-        const defaultExecuteHandler = () => console.warn(`NO execute handler from notebook controller '${data.id}' of extension: '${extensionId}'`);
+        const defaultExecuteHandler = () => console.warn(`NO execute handler from notebook controller '${data.id}' of extension: '${extension.id}'`);
 
         let isDisposed = false;
         const commandDisposables = new DisposableCollection();
@@ -92,10 +93,12 @@ export class NotebookKernelsExtImpl implements NotebookKernelsExt {
         const onDidReceiveMessage = new Emitter<{ editor: theia.NotebookEditor; message: unknown }>();
 
         const data: NotebookKernelDto = {
-            id: createKernelId(extensionId, id),
+            id: createKernelId(extension.id, id),
             notebookType: viewType,
-            extensionId: extensionId,
-            label: label || extensionId,
+            extensionId: extension.id,
+            extensionLocation: toUriComponents(extension.packageUri),
+            label: label || extension.id,
+            preloads: rendererScripts?.map(preload => ({ uri: toUriComponents(preload.uri.toString()), provides: preload.provides })) ?? []
         };
 
         //
@@ -131,12 +134,11 @@ export class NotebookKernelsExtImpl implements NotebookKernelsExt {
             get id(): string { return id; },
             get notebookType(): string { return data.notebookType; },
             onDidChangeSelectedNotebooks: onDidChangeSelection.event,
-            onDidReceiveMessage: onDidReceiveMessage.event,
             get label(): string {
                 return data.label;
             },
             set label(value) {
-                data.label = value ?? extensionId;
+                data.label = value ?? extension.id;
                 update();
             },
             get detail(): string {
@@ -168,11 +170,7 @@ export class NotebookKernelsExtImpl implements NotebookKernelsExt {
                 update();
             },
             get rendererScripts(): NotebookRendererScript[] {
-                return data.rendererScripts ?? [];
-            },
-            set rendererScripts(value) {
-                data.rendererScripts = value;
-                update();
+                return data.preloads?.map(preload => (new NotebookRendererScript(URI.from(preload.uri), preload.provides))) ?? [];
             },
             get executeHandler(): (cells: theia.NotebookCell[], notebook: theia.NotebookDocument, controller: theia.NotebookController) => void | Thenable<void> {
                 return executeHandler;
@@ -197,7 +195,7 @@ export class NotebookKernelsExtImpl implements NotebookKernelsExt {
                         Array.from(associatedNotebooks.keys()).map(u => u.toString()));
                     throw new Error(`notebook controller is NOT associated to notebook: ${cell.notebook.uri.toString()}`);
                 }
-                return that.createNotebookCellExecution(cell, createKernelId(extensionId, this.id));
+                return that.createNotebookCellExecution(cell, createKernelId(extension.id, this.id));
             },
             dispose: () => {
                 if (!isDisposed) {
@@ -213,16 +211,18 @@ export class NotebookKernelsExtImpl implements NotebookKernelsExt {
             updateNotebookAffinity(notebook, priority): void {
                 that.proxy.$updateNotebookPriority(handle, notebook.uri, priority);
             },
+            onDidReceiveMessage: onDidReceiveMessage.event,
             async postMessage(message: unknown, editor?: theia.NotebookEditor): Promise<boolean> {
-                return Promise.resolve(true); // TODO needs implementation
+                return that.proxy.$postMessage(handle, 'notebook:' + editor?.notebook.uri.toString(), message);
             },
             asWebviewUri(localResource: theia.Uri): theia.Uri {
-                throw new Error('Method not implemented.');
+                const basePath = PluginPackage.toPluginUrl(extension, '');
+                return URI.from({ path: new Path(basePath).join(localResource.path).toString(), scheme: 'https' });
             }
         };
 
         this.kernelData.set(handle, {
-            extensionId: extensionId,
+            extensionId: extension.id,
             controller,
             onDidReceiveMessage,
             onDidChangeSelection,
@@ -294,11 +294,11 @@ export class NotebookKernelsExtImpl implements NotebookKernelsExt {
         };
     }
 
-    $acceptNotebookAssociation(handle: number, uri: UriComponents, value: boolean): void {
+    async $acceptNotebookAssociation(handle: number, uri: UriComponents, value: boolean): Promise<void> {
         const obj = this.kernelData.get(handle);
         if (obj) {
             // update data structure
-            const notebook = this.notebooks.getNotebookDocument(URI.from(uri))!;
+            const notebook = await this.notebooks.waitForNotebookDocument(URI.from(uri));
             if (value) {
                 obj.associatedNotebooks.set(notebook.uri.toString(), true);
             } else {
@@ -320,7 +320,7 @@ export class NotebookKernelsExtImpl implements NotebookKernelsExt {
             // extension can dispose kernels in the meantime
             return Promise.resolve();
         }
-        const document = this.notebooks.getNotebookDocument(URI.from(uri));
+        const document = await this.notebooks.waitForNotebookDocument(URI.from(uri));
         const cells: theia.NotebookCell[] = [];
         for (const cellHandle of handles) {
             const cell = document.getCell(cellHandle);
@@ -347,7 +347,7 @@ export class NotebookKernelsExtImpl implements NotebookKernelsExt {
 
         // cancel or interrupt depends on the controller. When an interrupt handler is used we
         // don't trigger the cancelation token of executions.N
-        const document = this.notebooks.getNotebookDocument(URI.from(uri));
+        const document = await this.notebooks.waitForNotebookDocument(URI.from(uri));
         if (obj.controller.interruptHandler) {
             await obj.controller.interruptHandler.call(obj.controller, document.apiNotebook);
 
@@ -376,7 +376,7 @@ export class NotebookKernelsExtImpl implements NotebookKernelsExt {
         // Proposed Api though seems needed by jupyter for telemetry
     }
 
-    async $provideKernelSourceActions(handle: number, token: CancellationToken): Promise<NotebookKernelSourceActionDto[]> {
+    async $provideKernelSourceActions(handle: number, token: theia.CancellationToken): Promise<NotebookKernelSourceActionDto[]> {
         const provider = this.kernelSourceActionProviders.get(handle);
         if (provider) {
             const disposables = new DisposableCollection();
@@ -496,7 +496,7 @@ class NotebookCellExecutionTask implements Disposable {
     asApiObject(): theia.NotebookCellExecution {
         const that = this;
         const result: theia.NotebookCellExecution = {
-            get token(): CancellationToken { return that.tokenSource.token; },
+            get token(): theia.CancellationToken { return that.tokenSource.token; },
             get cell(): theia.NotebookCell { return that.cell.apiCell; },
             get executionOrder(): number | undefined { return that.executionOrder; },
             set executionOrder(v: number | undefined) {

package/src/plugin/notebook/notebook-renderers.ts

@@ -43,7 +43,6 @@ export class NotebookRenderersExtImpl implements NotebookRenderersExt {
         const messaging: theia.NotebookRendererMessaging = {
             onDidReceiveMessage: (listener, thisArg, disposables) => this.getOrCreateEmitterFor(rendererId).event(listener, thisArg, disposables),
             postMessage: (message, editorOrAlias) => {
-
                 const extHostEditor = editorOrAlias && NotebookEditor.apiEditorsToExtHost.get(editorOrAlias);
                 return this.proxy.$postMessage(extHostEditor?.id, rendererId, message);
             },

package/src/plugin/notebook/notebooks.ts

@@ -312,6 +312,26 @@ export class NotebooksExtImpl implements NotebooksExt {
         return result;
     }
 
+    waitForNotebookDocument(uri: TheiaURI, duration = 2000): Promise<NotebookDocument> {
+        const existing = this.getNotebookDocument(uri, true);
+        if (existing) {
+            return Promise.resolve(existing);
+        }
+        return new Promise<NotebookDocument>((resolve, reject) => {
+            const listener = this.onDidOpenNotebookDocument(event => {
+                if (event.uri.toString() === uri.toString()) {
+                    clearTimeout(timeout);
+                    listener.dispose();
+                    resolve(this.getNotebookDocument(uri));
+                }
+            });
+            const timeout = setTimeout(() => {
+                listener.dispose();
+                reject(new Error(`Notebook document did NOT open in ${duration}ms: ${uri}`));
+            }, duration);
+        });
+    }
+
     private createExtHostEditor(document: NotebookDocument, editorId: string, data: NotebookEditorAddData): void {
 
         if (this.editors.has(editorId)) {

package/src/plugin/plugin-context.ts

@@ -709,7 +709,8 @@ export function createAPIFactory(
                 } else {
                     throw new Error('Invalid arguments');
                 }
-                return notebooksExt.getNotebookDocument(uri).apiNotebook;
+                const result = await notebooksExt.waitForNotebookDocument(uri);
+                return result.apiNotebook;
 
             },
             createFileSystemWatcher: (pattern, ignoreCreate, ignoreChange, ignoreDelete): theia.FileSystemWatcher =>
@@ -721,6 +722,13 @@ export function createAPIFactory(
                 callbackOrToken?: CancellationToken | ((result: theia.TextSearchResult) => void), token?: CancellationToken): Promise<theia.TextSearchComplete> {
                 return workspaceExt.findTextInFiles(query, optionsOrCallback, callbackOrToken, token);
             },
+            save(uri: theia.Uri): PromiseLike<theia.Uri | undefined> {
+                return editors.save(uri);
+            },
+
+            saveAs(uri: theia.Uri): PromiseLike<theia.Uri | undefined> {
+                return editors.saveAs(uri);
+            },
             saveAll(includeUntitled?: boolean): PromiseLike<boolean> {
                 return editors.saveAll(includeUntitled);
             },
@@ -730,7 +738,8 @@ export function createAPIFactory(
             registerTextDocumentContentProvider(scheme: string, provider: theia.TextDocumentContentProvider): theia.Disposable {
                 return workspaceExt.registerTextDocumentContentProvider(scheme, provider);
             },
-            registerFileSystemProvider(scheme: string, provider: theia.FileSystemProvider, options?: { isCaseSensitive?: boolean, isReadonly?: boolean }): theia.Disposable {
+            registerFileSystemProvider(scheme: string, provider: theia.FileSystemProvider, options?: { isCaseSensitive?: boolean, isReadonly?: boolean | MarkdownString}):
+                theia.Disposable {
                 return fileSystemExt.registerFileSystemProvider(scheme, provider, options);
             },
             getWorkspaceFolder(uri: theia.Uri): theia.WorkspaceFolder | undefined {
@@ -1175,7 +1184,7 @@ export function createAPIFactory(
                     controller: theia.NotebookController) => void | Thenable<void>,
                 rendererScripts?: NotebookRendererScript[]
             ) {
-                return notebookKernels.createNotebookController(plugin.model.id, id, notebookType, label, handler, rendererScripts);
+                return notebookKernels.createNotebookController(plugin.model, id, notebookType, label, handler, rendererScripts);
             },
             createRendererMessaging(rendererId) {
                 return notebookRenderers.createRendererMessaging(rendererId);

package/src/plugin/preference-registry.ts

@@ -25,7 +25,7 @@ import { IConfigurationOverrides } from '@theia/monaco-editor-core/esm/vs/platfo
 import { Configuration, ConfigurationModel, ConfigurationModelParser } from '@theia/monaco-editor-core/esm/vs/platform/configuration/common/configurationModels';
 import { Workspace, WorkspaceFolder } from '@theia/monaco-editor-core/esm/vs/platform/workspace/common/workspace';
 import * as theia from '@theia/plugin';
-import { v4 } from 'uuid';
+import { generateUuid } from '@theia/core/lib/common/uuid';
 import {
     PLUGIN_RPC_CONTEXT, PreferenceChangeExt, PreferenceData, PreferenceRegistryExt,
     PreferenceRegistryMain
@@ -75,7 +75,7 @@ function lookUp(tree: any, key: string): any {
 export class TheiaWorkspace extends Workspace {
     constructor(ext: WorkspaceExtImpl) {
         const folders = (ext.workspaceFolders ?? []).map(folder => new WorkspaceFolder(folder));
-        super(v4(), folders, false, ext.workspaceFile ?? null, () => isOSX || isWindows);
+        super(generateUuid(), folders, false, ext.workspaceFile ?? null, () => isOSX || isWindows);
     }
 }
 

package/src/plugin/quick-open.ts

@@ -16,7 +16,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import {
     QuickOpenExt, PLUGIN_RPC_CONTEXT as Ext, QuickOpenMain, TransferInputBox, Plugin,
-    Item, TransferQuickInputButton, TransferQuickPickItems, TransferQuickInput
+    TransferQuickInputButton, TransferQuickInput, TransferQuickPickItem
 } from '../common/plugin-api-rpc';
 import * as theia from '@theia/plugin';
 import { CancellationToken } from '@theia/core/lib/common/cancellation';
@@ -31,7 +31,7 @@ import { PluginPackage } from '../common/plugin-protocol';
 import { QuickInputButtonHandle } from '@theia/core/lib/browser';
 import { MaybePromise } from '@theia/core/lib/common/types';
 import Severity from '@theia/monaco-editor-core/esm/vs/base/common/severity';
-import { ThemeIcon as MonacoThemeIcon } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService';
+import { ThemeIcon as MonacoThemeIcon } from '@theia/monaco-editor-core/esm/vs/base/common/themables';
 
 const canceledName = 'Canceled';
 /**
@@ -63,21 +63,7 @@ export function getDarkIconUri(iconPath: URI | { light: URI; dark: URI; }): URI
     return typeof iconPath === 'object' && 'dark' in iconPath ? iconPath.dark : iconPath;
 }
 
-export function getIconPathOrClass(button: theia.QuickInputButton): { iconPath: { dark: URI; light?: URI | undefined; } | undefined; iconClass: string | undefined; } {
-    const iconPathOrIconClass = getIconUris(button.iconPath);
-    let iconPath: { dark: URI; light?: URI | undefined } | undefined;
-    let iconClass: string | undefined;
-    if ('id' in iconPathOrIconClass) {
-        iconClass = MonacoThemeIcon.asClassName(iconPathOrIconClass);
-    } else {
-        iconPath = iconPathOrIconClass;
-    }
-
-    return {
-        iconPath,
-        iconClass
-    };
-}
+type Item = theia.QuickPickItem | string;
 
 export class QuickOpenExtImpl implements QuickOpenExt {
     private proxy: QuickOpenMain;
@@ -91,13 +77,13 @@ export class QuickOpenExtImpl implements QuickOpenExt {
     }
 
     /* eslint-disable max-len */
-    showQuickPick(itemsOrItemsPromise: Array<theia.QuickPickItem> | Promise<Array<theia.QuickPickItem>>, options: theia.QuickPickOptions & { canPickMany: true; }, token?: theia.CancellationToken): Promise<Array<theia.QuickPickItem> | undefined>;
+    showQuickPick(itemsOrItemsPromise: theia.QuickPickItem[] | Promise<theia.QuickPickItem[]>, options: theia.QuickPickOptions & { canPickMany: true; }, token?: theia.CancellationToken): Promise<Array<theia.QuickPickItem> | undefined>;
     showQuickPick(itemsOrItemsPromise: string[] | Promise<string[]>, options?: theia.QuickPickOptions, token?: theia.CancellationToken): Promise<string | undefined>;
-    showQuickPick(itemsOrItemsPromise: Array<theia.QuickPickItem> | Promise<Array<theia.QuickPickItem>>, options?: theia.QuickPickOptions, token?: theia.CancellationToken): Promise<theia.QuickPickItem | undefined>;
+    showQuickPick(itemsOrItemsPromise: theia.QuickPickItem[] | Promise<theia.QuickPickItem[]>, options?: theia.QuickPickOptions, token?: theia.CancellationToken): Promise<theia.QuickPickItem | undefined>;
     showQuickPick(itemsOrItemsPromise: Item[] | Promise<Item[]>, options?: theia.QuickPickOptions, token: theia.CancellationToken = CancellationToken.None): Promise<Item | Item[] | undefined> {
         this.onDidSelectItem = undefined;
 
-        const itemsPromise = <Promise<Item[]>>Promise.resolve(itemsOrItemsPromise);
+        const itemsPromise = Promise.resolve(itemsOrItemsPromise);
 
         const instance = ++this._instances;
 
@@ -118,7 +104,7 @@ export class QuickOpenExtImpl implements QuickOpenExt {
                 return undefined;
             }
             return itemsPromise.then(async items => {
-                const pickItems: Array<TransferQuickPickItems> = convertToTransferQuickPickItems(items);
+                const pickItems = convertToTransferQuickPickItems(items);
 
                 if (options && typeof options.onDidSelectItem === 'function') {
                     this.onDidSelectItem = handle => {
@@ -646,14 +632,14 @@ export class QuickPickExt<T extends theia.QuickPickItem> extends QuickInputExt i
             this._itemsToHandles.set(item, i);
         });
 
-        const pickItems: TransferQuickPickItems[] = [];
+        const pickItems: TransferQuickPickItem[] = [];
         for (let handle = 0; handle < items.length; handle++) {
             const item = items[handle];
             if (item.kind === QuickPickItemKind.Separator) {
-                pickItems.push({ type: 'separator', label: item.label, handle });
+                pickItems.push({ kind: 'separator', label: item.label, handle });
             } else {
                 pickItems.push({
-                    kind: item.kind,
+                    kind: 'item',
                     label: item.label,
                     iconPath: item.iconPath ? getIconUris(item.iconPath) : undefined,
                     description: item.description,

package/src/plugin/terminal-ext.ts

@@ -26,7 +26,7 @@ import * as Converter from './type-converters';
 import { Disposable, EnvironmentVariableMutatorType, TerminalExitReason, ThemeIcon } from './types-impl';
 import { NO_ROOT_URI, SerializableEnvironmentVariableCollection } from '@theia/terminal/lib/common/shell-terminal-protocol';
 import { ProvidedTerminalLink } from '../common/plugin-api-rpc-model';
-import { ThemeIcon as MonacoThemeIcon } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService';
+import { ThemeIcon as MonacoThemeIcon } from '@theia/monaco-editor-core/esm/vs/base/common/themables';
 
 export function getIconUris(iconPath: theia.TerminalOptions['iconPath']): { id: string } | undefined {
     if (ThemeIcon.is(iconPath)) {

package/src/plugin/tests.ts

@@ -34,7 +34,7 @@ import { isDefined } from '@theia/core/lib/common/types';
 import { TestingExt, PLUGIN_RPC_CONTEXT, TestingMain } from '../common/plugin-api-rpc';
 import { CommandRegistryImpl } from './command-registry';
 import { RPCProtocol } from '../common/rpc-protocol';
-import { v4 as uuidv4 } from 'uuid';
+import { generateUuid } from '@theia/core/lib/common/uuid';
 import * as Convert from './type-converters';
 import { TestItemImpl, TestItemCollection } from './test-item';
 import { AccumulatingTreeDeltaEmitter, TreeDelta } from '@theia/test/lib/common/tree-delta';
@@ -257,7 +257,7 @@ class TestRun implements theia.TestRun {
         readonly name: string,
         readonly isPersisted: boolean,
         isRunning: boolean) {
-        this.id = uuidv4();
+        this.id = generateUuid();
 
         this.tokenSource = new CancellationTokenSource();
         this.token = this.tokenSource.token;
@@ -416,6 +416,14 @@ export class TestingExtImpl implements TestingExt {
         this.controllersById.get(controllerId)?.getProfile(profileId)?.configureHandler?.();
     }
 
+    /** @inheritdoc */
+    $onDidChangeDefault(controllerId: string, profileId: string, isDefault: boolean): void {
+        const profile = this.controllersById.get(controllerId)?.getProfile(profileId);
+        if (profile) {
+            profile.doSetDefault(isDefault);
+        }
+    }
+
     /** @inheritdoc */
     async $refreshTests(controllerId: string, token: CancellationToken): Promise<void> {
         await this.withController(controllerId).refreshHandler?.(token);
@@ -483,8 +491,29 @@ export class TestRunProfile implements theia.TestRunProfile {
     @observableProperty('notifyPropertyChange')
     label: string;
 
-    @observableProperty('notifyPropertyChange')
-    isDefault: boolean;
+    _isDefault: boolean;
+
+    get isDefault(): boolean {
+        return this._isDefault;
+    }
+
+    set isDefault(isDefault: boolean) {
+        if (this.doSetDefault(isDefault)) {
+            this.proxy.$updateTestRunProfile(this.controllerId, this.profileId, { isDefault: isDefault });
+        }
+    }
+
+    doSetDefault(isDefault: boolean): boolean {
+       if (this._isDefault !== isDefault) {
+            this._isDefault = isDefault;
+            this.onDidChangeDefaultEmitter.fire(isDefault);
+            return true;
+        }
+        return false;
+    }
+
+    private onDidChangeDefaultEmitter = new Emitter<boolean>();
+    onDidChangeDefault = this.onDidChangeDefaultEmitter.event;
 
     @observableProperty('notifyTagChange')
     tag: theia.TestTag | undefined;

package/src/plugin/text-editors.ts

@@ -21,11 +21,10 @@ import { Emitter, Event } from '@theia/core/lib/common/event';
 import { EditorsAndDocumentsExtImpl } from './editors-and-documents';
 import { TextEditorExt } from './text-editor';
 import * as Converters from './type-converters';
-import { TextEditorSelectionChangeKind } from './types-impl';
+import { TextEditorSelectionChangeKind, URI } from './types-impl';
 import { IdGenerator } from '../common/id-generator';
 
 export class TextEditorsExtImpl implements TextEditorsExt {
-
     private readonly _onDidChangeTextEditorSelection = new Emitter<theia.TextEditorSelectionChangeEvent>();
     private readonly _onDidChangeTextEditorOptions = new Emitter<theia.TextEditorOptionsChangeEvent>();
     private readonly _onDidChangeTextEditorVisibleRanges = new Emitter<theia.TextEditorVisibleRangesChangeEvent>();
@@ -124,6 +123,14 @@ export class TextEditorsExtImpl implements TextEditorsExt {
         return this.proxy.$tryApplyWorkspaceEdit(dto, metadata);
     }
 
+    save(uri: theia.Uri): PromiseLike<theia.Uri | undefined> {
+        return this.proxy.$save(uri).then(components => URI.revive(components));
+    }
+
+    saveAs(uri: theia.Uri): PromiseLike<theia.Uri | undefined> {
+        return this.proxy.$saveAs(uri).then(components => URI.revive(components));
+    }
+
     saveAll(includeUntitled?: boolean): PromiseLike<boolean> {
         return this.proxy.$saveAll(includeUntitled);
     }

package/src/plugin/type-converters.ts

@@ -35,6 +35,7 @@ import { CellRange, isTextStreamMime } from '@theia/notebook/lib/common';
 import { MarkdownString as MarkdownStringDTO } from '@theia/core/lib/common/markdown-rendering';
 
 import { TestItemDTO, TestMessageDTO } from '../common/test-types';
+import { ThemeIcon } from '@theia/monaco-editor-core/esm/vs/base/common/themables';
 
 const SIDE_GROUP = -2;
 const ACTIVE_GROUP = -1;
@@ -747,9 +748,10 @@ export function isModelRange(arg: unknown): arg is model.Range {
 export function isUriComponents(arg: unknown): arg is UriComponents {
     return isObject<UriComponents>(arg) &&
         typeof arg.scheme === 'string' &&
+        (arg['$mid'] === 1 || (
         typeof arg.path === 'string' &&
         typeof arg.query === 'string' &&
-        typeof arg.fragment === 'string';
+        typeof arg.fragment === 'string'));
 }
 
 export function isModelCallHierarchyItem(arg: unknown): arg is model.CallHierarchyItem {
@@ -1212,23 +1214,57 @@ export function fromColorPresentation(colorPresentation: theia.ColorPresentation
     };
 }
 
-export function convertToTransferQuickPickItems(items: rpc.Item[]): rpc.TransferQuickPickItems[] {
-    return items.map<rpc.TransferQuickPickItems>((item, index) => {
+export function convertIconPath(iconPath: types.URI | { light: types.URI; dark: types.URI } | theia.ThemeIcon | undefined):
+    UriComponents | { light: UriComponents; dark: UriComponents } | ThemeIcon | undefined {
+    if (!iconPath) {
+        return undefined;
+    }
+    if (iconPath instanceof types.URI) {
+        return iconPath.toJSON();
+    } else if ('dark' in iconPath) {
+        return {
+            dark: iconPath.dark.toJSON(),
+            light: iconPath.light?.toJSON()
+        };
+    } else if (ThemeIcon.isThemeIcon(iconPath)) {
+        return {
+            id: iconPath.id,
+            color: iconPath.color ? { id: iconPath.color.id } : undefined
+        };
+    } else {
+        return undefined;
+    }
+}
+
+export function convertQuickInputButton(button: theia.QuickInputButton, index: number): rpc.TransferQuickInputButton {
+    const iconPath = convertIconPath(button.iconPath);
+    if (!iconPath) {
+        throw new Error(`Could not convert icon path: '${button.iconPath}'`);
+    }
+    return {
+        handle: index,
+        iconPath: iconPath,
+        tooltip: button.tooltip
+    };
+}
+
+export function convertToTransferQuickPickItems(items: (theia.QuickPickItem | string)[]): rpc.TransferQuickPickItem[] {
+    return items.map((item, index) => {
         if (typeof item === 'string') {
-            return { type: 'item', label: item, handle: index };
+            return { kind: 'item', label: item, handle: index };
         } else if (item.kind === QuickPickItemKind.Separator) {
-            return { type: 'separator', label: item.label, handle: index };
+            return { kind: 'separator', label: item.label, handle: index };
         } else {
             const { label, description, iconPath, detail, picked, alwaysShow, buttons } = item;
             return {
-                type: 'item',
+                kind: 'item',
                 label,
                 description,
-                iconPath,
+                iconPath: convertIconPath(iconPath),
                 detail,
                 picked,
                 alwaysShow,
-                buttons,
+                buttons: buttons ? buttons.map(convertQuickInputButton) : undefined,
                 handle: index,
             };
         }
@@ -1403,7 +1439,7 @@ export namespace DataTransferItem {
                     return {
                         name: file.name,
                         uri: URI.revive(file.uri),
-                        data: () => resolveFileData(item.id),
+                        data: () => resolveFileData(file.id),
                     };
                 }
             }('');

package/src/plugin/types-impl.ts

@@ -1869,13 +1869,13 @@ export class WorkspaceEdit implements theia.WorkspaceEdit {
     }
 
     set(uri: URI, edits: ReadonlyArray<TextEdit | SnippetTextEdit>): void;
-    set(uri: URI, edits: ReadonlyArray<[TextEdit | SnippetTextEdit, theia.WorkspaceEditEntryMetadata]>): void;
+    set(uri: URI, edits: ReadonlyArray<[TextEdit | SnippetTextEdit, theia.WorkspaceEditEntryMetadata | undefined]>): void;
     set(uri: URI, edits: ReadonlyArray<NotebookEdit>): void;
-    set(uri: URI, edits: ReadonlyArray<[NotebookEdit, theia.WorkspaceEditEntryMetadata]>): void;
+    set(uri: URI, edits: ReadonlyArray<[NotebookEdit, theia.WorkspaceEditEntryMetadata | undefined]>): void;
 
     set(uri: URI, edits: ReadonlyArray<TextEdit | SnippetTextEdit
-        | NotebookEdit | [NotebookEdit, theia.WorkspaceEditEntryMetadata]
-        | [TextEdit | SnippetTextEdit, theia.WorkspaceEditEntryMetadata]>): void {
+        | NotebookEdit | [NotebookEdit, theia.WorkspaceEditEntryMetadata | undefined]
+        | [TextEdit | SnippetTextEdit, theia.WorkspaceEditEntryMetadata | undefined]>): void {
         if (!edits) {
             // remove all text edits for `uri`
             for (let i = 0; i < this._edits.length; i++) {

package/src/plugin/webviews.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { v4 } from 'uuid';
+import { generateUuid, hashValue } from '@theia/core/lib/common/uuid';
 import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
 import { Plugin, WebviewsExt, WebviewPanelViewState, WebviewsMain, PLUGIN_RPC_CONTEXT, WebviewInitData, /* WebviewsMain, PLUGIN_RPC_CONTEXT  */ } from '../common/plugin-api-rpc';
 import * as theia from '@theia/plugin';
@@ -24,7 +24,6 @@ import { fromViewColumn, toViewColumn, toWebviewPanelShowOptions } from './type-
 import { Disposable, WebviewPanelTargetArea, URI } from './types-impl';
 import { WorkspaceExtImpl } from './workspace';
 import { PluginIconPath } from './plugin-icon-path';
-import { hashValue } from '@theia/core/lib/common/uuid';
 
 @injectable()
 export class WebviewsExtImpl implements WebviewsExt {
@@ -118,7 +117,7 @@ export class WebviewsExtImpl implements WebviewsExt {
         options: theia.WebviewPanelOptions & theia.WebviewOptions,
         plugin: Plugin
     ): theia.WebviewPanel {
-        const viewId = v4();
+        const viewId = generateUuid();
         const webviewShowOptions = toWebviewPanelShowOptions(showOptions);
         const webviewOptions = WebviewImpl.toWebviewOptions(options, this.workspace, plugin);
         this.proxy.$createWebviewPanel(viewId, viewType, title, webviewShowOptions, webviewOptions);
@@ -126,19 +125,33 @@ export class WebviewsExtImpl implements WebviewsExt {
         return panel;
     }
 
+    /**
+     * Creates a new webview panel.
+     *
+     * @param viewType Identifies the type of the webview panel.
+     * @param title Title of the panel.
+     * @param showOptions Where webview panel will be reside.
+     * @param options Settings for the new panel.
+     * @param plugin The plugin contributing the webview.
+     * @param viewId The identifier of the webview instance.
+     * @param originBasedOnType true if a stable origin based on the viewType shall be used, false if the viewId should be used.
+     * @returns The new webview panel.
+     */
     createWebviewPanel(
         viewType: string,
         title: string,
         showOptions: theia.ViewColumn | theia.WebviewPanelShowOptions,
         options: theia.WebviewPanelOptions & theia.WebviewOptions,
         plugin: Plugin,
-        viewId: string
+        viewId: string,
+        originBasedOnType = true
     ): WebviewPanelImpl {
         if (!this.initData) {
             throw new Error('Webviews are not initialized');
         }
         const webviewShowOptions = toWebviewPanelShowOptions(showOptions);
-        const webview = new WebviewImpl(viewId, this.proxy, options, this.initData, this.workspace, plugin, hashValue(viewType));
+        const origin = originBasedOnType ? hashValue(viewType) : undefined;
+        const webview = new WebviewImpl(viewId, this.proxy, options, this.initData, this.workspace, plugin, origin);
         const panel = new WebviewPanelImpl(viewId, this.proxy, viewType, title, webviewShowOptions, options, webview);
         this.webviewPanels.set(viewId, panel);
         return panel;
@@ -190,6 +203,10 @@ export class WebviewsExtImpl implements WebviewsExt {
     public getWebview(handle: string): WebviewImpl | undefined {
         return this.webviews.get(handle);
     }
+
+    public getResourceRoot(): string | undefined {
+        return this.initData?.webviewResourceRoot;
+    }
 }
 
 export class WebviewImpl implements theia.Webview {