Support parens (#99)

* add failing test * test passing * syntax too * fix: closing parenthesis at end position * chore: add changeset --------- Co-authored-by: Alessia Bellisario <github@bellisar.io>
apollographql · Oct 16, 2023 · 2a3fc1b · 2a3fc1b
1 parent 39e0b4f
commit 2a3fc1b
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 3 deletions.
diff --git a/.changeset/curly-spoons-clean.md b/.changeset/curly-spoons-clean.md
@@ -0,0 +1,5 @@
+---
+"vscode-apollo": patch
+---
+
+Support tagging inside of parentheses
diff --git a/src/language-server/__tests__/document.test.ts b/src/language-server/__tests__/document.test.ts
@@ -93,6 +93,33 @@ describe("extractGraphQLDocuments", () => {
       expect(documents?.[0].syntaxErrors.length).toBe(0);
       expect(documents?.[0].ast?.definitions.length).toBe(2);
     });
+
+    it("works with parens", () => {
+      const textDocument = mockTextDocument(`
+      gql(\`
+        {
+          hero {
+            ...Hero_character
+          }
+        }
+
+        \${Hero.fragments.character}
+
+        {
+          reviews(episode: NEWHOPE) {
+            ...ReviewList_reviews
+          }
+        }
+
+      \${ReviewList.fragments.reviews}
+    \`)
+    `);
+      const documents = extractGraphQLDocuments(textDocument);
+
+      expect(documents?.length).toEqual(1);
+      expect(documents?.[0].syntaxErrors.length).toBe(0);
+      expect(documents?.[0].ast?.definitions.length).toBe(2);
+    });
   });
 
   describe("extracting documents from ReasonML extension nodes", () => {

diff --git a/src/language-server/document.ts b/src/language-server/document.ts
@@ -91,7 +91,7 @@ function extractGraphQLDocumentsFromJSTemplateLiterals(
   const documents: GraphQLDocument[] = [];
 
   const regExp = new RegExp(
-    `(?:${tagName}\\s*\`|\`#graphql)([\\s\\S]+?)\``,
+    `(?:${tagName}(?:\\s|\\()*\`|\`#graphql)([\\s\\S]+?)\`\\)?`,
     "gm"
   );
 

diff --git a/syntaxes/graphql.js.json b/syntaxes/graphql.js.json
@@ -5,7 +5,7 @@
     {
       "name": "taggedTemplates",
       "contentName": "meta.embedded.block.graphql",
-      "begin": "(Relay\\.QL|gql|graphql(\\.experimental)?)(`)",
+      "begin": "(Relay\\.QL|gql|graphql(\\.experimental)?)\\(?(`)",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.tagged-template.js"
@@ -14,7 +14,7 @@
           "name": "punctuation.definition.string.template.begin.js"
         }
       },
-      "end": "`",
+      "end": "`\\)?",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.template.end.js"