From 42e97f3c0ae8f8fe9bdac66135827ee7caa6f70d Mon Sep 17 00:00:00 2001 From: rebornix Date: Thu, 24 Sep 2020 15:10:37 -0700 Subject: [PATCH] fix #107003. --- src/vs/workbench/api/common/extHostNotebook.ts | 2 +- .../contrib/notebook/browser/notebookEditorWidget.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/api/common/extHostNotebook.ts b/src/vs/workbench/api/common/extHostNotebook.ts index 4d88c7e7942..61f8bce094d 100644 --- a/src/vs/workbench/api/common/extHostNotebook.ts +++ b/src/vs/workbench/api/common/extHostNotebook.ts @@ -349,7 +349,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN .map(pattern => typeConverters.NotebookExclusiveDocumentPattern.from(pattern)) .filter(pattern => pattern !== undefined) as (string | IRelativePattern | INotebookExclusiveDocumentFilter)[]; - if (!viewOptionsFilenamePattern) { + if (options?.viewOptions?.filenamePattern && !viewOptionsFilenamePattern) { console.warn(`Notebook content provider view options file name pattern is invalid ${options?.viewOptions?.filenamePattern}`); } diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts index bb8ac657a0e..cc091698839 100644 --- a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts +++ b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts @@ -815,7 +815,9 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor || kernelsFromSameExtension.find(kernel => kernel.id === cachedKernelId) || kernelsFromSameExtension[0]; this.activeKernel = preferedKernel; - await this._loadKernelPreloads(this.activeKernel.extensionLocation, this.activeKernel); + if (this.activeKernel) { + await this._loadKernelPreloads(this.activeKernel.extensionLocation, this.activeKernel); + } if (tokenSource.token.isCancellationRequested) { return;