Try to minimise diff even further

effekt-lang · Jul 20, 2024 · 1fea08d · 1fea08d
1 parent 58c0700
commit 1fea08d
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/src/effekt-syntax.ts b/src/effekt-syntax.ts
@@ -69,8 +69,8 @@ export const syntax = <ILanguage>{
       [/[;,.]/, 'delimiter'],
 
       // strings
-      [/"([^"\\]|\\.)*$/, 'string.invalid'],
-      [/"/, { token: 'string.quote', bracket: '@open', next: '@string' }],
+      [/"([^"\\]|\\.)*$/, 'string.invalid' ],  // non-teminated string
+      [/"/,  { token: 'string.quote', bracket: '@open', next: '@string' } ],
 
       // characters
       [/'[^\\']'/, 'string'],
@@ -79,8 +79,9 @@ export const syntax = <ILanguage>{
     ],
 
     definition: [
-      [/[a-zA-Z_$][\w$]*/, 'definition'],
-      [/\s*/, '', '@pop']
+      { include: '@whitespace' },
+      [/[a-zA-Z_$][\w$?!]*/, 'definition'],
+      [new RegExp(""),'','@pop']
     ],
 
     comment: [
@@ -91,12 +92,12 @@ export const syntax = <ILanguage>{
     ],
 
     string: [
-      [/[^\\"$]+/, 'string'],
-      [/@escapes/, 'string.escape'],
-      [/\\./, 'string.escape.invalid'],
-      [/\$\{/, { token: 'delimiter.bracket', next: '@bracketCounting' }],
+      [/[^\\"$]+/,       'string'],
+      [/@escapes/,       'string.escape'],
+      [/\\./,            'string.escape.invalid'],
+      [/\$\{/,           { token: 'delimiter.bracket', next: '@bracketCounting' }],
       [/\$[a-z_][\w$]*/, 'variable'],
-      [/"/, { token: 'string.quote', bracket: '@close', next: '@pop' }]
+      [/"/,              { token: 'string.quote', bracket: '@close', next: '@pop' }]
     ],
 
     bracketCounting: [