feat: Update scoping operator syntax (#169)

grain-lang · Mar 2, 2024 · e738bb0 · e738bb0
1 parent afd628c
commit e738bb0
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/editor-extensions/vscode/syntaxes/grain.json b/editor-extensions/vscode/syntaxes/grain.json
@@ -649,15 +649,17 @@
     "use": {
       "patterns": [
         {
-          "begin": "\\b(from)\\b\\s*\\b([A-Z]\\w*((\\.)[A-Z]\\w*)*)\\b\\s*\\b(use)\\b\\s*(\\{)",
+          "begin": "\\b(use)\\b\\s*\\b([A-Z]\\w*((\\.)[A-Z]\\w*)*)\\b\\s*(\\.)\\s*(\\{)",
           "end": "(\\})",
           "beginCaptures": {
             "1": { "patterns": [{ "include": "#keywords" }] },
             "2": { "name": "entity.name.module.grain" },
             "4": {
               "name": "keyword.operator.accessor.grain"
             },
-            "5": { "patterns": [{ "include": "#keywords" }] },
+            "5": {
+              "name": "keyword.operator.accessor.grain"
+            },
             "6": { "name": "punctuation.definition.start.grain" }
           },
           "endCaptures": {
@@ -691,26 +693,31 @@
           ]
         },
         {
-          "match": "\\b(from)\\b\\s*\\b([A-Z]\\w*((\\.)[A-Z]\\w*)*)\\b\\s*\\b(use)\\b\\s*(\\*)?",
+          "match": "\\b(use)\\b\\s*\\b([A-Z]\\w*((\\.)[A-Z]\\w*)*)\\b\\s*(\\.)\\s*(\\*)?",
           "captures": {
             "1": { "patterns": [{ "include": "#keywords" }] },
             "2": { "name": "entity.name.module.grain" },
             "4": {
               "name": "keyword.operator.accessor.grain"
             },
-            "5": { "patterns": [{ "include": "#keywords" }] },
+            "5": {
+              "name": "keyword.operator.accessor.grain"
+            },
             "6": {
               "name": "keyword.operator.grain"
             }
           }
         },
         {
-          "match": "\\b(from)\\b\\s*\\b([A-Z]\\w*((\\.)[A-Z]\\w*)*)\\b",
+          "match": "\\b(use)\\b\\s*\\b([A-Z]\\w*((\\.)[A-Z]\\w*)*)\\b(\\.)?",
           "captures": {
             "1": { "patterns": [{ "include": "#keywords" }] },
             "2": { "name": "entity.name.module.grain" },
             "4": {
               "name": "keyword.operator.accessor.grain"
+            },
+            "5": {
+              "name": "keyword.operator.accessor.grain"
             }
           }
         }