fix: add shell type to setup providers

Author: karthiknadig

src/extension.ts

@@ -45,7 +45,7 @@ import { PythonProjectManagerImpl } from './features/projectManager';
 import { getPythonApi, setPythonApi } from './features/pythonApi';
 import { registerCompletionProvider } from './features/settings/settingCompletions';
 import { setActivateMenuButtonContext } from './features/terminal/activateMenuButton';
-import { ShellStartupActivationManagerImpl } from './features/terminal/shells/activateUsingShellStartup';
+import { ShellStartupActivationManagerImpl } from './features/terminal/activateUsingShellStartup';
 import { normalizeShellPath } from './features/terminal/shells/common/shellUtils';
 import { createShellEnvProviders, createShellStartupProviders } from './features/terminal/shells/providers';
 import { TerminalActivationImpl } from './features/terminal/terminalActivationState';

src/features/terminal/activateUsingShellStartup.ts

@@ -24,11 +24,11 @@ export class ShellStartupActivationManagerImpl implements ShellStartupActivation
     ) {
         this.envCollection.description = ShellStartupActivationStrings.envCollectionDescription;
         this.disposables.push(
-            onDidChangeConfiguration((e: ConfigurationChangeEvent) => {
-                this.handleConfigurationChange(e);
+            onDidChangeConfiguration(async (e: ConfigurationChangeEvent) => {
+                await this.handleConfigurationChange(e);
             }),
-            this.em.onDidChangeEnvironmentFiltered((e: DidChangeEnvironmentEventArgs) => {
-                this.handleEnvironmentChange(e);
+            this.em.onDidChangeEnvironmentFiltered(async (e: DidChangeEnvironmentEventArgs) => {
+                await this.handleEnvironmentChange(e);
             }),
         );
     }

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

@@ -1,11 +1,12 @@
 import * as fs from 'fs-extra';
-import * as path from 'path';
 import * as os from 'os';
-import { ShellScriptEditState, ShellSetupState, ShellStartupScriptProvider } from '../startupProvider';
-import { traceError, traceInfo, traceVerbose } from '../../../../common/logging';
+import * as path from 'path';
 import which from 'which';
-import { BASH_ENV_KEY, ZSH_ENV_KEY } from './bashConstants';
+import { traceError, traceInfo, traceVerbose } from '../../../../common/logging';
+import { ShellConstants } from '../../../common/shellConstants';
 import { hasStartupCode, insertStartupCode, removeStartupCode } from '../common/editUtils';
+import { ShellScriptEditState, ShellSetupState, ShellStartupScriptProvider } from '../startupProvider';
+import { BASH_ENV_KEY, ZSH_ENV_KEY } from './bashConstants';
 
 async function isBashLikeInstalled(): Promise<boolean> {
     const result = await Promise.all([which('bash', { nothrow: true }), which('sh', { nothrow: true })]);
@@ -106,6 +107,7 @@ async function removeStartup(profile: string, key: string): Promise<boolean> {
 
 export class BashStartupProvider implements ShellStartupScriptProvider {
     public readonly name: string = 'Bash';
+    public readonly shellType: string = ShellConstants.BASH;
 
     private async checkShellInstalled(): Promise<boolean> {
         const found = await isBashLikeInstalled();
@@ -168,6 +170,7 @@ export class BashStartupProvider implements ShellStartupScriptProvider {
 
 export class ZshStartupProvider implements ShellStartupScriptProvider {
     public readonly name: string = 'Zsh';
+    public readonly shellType: string = ShellConstants.ZSH;
 
     private async checkShellInstalled(): Promise<boolean> {
         const found = await isZshInstalled();
@@ -225,6 +228,7 @@ export class ZshStartupProvider implements ShellStartupScriptProvider {
 
 export class GitBashStartupProvider implements ShellStartupScriptProvider {
     public readonly name: string = 'GitBash';
+    public readonly shellType: string = ShellConstants.GITBASH;
 
     private async checkShellInstalled(): Promise<boolean> {
         const found = await isGitBashInstalled();

src/features/terminal/shells/cmd/cmdStartup.ts

@@ -6,6 +6,7 @@ import { promisify } from 'util';
 import which from 'which';
 import { traceError, traceInfo, traceVerbose } from '../../../../common/logging';
 import { isWindows } from '../../../../common/utils/platformUtils';
+import { ShellConstants } from '../../../common/shellConstants';
 import { hasStartupCode, insertStartupCode, removeStartupCode } from '../common/editUtils';
 import { ShellScriptEditState, ShellSetupState, ShellStartupScriptProvider } from '../startupProvider';
 import { CMD_ENV_KEY } from './cmdConstants';
@@ -256,6 +257,7 @@ async function removeCmdStartup(startupFile: string, key: string): Promise<boole
 
 export class CmdStartupProvider implements ShellStartupScriptProvider {
     public readonly name: string = 'Command Prompt';
+    public readonly shellType: string = ShellConstants.CMD;
 
     async isSetup(): Promise<ShellSetupState> {
         const isInstalled = await isCmdInstalled();

src/features/terminal/shells/fish/fishStartup.ts

@@ -4,6 +4,7 @@ import * as path from 'path';
 import which from 'which';
 
 import { traceError, traceInfo, traceVerbose } from '../../../../common/logging';
+import { ShellConstants } from '../../../common/shellConstants';
 import { hasStartupCode, insertStartupCode, removeStartupCode } from '../common/editUtils';
 import { ShellScriptEditState, ShellSetupState, ShellStartupScriptProvider } from '../startupProvider';
 import { FISH_ENV_KEY } from './fishConstants';
@@ -90,6 +91,7 @@ async function removeFishStartup(profilePath: string, key: string): Promise<bool
 
 export class FishStartupProvider implements ShellStartupScriptProvider {
     public readonly name: string = 'Fish';
+    public readonly shellType: string = ShellConstants.FISH;
 
     async isSetup(): Promise<ShellSetupState> {
         const isInstalled = await isFishInstalled();

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

@@ -7,6 +7,7 @@ import { isWindows } from '../../../../common/utils/platformUtils';
 import { ShellScriptEditState, ShellSetupState, ShellStartupScriptProvider } from '../startupProvider';
 import { runCommand } from '../utils';
 
+import { ShellConstants } from '../../../common/shellConstants';
 import { hasStartupCode, insertStartupCode, removeStartupCode } from '../common/editUtils';
 import { POWERSHELL_ENV_KEY } from './pwshConstants';
 
@@ -133,6 +134,7 @@ async function removePowerShellStartup(shell: string, profile: string): Promise<
 
 export class PowerShellClassicStartupProvider implements ShellStartupScriptProvider {
     public readonly name: string = 'PowerShell5';
+    public readonly shellType: string = 'powershell';
 
     async isSetup(): Promise<ShellSetupState> {
         const isInstalled = await isPowerShellInstalled('powershell');
@@ -188,6 +190,7 @@ export class PowerShellClassicStartupProvider implements ShellStartupScriptProvi
 
 export class PwshStartupProvider implements ShellStartupScriptProvider {
     public readonly name: string = 'PowerShell';
+    public readonly shellType: string = ShellConstants.PWSH;
 
     async isSetup(): Promise<ShellSetupState> {
         const isInstalled = await isPowerShellInstalled('pwsh');

src/features/terminal/shells/startupProvider.ts

@@ -15,6 +15,7 @@ export enum ShellScriptEditState {
 
 export interface ShellStartupScriptProvider {
     name: string;
+    readonly shellType: string;
     isSetup(): Promise<ShellSetupState>;
     setupScripts(): Promise<ShellScriptEditState>;
     teardownScripts(): Promise<ShellScriptEditState>;