Improve GraphQL regex to match 'GQL'

Shopify · Feb 2, 2024 · 84385bf · 84385bf
1 parent ca4f02a
commit 84385bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/grammars/ruby.cson.json b/grammars/ruby.cson.json
@@ -1671,13 +1671,13 @@
       ]
     },
     {
-      "begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)GRAPHQL)\\b\\1))",
+      "begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:GRAPHQL|GQL))\\b\\1))",
       "comment": "Heredoc with embedded GraphQL",
       "end": "(?!\\G)",
       "name": "meta.embedded.block.graphql",
       "patterns": [
         {
-          "begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)GRAPHQL)\\b\\1)",
+          "begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:GRAPHQL|GQL))\\b\\1)",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.ruby"

diff --git a/src/test/suite/grammars.test.ts b/src/test/suite/grammars.test.ts
@@ -27,7 +27,6 @@ const EMBEDDED_HEREDOC_LANGUAGES: InferrableLanguageConfigOrLabel[] = [
   // Languages for which we can infer everything from the comment label
   "C",
   "CSS",
-  "GraphQL",
   "Lua",
   "Ruby",
   "SQL",
@@ -37,6 +36,10 @@ const EMBEDDED_HEREDOC_LANGUAGES: InferrableLanguageConfigOrLabel[] = [
     id: "cpp",
     label: "C++",
   },
+  {
+    label: "GraphQL",
+    delimiters: ["GRAPHQL", "GQL"],
+  },
   {
     label: "HAML",
     contentName: "text.haml",