development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-12 22:37:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix #107003.

Browse source
This commit is contained in:
rebornix 2020-09-24 15:10:37 -07:00
parent 97af4fb370
commit 42e97f3c0a
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/workbench/api/common/extHostNotebook.ts
View file

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

2
src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
View file

@ -815,7 +815,9 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
|| kernelsFromSameExtension.find(kernel => kernel.id === cachedKernelId)
|| kernelsFromSameExtension[0];
this.activeKernel = preferedKernel;
if (this.activeKernel) {
await this._loadKernelPreloads(this.activeKernel.extensionLocation, this.activeKernel);
}
if (tokenSource.token.isCancellationRequested) {
return;