improved editor highlighting

eneoli · Sep 4, 2024 · 40e0799 · 40e0799
1 parent 9c80698
commit 40e0799
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 35 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/src/domain/code-editor/components/code-editor.tsx b/frontend/src/domain/code-editor/components/code-editor.tsx
@@ -15,19 +15,52 @@ function handleEditorWillMount(monaco: Monaco) {
 
     monaco.languages.register({ id: 'alice' });
     monaco.languages.setMonarchTokensProvider('alice', {
+        brackets: [{ token: 'delimiter.parenthesis', open: '(', close: ')' }],
         keywords,
         tokenizer: {
             root: [
-                [/@?[a-zA-Z][\w$]*/, {
-                    cases: {
-                        '@keywords': 'keyword',
-                        '@default': 'variable',
-                    }
-                }]
-            ]
-        }
+                [
+                    /@?[a-zA-Z][\w$]*/, {
+                        cases: {
+                            '@keywords': 'keyword',
+                            '@default': 'variable',
+                        }
+                    }],
+                { include: '@whitespace' },],
+            whitespace: [
+                [/[ \t\r\n]+/, ''],
+                [/\/\*/, 'comment', '@comment'],
+                [/\/\/.*\\$/, 'comment', '@linecomment'],
+                [/\/\/.*$/, 'comment']
+            ],
+            comment: [
+                [/[^\/*]+/, 'comment'],
+                [/\*\//, 'comment', '@pop'],
+                [/[\/*]/, 'comment']
+            ],
+            linecomment: [
+                [/.*[^\\]$/, 'comment', '@pop'],
+                [/[^]+/, 'comment']
+            ],
+        },
     });
 
+    monaco.languages.setLanguageConfiguration('alice', {
+        comments: {
+            lineComment: '//',
+            blockComment: ['/*', '*/'],
+        },
+        brackets: [
+            ['(', ')']
+        ],
+        autoClosingPairs: [
+            { open: '(', close: ')' },
+        ],
+        surroundingPairs: [
+            { open: '(', close: ')' },
+        ],
+    })
+
     monaco.languages.registerCompletionItemProvider('alice', {
         provideCompletionItems: function (model, position) {
             // Get the text before the cursor