impr(commandline): when searching, allow display and alias matching a…

…t the same time
monkeytypegame · Apr 26, 2024 · 04ae04d · 04ae04d
1 parent 94bf02d
commit 04ae04d
Showing 1 changed file with 28 additions and 2 deletions.
diff --git a/frontend/src/ts/commandline/commandline.ts b/frontend/src/ts/commandline/commandline.ts
@@ -174,19 +174,35 @@ async function filterSubgroup(): Promise<void> {
   const inputSplit =
     inputNoQuickSingle.length === 0 ? [] : inputNoQuickSingle.split(" ");
 
+  const matches: {
+    displayMatchCount: number;
+    aliasMatchCount: number;
+    aliasCount: number;
+  }[] = [];
+
   const displayMatchCounts: number[] = [];
   const aliasMatchCounts: number[] = [];
   for (const command of list) {
     const isAvailable = command.available?.() ?? true;
     if (!isAvailable) {
       displayMatchCounts.push(-1);
       aliasMatchCounts.push(-1);
+      matches.push({
+        displayMatchCount: -1,
+        aliasMatchCount: -1,
+        aliasCount: 0,
+      });
       continue;
     }
 
     if (inputNoQuickSingle.length === 0 || inputSplit.length === 0) {
       displayMatchCounts.push(0);
       aliasMatchCounts.push(0);
+      matches.push({
+        displayMatchCount: 0,
+        aliasMatchCount: 0,
+        aliasCount: 0,
+      });
       continue;
     }
 
@@ -234,12 +250,22 @@ async function filterSubgroup(): Promise<void> {
 
     displayMatchCounts.push(displayMatchCount);
     aliasMatchCounts.push(aliasMatchCount);
+    matches.push({
+      displayMatchCount,
+      aliasMatchCount,
+      aliasCount: aliasSplit.length,
+    });
   }
 
   for (const [index, command] of list.entries()) {
+    const match = matches[index];
+    if (match === undefined) {
+      command.found = false;
+      continue;
+    }
     if (
-      (displayMatchCounts[index] as number) >= inputSplit.length ||
-      (aliasMatchCounts[index] as number) >= inputSplit.length
+      match.displayMatchCount >= inputSplit.length ||
+      (match.aliasCount > 0 && match.aliasMatchCount >= 1)
     ) {
       command.found = true;
     } else {