feature: add fragment arguments syntax highlights (#3019)

graphql · Feb 19, 2023 · ae43add · ae43add
1 parent 65f5176
commit ae43add
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/.changeset/eighty-rabbits-ring.md b/.changeset/eighty-rabbits-ring.md
@@ -0,0 +1,5 @@
+---
+'vscode-graphql-syntax': minor
+---
+
+Adds syntax highlighting for arguments on fragment spreads as well as variable definitions on fragments.
diff --git a/packages/vscode-graphql-syntax/grammars/graphql.json b/packages/vscode-graphql-syntax/grammars/graphql.json
@@ -31,15 +31,21 @@
     },
     "graphql-fragment-definition": {
       "name": "meta.fragment.graphql",
-      "begin": "\\s*(?:(\\bfragment\\b)\\s*([_A-Za-z][_0-9A-Za-z]*)?\\s*(?:(\\bon\\b)\\s*([_A-Za-z][_0-9A-Za-z]*)))",
+      "begin": "\\s*(?:(\\bfragment\\b)\\s*([_A-Za-z][_0-9A-Za-z]*)?)",
       "end": "(?<=})",
       "captures": {
         "1": { "name": "keyword.fragment.graphql" },
-        "2": { "name": "entity.name.fragment.graphql" },
-        "3": { "name": "keyword.on.graphql" },
-        "4": { "name": "support.type.graphql" }
+        "2": { "name": "entity.name.fragment.graphql" }
       },
       "patterns": [
+        {
+          "match": "\\s*(?:(\\bon\\b)\\s*([_A-Za-z][_0-9A-Za-z]*))",
+          "captures": {
+            "1": { "name": "keyword.on.graphql" },
+            "2": { "name": "support.type.graphql" }
+          }
+        },
+        { "include": "#graphql-variable-definitions" },
         { "include": "#graphql-comment" },
         { "include": "#graphql-description-docstring" },
         { "include": "#graphql-description-singleline" },
@@ -487,6 +493,7 @@
         "2": { "name": "variable.fragment.graphql" }
       },
       "patterns": [
+        { "include": "#graphql-arguments" },
         { "include": "#graphql-comment" },
         { "include": "#graphql-description-docstring" },
         { "include": "#graphql-description-singleline" },