Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/microsoft/vscode.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/vs/workbench/contrib/notebook/browser/notebookKernelServiceImpl.ts')
-rw-r--r--src/vs/workbench/contrib/notebook/browser/notebookKernelServiceImpl.ts11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookKernelServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/notebookKernelServiceImpl.ts
index 1f2e2e72032..3a14f27d0ff 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookKernelServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookKernelServiceImpl.ts
@@ -196,7 +196,16 @@ export class NotebookKernelService extends Disposable implements INotebookKernel
getSelectedOrSuggestedKernel(notebook: INotebookTextModel): INotebookKernel | undefined {
const info = this.getMatchingKernel(notebook);
- return info.selected ?? (info.all.length === 1 ? info.all[0] : undefined);
+ if (info.selected) {
+ return info.selected;
+ }
+
+ const preferred = info.all.filter(kernel => this._kernels.get(kernel.id)?.notebookPriorities.get(notebook.uri) === 2 /* vscode.NotebookControllerPriority.Preferred */);
+ if (preferred.length === 1) {
+ return preferred[0];
+ }
+
+ return info.all.length === 1 ? info.all[0] : undefined;
}
// default kernel for notebookType