chore: use ShellConstants for shell name

Author: karthiknadig

src/features/terminal/runInTerminal.ts

@@ -4,6 +4,7 @@ import { onDidEndTerminalShellExecution } from '../../common/window.apis';
 import { createDeferred } from '../../common/utils/deferred';
 import { quoteArgs } from '../execution/execUtils';
 import { identifyTerminalShell } from '../common/shellDetector';
+import { ShellConstants } from '../common/shellConstants';
 
 export async function runInTerminal(
     environment: PythonEnvironment,
@@ -33,7 +34,7 @@ export async function runInTerminal(
     } else {
         const shellType = identifyTerminalShell(terminal);
         let text = quoteArgs([executable, ...allArgs]).join(' ');
-        if (shellType === 'pwsh' && !text.startsWith('&')) {
+        if (shellType === ShellConstants.PWSH && !text.startsWith('&')) {
             // PowerShell requires commands to be prefixed with '&' to run them.
             text = `& ${text}`;
         }

src/features/terminal/shells/bash/bashEnvs.ts

@@ -8,19 +8,19 @@ import { getCommandAsString } from '../utils';
 import { BASH_ENV_KEY, ZSH_ENV_KEY } from './bashConstants';
 
 export class BashEnvsProvider implements ShellEnvsProvider {
-    constructor(public readonly shell: 'bash' | 'gitbash') {}
+    constructor(public readonly shellType: 'bash' | 'gitbash') {}
 
     async updateEnvVariables(collection: EnvironmentVariableCollection, env: PythonEnvironment): Promise<void> {
         try {
-            const bashActivation = getActivationCommandForShell(env, this.shell);
+            const bashActivation = getActivationCommandForShell(env, this.shellType);
             if (bashActivation) {
                 const command = getCommandAsString(bashActivation, '&&');
                 collection.replace(BASH_ENV_KEY, command);
             } else {
                 collection.delete(BASH_ENV_KEY);
             }
         } catch (err) {
-            traceError(`Failed to update env variables for ${this.shell}`, err);
+            traceError(`Failed to update env variables for ${this.shellType}`, err);
             collection.delete(BASH_ENV_KEY);
         }
     }
@@ -42,13 +42,14 @@ export class BashEnvsProvider implements ShellEnvsProvider {
             }
             return undefined;
         } catch (err) {
-            traceError(`Failed to get env variables for ${this.shell}`, err);
+            traceError(`Failed to get env variables for ${this.shellType}`, err);
             return undefined;
         }
     }
 }
 
 export class ZshEnvsProvider implements ShellEnvsProvider {
+    public readonly shellType: string = ShellConstants.ZSH;
     async updateEnvVariables(envVars: EnvironmentVariableCollection, env: PythonEnvironment): Promise<void> {
         try {
             const zshActivation = getActivationCommandForShell(env, ShellConstants.ZSH);

src/features/terminal/shells/pwsh/pwshEnvs.ts

@@ -8,6 +8,8 @@ import { ShellConstants } from '../../../common/shellConstants';
 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> {
         try {
             const pwshActivation = getActivationCommandForShell(env, ShellConstants.PWSH);

src/features/terminal/shells/startupProvider.ts

@@ -21,6 +21,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>;