sys info cell order

microsoft · Oct 2, 2024 · 9f97edb · 9f97edb
1 parent 92a16fd
commit 9f97edb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/interactive-window/InteractiveWindowController.ts b/src/interactive-window/InteractiveWindowController.ts
@@ -54,14 +54,14 @@ export class InteractiveWindowController {
             throw new Error('Interactive Window kernel not selected');
         }
 
-        await this.setInfoMessage(this.metadata, SysInfoReason.Start);
+        this.setInfoMessage(this.metadata, SysInfoReason.Start);
         try {
             const kernel = await this.createKernel();
             const kernelEventHookForRestart = async () => {
                 if (this.interactiveWindow.notebookDocument && this.metadata) {
                     this.systemInfoCell = undefined;
                     // If we're about to restart, insert a 'restarting' message as it happens
-                    await this.setInfoMessage(this.metadata, SysInfoReason.Restart);
+                    this.setInfoMessage(this.metadata, SysInfoReason.Restart);
                 }
             };
             // Hook pre interrupt so we can stick in a message
@@ -220,9 +220,13 @@ export class InteractiveWindowController {
         }
     }
 
+    public async resolveSysInfoCell(){
+        await this.systemInfoCell?.resolveCell();
+    }
+
     private setInfoMessage(metadata: KernelConnectionMetadata, reason: SysInfoReason) {
         const message = getStartConnectMessage(metadata, reason);
-        return this.setInfoMessageCell(message);
+        this.setInfoMessageCell(message);
     }
 
     private finishSysInfoMessage(kernel: IKernel, reason: SysInfoReason) {

diff --git a/src/interactive-window/interactiveWindow.ts b/src/interactive-window/interactiveWindow.ts
@@ -210,7 +210,8 @@ export class InteractiveWindow implements IInteractiveWindow {
         }
 
         if (this.controller.controller) {
-            this.controller.startKernel().catch(noop);
+            await this.controller.startKernel();
+            await this.controller.resolveSysInfoCell();
         } else {
             logger.info('No controller selected for Interactive Window initialization');
             this.controller.setInfoMessageCell(DataScience.selectKernelForEditor);

diff --git a/src/interactive-window/systemInfoCell.ts b/src/interactive-window/systemInfoCell.ts
@@ -54,6 +54,10 @@ export class SystemInfoCell {
         this.sysInfoCellPromise = this.getOrUpdate(message);
     }
 
+    public async resolveCell() {
+        return await this.sysInfoCellPromise;
+    }
+
     private async getOrUpdate(message: string) {
         const lastCellIndex = (await this.interactiveWindow.getAppendIndex()) - 1;
         if (lastCellIndex >= 0) {