Dot was the wrong place for calls/properties.

thesoftwarephilosopher · Aug 22, 2024 · db1e42c · db1e42c
1 parent ce46d5b
commit db1e42c
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/site/token-provider.ts b/site/token-provider.ts
@@ -87,6 +87,9 @@ export const tokenProvider = {
       ],
       [/[A-Z][\w\$]*/, 'type.identifier'],
 
+      // [/#?[\w$]+\s*(?=[<(])/, 'method'],
+      // [/#?[\w$]+\s*(?=[=.])/, 'property'],
+
       // whitespace
       { include: '@whitespace' },
 
@@ -118,10 +121,9 @@ export const tokenProvider = {
       [/0[bB](@binarydigits)n?/, 'number.binary'],
       [/(@digits)n?/, 'number'],
 
-      [/\./, '@rematch', '@dot'],
-
       // delimiter: after number because of .\d floats
-      [/[;,]/, 'delimiter'],
+      [/\.\.\./, 'keyword'],
+      [/[;,.]/, 'delimiter'],
 
       // strings
       [/"([^"\\]|\\.)*$/, 'string.invalid'], // non-teminated string
@@ -131,14 +133,6 @@ export const tokenProvider = {
       [/`/, 'string', '@string_backtick']
     ],
 
-    dot: [
-      [/\.\.\./, 'keyword', '@pop'],
-      [/#?[\w$]+\s*(?=[<(])/, 'method'],
-      [/#?[\w$]+\s*(?=[=.])/, 'property'],
-      [/\./, 'delimiter'],
-      [/./, '@rematch', '@pop'],
-    ],
-
     whitespace: [
       [/[ \t\r\n]+/, ''],
       [/\/\*\*(?!\/)/, 'comment.doc', '@jsdoc'],