fix: fix lost of comments after desription

vektah · Jun 24, 2023 · 03b382f · 03b382f
1 parent dbc6f03
commit 03b382f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/formatter/testdata/baseline/FormatSchema/description.graphql b/formatter/testdata/baseline/FormatSchema/description.graphql
@@ -7,5 +7,6 @@ meow!
 type Cat {
 	# field description comment
 	"""Shiny brillian name."""
+	# field comment
 	name: String
 }
diff --git a/formatter/testdata/baseline/FormatSchemaDocument/description.graphql b/formatter/testdata/baseline/FormatSchemaDocument/description.graphql
@@ -7,5 +7,6 @@ meow!
 type Cat {
 	# field description comment
 	"""Shiny brillian name."""
+	# field comment
 	name: String
 }
diff --git a/parser/schema.go b/parser/schema.go
@@ -2,6 +2,7 @@ package parser
 
 import (
 	//nolint:revive
+
 	. "github.com/vektah/gqlparser/v2/ast"
 	"github.com/vektah/gqlparser/v2/lexer"
 )
@@ -204,6 +205,7 @@ func (p *parser) parseFieldDefinition() *FieldDefinition {
 		def.Description = desc.text
 	}
 
+	p.peek() // peek to set p.comment
 	def.AfterDescriptionComment = p.comment
 	def.Name = p.parseName()
 	def.Arguments = p.parseArgumentDefs()
@@ -232,6 +234,7 @@ func (p *parser) parseArgumentDef() *ArgumentDefinition {
 		def.Description = desc.text
 	}
 
+	p.peek() // peek to set p.comment
 	def.AfterDescriptionComment = p.comment
 	def.Name = p.parseName()
 	p.expect(lexer.Colon)
@@ -253,6 +256,7 @@ func (p *parser) parseInputValueDef() *FieldDefinition {
 		def.Description = desc.text
 	}
 
+	p.peek() // peek to set p.comment
 	def.AfterDescriptionComment = p.comment
 	def.Name = p.parseName()
 	p.expect(lexer.Colon)
@@ -341,6 +345,7 @@ func (p *parser) parseEnumValueDefinition() *EnumValueDefinition {
 		def.Description = desc.text
 	}
 
+	p.peek() // peek to set p.comment
 	def.AfterDescriptionComment = p.comment
 
 	def.Name = p.parseName()