From 771a978c375969e95f06c84256459447f91c500f Mon Sep 17 00:00:00 2001 From: Dennis Huebner Date: Fri, 9 Aug 2024 11:31:15 +0200 Subject: [PATCH] Make sure notebook model created when calling openNotebookDocument --- .../src/main/browser/notebooks/notebook-documents-main.ts | 1 + packages/plugin-ext/src/plugin/plugin-context.ts | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/plugin-ext/src/main/browser/notebooks/notebook-documents-main.ts b/packages/plugin-ext/src/main/browser/notebooks/notebook-documents-main.ts index e17840b778e5d..427e0a009b627 100644 --- a/packages/plugin-ext/src/main/browser/notebooks/notebook-documents-main.ts +++ b/packages/plugin-ext/src/main/browser/notebooks/notebook-documents-main.ts @@ -169,6 +169,7 @@ export class NotebookDocumentsMainImpl implements NotebookDocumentsMain { async $tryOpenNotebook(uriComponents: UriComponents): Promise { const uri = URI.fromComponents(uriComponents); + await this.notebookModelResolverService.resolve(uri); return uri.toComponents(); } diff --git a/packages/plugin-ext/src/plugin/plugin-context.ts b/packages/plugin-ext/src/plugin/plugin-context.ts index 1a66df549a33c..2bbc0d04c7410 100644 --- a/packages/plugin-ext/src/plugin/plugin-context.ts +++ b/packages/plugin-ext/src/plugin/plugin-context.ts @@ -740,9 +740,8 @@ export function createAPIFactory( } else { throw new Error('Invalid arguments'); } - const result = await notebooksExt.waitForNotebookDocument(uri); - return result.apiNotebook; - + // Notebook extension will create a document in openNotebookDocument() or create openNotebookDocument() + return notebooksExt.getNotebookDocument(uri).apiNotebook; }, createFileSystemWatcher: (pattern, ignoreCreate, ignoreChange, ignoreDelete): theia.FileSystemWatcher => extHostFileSystemEvent.createFileSystemWatcher(fromGlobPattern(pattern), ignoreCreate, ignoreChange, ignoreDelete),