fix: powershell special case

Author: karthiknadig

src/features/terminal/shellStartupSetupHandlers.ts

@@ -2,60 +2,27 @@ import { l10n } from 'vscode';
 import { executeCommand } from '../../common/command.api';
 import { Common, ShellStartupActivationStrings } from '../../common/localize';
 import { traceInfo, traceVerbose } from '../../common/logging';
+import { isWindows } from '../../common/utils/platformUtils';
 import { showErrorMessage, showInformationMessage } from '../../common/window.apis';
+import { ShellConstants } from '../common/shellConstants';
 import { ShellScriptEditState, ShellStartupScriptProvider } from './shells/startupProvider';
 import { getAutoActivationType, setAutoActivationType } from './utils';
 
-export async function handleSettingUpShellProfile(provider: ShellStartupScriptProvider): Promise<boolean> {
-    const response = await showInformationMessage(
-        l10n.t(
-            'To use "{0}" activation, the shell profile for "{1}" shell needs to be set up. Do you want to set it up now?',
-            'shellStartup',
-            provider.shellType,
-        ),
-        { modal: true },
-        Common.yes,
-        Common.no,
-    );
-    if (response === Common.yes) {
-        traceVerbose(`User chose to set up shell profile for ${provider.shellType} shell`);
-        const state = await provider.setupScripts();
-
-        if (state === ShellScriptEditState.Edited) {
-            setImmediate(async () => {
-                await showInformationMessage(
-                    l10n.t(
-                        'Shell profile for "{0}" shell has been set up successfully. Extension will use shell startup activation next time a new terminal is created.',
-                        provider.shellType,
-                    ),
-                    Common.ok,
-                );
-            });
+function getProviders(shellTypes: Set<string>, providers: ShellStartupScriptProvider[]): ShellStartupScriptProvider[] {
+    return providers.filter((provider) => {
+        if (isWindows() && shellTypes.has(ShellConstants.PWSH) && provider.shellType === 'powershell') {
             return true;
-        } else if (state === ShellScriptEditState.NotEdited || state === ShellScriptEditState.NotInstalled) {
-            setImmediate(async () => {
-                const button = await showErrorMessage(
-                    l10n.t(
-                        'Failed to set up shell profile for "{0}" shell. Please check the output panel for more details.',
-                        provider.shellType,
-                    ),
-                    Common.viewLogs,
-                );
-                if (button === Common.viewLogs) {
-                    await executeCommand('python-envs.viewLogs');
-                }
-            });
         }
-    } else {
-        traceVerbose(`User chose not to set up shell profile for ${provider.shellType} shell`);
-    }
-    return false;
+        return shellTypes.has(provider.shellType);
+    });
 }
 
-export async function handleSettingUpShellProfileMultiple(
-    providers: ShellStartupScriptProvider[],
+export async function handleSettingUpShellProfile(
+    shellTypes: Set<string>,
+    allProviders: ShellStartupScriptProvider[],
     callback: (provider: ShellStartupScriptProvider, result: boolean) => void,
 ): Promise<void> {
+    const providers = getProviders(shellTypes, allProviders);
     const shells = providers.map((p) => p.shellType).join(', ');
     const response = await showInformationMessage(
         l10n.t(
@@ -95,8 +62,8 @@ export async function handleSettingUpShellProfileMultiple(
     }
 }
 
-export async function cleanupStartupScripts(shellStartupProviders: ShellStartupScriptProvider[]): Promise<void> {
-    await Promise.all(shellStartupProviders.map((provider) => provider.teardownScripts()));
+export async function cleanupStartupScripts(allProviders: ShellStartupScriptProvider[]): Promise<void> {
+    await Promise.all(allProviders.map((provider) => provider.teardownScripts()));
     if (getAutoActivationType() === 'shellStartup') {
         setAutoActivationType('command');
         traceInfo(

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

@@ -216,7 +216,6 @@ export class PowerShellClassicStartupProvider implements ShellStartupScriptProvi
     async setupScripts(): Promise<ShellScriptEditState> {
         const isInstalled = await this.checkInstallation();
         if (!isInstalled) {
-            traceVerbose('PowerShell is not installed');
             return ShellScriptEditState.NotInstalled;
         }
 
@@ -267,7 +266,6 @@ export class PwshStartupProvider implements ShellStartupScriptProvider {
     async isSetup(): Promise<ShellSetupState> {
         const isInstalled = await this.checkInstallation();
         if (!isInstalled) {
-            traceVerbose('PowerShell is not installed');
             return ShellSetupState.NotInstalled;
         }
 

src/features/terminal/terminalManager.ts

@@ -15,7 +15,7 @@ import { isActivatableEnvironment } from '../common/activation';
 import { identifyTerminalShell } from '../common/shellDetector';
 import { getPythonApi } from '../pythonApi';
 import { ShellEnvsProvider, ShellStartupScriptProvider } from './shells/startupProvider';
-import { handleSettingUpShellProfile, handleSettingUpShellProfileMultiple } from './shellStartupSetupHandlers';
+import { handleSettingUpShellProfile } from './shellStartupSetupHandlers';
 import {
     DidChangeTerminalActivationStateEvent,
     TerminalActivation,
@@ -112,9 +112,8 @@ export class TerminalManagerImpl implements TerminalManager {
                                 .map((t) => identifyTerminalShell(t))
                                 .filter((t) => t !== 'unknown'),
                         );
-                        await handleSettingUpShellProfileMultiple(
-                            this.startupScriptProviders.filter((p) => shells.has(p.shellType)),
-                            (p, v) => this.shellSetup.set(p.shellType, v),
+                        await handleSettingUpShellProfile(shells, this.startupScriptProviders, (p, v) =>
+                            this.shellSetup.set(p.shellType, v),
                         );
                     }
                 }
@@ -145,8 +144,9 @@ export class TerminalManagerImpl implements TerminalManager {
             traceVerbose(`Shell profile for ${shellType} is not setup, falling back to command activation`);
 
             setImmediate(async () => {
-                const result = await handleSettingUpShellProfile(provider);
-                this.shellSetup.set(shellType, result);
+                await handleSettingUpShellProfile(new Set([shellType]), this.startupScriptProviders, (p, v) =>
+                    this.shellSetup.set(p.shellType, v),
+                );
             });
             return 'command';
         }
@@ -319,9 +319,8 @@ export class TerminalManagerImpl implements TerminalManager {
                     .map((t) => identifyTerminalShell(t))
                     .filter((t) => t !== 'unknown'),
             );
-            await handleSettingUpShellProfileMultiple(
-                this.startupScriptProviders.filter((p) => shells.has(p.shellType)),
-                (p, v) => this.shellSetup.set(p.shellType, v),
+            await handleSettingUpShellProfile(shells, this.startupScriptProviders, (p, v) =>
+                this.shellSetup.set(p.shellType, v),
             );
         }
     }