ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Wait for all notebook models to load before shutting down active sessions during python upgrade (#17766)

Browse Source 
* handle undefined model

* wait for kernel to load before restart

* comment

* await editor model resolved

* remove cast
This commit is contained in:
Lucy Zhang
2021-12-03 16:39:07 -08:00
committed by GitHub
parent 8a205965d2
commit 969eb16df7
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/workbench/contrib/notebook/browser/models/notebookInput.ts
View File

@@ -417,6 +417,10 @@ export abstract class NotebookInput extends EditorInput implements INotebookInpu
} }
} }
get modelResolved(): Promise<void> {
return this._modelResolved.promise;
}
private hookDirtyListener(dirtyEvent: Event<void>, listener: (e: any) => void): void { private hookDirtyListener(dirtyEvent: Event<void>, listener: (e: any) => void): void {
let disposable = dirtyEvent(listener); let disposable = dirtyEvent(listener);
if (this._dirtyListener) { if (this._dirtyListener) {

3
src/sql/workbench/contrib/notebook/browser/notebook.contribution.ts
View File

@@ -223,6 +223,9 @@ CommandsRegistry.registerCommand({
for (let editor of editors) { for (let editor of editors) {
if (editor instanceof NotebookInput) { if (editor instanceof NotebookInput) {
// Wait for NotebookInput.resolve() to be called to ensure the _model field in NotebookInput
// is not undefined when trying to get the notebookModel.
await editor.modelResolved;
let model: INotebookModel = editor.notebookModel; let model: INotebookModel = editor.notebookModel;
if (model?.providerId === JUPYTER_PROVIDER_ID) { if (model?.providerId === JUPYTER_PROVIDER_ID) {
let jupyterNotebookManager: IExecuteManager = model.executeManagers.find(x => x.providerId === JUPYTER_PROVIDER_ID); let jupyterNotebookManager: IExecuteManager = model.executeManagers.find(x => x.providerId === JUPYTER_PROVIDER_ID);