Remove duplicated bigl and biggl and friends, simpler suggestion …

…sorting
James-Yu · Sep 13, 2024 · 2fdbf5f · 2fdbf5f
1 parent 2de71a4
commit 2fdbf5f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 104 deletions.
diff --git a/data/macros.json b/data/macros.json
@@ -42,102 +42,6 @@
     },
     "detail": "\\left\\{ ... \\right\\}, shortcut @{"
   },
-  {
-    "name": "bigl",
-    "arg": {
-      "format": "(",
-      "snippet": "bigl(${1}\\bigr)"
-    },
-    "detail": "\\bigl( ... \\bigr)"
-  },
-  {
-    "name": "bigl",
-    "arg": {
-      "format": "[",
-      "snippet": "bigl[${1}\\bigr]"
-    },
-    "detail": "\\bigl[ ... \\bigr]"
-  },
-  {
-    "name": "bigl",
-    "arg": {
-      "format": "{",
-      "snippet": "bigl\\{${1}\\bigr\\\\}"
-    },
-    "detail": "\\bigl\\{ ... \\bigr\\}"
-  },
-  {
-    "name": "Bigl",
-    "arg": {
-      "format": "(",
-      "snippet": "Bigl(${1}\\Bigr)"
-    },
-    "detail": "\\Bigl( ... \\Bigr)"
-  },
-  {
-    "name": "Bigl",
-    "arg": {
-      "format": "[",
-      "snippet": "Bigl[${1}\\Bigr]"
-    },
-    "detail": "\\Bigl[ ... \\Bigr]"
-  },
-  {
-    "name": "Bigl",
-    "arg": {
-      "format": "{",
-      "snippet": "Bigl\\{${1}\\Bigr\\\\}"
-    },
-    "detail": "\\Bigl\\{ ... \\Bigr\\}"
-  },
-  {
-    "name": "biggl",
-    "arg": {
-      "format": "(",
-      "snippet": "biggl(${1}\\biggr)"
-    },
-    "detail": "\\biggl( ... \\biggr)"
-  },
-  {
-    "name": "biggl",
-    "arg": {
-      "format": "[",
-      "snippet": "biggl[${1}\\biggr]"
-    },
-    "detail": "\\biggl[ ... \\biggr]"
-  },
-  {
-    "name": "biggl",
-    "arg": {
-      "format": "{",
-      "snippet": "biggl\\{${1}\\biggr\\\\}"
-    },
-    "detail": "\\biggl\\{ ... \\biggr\\}"
-  },
-  {
-    "name": "Biggl",
-    "arg": {
-      "format": "(",
-      "snippet": "Biggl${1}\\Biggr)"
-    },
-    "detail": "\\Biggl( ... \\Biggr)"
-  },
-  {
-    "name": "Biggl",
-    "arg": {
-      "format": "[",
-      "snippet": "Biggl[${1}\\Biggr]"
-    },
-    "detail": "\\Biggl[ ... \\Biggr]"
-  },
-  {
-    "name": "Biggl",
-    "arg": {
-      "format": "{",
-      "snippet": "Biggl\\{${1}\\Biggr\\\\}"
-    },
-    "detail": "\\Biggl\\{ ... \\Biggr\\}"
-  },
   {
     "name": "frame",
     "arg": {

diff --git a/src/completion/completer/environment.ts b/src/completion/completer/environment.ts
@@ -283,10 +283,7 @@ function entryEnvToCompletion(item: EnvironmentInfo, type: EnvSnippetType): CmdE
     if (item.package) {
         suggestion.documentation += ` From package: ${item.package}.`
     }
-    suggestion.sortText = label.replace(/^[a-zA-Z]/, c => {
-        const n = c.match(/[a-z]/) ? c.toUpperCase().charCodeAt(0): c.toLowerCase().charCodeAt(0)
-        return n !== undefined ? n.toString(16): c
-    })
+    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
@@ -420,10 +420,8 @@ function entryCmdToCompletion(item: MacroRaw, packageName?: string, postAction?:
     if (packageName) {
         suggestion.documentation += ` From package: ${packageName}.`
     }
-    suggestion.sortText = (item.name + (item.arg?.format ?? '')).replace(/^[a-zA-Z]/, c => {
-        const n = c.match(/[a-z]/) ? c.toUpperCase().charCodeAt(0): c.toLowerCase().charCodeAt(0)
-        return n !== undefined ? n.toString(16): c
-    })
+    suggestion.sortText = (item.name + (item.arg?.format ?? ''))
+    .replace(/([A-Z])/g, '$10').toLowerCase()
     if (postAction) {
         suggestion.command = { title: 'Post-Action', command: postAction }
     } else if (isTriggerSuggestNeeded(item.name)) {