feat: Support and keyword for data types (#172)

grain-lang · Mar 4, 2024 · a8b556e · a8b556e
1 parent 44851bc
commit a8b556e
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/editor-extensions/vscode/syntaxes/grain.json b/editor-extensions/vscode/syntaxes/grain.json
@@ -375,13 +375,14 @@
           }
         },
         {
-          "begin": "\\b(enum)\\b\\s+([A-Z]\\w*\\s*(<.*>\\s*)?)\\s*(\\{)",
+          "begin": "\\b(enum)\\b\\s+(\\b(rec)\\b\\s+)?([A-Z]\\w*\\s*(<.*>\\s*)?)\\s*(\\{)",
           "end": "(\\})",
           "beginCaptures": {
             "1": { "name": "storage.type.grain" },
-            "2": { "name": "entity.name.type.grain" },
-            "3": { "patterns": [{ "include": "#type-vector" }] },
-            "4": { "name": "punctuation.definition.parameters.begin.grain" }
+            "3": { "name": "storage.type.grain" },
+            "4": { "name": "entity.name.type.grain" },
+            "5": { "patterns": [{ "include": "#type-vector" }] },
+            "6": { "name": "punctuation.definition.parameters.begin.grain" }
           },
           "endCaptures": {
             "1": { "name": "punctuation.definition.parameters.end.grain" }
@@ -395,13 +396,14 @@
           ]
         },
         {
-          "begin": "\\b(record)\\b\\s+([A-Z]\\w*\\s*(<.*>\\s*)?)\\s*(\\{)",
+          "begin": "\\b(record)\\b\\s+(\\b(rec)\\b\\s+)?([A-Z]\\w*\\s*(<.*>\\s*)?)\\s*(\\{)",
           "end": "(\\})",
           "beginCaptures": {
             "1": { "name": "storage.type.grain" },
-            "2": { "name": "entity.name.type.grain" },
-            "3": { "patterns": [{ "include": "#type-vector" }] },
-            "4": { "name": "punctuation.definition.parameters.begin.grain" }
+            "3": { "name": "storage.type.grain" },
+            "4": { "name": "entity.name.type.grain" },
+            "5": { "patterns": [{ "include": "#type-vector" }] },
+            "6": { "name": "punctuation.definition.parameters.begin.grain" }
           },
           "endCaptures": {
             "1": { "name": "punctuation.definition.parameters.end.grain" }
@@ -438,11 +440,12 @@
           }
         },
         {
-          "match": "(type|record|enum)\\s+([A-Z]\\w*)(<.*>)?",
+          "match": "(type|record|enum)\\s+(\\b(rec)\\b\\s+)?([A-Z]\\w*)(<.*>)?",
           "captures": {
             "1": { "name": "storage.type.grain" },
-            "2": { "name": "entity.name.type.grain" },
-            "3": { "patterns": [{ "include": "#type-vector" }] }
+            "3": { "name": "storage.type.grain" },
+            "4": { "name": "entity.name.type.grain" },
+            "5": { "patterns": [{ "include": "#type-vector" }] }
           }
         }
       ]
@@ -1097,7 +1100,7 @@
           "name": "keyword.control.grain"
         },
         {
-          "match": "\\b(module|let|rec|mut|record|type|enum|foreign|primitive)\\b",
+          "match": "\\b(module|let|rec|mut|record|type|enum|and|foreign|primitive)\\b",
           "name": "storage.type.grain"
         }
       ]