@bhsd/codemirror-mediawiki 3.12.2 → 3.12.3

package/dist/lua.js

@@ -4,7 +4,7 @@ import { ViewPlugin, Decoration } from '@codemirror/view';
 import { syntaxTree, LanguageSupport, StreamLanguage, foldService, HighlightStyle, syntaxHighlighting, } from '@codemirror/language';
 import { snippetCompletion } from '@codemirror/autocomplete';
 import { tags } from '@lezer/highlight';
-import { leadingSpaces, sliceDoc, markDocTagType } from './util.js';
+import { leadingSpaces, sliceDoc, markDocTagType, getCompletions } from './util.js';
 import { lightHighlightStyle } from './theme.js';
 const map = {
     1: 'constant',
@@ -218,12 +218,9 @@ const map = {
         },
         ext: 4,
     },
-}, luaBuiltin = ['false', 'nil', 'true'], luaBuiltins = luaBuiltin.map(label => ({ label, type: 'constant' })), tables = [
-    '_G',
-    ...Object.keys(globals),
-].map(label => ({ label, type: 'namespace' })), constants = [
+}, luaBuiltin = ['false', 'nil', 'true'], luaBuiltins = getCompletions(luaBuiltin, 'constant'), tables = getCompletions(['_G', ...Object.keys(globals)], 'namespace'), constants = [
     { label: '_VERSION', type: 'constant' },
-    ...[
+    ...getCompletions([
         'assert',
         'error',
         'getfenv',
@@ -243,22 +240,15 @@ const map = {
         'unpack',
         'xpcall',
         'require',
-    ].map(label => ({ label, type: 'function' })),
-], binary = [
-    'and',
-    'or',
-    'in',
-].map(label => ({ label, type: 'keyword' })), unary = [
-    ...[
-        'not',
-        'function',
-    ].map(label => ({ label, type: 'keyword' })),
+    ], 'function'),
+], binary = getCompletions(['and', 'or', 'in']), unary = [
+    ...getCompletions(['not', 'function']),
     snippetCompletion('function ${name}(${})\n\t${}\nend', {
         label: 'function',
         detail: 'definition',
         type: 'keyword',
     }),
-], blocks = [
+], blocks = getCompletions([
     'break',
     'elseif',
     'return',
@@ -268,14 +258,14 @@ const map = {
     'do',
     'until',
     'goto',
-].map(label => ({ label, type: 'keyword' })), luaKeywords = [
-    ...[
+]), luaKeywords = [
+    ...getCompletions([
         'if',
         'while',
         'repeat',
         'for',
         'local',
-    ].map(label => ({ label, type: 'keyword' })),
+    ]),
     snippetCompletion('if ${condition} then\n\t${}\nend', {
         label: 'if',
         detail: 'block',
@@ -358,41 +348,6 @@ const source = context => {
                 };
             }
             break;
-        case '..':
-        case '+':
-        case '-':
-        case '*':
-        case '/':
-        case '%':
-        case '^':
-        case '&':
-        case '|':
-        case '~':
-        case '<':
-        case '>':
-        case '[':
-            return {
-                from,
-                options: [...constants, ...tables],
-                validFor,
-            };
-        case '=':
-        case '{':
-        case '(':
-        case ',':
-            return {
-                from,
-                options: [...luaBuiltins, ...constants, ...tables, ...unary],
-                validFor,
-            };
-        case '}':
-        case ']':
-        case ')':
-            return {
-                from,
-                options: [...binary, ...blocks],
-                validFor,
-            };
         case ';':
         case '':
             return {
@@ -401,7 +356,28 @@ const source = context => {
                 validFor,
             };
         default:
-            if (pre !== char) {
+            if (/\.\.|[-+*/%^&|~<>[]/u.test(char)) {
+                return {
+                    from,
+                    options: [...constants, ...tables],
+                    validFor,
+                };
+            }
+            else if (/[={(,]/u.test(char)) {
+                return {
+                    from,
+                    options: [...luaBuiltins, ...constants, ...tables, ...unary],
+                    validFor,
+                };
+            }
+            else if (/[}\])]/u.test(char)) {
+                return {
+                    from,
+                    options: [...binary, ...blocks],
+                    validFor,
+                };
+            }
+            else if (pre !== char) {
                 const { prevSibling } = node;
                 return {
                     from,