fix: completion type priority

CyanSalt · CyanSalt · commit 6a59e03a6877 · 2025-03-13T14:52:30.000+08:00
diff --git a/src/renderer/utils/shell-integration.ts b/src/renderer/utils/shell-integration.ts
@@ -79,6 +79,30 @@ function updateDecorationElement(decoration: IDecoration, callback: (el: HTMLEle
   }
 }
 
+const completionTypePriority: Record<NonNullable<CommandCompletion['type']>, number> = {
+  'third-party': 0,
+  recommendation: 1,
+  history: 2,
+  directory: 3,
+  file: 4,
+  command: 5,
+  default: Infinity,
+}
+
+const completionTypeOrder = Object.entries(completionTypePriority)
+  .sort((a, b) => a[1] - b[1])
+  .map(([type, priority]) => type)
+
+function determineCompletionType(
+  a: CommandCompletion['type'],
+  b: CommandCompletion['type'],
+): NonNullable<CommandCompletion['type']> {
+  for (const type of completionTypeOrder) {
+    if (a === type || b === type) return type
+  }
+  return 'default'
+}
+
 function filterAndSortCompletions(completions: CommandCompletion[]) {
   const duplicatedTimes: (Pick<CommandCompletion, 'value' | 'query'> & { times: number })[] = []
   const deduplicatedCompletions: CommandCompletion[] = []
@@ -109,7 +133,7 @@ function filterAndSortCompletions(completions: CommandCompletion[]) {
       const existingItem = deduplicatedCompletions[existingIndex]
       const replacement = {
         ...existingItem,
-        type: 'default' as const,
+        type: determineCompletionType(existingItem.type, completion.type),
         description: existingItem.description || completion.description,
       }
       deduplicatedCompletions.splice(existingIndex, 1, replacement)
