fix microsoft#107003.

rebornix · rebornix · commit 42e97f3c0ae8 · 2020-09-24T15:10:37.000-07:00
diff --git 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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN`
`349`	`349`	`.map(pattern => typeConverters.NotebookExclusiveDocumentPattern.from(pattern))`
`350`	`350`	`.filter(pattern => pattern !== undefined) as (string \| IRelativePattern \| INotebookExclusiveDocumentFilter)[];`
`351`	`351`
`352`		`- if (!viewOptionsFilenamePattern) {`
	`352`	`+ if (options?.viewOptions?.filenamePattern && !viewOptionsFilenamePattern) {`
`353`	`353`	console.warn(`Notebook content provider view options file name pattern is invalid ${options?.viewOptions?.filenamePattern}`);
`354`	`354`	`}`
`355`	`355`