From f4c98c1f7c6df5a918479e641631e8fbc5b5a92e Mon Sep 17 00:00:00 2001
From: John Collett <92598453+johndcollett@users.noreply.github.com>
Date: Fri, 1 Mar 2024 09:34:37 -0500
Subject: [PATCH] multiple argument syntax highlighting (#3534)

---
 .changeset/green-houses-raise.md         |  5 +++++
 packages/cm6-graphql/__tests__/cases.txt | 10 ++++++++++
 packages/cm6-graphql/src/syntax.grammar  |  2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/green-houses-raise.md

diff --git a/.changeset/green-houses-raise.md b/.changeset/green-houses-raise.md
new file mode 100644
index 00000000000..dab16a796a6
--- /dev/null
+++ b/.changeset/green-houses-raise.md
@@ -0,0 +1,5 @@
+---
+'cm6-graphql': patch
+---
+
+fix: multiple argument syntax highlighting
diff --git a/packages/cm6-graphql/__tests__/cases.txt b/packages/cm6-graphql/__tests__/cases.txt
index 241700a124d..dbd41900c01 100644
--- a/packages/cm6-graphql/__tests__/cases.txt
+++ b/packages/cm6-graphql/__tests__/cases.txt
@@ -145,3 +145,13 @@ Document(
     )
   )
 )
+
+# multiple arguments separated by a commas
+
+{
+  picture(width: 200, height: 100)
+}
+
+==>
+
+Document(OperationDefinition(SelectionSet("{",Selection(Field(FieldName,Arguments("(",Argument(ArgumentAttributeName,IntValue),Argument(ArgumentAttributeName,IntValue),")"))),"}")))
diff --git a/packages/cm6-graphql/src/syntax.grammar b/packages/cm6-graphql/src/syntax.grammar
index 71c1c0838aa..1a61dda1d53 100644
--- a/packages/cm6-graphql/src/syntax.grammar
+++ b/packages/cm6-graphql/src/syntax.grammar
@@ -291,7 +291,7 @@ Directive { DirectiveName Arguments? }
 Arguments { "(" Argument+ ")"}
 
 // https://spec.graphql.org/October2021/#Argument
-Argument { ArgumentAttributeName ":" value }
+Argument { ArgumentAttributeName ":" value comma? }
 
 ArgumentAttributeName { name }