Move special rules out of common.

thesoftwarephilosopher · Aug 22, 2024 · 05f0fb3 · 05f0fb3
1 parent 1b75d6d
commit 05f0fb3
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/site/token-provider.ts b/site/token-provider.ts
@@ -73,13 +73,11 @@ export const tokenProvider = {
   tokenizer: {
     root: [
       [/[{}]/, 'delimiter.bracket'],
-      [/^\s*#?[\w$]+(?=\s*[;=:])/, 'variable.property'],
-      { include: 'common' },
-    ],
 
-    common: [
+      // highlight class field-properties
+      [/^\s*#?[\w$]+(?=\s*[;=:])/, 'variable.property'],
 
-      // highlight function/class defs nicely
+      // highlight function/class defs
       [/((?:function|class)\s+)(#?[\w$]+\s*)([<(]?)/, [
         { token: 'keyword' },
         {
@@ -97,14 +95,19 @@ export const tokenProvider = {
         },
       ]],
 
-      // highlight var/const/let defs nicely
+      // highlight var/const/let defs
       [/((?:const|let|var)\s+)(#?[\w$]+)/, ['keyword', {
         cases: {
           '$1~const\\s+': 'constant',
           '@default': 'variable',
         }
       }]],
 
+      { include: 'common' },
+    ],
+
+    common: [
+
       // identifiers and keywords
       [/#?[a-z_$][\w$]*/, {
         cases: {
@@ -113,8 +116,7 @@ export const tokenProvider = {
           '@default': 'identifier',
         }
       }],
-      [/[A-Z][\w\$]*/, 'type.identifier'], // to show class names nicely
-      // [/[A-Z][\w\$]*/, 'identifier'],
+      [/[A-Z][\w\$]*/, 'type.identifier'],
 
       // whitespace
       { include: '@whitespace' },