@theia/plugin-ext 1.44.0 → 1.45.1

package/package.json

@@ -1,37 +1,37 @@
 {
   "name": "@theia/plugin-ext",
-  "version": "1.44.0",
+  "version": "1.45.1",
   "description": "Theia - Plugin Extension",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
   "dependencies": {
-    "@theia/bulk-edit": "1.44.0",
-    "@theia/callhierarchy": "1.44.0",
-    "@theia/console": "1.44.0",
-    "@theia/core": "1.44.0",
-    "@theia/debug": "1.44.0",
-    "@theia/editor": "1.44.0",
-    "@theia/editor-preview": "1.44.0",
-    "@theia/file-search": "1.44.0",
-    "@theia/filesystem": "1.44.0",
-    "@theia/markers": "1.44.0",
-    "@theia/messages": "1.44.0",
-    "@theia/monaco": "1.44.0",
+    "@theia/bulk-edit": "1.45.1",
+    "@theia/callhierarchy": "1.45.1",
+    "@theia/console": "1.45.1",
+    "@theia/core": "1.45.1",
+    "@theia/debug": "1.45.1",
+    "@theia/editor": "1.45.1",
+    "@theia/editor-preview": "1.45.1",
+    "@theia/file-search": "1.45.1",
+    "@theia/filesystem": "1.45.1",
+    "@theia/markers": "1.45.1",
+    "@theia/messages": "1.45.1",
+    "@theia/monaco": "1.45.1",
     "@theia/monaco-editor-core": "1.72.3",
-    "@theia/navigator": "1.44.0",
-    "@theia/notebook": "1.44.0",
-    "@theia/output": "1.44.0",
-    "@theia/plugin": "1.44.0",
-    "@theia/preferences": "1.44.0",
-    "@theia/scm": "1.44.0",
-    "@theia/search-in-workspace": "1.44.0",
-    "@theia/task": "1.44.0",
-    "@theia/terminal": "1.44.0",
-    "@theia/test": "1.44.0",
-    "@theia/timeline": "1.44.0",
-    "@theia/typehierarchy": "1.44.0",
-    "@theia/variable-resolver": "1.44.0",
-    "@theia/workspace": "1.44.0",
+    "@theia/navigator": "1.45.1",
+    "@theia/notebook": "1.45.1",
+    "@theia/output": "1.45.1",
+    "@theia/plugin": "1.45.1",
+    "@theia/preferences": "1.45.1",
+    "@theia/scm": "1.45.1",
+    "@theia/search-in-workspace": "1.45.1",
+    "@theia/task": "1.45.1",
+    "@theia/terminal": "1.45.1",
+    "@theia/test": "1.45.1",
+    "@theia/timeline": "1.45.1",
+    "@theia/typehierarchy": "1.45.1",
+    "@theia/variable-resolver": "1.45.1",
+    "@theia/workspace": "1.45.1",
     "@types/mime": "^2.0.1",
     "@vscode/debugprotocol": "^1.51.0",
     "@vscode/proxy-agent": "^0.13.2",
@@ -88,7 +88,7 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.44.0",
+    "@theia/ext-scripts": "1.45.1",
     "@types/decompress": "^4.2.2",
     "@types/escape-html": "^0.0.20",
     "@types/lodash.clonedeep": "^4.5.3",
@@ -97,5 +97,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "46349875c7ff0e58c3c77ffe4eaa53ac74fa97a5"
+  "gitHead": "3837c50544190b80d0ad8e87aa9fa9f286c70fcc"
 }

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

@@ -234,6 +234,7 @@ export interface PluginManagerInitializeParams {
     extApi?: ExtPluginApi[]
     webview: WebviewInitData
     jsonValidation: PluginJsonValidationContribution[]
+    supportedActivationEvents?: string[]
 }
 
 export interface PluginManagerStartParams {
@@ -2342,7 +2343,7 @@ export interface NotebookOutputItemDto {
 export interface NotebookOutputDto {
     outputId: string;
     items: NotebookOutputItemDto[];
-    metadata?: Record<string, any>;
+    metadata?: Record<string, unknown>;
 }
 
 export interface NotebookCellDataDto {

package/src/common/proxy-handler.ts

@@ -48,11 +48,13 @@ export class ClientProxyHandler<T extends object> implements ProxyHandler<T> {
     }
 
     private initializeRpc(): void {
+        // we need to set the flag to true before waiting for the channel provider. Otherwise `get` might
+        // get called again and we'll try to open a channel more than once
+        this.isRpcInitialized = true;
         const clientOptions: RpcProtocolOptions = { encoder: this.encoder, decoder: this.decoder, mode: 'clientOnly' };
         this.channelProvider().then(channel => {
             const rpc = new RpcProtocol(channel, undefined, clientOptions);
             this.rpcDeferred.resolve(rpc);
-            this.isRpcInitialized = true;
         });
     }
 

package/src/common/test-types.ts

@@ -84,6 +84,7 @@ export interface TestMessageDTO {
     readonly actual?: string;
     readonly location?: Location;
     readonly message: string | MarkdownString;
+    readonly contextValue?: string;
 }
 
 export interface TestItemDTO {
@@ -131,3 +132,22 @@ export namespace TestItemReference {
     }
 }
 
+export interface TestMessageArg {
+    testItemReference: TestItemReference | undefined,
+    testMessage: TestMessageDTO
+}
+
+export namespace TestMessageArg {
+    export function is(arg: unknown): arg is TestMessageArg {
+        return isObject<TestMessageArg>(arg)
+            && isObject<TestMessageDTO>(arg.testMessage)
+            && (MarkdownString.is(arg.testMessage.message) || typeof arg.testMessage.message === 'string');
+    }
+
+    export function create(testItemReference: TestItemReference | undefined, testMessageDTO: TestMessageDTO): TestMessageArg {
+        return {
+            testItemReference: testItemReference,
+            testMessage: testMessageDTO
+        };
+    }
+}

package/src/hosted/browser/hosted-plugin.ts

@@ -80,6 +80,30 @@ export const ALL_ACTIVATION_EVENT = '*';
 @injectable()
 export class HostedPluginSupport {
 
+    protected static ADDITIONAL_ACTIVATION_EVENTS_ENV = 'ADDITIONAL_ACTIVATION_EVENTS';
+    protected static BUILTIN_ACTIVATION_EVENTS = [
+        '*',
+        'onLanguage',
+        'onCommand',
+        'onDebug',
+        'onDebugInitialConfigurations',
+        'onDebugResolve',
+        'onDebugAdapterProtocolTracker',
+        'onDebugDynamicConfigurations',
+        'onTaskType',
+        'workspaceContains',
+        'onView',
+        'onUri',
+        'onTerminalProfile',
+        'onWebviewPanel',
+        'onFileSystem',
+        'onCustomEditor',
+        'onStartupFinished',
+        'onAuthenticationRequest',
+        'onNotebook',
+        'onNotebookSerializer'
+    ];
+
     protected readonly clientId = UUID.uuid4();
 
     protected container: interfaces.Container;
@@ -377,8 +401,12 @@ export class HostedPluginSupport {
                 waitPluginsMeasurement.error('Backend deployment failed.');
             }
         }
-
-        syncPluginsMeasurement?.log(`Sync of ${this.getPluginCount(initialized)}`);
+        if (initialized > 0) {
+            // Only log sync measurement if there are were plugins to sync.
+            syncPluginsMeasurement?.log(`Sync of ${this.getPluginCount(initialized)}`);
+        } else {
+            syncPluginsMeasurement.stop();
+        }
     }
 
     /**
@@ -416,8 +444,12 @@ export class HostedPluginSupport {
                 }));
             }
         }
-
-        loadPluginsMeasurement.log(`Load contributions of ${this.getPluginCount(loaded)}`);
+        if (loaded > 0) {
+            // Only log load measurement if there are were plugins to load.
+            loadPluginsMeasurement?.log(`Load contributions of ${this.getPluginCount(loaded)}`);
+        } else {
+            loadPluginsMeasurement.stop();
+        }
 
         return hostContributions;
     }
@@ -488,7 +520,11 @@ export class HostedPluginSupport {
             return;
         }
 
-        startPluginsMeasurement.log(`Start of ${this.getPluginCount(started)}`);
+        if (started > 0) {
+            startPluginsMeasurement.log(`Start of ${this.getPluginCount(started)}`);
+        } else {
+            startPluginsMeasurement.stop();
+        }
     }
 
     protected async obtainManager(host: string, hostContributions: PluginContributions[], toDisconnect: DisposableCollection): Promise<PluginManagerExt | undefined> {
@@ -519,6 +555,13 @@ export class HostedPluginSupport {
             }
 
             const isElectron = environment.electron.is();
+
+            const supportedActivationEvents = [...HostedPluginSupport.BUILTIN_ACTIVATION_EVENTS];
+            const additionalActivationEvents = await this.envServer.getValue(HostedPluginSupport.ADDITIONAL_ACTIVATION_EVENTS_ENV);
+            if (additionalActivationEvents && additionalActivationEvents.value) {
+                additionalActivationEvents.value.split(',').forEach(event => supportedActivationEvents.push(event));
+            }
+
             await manager.$init({
                 preferences: getPreferences(this.preferenceProviderProvider, this.workspaceService.tryGetRoots()),
                 globalState,
@@ -536,11 +579,13 @@ export class HostedPluginSupport {
                     webviewResourceRoot,
                     webviewCspSource
                 },
-                jsonValidation
+                jsonValidation,
+                supportedActivationEvents
             });
             if (toDisconnect.disposed) {
                 return undefined;
             }
+            this.activationEvents.forEach(event => manager!.$activateByEvent(event));
         }
         return manager;
     }

package/src/hosted/node/plugin-activation-events.ts

@@ -20,6 +20,7 @@ import {
     PluginPackage,
     PluginPackageAuthenticationProvider,
     PluginPackageCommand,
+    PluginPackageContribution,
     PluginPackageCustomEditor,
     PluginPackageLanguageContribution,
     PluginPackageNotebook,
@@ -31,7 +32,7 @@ import {
  * This function will update the manifest based on the plugin contributions.
  */
 export function updateActivationEvents(manifest: PluginPackage): void {
-    if (!isObject(manifest) || !isObject(manifest.contributes) || !manifest.contributes) {
+    if (!isObject<PluginPackage>(manifest) || !isObject<PluginPackageContribution>(manifest.contributes) || !manifest.contributes) {
         return;
     }
 
@@ -42,8 +43,8 @@ export function updateActivationEvents(manifest: PluginPackage): void {
         const commands = Array.isArray(value) ? value : [value];
         updateCommandsContributions(commands, activationEvents);
     }
-    if (Array.isArray(manifest.contributes.views)) {
-        const views = flatten(Object.values(manifest.contributes.views)) as PluginPackageView[];
+    if (isObject(manifest.contributes.views)) {
+        const views = flatten(Object.values(manifest.contributes.views));
         updateViewsContribution(views, activationEvents);
     }
     if (Array.isArray(manifest.contributes.customEditors)) {
@@ -64,7 +65,7 @@ export function updateActivationEvents(manifest: PluginPackage): void {
 
 function updateViewsContribution(views: PluginPackageView[], activationEvents: Set<string>): void {
     for (const view of views) {
-        if (isObject(view) && typeof view.id === 'string') {
+        if (isObject<PluginPackageView>(view) && typeof view.id === 'string') {
             activationEvents.add(`onView:${view.id}`);
         }
     }
@@ -72,7 +73,7 @@ function updateViewsContribution(views: PluginPackageView[], activationEvents: S
 
 function updateCustomEditorsContribution(customEditors: PluginPackageCustomEditor[], activationEvents: Set<string>): void {
     for (const customEditor of customEditors) {
-        if (isObject(customEditor) && typeof customEditor.viewType === 'string') {
+        if (isObject<PluginPackageCustomEditor>(customEditor) && typeof customEditor.viewType === 'string') {
             activationEvents.add(`onCustomEditor:${customEditor.viewType}`);
         }
     }
@@ -80,7 +81,7 @@ function updateCustomEditorsContribution(customEditors: PluginPackageCustomEdito
 
 function updateCommandsContributions(commands: PluginPackageCommand[], activationEvents: Set<string>): void {
     for (const command of commands) {
-        if (isObject(command) && typeof command.command === 'string') {
+        if (isObject<PluginPackageCommand>(command) && typeof command.command === 'string') {
             activationEvents.add(`onCommand:${command.command}`);
         }
     }
@@ -88,7 +89,7 @@ function updateCommandsContributions(commands: PluginPackageCommand[], activatio
 
 function updateAuthenticationProviderContributions(authProviders: PluginPackageAuthenticationProvider[], activationEvents: Set<string>): void {
     for (const authProvider of authProviders) {
-        if (isObject(authProvider) && typeof authProvider.id === 'string') {
+        if (isObject<PluginPackageAuthenticationProvider>(authProvider) && typeof authProvider.id === 'string') {
             activationEvents.add(`onAuthenticationRequest:${authProvider.id}`);
         }
     }
@@ -96,7 +97,7 @@ function updateAuthenticationProviderContributions(authProviders: PluginPackageA
 
 function updateLanguageContributions(languages: PluginPackageLanguageContribution[], activationEvents: Set<string>): void {
     for (const language of languages) {
-        if (isObject(language) && typeof language.id === 'string') {
+        if (isObject<PluginPackageLanguageContribution>(language) && typeof language.id === 'string') {
             activationEvents.add(`onLanguage:${language.id}`);
         }
     }
@@ -104,7 +105,7 @@ function updateLanguageContributions(languages: PluginPackageLanguageContributio
 
 function updateNotebookContributions(notebooks: PluginPackageNotebook[], activationEvents: Set<string>): void {
     for (const notebook of notebooks) {
-        if (isObject(notebook) && typeof notebook.type === 'string') {
+        if (isObject<PluginPackageNotebook>(notebook) && typeof notebook.type === 'string') {
             activationEvents.add(`onNotebookSerializer:${notebook.type}`);
         }
     }

package/src/main/browser/debug/plugin-debug-service.ts

@@ -97,6 +97,13 @@ export class PluginDebugService implements DebugService {
     }, 100);
 
     registerDebugConfigurationProvider(provider: PluginDebugConfigurationProvider): Disposable {
+        if (this.configurationProviders.has(provider.handle)) {
+            const configuration = this.configurationProviders.get(provider.handle);
+            if (configuration && configuration.type !== provider.type) {
+                console.warn(`Different debug configuration provider with type '${configuration.type}' already registered.`);
+                provider.handle = this.configurationProviders.size;
+            }
+        }
         const handle = provider.handle;
         this.configurationProviders.set(handle, provider);
         this.fireOnDidConfigurationProvidersChanged();

package/src/main/browser/menus/plugin-menu-command-adapter.ts

@@ -23,10 +23,13 @@ import { ScmRepository } from '@theia/scm/lib/browser/scm-repository';
 import { ScmService } from '@theia/scm/lib/browser/scm-service';
 import { TimelineItem } from '@theia/timeline/lib/common/timeline-model';
 import { ScmCommandArg, TimelineCommandArg, TreeViewItemReference } from '../../../common';
+import { TestItemReference, TestMessageArg } from '../../../common/test-types';
 import { PluginScmProvider, PluginScmResource, PluginScmResourceGroup } from '../scm-main';
 import { TreeViewWidget } from '../view/tree-view-widget';
 import { CodeEditorWidgetUtil, codeToTheiaMappings, ContributionPoint } from './vscode-theia-menu-mappings';
 import { TAB_BAR_TOOLBAR_CONTEXT_MENU } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
+import { TestItem, TestMessage } from '@theia/test/lib/browser/test-service';
+import { fromLocation } from '../hierarchy/hierarchy-types-converters';
 
 export type ArgumentAdapter = (...args: unknown[]) => unknown[];
 
@@ -79,6 +82,7 @@ export class PluginMenuCommandAdapter implements MenuCommandAdapter {
     @postConstruct()
     protected init(): void {
         const toCommentArgs: ArgumentAdapter = (...args) => this.toCommentArgs(...args);
+        const toTestMessageArgs: ArgumentAdapter = (...args) => this.toTestMessageArgs(...args);
         const firstArgOnly: ArgumentAdapter = (...args) => [args[0]];
         const noArgs: ArgumentAdapter = () => [];
         const toScmArgs: ArgumentAdapter = (...args) => this.toScmArgs(...args);
@@ -100,9 +104,11 @@ export class PluginMenuCommandAdapter implements MenuCommandAdapter {
             ['scm/resourceGroup/context', toScmArgs],
             ['scm/resourceState/context', toScmArgs],
             ['scm/title', () => [this.toScmArg(this.scmService.selectedRepository)]],
+            ['testing/message/context', toTestMessageArgs],
             ['timeline/item/context', (...args) => this.toTimelineArgs(...args)],
             ['view/item/context', (...args) => this.toTreeArgs(...args)],
             ['view/title', noArgs],
+            ['webview/context', noArgs]
         ]).forEach(([contributionPoint, adapter]) => {
             if (adapter) {
                 const paths = codeToTheiaMappings.get(contributionPoint);
@@ -229,6 +235,30 @@ export class PluginMenuCommandAdapter implements MenuCommandAdapter {
         return timelineArgs;
     }
 
+    protected toTestMessageArgs(...args: any[]): any[] {
+        let testItem: TestItem | undefined;
+        let testMessage: TestMessage | undefined;
+        for (const arg of args) {
+            if (TestItem.is(arg)) {
+                testItem = arg;
+            } else if (Array.isArray(arg) && TestMessage.is(arg[0])) {
+                testMessage = arg[0];
+            }
+        }
+        if (testMessage) {
+            const testItemReference = (testItem && testItem.controller) ? TestItemReference.create(testItem.controller.id, testItem.path) : undefined;
+            const testMessageDTO = {
+                message: testMessage.message,
+                actual: testMessage.actual,
+                expected: testMessage.expected,
+                contextValue: testMessage.contextValue,
+                location: testMessage.location ? fromLocation(testMessage.location) : undefined
+            };
+            return [TestMessageArg.create(testItemReference, testMessageDTO)];
+        }
+        return [];
+    }
+
     protected toTimelineArg(arg: TimelineItem): TimelineCommandArg {
         return {
             timelineHandle: arg.handle,

package/src/main/browser/menus/vscode-theia-menu-mappings.ts

@@ -29,9 +29,10 @@ import { ScmTreeWidget } from '@theia/scm/lib/browser/scm-tree-widget';
 import { TIMELINE_ITEM_CONTEXT_MENU } from '@theia/timeline/lib/browser/timeline-tree-widget';
 import { COMMENT_CONTEXT, COMMENT_THREAD_CONTEXT, COMMENT_TITLE } from '../comments/comment-thread-widget';
 import { VIEW_ITEM_CONTEXT_MENU } from '../view/tree-view-widget';
-import { WebviewWidget } from '../webview/webview';
+import { WEBVIEW_CONTEXT_MENU, WebviewWidget } from '../webview/webview';
 import { EDITOR_LINENUMBER_CONTEXT_MENU } from '@theia/editor/lib/browser/editor-linenumber-contribution';
 import { TEST_VIEW_CONTEXT_MENU } from '@theia/test/lib/browser/view/test-view-contribution';
+import { TEST_RUNS_CONTEXT_MENU } from '@theia/test/lib/browser/view/test-run-view-contribution';
 
 export const PLUGIN_EDITOR_TITLE_MENU = ['plugin_editor/title'];
 export const PLUGIN_EDITOR_TITLE_RUN_MENU = ['plugin_editor/title/run'];
@@ -57,8 +58,10 @@ export const implementedVSCodeContributionPoints = [
     'scm/title',
     'timeline/item/context',
     'testing/item/context',
+    'testing/message/context',
     'view/item/context',
-    'view/title'
+    'view/title',
+    'webview/context'
 ] as const;
 
 export type ContributionPoint = (typeof implementedVSCodeContributionPoints)[number];
@@ -82,9 +85,11 @@ export const codeToTheiaMappings = new Map<ContributionPoint, MenuPath[]>([
     ['scm/resourceState/context', [ScmTreeWidget.RESOURCE_CONTEXT_MENU]],
     ['scm/title', [PLUGIN_SCM_TITLE_MENU]],
     ['testing/item/context', [TEST_VIEW_CONTEXT_MENU]],
+    ['testing/message/context', [TEST_RUNS_CONTEXT_MENU]],
     ['timeline/item/context', [TIMELINE_ITEM_CONTEXT_MENU]],
     ['view/item/context', [VIEW_ITEM_CONTEXT_MENU]],
     ['view/title', [PLUGIN_VIEW_TITLE_MENU]],
+    ['webview/context', [WEBVIEW_CONTEXT_MENU]]
 ]);
 
 type CodeEditorWidget = EditorWidget | WebviewWidget;

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

@@ -23,7 +23,7 @@ import { interfaces } from '@theia/core/shared/inversify';
 import { UriComponents } from '@theia/core/lib/common/uri';
 import { NotebookEditorWidget, NotebookService, NotebookEditorWidgetService } from '@theia/notebook/lib/browser';
 import { NotebookModel } from '@theia/notebook/lib/browser/view-model/notebook-model';
-import { MAIN_RPC_CONTEXT, NotebookDocumentsAndEditorsDelta, NotebookDocumentsAndEditorsMain, NotebookModelAddedData, NotebooksExt } from '../../../common';
+import { MAIN_RPC_CONTEXT, NotebookDocumentsAndEditorsDelta, NotebookDocumentsAndEditorsMain, NotebookEditorAddData, NotebookModelAddedData, NotebooksExt } from '../../../common';
 import { RPCProtocol } from '../../../common/rpc-protocol';
 import { NotebookDto } from './notebook-dto';
 import { WidgetManager } from '@theia/core/lib/browser';
@@ -31,6 +31,7 @@ import { NotebookEditorsMainImpl } from './notebook-editors-main';
 import { NotebookDocumentsMainImpl } from './notebook-documents-main';
 import { diffMaps, diffSets } from '../../../common/collections';
 import { Mutex } from 'async-mutex';
+import throttle = require('@theia/core/shared/lodash.throttle');
 
 interface NotebookAndEditorDelta {
     removedDocuments: UriComponents[];
@@ -42,7 +43,7 @@ interface NotebookAndEditorDelta {
 }
 
 class NotebookAndEditorState {
-    static delta(before: NotebookAndEditorState | undefined, after: NotebookAndEditorState): NotebookAndEditorDelta {
+    static computeDelta(before: NotebookAndEditorState | undefined, after: NotebookAndEditorState): NotebookAndEditorDelta {
         if (!before) {
             return {
                 addedDocuments: [...after.documents],
@@ -106,12 +107,12 @@ export class NotebooksAndEditorsMain implements NotebookDocumentsAndEditorsMain
         this.notebookEditorService = container.get(NotebookEditorWidgetService);
         this.WidgetManager = container.get(WidgetManager);
 
-        this.notebookService.onDidAddNotebookDocument(async () => this.updateState(), this, this.disposables);
-        this.notebookService.onDidRemoveNotebookDocument(async () => this.updateState(), this, this.disposables);
+        this.notebookService.onDidAddNotebookDocument(async () => this.throttleStateUpdate(), this, this.disposables);
+        this.notebookService.onDidRemoveNotebookDocument(async () => this.throttleStateUpdate(), this, this.disposables);
         // this.WidgetManager.onActiveEditorChanged(() => this.updateState(), this, this.disposables);
         this.notebookEditorService.onDidAddNotebookEditor(async editor => this.handleEditorAdd(editor), this, this.disposables);
         this.notebookEditorService.onDidRemoveNotebookEditor(async editor => this.handleEditorRemove(editor), this, this.disposables);
-        this.notebookEditorService.onDidChangeFocusedEditor(async editor => this.updateState(editor), this, this.disposables);
+        this.notebookEditorService.onDidChangeFocusedEditor(async editor => this.throttleStateUpdate(editor), this, this.disposables);
     }
 
     dispose(): void {
@@ -129,16 +130,18 @@ export class NotebooksAndEditorsMain implements NotebookDocumentsAndEditorsMain
         } else {
             this.editorListeners.set(editor.id, [disposable]);
         }
-        await this.updateState();
+        await this.throttleStateUpdate();
     }
 
     private handleEditorRemove(editor: NotebookEditorWidget): void {
         const listeners = this.editorListeners.get(editor.id);
         listeners?.forEach(listener => listener.dispose());
         this.editorListeners.delete(editor.id);
-        this.updateState();
+        this.throttleStateUpdate();
     }
 
+    private throttleStateUpdate = throttle((focusedEditor?: NotebookEditorWidget) => this.updateState(focusedEditor), 100);
+
     private async updateState(focusedEditor?: NotebookEditorWidget): Promise<void> {
         await this.updateMutex.runExclusive(async () => this.doUpdateState(focusedEditor));
     }
@@ -148,10 +151,8 @@ export class NotebooksAndEditorsMain implements NotebookDocumentsAndEditorsMain
         const editors = new Map<string, NotebookEditorWidget>();
         const visibleEditorsMap = new Map<string, NotebookEditorWidget>();
 
-        for (const editor of this.notebookEditorService.listNotebookEditors()) {
-            if (editor.model) {
-                editors.set(editor.id, editor);
-            }
+        for (const editor of this.notebookEditorService.getNotebookEditors()) {
+            editors.set(editor.id, editor);
         }
 
         const activeNotebookEditor = this.notebookEditorService.focusedEditor;
@@ -167,7 +168,7 @@ export class NotebooksAndEditorsMain implements NotebookDocumentsAndEditorsMain
 
         const notebookEditors = this.WidgetManager.getWidgets(NotebookEditorWidget.ID) as NotebookEditorWidget[];
         for (const notebookEditor of notebookEditors) {
-            if (notebookEditor?.model && editors.has(notebookEditor.id) && notebookEditor.isVisible) {
+            if (editors.has(notebookEditor.id) && notebookEditor.isVisible) {
                 visibleEditorsMap.set(notebookEditor.id, notebookEditor);
             }
         }
@@ -176,12 +177,12 @@ export class NotebooksAndEditorsMain implements NotebookDocumentsAndEditorsMain
             new Set(this.notebookService.listNotebookDocuments()),
             editors,
             activeEditor, visibleEditorsMap);
-        await this.onDelta(NotebookAndEditorState.delta(this.currentState, newState));
+        await this.onDelta(NotebookAndEditorState.computeDelta(this.currentState, newState));
         this.currentState = newState;
     }
 
     private async onDelta(delta: NotebookAndEditorDelta): Promise<void> {
-        if (NotebooksAndEditorsMain._isDeltaEmpty(delta)) {
+        if (NotebooksAndEditorsMain.isDeltaEmpty(delta)) {
             return;
         }
 
@@ -191,7 +192,7 @@ export class NotebooksAndEditorsMain implements NotebookDocumentsAndEditorsMain
             newActiveEditor: delta.newActiveEditor,
             visibleEditors: delta.visibleEditors,
             addedDocuments: delta.addedDocuments.map(NotebooksAndEditorsMain.asModelAddData),
-            // addedEditors: delta.addedEditors.map(this.asEditorAddData, this),
+            addedEditors: delta.addedEditors.map(NotebooksAndEditorsMain.asEditorAddData),
         };
 
         // send to extension FIRST
@@ -204,23 +205,23 @@ export class NotebooksAndEditorsMain implements NotebookDocumentsAndEditorsMain
         this.notebookEditorsMain.handleEditorsAdded(delta.addedEditors);
     }
 
-    private static _isDeltaEmpty(delta: NotebookAndEditorDelta): boolean {
-        if (delta.addedDocuments !== undefined && delta.addedDocuments.length > 0) {
+    private static isDeltaEmpty(delta: NotebookAndEditorDelta): boolean {
+        if (delta.addedDocuments?.length) {
             return false;
         }
-        if (delta.removedDocuments !== undefined && delta.removedDocuments.length > 0) {
+        if (delta.removedDocuments?.length) {
             return false;
         }
-        if (delta.addedEditors !== undefined && delta.addedEditors.length > 0) {
+        if (delta.addedEditors?.length) {
             return false;
         }
-        if (delta.removedEditors !== undefined && delta.removedEditors.length > 0) {
+        if (delta.removedEditors?.length) {
             return false;
         }
-        if (delta.visibleEditors !== undefined && delta.visibleEditors.length > 0) {
+        if (delta.visibleEditors?.length) {
             return false;
         }
-        if (delta.newActiveEditor !== undefined) {
+        if (delta.newActiveEditor) {
             return false;
         }
         return true;
@@ -235,4 +236,17 @@ export class NotebooksAndEditorsMain implements NotebookDocumentsAndEditorsMain
             cells: e.cells.map(NotebookDto.toNotebookCellDto)
         };
     }
+
+    private static asEditorAddData(notebookEditor: NotebookEditorWidget): NotebookEditorAddData {
+        const uri = notebookEditor.getResourceUri();
+        if (!uri) {
+            throw new Error('Notebook editor without resource URI');
+        }
+        return {
+            id: notebookEditor.id,
+            documentUri: uri.toComponents(),
+            selections: [],
+            visibleRanges: []
+        };
+    }
 }