@theia/plugin-ext 1.47.0-next.0 → 1.47.0

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

@@ -14,7 +14,6 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { URI } from '@theia/core/shared/vscode-uri';
 import {
     TextEditorsMain,
     MAIN_RPC_CONTEXT,
@@ -40,12 +39,14 @@ import { TextEditorMain } from './text-editor-main';
 import { disposed } from '../../common/errors';
 import { toMonacoWorkspaceEdit } from './languages-main';
 import { MonacoBulkEditService } from '@theia/monaco/lib/browser/monaco-bulk-edit-service';
-import { MonacoEditorService } from '@theia/monaco/lib/browser/monaco-editor-service';
-import { theiaUritoUriComponents, UriComponents } from '../../common/uri-components';
+import { UriComponents } from '../../common/uri-components';
 import { Endpoint } from '@theia/core/lib/browser/endpoint';
 import * as monaco from '@theia/monaco-editor-core';
 import { ResourceEdit } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/bulkEditService';
 import { IDecorationRenderOptions } from '@theia/monaco-editor-core/esm/vs/editor/common/editorCommon';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
+import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
+import { URI } from '@theia/core';
 
 export class TextEditorsMainImpl implements TextEditorsMain, Disposable {
 
@@ -59,7 +60,6 @@ export class TextEditorsMainImpl implements TextEditorsMain, Disposable {
         private readonly documents: DocumentsMain,
         rpc: RPCProtocol,
         private readonly bulkEditService: MonacoBulkEditService,
-        private readonly monacoEditorService: MonacoEditorService,
     ) {
         this.proxy = rpc.getProxy(MAIN_RPC_CONTEXT.TEXT_EDITORS_EXT);
         this.toDispose.push(editorsAndDocuments);
@@ -131,8 +131,8 @@ export class TextEditorsMainImpl implements TextEditorsMain, Disposable {
         const workspaceEdit = toMonacoWorkspaceEdit(dto);
         try {
             const edits = ResourceEdit.convert(workspaceEdit);
-            const { success } = await this.bulkEditService.apply(edits, { respectAutoSaveConfig: metadata?.isRefactoring });
-            return success;
+            const { isApplied } = await this.bulkEditService.apply(edits, { respectAutoSaveConfig: metadata?.isRefactoring });
+            return isApplied;
         } catch {
             return false;
         }
@@ -145,9 +145,9 @@ export class TextEditorsMainImpl implements TextEditorsMain, Disposable {
         return Promise.resolve(this.editorsAndDocuments.getEditor(id)!.insertSnippet(template, ranges, opts));
     }
 
-    $registerTextEditorDecorationType(key: string, options: DecorationRenderOptions | IDecorationRenderOptions): void {
+    $registerTextEditorDecorationType(key: string, options: DecorationRenderOptions): void {
         this.injectRemoteUris(options);
-        this.monacoEditorService.registerDecorationType('Plugin decoration', key, options as IDecorationRenderOptions);
+        StandaloneServices.get(ICodeEditorService).registerDecorationType('Plugin decoration', key, options as IDecorationRenderOptions);
         this.toDispose.push(Disposable.create(() => this.$removeTextEditorDecorationType(key)));
     }
 
@@ -171,13 +171,13 @@ export class TextEditorsMainImpl implements TextEditorsMain, Disposable {
 
     protected toRemoteUri(uri?: UriComponents): UriComponents | undefined {
         if (uri && uri.scheme === 'file') {
-            return theiaUritoUriComponents(this.fileEndpoint.withQuery(URI.revive(uri).toString()));
+            return this.fileEndpoint.withQuery(URI.fromComponents(uri).toString()).toComponents();
         }
         return uri;
     }
 
     $removeTextEditorDecorationType(key: string): void {
-        this.monacoEditorService.removeDecorationType(key);
+        StandaloneServices.get(ICodeEditorService).removeDecorationType(key);
     }
 
     $tryHideEditor(id: string): Promise<void> {
@@ -200,6 +200,14 @@ export class TextEditorsMainImpl implements TextEditorsMain, Disposable {
         return Promise.resolve();
     }
 
+    $save(uri: UriComponents): PromiseLike<UriComponents | undefined> {
+        return this.editorsAndDocuments.save(URI.fromComponents(uri)).then(u => u?.toComponents());
+    }
+
+    $saveAs(uri: UriComponents): PromiseLike<UriComponents | undefined> {
+        return this.editorsAndDocuments.saveAs(URI.fromComponents(uri)).then(u => u?.toComponents());
+    }
+
     $saveAll(includeUntitled?: boolean): Promise<boolean> {
         return this.editorsAndDocuments.saveAll(includeUntitled);
     }

package/src/main/browser/theme-icon-override.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { ThemeIcon } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService';
+import { getIconRegistry } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/iconRegistry';
 
 // @monaco-uplift
 // Keep this up-to-date with the table at https://code.visualstudio.com/api/references/icons-in-labels#icon-listing
@@ -27,11 +27,12 @@ const codeIconMap: Record<string, string> = {
     'callhierarchy-outgoing': 'call-outgoing',
     'callstack-view-icon': 'debug-alt',
     'callstack-view-session': 'bug',
+    'chat-editor-label-icon': 'comment-discussion',
     'comments-view-icon': 'comment-discussion',
     'debug-breakpoint': 'debug-breakpoint',
     'debug-breakpoint-conditional': 'debug-breakpoint-conditional',
     'debug-breakpoint-conditional-disabled': 'debug-breakpoint-conditional-disabled',
-    'debug-breakpoint-conditional-verified': 'debug-breakpoint-conditional-unverified',
+    'debug-breakpoint-conditional-unverified': 'debug-breakpoint-conditional-unverified',
     'debug-breakpoint-data': 'debug-breakpoint-data',
     'debug-breakpoint-data-disabled': 'debug-breakpoint-data-disabled',
     'debug-breakpoint-data-unverified': 'debug-breakpoint-data-unverified',
@@ -173,9 +174,11 @@ const codeIconMap: Record<string, string> = {
     'remote-explorer-view-icon': 'remote-explorer',
     'review-comment-collapse': 'chevron-up',
     'run-view-icon': 'debug-alt',
+    'runtime-extensions-editor-label-icon': ' extensions',
     'search-clear-results': 'clear-all',
     'search-collapse-results': 'collapse-all',
     'search-details': 'ellipsis',
+    'search-editor-label-icon': 'search',
     'search-expand-results': 'expand-all',
     'search-hide-replace': 'chevron-right',
     'search-new-editor': 'new-file',
@@ -190,6 +193,7 @@ const codeIconMap: Record<string, string> = {
     'settings-add': 'add',
     'settings-discard': 'discard',
     'settings-edit': 'edit',
+    'settings-editor-label-icon': 'settings',
     'settings-folder-dropdown': 'triangle-down',
     'settings-group-collapsed': 'chevron-right',
     'settings-group-expanded': 'chevron-down',
@@ -229,24 +233,14 @@ const codeIconMap: Record<string, string> = {
     'watch-expressions-add-function-breakpoint': 'add',
     'watch-expressions-remove-all': 'close-all',
     'watch-view-icon': 'debug-alt',
-    'widget-close': 'close'
+    'widget-close': 'close',
+    'workspace-trust-editor-label-icon': ' shield'
 };
 
-const originalAsCSSSelector = ThemeIcon.asCSSSelector;
-const originalAsClassName = ThemeIcon.asClassName;
-const originalAsClassNameArray = ThemeIcon.asClassNameArray;
+const registry = getIconRegistry();
 
-function buildMappedIcon(icon: ThemeIcon): ThemeIcon {
-    const id = codeIconMap[icon.id] ?? icon.id;
-    const newIcon: ThemeIcon = {
-        ...icon,
-        id
-    };
-    return newIcon;
+for (const key in codeIconMap) {
+    if (codeIconMap.hasOwnProperty(key)) {
+        registry.registerIcon(key, { id: codeIconMap[key] }, key);
+    }
 }
-
-Object.assign(ThemeIcon, {
-    asCSSSelector: (icon: ThemeIcon) => originalAsCSSSelector(buildMappedIcon(icon)),
-    asClassName: (icon: ThemeIcon) => originalAsClassName(buildMappedIcon(icon)),
-    asClassNameArray: (icon: ThemeIcon) => originalAsClassNameArray(buildMappedIcon(icon))
-});

package/src/main/browser/view/plugin-tree-view-node-label-provider.ts

@@ -20,7 +20,7 @@ import { LabelProviderContribution, LabelProvider, URIIconReference } from '@the
 import { TreeLabelProvider } from '@theia/core/lib/browser/tree/tree-label-provider';
 import { TreeViewNode } from './tree-view-widget';
 import { TreeNode } from '@theia/core/lib/browser/tree/tree';
-import { ThemeIcon } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService';
+import { ThemeIcon } from '@theia/monaco-editor-core/esm/vs/base/common/themables';
 
 @injectable()
 export class PluginTreeViewNodeLabelProvider implements LabelProviderContribution {

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

@@ -40,14 +40,14 @@ import { DebugConsoleContribution } from '@theia/debug/lib/browser/console/debug
 import { TreeViewWidget } from './tree-view-widget';
 import { SEARCH_VIEW_CONTAINER_ID } from '@theia/search-in-workspace/lib/browser/search-in-workspace-factory';
 import { TEST_VIEW_CONTAINER_ID } from '@theia/test/lib/browser/view/test-view-contribution';
-import { ThemeIcon } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService';
 import { WebviewView, WebviewViewResolver } from '../webview-views/webview-views';
 import { WebviewWidget, WebviewWidgetIdentifier } from '../webview/webview';
 import { CancellationToken } from '@theia/core/lib/common/cancellation';
-import { v4 } from 'uuid';
+import { generateUuid } from '@theia/core/lib/common/uuid';
 import { nls } from '@theia/core';
 import { TheiaDockPanel } from '@theia/core/lib/browser/shell/theia-dock-panel';
 import { Deferred } from '@theia/core/lib/common/promise-util';
+import { ThemeIcon } from '@theia/monaco-editor-core/esm/vs/base/common/themables';
 
 export const PLUGIN_VIEW_FACTORY_ID = 'plugin-view';
 export const PLUGIN_VIEW_CONTAINER_FACTORY_ID = 'plugin-view-container';
@@ -440,7 +440,7 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
     protected async createNewWebviewView(viewId: string): Promise<WebviewView> {
         const webview = await this.widgetManager.getOrCreateWidget<WebviewWidget>(
             WebviewWidget.FACTORY_ID, <WebviewWidgetIdentifier>{
-                id: v4(),
+                id: generateUuid(),
                 viewId,
             });
         webview.setContentOptions({ allowScripts: true });

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

@@ -75,7 +75,6 @@ export class PluginViewWidget extends Panel implements StatefulWidget, Descripti
         this.id = this.options.id;
         const localContext = this.contextKeyService.createScoped(this.node);
         localContext.setContext('view', this.options.viewId);
-        this.toDispose.push(localContext);
     }
 
     get onDidChangeDescription(): Event<void> {

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

@@ -669,7 +669,7 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
 
         this.model.proxy!.$dragStarted(this.options.id, selectedNodes.map(selected => selected.id), CancellationToken.None).then(maybeUris => {
             if (maybeUris) {
-                this.applicationShell.addAdditionalDraggedEditorUris(maybeUris.map(URI.fromComponents));
+                this.applicationShell.addAdditionalDraggedEditorUris(maybeUris.map(uri => URI.fromComponents(uri)));
             }
         });
     }
@@ -921,8 +921,7 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
                     menuPath: contextMenuPath,
                     anchor: { x, y },
                     args,
-                    contextKeyService,
-                    onHide: () => contextKeyService.dispose(),
+                    contextKeyService
                 }), 10);
             }
         }

package/src/main/node/errors.spec.ts

@@ -17,13 +17,13 @@
 import { rejects } from 'assert';
 import { strictEqual } from 'assert/strict';
 import { promises as fs } from 'fs';
-import { v4 } from 'uuid';
+import { generateUuid } from '@theia/core/lib/common/uuid';
 import { isENOENT } from '../../common/errors';
 
 describe('errors', () => {
     describe('errno-exception', () => {
         it('should be ENOENT error', async () => {
-            await rejects(fs.readFile(v4()), reason => isENOENT(reason));
+            await rejects(fs.readFile(generateUuid()), reason => isENOENT(reason));
         });
 
         it('should not be ENOENT error (no code)', () => {

package/src/plugin/debug/debug-ext.ts

@@ -28,7 +28,7 @@ import { DEBUG_SCHEME, SCHEME_PATTERN } from '@theia/debug/lib/common/debug-uri-
 import { Disposable, Breakpoint as BreakpointExt, SourceBreakpoint, FunctionBreakpoint, Location, Range, URI as URIImpl } from '../types-impl';
 import { PluginDebugAdapterSession } from './plugin-debug-adapter-session';
 import { PluginDebugAdapterTracker } from './plugin-debug-adapter-tracker';
-import uuid = require('uuid');
+import { generateUuid } from '@theia/core/lib/common/uuid';
 import { DebugAdapter } from '@theia/debug/lib/common/debug-model';
 import { PluginDebugAdapterCreator } from './plugin-debug-adapter-creator';
 import { NodeDebugAdapterCreator } from '../node/debug/plugin-node-debug-adapter-creator';
@@ -345,7 +345,7 @@ export class DebugExtImpl implements DebugExt {
     }
 
     async $createDebugSession(debugConfiguration: DebugConfiguration, workspaceFolderUri: string | undefined): Promise<string> {
-        const sessionId = uuid.v4();
+        const sessionId = generateUuid();
 
         const parentSession = debugConfiguration.parentSessionId ? this.sessions.get(debugConfiguration.parentSessionId) : undefined;
         const theiaSession: theia.DebugSession = {

package/src/plugin/env.ts

@@ -19,7 +19,7 @@ import * as theia from '@theia/plugin';
 import { RPCProtocol } from '../common/rpc-protocol';
 import { EnvMain, PLUGIN_RPC_CONTEXT } from '../common/plugin-api-rpc';
 import { QueryParameters } from '../common/env';
-import { v4 } from 'uuid';
+import { generateUuid } from '@theia/core/lib/common/uuid';
 
 @injectable()
 export abstract class EnvExtImpl {
@@ -38,8 +38,8 @@ export abstract class EnvExtImpl {
     private _remoteName: string | undefined;
 
     constructor() {
-        this.envSessionId = v4();
-        this.envMachineId = v4();
+        this.envSessionId = generateUuid();
+        this.envMachineId = generateUuid();
         this._remoteName = undefined;
     }
 

package/src/plugin/file-system-ext-impl.ts

@@ -41,6 +41,7 @@ import { commonPrefixLength } from '@theia/core/lib/common/strings';
 import { CharCode } from '@theia/core/lib/common/char-code';
 import { BinaryBuffer } from '@theia/core/lib/common/buffer';
 import { Emitter } from '@theia/core/shared/vscode-languageserver-protocol';
+import { MarkdownString } from '../common/plugin-api-rpc-model';
 
 type IDisposable = vscode.Disposable;
 
@@ -223,7 +224,7 @@ export class FileSystemExtImpl implements FileSystemExt {
         this.onWillRegisterFileSystemProviderEmitter.dispose();
     }
 
-    registerFileSystemProvider(scheme: string, provider: vscode.FileSystemProvider, options: { isCaseSensitive?: boolean, isReadonly?: boolean } = {}) {
+    registerFileSystemProvider(scheme: string, provider: vscode.FileSystemProvider, options: { isCaseSensitive?: boolean, isReadonly?: boolean | MarkdownString } = {}) {
 
         if (this._usedSchemes.has(scheme)) {
             throw new Error(`a provider for the scheme '${scheme}' is already registered`);
@@ -252,7 +253,19 @@ export class FileSystemExtImpl implements FileSystemExt {
             capabilities += files.FileSystemProviderCapabilities.FileOpenReadWriteClose;
         }
 
-        this._proxy.$registerFileSystemProvider(handle, scheme, capabilities);
+        let readonlyMessage: MarkdownString | undefined;
+        if (options.isReadonly && MarkdownString.is(options.isReadonly)) {
+            readonlyMessage = {
+                value: options.isReadonly.value,
+                isTrusted: options.isReadonly.isTrusted,
+                supportThemeIcons: options.isReadonly.supportThemeIcons,
+                supportHtml: options.isReadonly.supportHtml,
+                baseUri: options.isReadonly.baseUri,
+                uris: options.isReadonly.uris
+            };
+        }
+
+        this._proxy.$registerFileSystemProvider(handle, scheme, capabilities, readonlyMessage);
 
         const subscription = provider.onDidChangeFile(event => {
             const mapped: IFileChangeDto[] = [];

package/src/plugin/known-commands.ts

@@ -261,6 +261,7 @@ export namespace KnownCommands {
     mappings['closeReferenceSearch'] = ['closeReferenceSearch', CONVERT_VSCODE_TO_MONACO];
     mappings['goToNextReference'] = ['goToNextReference', CONVERT_VSCODE_TO_MONACO];
     mappings['goToPreviousReference'] = ['goToPreviousReference', CONVERT_VSCODE_TO_MONACO];
+    mappings['setContext'] = ['_setContext', CONVERT_VSCODE_TO_MONACO];
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const CONVERT_MONACO_TO_VSCODE = (args: any | undefined) => {

package/src/plugin/languages/diagnostics.ts

@@ -22,7 +22,7 @@ import { MarkerData } from '../../common/plugin-api-rpc-model';
 import { RPCProtocol } from '../../common/rpc-protocol';
 import { PLUGIN_RPC_CONTEXT, LanguagesMain } from '../../common/plugin-api-rpc';
 import { URI } from '@theia/core/shared/vscode-uri';
-import { v4 } from 'uuid';
+import { generateUuid } from '@theia/core/lib/common/uuid';
 
 export class DiagnosticCollection implements theia.DiagnosticCollection {
     private static DIAGNOSTICS_PRIORITY = [
@@ -288,7 +288,7 @@ export class Diagnostics {
     }
 
     private getNextId(): string {
-        return v4();
+        return generateUuid();
     }
 
     private getAllDiagnosticsForResource(uri: URI): theia.Diagnostic[] {

package/src/plugin/languages/link-provider.ts

@@ -33,7 +33,9 @@ export class LinkProviderAdapter {
     provideLinks(resource: URI, token: theia.CancellationToken): Promise<DocumentLink[] | undefined> {
         const document = this.documents.getDocumentData(resource);
         if (!document) {
-            return Promise.reject(new Error(`There is no document for ${resource}`));
+            // not all documents are replicated to the plugin host (e.g. breakpoint input)
+            console.warn(`There is no document for ${resource}`);
+            return Promise.resolve(undefined);
         }
 
         const doc = document.document;

package/src/plugin/markdown-string.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { Mutable } from '@theia/core';
-import { MarkdownStringImpl as BaseMarkdownString, MarkdownString as MarkdownStringInterface } from '@theia/core/lib/common/markdown-rendering';
+import { MarkdownStringImpl as BaseMarkdownString, MarkdownString as MarkdownStringInterface, MarkdownStringTrustedOptions } from '@theia/core/lib/common/markdown-rendering';
 import * as pluginAPI from '@theia/plugin';
 import { es5ClassCompat } from '../common/types';
 import { URI } from './types-impl';
@@ -49,11 +49,11 @@ export class MarkdownString implements pluginAPI.MarkdownString {
         this.#delegate.value = value;
     }
 
-    get isTrusted(): boolean | undefined {
+    get isTrusted(): boolean | MarkdownStringTrustedOptions | undefined {
         return this.#delegate.isTrusted;
     }
 
-    set isTrusted(value: boolean | undefined) {
+    set isTrusted(value: boolean | MarkdownStringTrustedOptions | undefined) {
         this.#delegate.isTrusted = value;
     }
 

package/src/plugin/node/env-node-ext.ts

@@ -18,7 +18,7 @@ import { injectable } from '@theia/core/shared/inversify';
 import * as mac from 'macaddress';
 import { EnvExtImpl } from '../env';
 import { createHash } from 'crypto';
-import { v4 } from 'uuid';
+import { generateUuid } from '@theia/core/lib/common/uuid';
 import fs = require('fs');
 
 /**
@@ -36,7 +36,7 @@ export class EnvNodeExtImpl extends EnvExtImpl {
 
         mac.one((err, macAddress) => {
             if (err) {
-                this.macMachineId = v4();
+                this.macMachineId = generateUuid();
             } else {
                 this.macMachineId = createHash('sha256').update(macAddress, 'utf8').digest('hex');
             }

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,
@@ -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/plugin-context.ts

@@ -722,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);
             },
@@ -731,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 {
@@ -1176,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);
     }
 }