Simplify getShellCommandAsString

Author: Tyriar

src/features/terminal/shells/common/shellUtils.ts

@@ -10,50 +10,36 @@ import { quoteArgs } from '../../../execution/execUtils';
  * - Zsh: When setopt HIST_IGNORE_SPACE is enabled
  * - Git Bash: Uses bash under the hood, same behavior as Bash
  */
-export const shellsWithLeadingSpaceHistorySupport = [ShellConstants.BASH, ShellConstants.ZSH, ShellConstants.GITBASH];
+export const shellsWithLeadingSpaceHistorySupport = new Set([
+    ShellConstants.BASH,
+    ShellConstants.ZSH,
+    ShellConstants.GITBASH,
+]);
 
-function getCommandAsString(command: PythonCommandRunConfiguration[], shell: string, delimiter: string): string {
+const defaultShellDelimiter = '&&';
+const shellDelimiterByShell = new Map<string, string>([
+    [ShellConstants.PWSH, ';'],
+    [ShellConstants.NU, ';'],
+    [ShellConstants.FISH, '; and'],
+]);
+
+export function getShellCommandAsString(shell: string, command: PythonCommandRunConfiguration[]): string {
+    const delimiter = shellDelimiterByShell.get(shell) ?? defaultShellDelimiter;
     const parts = [];
     for (const cmd of command) {
         const args = cmd.args ?? [];
         parts.push(quoteArgs([normalizeShellPath(cmd.executable, shell), ...args]).join(' '));
     }
-    if (shell === ShellConstants.PWSH) {
-        if (parts.length === 1) {
-            return parts[0];
-        }
-        return parts.map((p) => `(${p})`).join(` ${delimiter} `);
-    }
-    return parts.join(` ${delimiter} `);
-}
 
-export function getShellCommandAsString(shell: string, command: PythonCommandRunConfiguration[]): string {
-    let commandStr: string;
-    switch (shell) {
-        case ShellConstants.PWSH:
-            commandStr = getCommandAsString(command, shell, ';');
-            break;
-        case ShellConstants.NU:
-            commandStr = getCommandAsString(command, shell, ';');
-            break;
-        case ShellConstants.FISH:
-            commandStr = getCommandAsString(command, shell, '; and');
-            break;
-        case ShellConstants.BASH:
-        case ShellConstants.SH:
-        case ShellConstants.ZSH:
-
-        case ShellConstants.CMD:
-        case ShellConstants.GITBASH:
-        default:
-            commandStr = getCommandAsString(command, shell, '&&');
-            break;
+    let commandStr = parts.join(` ${delimiter} `);
+    if (shell === ShellConstants.PWSH && parts.length > 1) {
+        commandStr = parts.map((p) => `(${p})`).join(` ${delimiter} `);
     }
 
     // Add a leading space for shells that support history ignore with leading space.
     // This prevents the activation command from being saved in bash/zsh history
     // when HISTCONTROL=ignorespace (bash) or setopt HIST_IGNORE_SPACE (zsh) is set.
-    if (shellsWithLeadingSpaceHistorySupport.includes(shell)) {
+    if (shellsWithLeadingSpaceHistorySupport.has(shell)) {
         return ` ${commandStr}`;
     }
     return commandStr;

src/test/features/terminal/shells/common/shellUtils.unit.test.ts

@@ -1,13 +1,13 @@
 import * as assert from 'assert';
+import { PythonCommandRunConfiguration } from '../../../../../api';
+import { ShellConstants } from '../../../../../features/common/shellConstants';
 import {
     extractProfilePath,
     getShellCommandAsString,
     PROFILE_TAG_END,
     PROFILE_TAG_START,
     shellsWithLeadingSpaceHistorySupport,
 } from '../../../../../features/terminal/shells/common/shellUtils';
-import { ShellConstants } from '../../../../../features/common/shellConstants';
-import { PythonCommandRunConfiguration } from '../../../../../api';
 
 suite('Shell Utils', () => {
     suite('extractProfilePath', () => {
@@ -84,17 +84,17 @@ suite('Shell Utils', () => {
 
     suite('shellsWithLeadingSpaceHistorySupport', () => {
         test('should include bash, zsh, and gitbash', () => {
-            assert.ok(shellsWithLeadingSpaceHistorySupport.includes(ShellConstants.BASH));
-            assert.ok(shellsWithLeadingSpaceHistorySupport.includes(ShellConstants.ZSH));
-            assert.ok(shellsWithLeadingSpaceHistorySupport.includes(ShellConstants.GITBASH));
+            assert.ok(shellsWithLeadingSpaceHistorySupport.has(ShellConstants.BASH));
+            assert.ok(shellsWithLeadingSpaceHistorySupport.has(ShellConstants.ZSH));
+            assert.ok(shellsWithLeadingSpaceHistorySupport.has(ShellConstants.GITBASH));
         });
 
         test('should not include shells without leading space history support', () => {
-            assert.ok(!shellsWithLeadingSpaceHistorySupport.includes(ShellConstants.PWSH));
-            assert.ok(!shellsWithLeadingSpaceHistorySupport.includes(ShellConstants.CMD));
-            assert.ok(!shellsWithLeadingSpaceHistorySupport.includes(ShellConstants.FISH));
-            assert.ok(!shellsWithLeadingSpaceHistorySupport.includes(ShellConstants.SH));
-            assert.ok(!shellsWithLeadingSpaceHistorySupport.includes(ShellConstants.NU));
+            assert.ok(!shellsWithLeadingSpaceHistorySupport.has(ShellConstants.PWSH));
+            assert.ok(!shellsWithLeadingSpaceHistorySupport.has(ShellConstants.CMD));
+            assert.ok(!shellsWithLeadingSpaceHistorySupport.has(ShellConstants.FISH));
+            assert.ok(!shellsWithLeadingSpaceHistorySupport.has(ShellConstants.SH));
+            assert.ok(!shellsWithLeadingSpaceHistorySupport.has(ShellConstants.NU));
         });
     });