Merge pull request #4401 from James-Yu/suggestion-order

Tweak suggestion order
James-Yu · Sep 20, 2024 · 2974304 · 2974304 · julius-thomas · Sep 20, 2024
2 parents 460246f + cd76bf9
commit 2974304
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/completion/completer/environment.ts b/src/completion/completer/environment.ts
@@ -283,7 +283,7 @@ function entryEnvToCompletion(item: EnvironmentInfo, type: EnvSnippetType): CmdE
     if (item.package) {
         suggestion.documentation += ` From package: ${item.package}.`
     }
-    suggestion.sortText = label.replace(/([A-Z])/g, '$10').toLowerCase()
+    suggestion.sortText = label.replace(/([a-z])/g, '$10').toLowerCase()
 
     if (type === EnvSnippetType.AsName) {
         return suggestion

diff --git a/src/completion/completer/macro.ts b/src/completion/completer/macro.ts
@@ -421,10 +421,12 @@ function entryCmdToCompletion(item: MacroRaw, packageName?: string, postAction?:
         suggestion.documentation += ` From package: ${packageName}.`
     }
     suggestion.sortText = (item.name + (item.arg?.format ?? ''))
-        .replace(/([A-Z])/g, '$10').toLowerCase()
+        .replace(/([a-z])/g, '$10').toLowerCase()
         .replaceAll('{', '0')
         .replaceAll('[', '1')
-        .replaceAll('(', '2')
+        .replace(/^(.+?)\(/g, '$12') // Skip \(
+        .replaceAll('|', '3')
+        .replaceAll('*', '9')
     if (postAction) {
         suggestion.command = { title: 'Post-Action', command: postAction }
     } else if (isTriggerSuggestNeeded(item.name)) {