fix: xonsh should be expected on path, don't search python modules (#215

) * fix: xonsh should be expected on path, don't search python modules Signed-off-by: Chapman Pendery <cpendery@vt.edu> * fix: xonsh prompt when not under test Signed-off-by: Chapman Pendery <cpendery@vt.edu> --------- Signed-off-by: Chapman Pendery <cpendery@vt.edu>
microsoft · Mar 22, 2024 · 405385c · 405385c
1 parent 710f256
commit 405385c
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 36 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -56,7 +56,7 @@ jobs:
         if: matrix.os == 'windows-latest'
         shell: pwsh
         run: |
-          python -m pip install 'xonsh[full]'
+          pipx install 'xonsh[full]'
 
       - run: npm test
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/shell/shellIntegration.xsh b/shell/shellIntegration.xsh
@@ -23,7 +23,7 @@ def __is_update_cwd() -> str:
 $PROMPT_FIELDS['__is_prompt_start'] = __is_prompt_start
 $PROMPT_FIELDS['__is_prompt_end'] = __is_prompt_end
 $PROMPT_FIELDS['__is_update_cwd'] = __is_update_cwd
-if $ISTERM_TESTING:
+if 'ISTERM_TESTING' in ${...}:
     $PROMPT = "> "
 
 $PROMPT = "{__is_prompt_start}{__is_update_cwd}" + $PROMPT + "{__is_prompt_end}"
diff --git a/src/isterm/pty.ts b/src/isterm/pty.ts
@@ -9,7 +9,7 @@ import url from "node:url";
 import fs from "node:fs";
 
 import pty, { IPty, IEvent } from "@homebridge/node-pty-prebuilt-multiarch";
-import { Shell, getPythonPath, userZdotdir, zdotdir } from "../utils/shell.js";
+import { Shell, userZdotdir, zdotdir } from "../utils/shell.js";
 import { IsTermOscPs, IstermOscPt, IstermPromptStart, IstermPromptEnd } from "../utils/ansi.js";
 import xterm from "@xterm/headless";
 import { CommandManager, CommandState } from "./commandManager.js";
@@ -253,7 +253,7 @@ export const spawn = async (options: ISTermOptions): Promise<ISTerm> => {
 
 const convertToPtyTarget = async (shell: Shell) => {
   const platform = os.platform();
-  let shellTarget = shell == Shell.Bash && platform == "win32" ? await gitBashPath() : platform == "win32" ? `${shell}.exe` : shell;
+  const shellTarget = shell == Shell.Bash && platform == "win32" ? await gitBashPath() : platform == "win32" ? `${shell}.exe` : shell;
   const shellFolderPath = path.join(path.dirname(url.fileURLToPath(import.meta.url)), "..", "..", "shell");
   let shellArgs: string[] = [];
 
@@ -276,9 +276,7 @@ const convertToPtyTarget = async (shell: Shell) => {
         path.join(os.homedir(), ".config", "xonsh", "rc.d"),
       ];
       const configs = [sharedConfig, ...userConfigs].filter((config) => fs.existsSync(config));
-
-      shellArgs = ["-m", "xonsh", "--rc", ...configs, path.join(shellFolderPath, "shellIntegration.xsh")];
-      shellTarget = await getPythonPath();
+      shellArgs = ["--rc", ...configs, path.join(shellFolderPath, "shellIntegration.xsh")];
       break;
     }
   }
@@ -287,11 +285,12 @@ const convertToPtyTarget = async (shell: Shell) => {
 };
 
 const convertToPtyEnv = (shell: Shell, underTest: boolean) => {
-  const env = {
+  const env: Record<string, string> = {
     ...process.env,
     ISTERM: "1",
-    ISTERM_TESTING: underTest ? "1" : undefined,
   };
+  if (underTest) env.ISTERM_TESTING = "1";
+
   switch (shell) {
     case Shell.Cmd: {
       if (underTest) {

diff --git a/src/tests/ui/autocomplete.test.ts b/src/tests/ui/autocomplete.test.ts
@@ -4,7 +4,7 @@
 import { test, expect, Shell } from "@microsoft/tui-test";
 import os from "node:os";
 
-const windowsShells = [Shell.Cmd, Shell.Powershell, Shell.WindowsPowershell, "xonsh"];
+const windowsShells = [Shell.Cmd, Shell.Powershell, Shell.WindowsPowershell, Shell.Xonsh];
 const unixShells = [Shell.Bash, Shell.Fish, Shell.Zsh];
 const shells = os.platform() == "win32" ? windowsShells : unixShells;
 

diff --git a/src/utils/shell.ts b/src/utils/shell.ts
@@ -74,10 +74,6 @@ export const gitBashPath = async (): Promise<string> => {
   throw new Error("unable to find a git bash executable installed");
 };
 
-export const getPythonPath = async (): Promise<string> => {
-  return await which("python", { nothrow: true });
-};
-
 const getGitBashPaths = async (): Promise<string[]> => {
   const gitDirs: Set<string> = new Set();