From 87e2f5c23bc014306b1d76942d2664a6c1dd2c17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Gannaz?= <mytskine@gmail.com>
Date: Mon, 30 Oct 2023 17:32:11 +0100
Subject: [PATCH] TERMINAL: Fix autocompletion when running scripts with the
 "./" command (#900)

---
 src/Terminal/getTabCompletionPossibilities.ts | 8 +++++++-
 src/Terminal/ui/TerminalInput.tsx             | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Terminal/getTabCompletionPossibilities.ts b/src/Terminal/getTabCompletionPossibilities.ts
index efd20b974..fb84c8a0b 100644
--- a/src/Terminal/getTabCompletionPossibilities.ts
+++ b/src/Terminal/getTabCompletionPossibilities.ts
@@ -277,12 +277,18 @@ export async function getTabCompletionPossibilities(terminalText: string, baseDi
       return possibilities;
 
     default:
+      if (!onCommand) {
+        const options = await scriptAutocomplete();
+        if (options) {
+          addGeneric({ iterable: options, usePathing: false });
+        }
+      }
       return possibilities;
   }
 
   async function scriptAutocomplete(): Promise<string[] | undefined> {
     let inputCopy = commandArray.join(" ");
-    if (commandLength === 1) inputCopy = "run " + inputCopy;
+    if (commandLength >= 1 && commandArray[0] !== "run") inputCopy = "run " + inputCopy;
     const commands = parseCommands(inputCopy);
     if (commands.length === 0) return;
     const command = parseCommand(commands[commands.length - 1]);
diff --git a/src/Terminal/ui/TerminalInput.tsx b/src/Terminal/ui/TerminalInput.tsx
index 185b3e06d..e0dbee5ce 100644
--- a/src/Terminal/ui/TerminalInput.tsx
+++ b/src/Terminal/ui/TerminalInput.tsx
@@ -233,6 +233,9 @@ export function TerminalInput(): React.ReactElement {
 
     // Autocomplete
     if (event.key === KEY.TAB) {
+      if (event.altKey || event.ctrlKey) {
+        return;
+      }
       event.preventDefault();
       if (searchResults.length) {
         saveValue(searchResults[searchResultsIndex]);