From 248c52ddd284f035b29c469b04f38ef328464529 Mon Sep 17 00:00:00 2001 From: James Yu Date: Fri, 20 Sep 2024 11:47:02 +0800 Subject: [PATCH 1/3] Prioritize lower case over upper --- src/completion/completer/environment.ts | 2 +- src/completion/completer/macro.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/completion/completer/environment.ts b/src/completion/completer/environment.ts index 1b63e7a6b..ac3854dd9 100644 --- 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 index 97146c53c..4adab39c0 100644 --- a/src/completion/completer/macro.ts +++ b/src/completion/completer/macro.ts @@ -421,7 +421,7 @@ 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') From 097d3816b3d1181509c2d39779abac718210b73c Mon Sep 17 00:00:00 2001 From: James Yu Date: Fri, 20 Sep 2024 11:50:26 +0800 Subject: [PATCH 2/3] Starred macros come after normal ones --- src/completion/completer/macro.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/completion/completer/macro.ts b/src/completion/completer/macro.ts index 4adab39c0..f9680a9f7 100644 --- a/src/completion/completer/macro.ts +++ b/src/completion/completer/macro.ts @@ -425,6 +425,7 @@ function entryCmdToCompletion(item: MacroRaw, packageName?: string, postAction?: .replaceAll('{', '0') .replaceAll('[', '1') .replaceAll('(', '2') + .replaceAll('*', '9') if (postAction) { suggestion.command = { title: 'Post-Action', command: postAction } } else if (isTriggerSuggestNeeded(item.name)) { From cd76bf961e02b88398d4a4438a28aba6b95d9030 Mon Sep 17 00:00:00 2001 From: James Yu Date: Fri, 20 Sep 2024 11:55:10 +0800 Subject: [PATCH 3/3] Fix #4400 Prioritize `\(`, give `|` an order --- src/completion/completer/macro.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/completion/completer/macro.ts b/src/completion/completer/macro.ts index f9680a9f7..195f9c66b 100644 --- a/src/completion/completer/macro.ts +++ b/src/completion/completer/macro.ts @@ -424,7 +424,8 @@ function entryCmdToCompletion(item: MacroRaw, packageName?: string, postAction?: .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 }