Always export env vars to the terminal (#869)

## Changes  ## Tests
databricks · Sep 20, 2023 · deaaaf7 · deaaaf7
1 parent b3d56fb
commit deaaaf7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 39 deletions.
diff --git a/packages/databricks-vscode/src/file-managers/DatabricksEnvFileManager.ts b/packages/databricks-vscode/src/file-managers/DatabricksEnvFileManager.ts
@@ -96,58 +96,39 @@ export class DatabricksEnvFileManager implements Disposable {
 
         this.disposables.push(
             userEnvFileWatcher,
-            userEnvFileWatcher.onDidChange(() => this.writeFile(), this),
-            userEnvFileWatcher.onDidDelete(() => this.writeFile(), this),
-            userEnvFileWatcher.onDidCreate(() => this.writeFile(), this),
+            userEnvFileWatcher.onDidChange(async () => {
+                await this.emitToTerminal();
+                await this.writeFile();
+            }, this),
+            userEnvFileWatcher.onDidDelete(async () => {
+                await this.emitToTerminal();
+                await this.writeFile();
+            }, this),
+            userEnvFileWatcher.onDidCreate(async () => {
+                await this.emitToTerminal();
+                await this.writeFile();
+            }, this),
             this.featureManager.onDidChangeState(
                 "notebooks.dbconnect",
                 async () => {
-                    await this.clearTerminalEnv();
                     await this.emitToTerminal();
                     await this.writeFile();
                 }
             ),
             this.featureManager.onDidChangeState(
                 "debugging.dbconnect",
-                (featureState) => {
-                    if (!featureState.avaliable) {
-                        this.clearTerminalEnv();
-                    } else {
-                        this.emitToTerminal();
-                    }
+                () => {
+                    this.emitToTerminal();
                     this.writeFile();
                 },
                 this
             ),
-            this.connectionManager.onDidChangeCluster(async (cluster) => {
-                if (
-                    !cluster ||
-                    this.connectionManager.state !== "CONNECTED" ||
-                    !(
-                        await this.featureManager.isEnabled(
-                            "debugging.dbconnect"
-                        )
-                    ).avaliable
-                ) {
-                    this.clearTerminalEnv();
-                } else {
-                    this.emitToTerminal();
-                }
+            this.connectionManager.onDidChangeCluster(async () => {
+                this.emitToTerminal();
                 this.writeFile();
             }, this),
             this.connectionManager.onDidChangeState(async () => {
-                if (
-                    this.connectionManager.state !== "CONNECTED" ||
-                    !(
-                        await this.featureManager.isEnabled(
-                            "debugging.dbconnect"
-                        )
-                    ).avaliable
-                ) {
-                    this.clearTerminalEnv();
-                } else {
-                    this.emitToTerminal();
-                }
+                this.emitToTerminal();
                 this.writeFile();
             }, this)
         );

diff --git a/packages/databricks-vscode/src/language/notebooks/restartNotebookDialogue.ts b/packages/databricks-vscode/src/language/notebooks/restartNotebookDialogue.ts
@@ -15,9 +15,6 @@ export function showRestartNotebookDialogue(
             try {
                 const choice = await window.showInformationMessage(
                     "Environment variables have changed. Restart all jupyter kernels to pickup the latest environment variables. ",
-                    {
-                        modal: true,
-                    },
                     "Restart All Jupyter Kernels"
                 );