fix: remove promise for env variables

karthiknadig · karthiknadig · commit 33d458b940fa · 2025-04-15T18:22:12.000-07:00
diff --git a/src/features/terminal/activateUsingShellStartup.ts b/src/features/terminal/activateUsingShellStartup.ts
@@ -1,12 +1,12 @@
 import { ConfigurationChangeEvent, Disposable, GlobalEnvironmentVariableCollection } from 'vscode';
-import { DidChangeEnvironmentEventArgs } from '../../../api';
-import { ShellStartupActivationStrings } from '../../../common/localize';
-import { traceError, traceInfo } from '../../../common/logging';
-import { showErrorMessage, showInformationMessage } from '../../../common/window.apis';
-import { getWorkspaceFolder, getWorkspaceFolders, onDidChangeConfiguration } from '../../../common/workspace.apis';
-import { EnvironmentManagers } from '../../../internal.api';
-import { getAutoActivationType, setAutoActivationType } from '../utils';
-import { ShellEnvsProvider, ShellScriptEditState, ShellStartupScriptProvider } from './startupProvider';
+import { DidChangeEnvironmentEventArgs } from '../../api';
+import { ShellStartupActivationStrings } from '../../common/localize';
+import { traceError, traceInfo } from '../../common/logging';
+import { showErrorMessage, showInformationMessage } from '../../common/window.apis';
+import { getWorkspaceFolder, getWorkspaceFolders, onDidChangeConfiguration } from '../../common/workspace.apis';
+import { EnvironmentManagers } from '../../internal.api';
+import { ShellEnvsProvider, ShellScriptEditState, ShellStartupScriptProvider } from './shells/startupProvider';
+import { getAutoActivationType, setAutoActivationType } from './utils';
 
 export interface ShellStartupActivationManager extends Disposable {
     initialize(): Promise<void>;
@@ -42,20 +42,12 @@ export class ShellStartupActivationManagerImpl implements ShellStartupActivation
                 // remove any contributed environment variables
                 const workspaces = getWorkspaceFolders() ?? [];
                 if (workspaces.length > 0) {
-                    // User has one or more workspaces open
-                    const promises: Promise<void>[] = [];
                     workspaces.forEach((workspace) => {
                         const collection = this.envCollection.getScoped({ workspaceFolder: workspace });
-                        promises.push(
-                            ...this.shellEnvsProviders.map((provider) => provider.removeEnvVariables(collection)),
-                        );
+                        this.shellEnvsProviders.forEach((provider) => provider.removeEnvVariables(collection));
                     });
-                    await Promise.all(promises);
                 } else {
-                    // User has no workspaces open
-                    await Promise.all(
-                        this.shellEnvsProviders.map((provider) => provider.removeEnvVariables(this.envCollection)),
-                    );
+                    this.shellEnvsProviders.forEach((provider) => provider.removeEnvVariables(this.envCollection));
                 }
             }
         }
@@ -72,15 +64,13 @@ export class ShellStartupActivationManagerImpl implements ShellStartupActivation
             if (wf) {
                 const envVars = this.envCollection.getScoped({ workspaceFolder: wf });
                 if (envVars) {
-                    await Promise.all(
-                        this.shellEnvsProviders.map(async (provider) => {
-                            if (e.new) {
-                                await provider.updateEnvVariables(envVars, e.new);
-                            } else {
-                                await provider.removeEnvVariables(envVars);
-                            }
-                        }),
-                    );
+                    this.shellEnvsProviders.forEach((provider) => {
+                        if (e.new) {
+                            provider.updateEnvVariables(envVars, e.new);
+                        } else {
+                            provider.removeEnvVariables(envVars);
+                        }
+                    });
                 }
             }
         }
@@ -132,9 +122,9 @@ export class ShellStartupActivationManagerImpl implements ShellStartupActivation
                         ...this.shellEnvsProviders.map(async (provider) => {
                             const env = await this.em.getEnvironment(workspace.uri);
                             if (env) {
-                                await provider.updateEnvVariables(collection, env);
+                                provider.updateEnvVariables(collection, env);
                             } else {
-                                await provider.removeEnvVariables(collection);
+                                provider.removeEnvVariables(collection);
                             }
                         }),
                     );
@@ -145,9 +135,9 @@ export class ShellStartupActivationManagerImpl implements ShellStartupActivation
                     this.shellEnvsProviders.map(async (provider) => {
                         const env = await this.em.getEnvironment(undefined);
                         if (env) {
-                            await provider.updateEnvVariables(this.envCollection, env);
+                            provider.updateEnvVariables(this.envCollection, env);
                         } else {
-                            await provider.removeEnvVariables(this.envCollection);
+                            provider.removeEnvVariables(this.envCollection);
                         }
                     }),
                 );
diff --git a/src/features/terminal/shells/bash/bashEnvs.ts b/src/features/terminal/shells/bash/bashEnvs.ts
@@ -2,14 +2,14 @@ import { EnvironmentVariableCollection } from 'vscode';
 import { PythonEnvironment } from '../../../../api';
 import { traceError } from '../../../../common/logging';
 import { ShellConstants } from '../../../common/shellConstants';
+import { getShellActivationCommand, getShellCommandAsString } from '../common/shellUtils';
 import { ShellEnvsProvider } from '../startupProvider';
 import { BASH_ENV_KEY, ZSH_ENV_KEY } from './bashConstants';
-import { getShellActivationCommand, getShellCommandAsString } from '../common/shellUtils';
 
 export class BashEnvsProvider implements ShellEnvsProvider {
     constructor(public readonly shellType: 'bash' | 'gitbash') {}
 
-    async updateEnvVariables(collection: EnvironmentVariableCollection, env: PythonEnvironment): Promise<void> {
+    updateEnvVariables(collection: EnvironmentVariableCollection, env: PythonEnvironment): void {
         try {
             const bashActivation = getShellActivationCommand(this.shellType, env);
             if (bashActivation) {
@@ -24,11 +24,11 @@ export class BashEnvsProvider implements ShellEnvsProvider {
         }
     }
 
-    async removeEnvVariables(envCollection: EnvironmentVariableCollection): Promise<void> {
+    removeEnvVariables(envCollection: EnvironmentVariableCollection): void {
         envCollection.delete(BASH_ENV_KEY);
     }
 
-    async getEnvVariables(env?: PythonEnvironment): Promise<Map<string, string | undefined> | undefined> {
+    getEnvVariables(env?: PythonEnvironment): Map<string, string | undefined> | undefined {
         if (!env) {
             return new Map([[BASH_ENV_KEY, undefined]]);
         }
@@ -49,7 +49,7 @@ export class BashEnvsProvider implements ShellEnvsProvider {
 
 export class ZshEnvsProvider implements ShellEnvsProvider {
     public readonly shellType: string = ShellConstants.ZSH;
-    async updateEnvVariables(envVars: EnvironmentVariableCollection, env: PythonEnvironment): Promise<void> {
+    updateEnvVariables(envVars: EnvironmentVariableCollection, env: PythonEnvironment): void {
         try {
             const zshActivation = getShellActivationCommand(this.shellType, env);
             if (zshActivation) {
@@ -64,11 +64,11 @@ export class ZshEnvsProvider implements ShellEnvsProvider {
         }
     }
 
-    async removeEnvVariables(envVars: EnvironmentVariableCollection): Promise<void> {
+    removeEnvVariables(envVars: EnvironmentVariableCollection): void {
         envVars.delete(ZSH_ENV_KEY);
     }
 
-    async getEnvVariables(env?: PythonEnvironment): Promise<Map<string, string | undefined> | undefined> {
+    getEnvVariables(env?: PythonEnvironment): Map<string, string | undefined> | undefined {
         if (!env) {
             return new Map([[ZSH_ENV_KEY, undefined]]);
         }
diff --git a/src/features/terminal/shells/cmd/cmdEnvs.ts b/src/features/terminal/shells/cmd/cmdEnvs.ts
@@ -8,7 +8,7 @@ import { CMD_ENV_KEY } from './cmdConstants';
 
 export class CmdEnvsProvider implements ShellEnvsProvider {
     readonly shellType: string = ShellConstants.CMD;
-    async updateEnvVariables(collection: EnvironmentVariableCollection, env: PythonEnvironment): Promise<void> {
+    updateEnvVariables(collection: EnvironmentVariableCollection, env: PythonEnvironment): void {
         try {
             const cmdActivation = getShellActivationCommand(this.shellType, env);
             if (cmdActivation) {
@@ -23,11 +23,11 @@ export class CmdEnvsProvider implements ShellEnvsProvider {
         }
     }
 
-    async removeEnvVariables(envCollection: EnvironmentVariableCollection): Promise<void> {
+    removeEnvVariables(envCollection: EnvironmentVariableCollection): void {
         envCollection.delete(CMD_ENV_KEY);
     }
 
-    async getEnvVariables(env?: PythonEnvironment): Promise<Map<string, string | undefined> | undefined> {
+    getEnvVariables(env?: PythonEnvironment): Map<string, string | undefined> | undefined {
         if (!env) {
             return new Map([[CMD_ENV_KEY, undefined]]);
         }
diff --git a/src/features/terminal/shells/fish/fishEnvs.ts b/src/features/terminal/shells/fish/fishEnvs.ts
@@ -8,7 +8,7 @@ import { FISH_ENV_KEY } from './fishConstants';
 
 export class FishEnvsProvider implements ShellEnvsProvider {
     readonly shellType: string = ShellConstants.FISH;
-    async updateEnvVariables(collection: EnvironmentVariableCollection, env: PythonEnvironment): Promise<void> {
+    updateEnvVariables(collection: EnvironmentVariableCollection, env: PythonEnvironment): void {
         try {
             const fishActivation = getShellActivationCommand(this.shellType, env);
             if (fishActivation) {
@@ -23,11 +23,11 @@ export class FishEnvsProvider implements ShellEnvsProvider {
         }
     }
 
-    async removeEnvVariables(envCollection: EnvironmentVariableCollection): Promise<void> {
+    removeEnvVariables(envCollection: EnvironmentVariableCollection): void {
         envCollection.delete(FISH_ENV_KEY);
     }
 
-    async getEnvVariables(env?: PythonEnvironment): Promise<Map<string, string | undefined> | undefined> {
+    getEnvVariables(env?: PythonEnvironment): Map<string, string | undefined> | undefined {
         if (!env) {
             return new Map([[FISH_ENV_KEY, undefined]]);
         }
diff --git a/src/features/terminal/shells/pwsh/pwshEnvs.ts b/src/features/terminal/shells/pwsh/pwshEnvs.ts
@@ -1,15 +1,15 @@
 import { EnvironmentVariableCollection } from 'vscode';
-import { traceError } from '../../../../common/logging';
-import { ShellEnvsProvider } from '../startupProvider';
 import { PythonEnvironment } from '../../../../api';
+import { traceError } from '../../../../common/logging';
 import { ShellConstants } from '../../../common/shellConstants';
-import { POWERSHELL_ENV_KEY } from './pwshConstants';
 import { getShellActivationCommand, getShellCommandAsString } from '../common/shellUtils';
+import { ShellEnvsProvider } from '../startupProvider';
+import { POWERSHELL_ENV_KEY } from './pwshConstants';
 
 export class PowerShellEnvsProvider implements ShellEnvsProvider {
     public readonly shellType: string = ShellConstants.PWSH;
 
-    async updateEnvVariables(collection: EnvironmentVariableCollection, env: PythonEnvironment): Promise<void> {
+    updateEnvVariables(collection: EnvironmentVariableCollection, env: PythonEnvironment): void {
         try {
             const pwshActivation = getShellActivationCommand(this.shellType, env);
             if (pwshActivation) {
@@ -24,11 +24,11 @@ export class PowerShellEnvsProvider implements ShellEnvsProvider {
         }
     }
 
-    async removeEnvVariables(envCollection: EnvironmentVariableCollection): Promise<void> {
+    removeEnvVariables(envCollection: EnvironmentVariableCollection): void {
         envCollection.delete(POWERSHELL_ENV_KEY);
     }
 
-    async getEnvVariables(env?: PythonEnvironment): Promise<Map<string, string | undefined> | undefined> {
+    getEnvVariables(env?: PythonEnvironment): Map<string, string | undefined> | undefined {
         if (!env) {
             return new Map([[POWERSHELL_ENV_KEY, undefined]]);
         }
diff --git a/src/features/terminal/shells/startupProvider.ts b/src/features/terminal/shells/startupProvider.ts
@@ -22,7 +22,7 @@ export interface ShellStartupScriptProvider {
 
 export interface ShellEnvsProvider {
     readonly shellType: string;
-    updateEnvVariables(envVars: EnvironmentVariableCollection, env: PythonEnvironment): Promise<void>;
-    removeEnvVariables(envVars: EnvironmentVariableCollection): Promise<void>;
-    getEnvVariables(env?: PythonEnvironment): Promise<Map<string, string | undefined> | undefined>;
+    updateEnvVariables(envVars: EnvironmentVariableCollection, env: PythonEnvironment): void;
+    removeEnvVariables(envVars: EnvironmentVariableCollection): void;
+    getEnvVariables(env?: PythonEnvironment): Map<string, string | undefined> | undefined;
 }

Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,14 @@ import { EnvironmentVariableCollection } from 'vscode';`
`2`	`2`	`import { PythonEnvironment } from '../../../../api';`
`3`	`3`	`import { traceError } from '../../../../common/logging';`
`4`	`4`	`import { ShellConstants } from '../../../common/shellConstants';`
	`5`	`+import { getShellActivationCommand, getShellCommandAsString } from '../common/shellUtils';`
`5`	`6`	`import { ShellEnvsProvider } from '../startupProvider';`
`6`	`7`	`import { BASH_ENV_KEY, ZSH_ENV_KEY } from './bashConstants';`
`7`		`-import { getShellActivationCommand, getShellCommandAsString } from '../common/shellUtils';`
`8`	`8`
`9`	`9`	`export class BashEnvsProvider implements ShellEnvsProvider {`
`10`	`10`	`constructor(public readonly shellType: 'bash' \| 'gitbash') {}`
`11`	`11`
`12`		`- async updateEnvVariables(collection: EnvironmentVariableCollection, env: PythonEnvironment): Promise<void> {`
	`12`	`+ updateEnvVariables(collection: EnvironmentVariableCollection, env: PythonEnvironment): void {`
`13`	`13`	`try {`
`14`	`14`	`const bashActivation = getShellActivationCommand(this.shellType, env);`
`15`	`15`	`if (bashActivation) {`
`@@ -24,11 +24,11 @@ export class BashEnvsProvider implements ShellEnvsProvider {`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		`- async removeEnvVariables(envCollection: EnvironmentVariableCollection): Promise<void> {`
	`27`	`+ removeEnvVariables(envCollection: EnvironmentVariableCollection): void {`
`28`	`28`	`envCollection.delete(BASH_ENV_KEY);`
`29`	`29`	`}`
`30`	`30`
`31`		`- async getEnvVariables(env?: PythonEnvironment): Promise<Map<string, string \| undefined> \| undefined> {`
	`31`	`+ getEnvVariables(env?: PythonEnvironment): Map<string, string \| undefined> \| undefined {`
`32`	`32`	`if (!env) {`
`33`	`33`	`return new Map([[BASH_ENV_KEY, undefined]]);`
`34`	`34`	`}`
`@@ -49,7 +49,7 @@ export class BashEnvsProvider implements ShellEnvsProvider {`
`49`	`49`
`50`	`50`	`export class ZshEnvsProvider implements ShellEnvsProvider {`
`51`	`51`	`public readonly shellType: string = ShellConstants.ZSH;`
`52`		`- async updateEnvVariables(envVars: EnvironmentVariableCollection, env: PythonEnvironment): Promise<void> {`
	`52`	`+ updateEnvVariables(envVars: EnvironmentVariableCollection, env: PythonEnvironment): void {`
`53`	`53`	`try {`
`54`	`54`	`const zshActivation = getShellActivationCommand(this.shellType, env);`
`55`	`55`	`if (zshActivation) {`
`@@ -64,11 +64,11 @@ export class ZshEnvsProvider implements ShellEnvsProvider {`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`- async removeEnvVariables(envVars: EnvironmentVariableCollection): Promise<void> {`
	`67`	`+ removeEnvVariables(envVars: EnvironmentVariableCollection): void {`
`68`	`68`	`envVars.delete(ZSH_ENV_KEY);`
`69`	`69`	`}`
`70`	`70`
`71`		`- async getEnvVariables(env?: PythonEnvironment): Promise<Map<string, string \| undefined> \| undefined> {`
	`71`	`+ getEnvVariables(env?: PythonEnvironment): Map<string, string \| undefined> \| undefined {`
`72`	`72`	`if (!env) {`
`73`	`73`	`return new Map([[ZSH_ENV_KEY, undefined]]);`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import { CMD_ENV_KEY } from './cmdConstants';`
`8`	`8`
`9`	`9`	`export class CmdEnvsProvider implements ShellEnvsProvider {`
`10`	`10`	`readonly shellType: string = ShellConstants.CMD;`
`11`		`- async updateEnvVariables(collection: EnvironmentVariableCollection, env: PythonEnvironment): Promise<void> {`
	`11`	`+ updateEnvVariables(collection: EnvironmentVariableCollection, env: PythonEnvironment): void {`
`12`	`12`	`try {`
`13`	`13`	`const cmdActivation = getShellActivationCommand(this.shellType, env);`
`14`	`14`	`if (cmdActivation) {`
`@@ -23,11 +23,11 @@ export class CmdEnvsProvider implements ShellEnvsProvider {`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`26`		`- async removeEnvVariables(envCollection: EnvironmentVariableCollection): Promise<void> {`
	`26`	`+ removeEnvVariables(envCollection: EnvironmentVariableCollection): void {`
`27`	`27`	`envCollection.delete(CMD_ENV_KEY);`
`28`	`28`	`}`
`29`	`29`
`30`		`- async getEnvVariables(env?: PythonEnvironment): Promise<Map<string, string \| undefined> \| undefined> {`
	`30`	`+ getEnvVariables(env?: PythonEnvironment): Map<string, string \| undefined> \| undefined {`
`31`	`31`	`if (!env) {`
`32`	`32`	`return new Map([[CMD_ENV_KEY, undefined]]);`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import { FISH_ENV_KEY } from './fishConstants';`
`8`	`8`
`9`	`9`	`export class FishEnvsProvider implements ShellEnvsProvider {`
`10`	`10`	`readonly shellType: string = ShellConstants.FISH;`
`11`		`- async updateEnvVariables(collection: EnvironmentVariableCollection, env: PythonEnvironment): Promise<void> {`
	`11`	`+ updateEnvVariables(collection: EnvironmentVariableCollection, env: PythonEnvironment): void {`
`12`	`12`	`try {`
`13`	`13`	`const fishActivation = getShellActivationCommand(this.shellType, env);`
`14`	`14`	`if (fishActivation) {`
`@@ -23,11 +23,11 @@ export class FishEnvsProvider implements ShellEnvsProvider {`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`26`		`- async removeEnvVariables(envCollection: EnvironmentVariableCollection): Promise<void> {`
	`26`	`+ removeEnvVariables(envCollection: EnvironmentVariableCollection): void {`
`27`	`27`	`envCollection.delete(FISH_ENV_KEY);`
`28`	`28`	`}`
`29`	`29`
`30`		`- async getEnvVariables(env?: PythonEnvironment): Promise<Map<string, string \| undefined> \| undefined> {`
	`30`	`+ getEnvVariables(env?: PythonEnvironment): Map<string, string \| undefined> \| undefined {`
`31`	`31`	`if (!env) {`
`32`	`32`	`return new Map([[FISH_ENV_KEY, undefined]]);`
`33`	`33`	`}`