feat: Add fish and some fixes

Author: karthiknadig

src/extension.ts

@@ -57,9 +57,14 @@ import { registerTools } from './common/lm.apis';
 import { GetPackagesTool } from './features/copilotTools';
 import { TerminalActivationImpl } from './features/terminal/terminalActivationState';
 import { getEnvironmentForTerminal, normalizeShellPath } from './features/terminal/utils';
-import { PowershellStartupProvider } from './features/terminal/startup/powershellStartup';
+import { PowerShellStartupProvider } from './features/terminal/startup/powershellStartup';
 import { ShellStartupActivationManagerImpl } from './features/terminal/startup/activateUsingShellStartup';
-import { BashStartupProvider, GitBashStartupProvider } from './features/terminal/startup/bashStartup';
+import {
+    BashStartupProvider,
+    GitBashStartupProvider,
+    ZshStartupProvider,
+} from './features/terminal/startup/bashStartup';
+import { FishStartupProvider } from './features/terminal/startup/fishStartup';
 import { isWindows } from './common/utils/platformUtils';
 
 export async function activate(context: ExtensionContext): Promise<PythonEnvironmentApi> {
@@ -88,8 +93,13 @@ export async function activate(context: ExtensionContext): Promise<PythonEnviron
 
     const terminalActivation = new TerminalActivationImpl();
     const shellStartupProviders = isWindows()
-        ? [new PowershellStartupProvider(), new GitBashStartupProvider()]
-        : [new PowershellStartupProvider(), new BashStartupProvider()];
+        ? [new PowerShellStartupProvider(), new GitBashStartupProvider()]
+        : [
+              new PowerShellStartupProvider(),
+              new BashStartupProvider(),
+              new ZshStartupProvider(),
+              new FishStartupProvider(),
+          ];
     const shellStartupActivationManager = new ShellStartupActivationManagerImpl(
         context.environmentVariableCollection,
         shellStartupProviders,

src/features/terminal/startup/activateUsingShellStartup.ts

@@ -1,7 +1,7 @@
 import { ConfigurationChangeEvent, Disposable, GlobalEnvironmentVariableCollection } from 'vscode';
 import { getWorkspaceFolder, getWorkspaceFolders, onDidChangeConfiguration } from '../../../common/workspace.apis';
 import { getAutoActivationType, setAutoActivationType } from '../utils';
-import { ShellStartupProvider } from './startupProvider';
+import { ShellScriptEditState, ShellSetupState, ShellStartupProvider } from './startupProvider';
 import { DidChangeEnvironmentEventArgs } from '../../../api';
 import { EnvironmentManagers } from '../../../internal.api';
 import { traceError, traceInfo } from '../../../common/logging';
@@ -87,7 +87,9 @@ export class ShellStartupActivationManagerImpl implements ShellStartupActivation
 
     private async isSetupRequired(): Promise<boolean> {
         const results = await Promise.all(this.shellStartupProviders.map((provider) => provider.isSetup()));
-        return results.some((result) => !result);
+        return results
+            .filter((r) => r !== ShellSetupState.NotInstalled)
+            .some((result) => result === ShellSetupState.NotSetup);
     }
 
     public async initialize(): Promise<void> {
@@ -145,17 +147,11 @@ export class ShellStartupActivationManagerImpl implements ShellStartupActivation
     }
 
     public async updateStartupScripts(): Promise<void> {
-        const results = await Promise.all(
-            this.shellStartupProviders.map(async (provider) => {
-                const result = await provider.setupScripts();
-                if (!result) {
-                    traceError(`Failed to setup shell startup scripts for ${provider.name}`);
-                }
-                return result;
-            }),
-        );
+        const results = await Promise.all(this.shellStartupProviders.map(async (provider) => provider.setupScripts()));
 
-        const success = results.every((result) => result);
+        const success = results
+            .filter((r) => r !== ShellScriptEditState.NotInstalled)
+            .every((result) => result === ShellScriptEditState.Edited);
 
         // Intentionally not awaiting this message. We don’t need a response here, and awaiting here for user response can
         // block setting up rest of the startup activation.