From 4f5e328f03e945cab3b94111177cc742c2432abf Mon Sep 17 00:00:00 2001
From: Gasser-Aly <gasser.aly@shopify.com>
Date: Sun, 14 Jan 2024 00:52:46 -0500
Subject: [PATCH 1/2] fix: block strings syntax highlighting in cm6-graphql

---
 .changeset/new-tools-unite.md            |  5 ++++
 packages/cm6-graphql/__tests__/cases.txt | 32 ++++++++++++++++++++++++
 packages/cm6-graphql/src/language.ts     |  1 +
 packages/cm6-graphql/src/syntax.grammar  |  5 +++-
 4 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/new-tools-unite.md

diff --git a/.changeset/new-tools-unite.md b/.changeset/new-tools-unite.md
new file mode 100644
index 00000000000..d9140ff2a5b
--- /dev/null
+++ b/.changeset/new-tools-unite.md
@@ -0,0 +1,5 @@
+---
+'cm6-graphql': patch
+---
+
+fix: block strings syntax highlighting
diff --git a/packages/cm6-graphql/__tests__/cases.txt b/packages/cm6-graphql/__tests__/cases.txt
index c6a8db77228..241700a124d 100644
--- a/packages/cm6-graphql/__tests__/cases.txt
+++ b/packages/cm6-graphql/__tests__/cases.txt
@@ -113,3 +113,35 @@ Document(
 Document(
   OperationDefinition(SelectionSet("{",Selection(Field(FieldName)),Selection(Field(FieldName,SelectionSet("{",Selection(Field(FieldName)),"}"))),"}"))
 )
+
+
+
+# Test case for blockStringCharacter in a Description
+
+"""
+This is a block string description
+with multiple lines.
+It can contain any character except for \""".
+"""
+type Example {
+  id: ID
+}
+
+==>
+
+Document(
+  TypeSystemDefinition(
+    TypeDefinition(
+      ObjectTypeDefinition(
+        Description(StringValue),
+        TypeKeyword(type),
+        Name,
+        FieldsDefinition(
+          "{",
+          FieldDefinition(Name, NamedType(Name)),
+          "}"
+        )
+      )
+    )
+  )
+)
diff --git a/packages/cm6-graphql/src/language.ts b/packages/cm6-graphql/src/language.ts
index 5a38e994d3b..bf9eb7931bf 100644
--- a/packages/cm6-graphql/src/language.ts
+++ b/packages/cm6-graphql/src/language.ts
@@ -20,6 +20,7 @@ export const graphqlLanguage = LRLanguage.define({
       styleTags({
         Variable: t.variableName,
         BooleanValue: t.bool,
+        Description: t.docComment,
         StringValue: t.string,
         Comment: t.lineComment,
         IntValue: t.integer,
diff --git a/packages/cm6-graphql/src/syntax.grammar b/packages/cm6-graphql/src/syntax.grammar
index 355ef280dd3..71c1c0838aa 100644
--- a/packages/cm6-graphql/src/syntax.grammar
+++ b/packages/cm6-graphql/src/syntax.grammar
@@ -393,7 +393,10 @@ Name { name }
   // https://spec.graphql.org/October2021/#BlockStringCharacter
   blockStringCharacter {
     '\\"""' |
-    '"' '"'? !["]
+    '"' '"'? !["] |
+    stringCharacter |
+    '\n' |
+    '\r\n'
   }
   
   // https://spec.graphql.org/October2021/#EscapedUnicode

From df8a318f27b7a6a2c2ca13ff4fc03f92ce2aba5b Mon Sep 17 00:00:00 2001
From: Gasser-Aly <105317851+Gasser-Aly@users.noreply.github.com>
Date: Tue, 16 Jan 2024 00:09:32 -0500
Subject: [PATCH 2/2] make Description tagged as string

---
 packages/cm6-graphql/src/language.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cm6-graphql/src/language.ts b/packages/cm6-graphql/src/language.ts
index bf9eb7931bf..cbec9695f7a 100644
--- a/packages/cm6-graphql/src/language.ts
+++ b/packages/cm6-graphql/src/language.ts
@@ -20,7 +20,7 @@ export const graphqlLanguage = LRLanguage.define({
       styleTags({
         Variable: t.variableName,
         BooleanValue: t.bool,
-        Description: t.docComment,
+        Description: t.string,
         StringValue: t.string,
         Comment: t.lineComment,
         IntValue: t.integer,