Enter isolated state for type params to avoid JSX collisions.

thesoftwarephilosopher · Aug 22, 2024 · b60eefe · b60eefe
1 parent fcddf91
commit b60eefe
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/site/token-provider.ts b/site/token-provider.ts
@@ -5,17 +5,18 @@
 /**
  * Differences from official typescript monarch token provider:
  * 
- * 1. `...` is highlighted as a keyword now
+ * 1. `...` is highlighted as a keyword
  * 2. `export/etc` are highlighted as control-flow keywords
  * 3. Class fields are highlighted as variables
+ * 4. Type params are highlighted separate from JSX
  * 
  */
 
 export const rules = [
   // { token: "identifier.ts", foreground: "9CDCFE" },
   { token: "variable.property.ts", foreground: "9CDCFE" },
   // { token: "function.ts", foreground: "DCDCAA" },
-  // { token: "method.ts", foreground: "DCDCAA" },
+  { token: "method.ts", foreground: "DCDCAA" },
   // { token: "delimiter.ts", foreground: "569CD6" },
 ];
 
@@ -76,12 +77,20 @@ export const tokenProvider = {
     common: [
       // identifiers and keywords
       [
-        /#?[a-z_$][\w$]*/,
+        /(#?[a-z_$][\w$]*)([<(]?)/,
         {
           cases: {
             '@ctrlKeywords': 'keyword.flow',
             '@keywords': 'keyword',
-            '@default': 'identifier'
+            'super\\(': 'keyword',
+            'constructor\\(': 'keyword',
+            '@default': {
+              cases: {
+                '$2==<': ['method', { token: '@brackets', next: '@typeparams' }],
+                '$2==(': ['method', ''],
+                '@default': 'identifier',
+              }
+            },
           }
         }
       ],
@@ -132,6 +141,11 @@ export const tokenProvider = {
       [/`/, 'string', '@string_backtick']
     ],
 
+    typeparams: [
+      [/>/, '@brackets', '@pop'],
+      { include: 'common' }
+    ],
+
     whitespace: [
       [/[ \t\r\n]+/, ''],
       [/\/\*\*(?!\/)/, 'comment.doc', '@jsdoc'],