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

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

@@ -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);
 

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 =>

package/src/plugin/webviews.ts

@@ -126,19 +126,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;