Revert "fix: Fix vscode-graphql-syntax’s grammar to support string li…

…terals on separate lines" (#3543) * Revert "fix: Fix vscode-graphql-syntax’s grammar to support string literals o…" This reverts commit e502c41.
graphql · Mar 2, 2024 · defc126 · defc126
1 parent 04b44fa
commit defc126
Show file tree

Hide file tree

Showing 7 changed files with 222 additions and 454 deletions.
diff --git a/.changeset/famous-ads-jam.md b/.changeset/famous-ads-jam.md
@@ -0,0 +1,6 @@
+---
+"vscode-graphql-syntax": patch
+"vscode-graphql": patch
+---
+
+Temporarily revert a syntax highlighting bugfix that caused more bugs
diff --git a/packages/vscode-graphql-syntax/grammars/graphql.js.json b/packages/vscode-graphql-syntax/grammars/graphql.js.json
@@ -4,33 +4,39 @@
   "patterns": [
     {
       "contentName": "meta.embedded.block.graphql",
-      "begin": "(?<=(?:(?:Relay\\??\\.)QL|gql|graphql|graphql\\.experimental)\\s*(?:<.*>)?\\s*)\\(",
-      "end": "\\)",
+      "begin": "\\s*+(?:(?:(Relay)\\??\\.)(QL)|(gql|graphql|graphql\\.experimental)|(/\\* GraphQL \\*/))\\s*\\(?\\s*(`|')",
+      "beginCaptures": {
+        "1": {
+          "name": "variable.other.class.js"
+        },
+        "2": {
+          "name": "entity.name.function.tagged-template.js"
+        },
+        "3": {
+          "name": "entity.name.function.tagged-template.js"
+        },
+        "4": {
+          "name": "comment.graphql.js"
+        },
+        "5": {
+          "name": "punctuation.definition.string.template.begin.js"
+        }
+      },
+      "end": "(`|')",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.template.end.js"
+        }
+      },
       "patterns": [
         {
-          "begin": "(`|')",
-          "end": "(`|')",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.template.begin.js"
-            }
-          },
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.template.end.js"
-            }
-          },
-          "patterns": [
-            {
-              "include": "source.graphql"
-            }
-          ]
+          "include": "source.graphql"
         }
       ]
     },
     {
       "contentName": "meta.embedded.block.graphql",
-      "begin": "\\s*+(?:(?:(?:(Relay)\\??\\.)(QL)|(gql|graphql|graphql\\.experimental)\\s*(?:<.*>)?\\s*)|(/\\* GraphQL \\*/))\\s*(`|')",
+      "begin": "\\s*+(?:(?:(Relay)\\??\\.)(QL)|(gql|graphql|graphql\\.experimental))\\s*\\(?\\s*(?:<.*>)(`|')",
       "beginCaptures": {
         "1": {
           "name": "variable.other.class.js"
@@ -42,9 +48,6 @@
           "name": "entity.name.function.tagged-template.js"
         },
         "4": {
-          "name": "comment.graphql.js"
-        },
-        "5": {
           "name": "punctuation.definition.string.template.begin.js"
         }
       },

diff --git a/packages/vscode-graphql-syntax/tests/__fixtures__/test-js.md b/packages/vscode-graphql-syntax/tests/__fixtures__/test-js.md
@@ -26,50 +26,6 @@ const Component = () => {
 };
 ```
 
-```js
-const variable = 1;
-
-const queryA = graphql(`
-  query {
-    something(arg: ${variable})
-  }
-`);
-
-const queryB = graphql(
-  `
-    query {
-      something(arg: ${variable})
-    }
-  `
-);
-
-const queryC = graphql(
-  'query { something(arg: ${variable}) }'
-);
-```
-
-```ts
-const variable: number = 1;
-
-const queryA = graphql(`
-  query {
-    something(arg: ${variable})
-  }
-`);
-
-const queryB = graphql(
-  `
-    query {
-      something(arg: ${variable})
-    }
-  `
-);
-
-const queryC = graphql(
-  'query { something(arg: ${variable}) }'
-);
-```
-
 ### svelte
 
 ```svelte

diff --git a/packages/vscode-graphql-syntax/tests/__fixtures__/test.js b/packages/vscode-graphql-syntax/tests/__fixtures__/test.js
@@ -37,18 +37,8 @@ const graphql = graphql(`
   }
 `);
 
-const graphql = graphql(
-  `
-    query($id: ID!) { test }
-  `,
-  [var1, var2]
-);
-
 const query = /* GraphQL */ 'query { id } ';
-const query = graphql('query($id: ID!) { id } ');
-const query = graphql(
-  'query($id: ID!) { test }'
-);
+const query = graphql('query { id } ');
 
 const queryWithInlineComment = `#graphql
  query {
@@ -69,6 +59,7 @@ const queryWithInlineComment = `#graphql
         }
     }
 `;
+// TODO: fix this
 const queryWithInlineComment = `
 #graphql
  query {

diff --git a/packages/vscode-graphql-syntax/tests/__fixtures__/test.ts b/packages/vscode-graphql-syntax/tests/__fixtures__/test.ts
@@ -25,27 +25,9 @@ const query = graphql<SomeGeneric>`
   }
 `;
 
+// TODO: Fix this
 const query = graphql<Generic>('query { id }');
 
-const query = graphql(
-  'query { id }'
-);
-
-const query = graphql<Generic>(
-  'query { id }'
-);
-
-const query = graphql(`
-  query { id }
-`);
-
-const query = graphql(
-  `
-    query { id }
-  `,
-  [var1, var2]
-);
-
 const queryWithInlineComment = `#graphql
  query {
         user(id: "5", name: boolean) {