development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 13:29:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #142751 from amunger/preSelectKernelforIW

Browse source 
don't attempt to update a document that doesn't exist yet
This commit is contained in:
Peng Lyu 2022-02-10 14:56:21 -08:00 committed by GitHub
parent a3b972bacb 1d111bf898
commit f8d80c9383
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/workbench/contrib/interactive/browser/interactive.contribution.ts
View file

@ -386,7 +386,7 @@ registerAction2(class extends Action2 {
const allKernels = kernelService.getMatchingKernel({ uri: notebookUri, viewType: 'interactive' }).all;
const preferredKernel = allKernels.find(kernel => kernel.id === id);
if (preferredKernel) {
kernelService.selectKernelForNotebook(preferredKernel, { uri: notebookUri, viewType: 'interactive' });
kernelService.preselectKernelForNotebook(preferredKernel, { uri: notebookUri, viewType: 'interactive' });
}
}

9
src/vs/workbench/contrib/notebook/browser/notebookKernelServiceImpl.ts
View file

@ -225,6 +225,15 @@ export class NotebookKernelService extends Disposable implements INotebookKernel
}
}
preselectKernelForNotebook(kernel: INotebookKernel, notebook: INotebookTextModelLike): void {
const key = NotebookTextModelLikeId.str(notebook);
const oldKernel = this._notebookBindings.get(key);
if (oldKernel !== kernel?.id) {
this._notebookBindings.set(key, kernel.id);
this._persistMementos();
}
}
updateKernelNotebookAffinity(kernel: INotebookKernel, notebook: URI, preference: number | undefined): void {
const info = this._kernels.get(kernel.id);
if (!info) {

5
src/vs/workbench/contrib/notebook/common/notebookKernelService.ts
View file

@ -81,6 +81,11 @@ export interface INotebookKernelService {
*/
selectKernelForNotebook(kernel: INotebookKernel, notebook: INotebookTextModelLike): void;
/**
* Set the kernel that a notebook should use when it starts up
*/
preselectKernelForNotebook(kernel: INotebookKernel, notebook: INotebookTextModelLike): void;
/**
* Bind a notebook type to a kernel.
* @param viewType