feat: some syntax highlighting improvements (#93)

noir-lang · Jan 8, 2025 · ed74a75 · ed74a75
1 parent cf4b161
commit ed74a75
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/syntaxes/noir.tmLanguage.json b/syntaxes/noir.tmLanguage.json
@@ -99,8 +99,7 @@
           },
           "patterns": [
             {
-              "match": "[a-zA-Z_(::)][a-zA-Z0-9_]*",
-              "name": "support.type.nr"
+              "include": "#code"
             }
           ]
         },
@@ -233,7 +232,7 @@
         },
         {
           "name": "keyword.nr",
-          "match": "\\b(global|comptime|quote|unsafe|unconstrained|pub|&mut|mut|self|in|as|let)\\b"
+          "match": "\\b(global|comptime|quote|unsafe|unconstrained|pub|crate|&mut|mut|self|in|as|let)\\b"
         }
       ]
     },
@@ -248,11 +247,18 @@
           "match": "\\b(_*[A-Z][a-zA-Z0-9_]*|[a-zA-Z_][a-zA-Z0-9_]*::)\\b"
         },
         {
-          "begin": "\\b([a-z_][a-zA-Z0-9_]*)\\s*\\(",
+          "begin": "\\b([a-z_][a-zA-Z0-9_]*)\\s*(::<(.*)>\\s*)?\\(",
           "end": "\\)",
           "beginCaptures": {
             "1": {
               "name": "support.function.nr"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#code"
+                }
+              ]
             }
           },
           "patterns": [
@@ -270,15 +276,15 @@
     "--struct-content": {
       "patterns": [
         {
-          "begin": "[a-zA-Z_][a-zA-Z0-9_]*",
-          "end": "([a-zA-Z_][a-zA-Z0-9_]*)|,",
-          "beginCaptures": {
-            "0": {
-              "name": "support.type.property-name.nr"
-            }
-          },
-          "endCaptures": {
+          "match": "(pub|pub\\(crate\\))?\\s*([a-zA-Z_][a-zA-Z0-9_]*)\\s*:\\s*([a-zA-Z_][a-zA-Z0-9_]*)",
+          "captures": {
             "1": {
+              "name": "keyword.nr"
+            },
+            "2": {
+              "name": "support.type.property-name.nr"
+            },
+            "3": {
               "name": "support.type.nr"
             }
           },