Fix parse error on doc comment before "and" in type def (#7001)

* Fix parse error on doc comment before "and" in type def

* CHANGELOG

Author: cknitt

CHANGELOG.md

@@ -37,6 +37,7 @@
 - Fix incorrect printing of external with `@as` attribute and `_` placholder (fixed argument). https://github.com/rescript-lang/rescript-compiler/pull/6970
 - Disallow spreading anything but regular variants inside of other variants. https://github.com/rescript-lang/rescript-compiler/pull/6980
 - Fix comment removed when function signature has `type` keyword. https://github.com/rescript-lang/rescript-compiler/pull/6997
+- Fix parse error on doc comment before "and" in type def. https://github.com/rescript-lang/rescript-compiler/pull/7001
 
 #### :house: Internal
 

jscomp/syntax/src/res_core.ml

@@ -2511,7 +2511,7 @@ and parse_attributes_and_binding (p : Parser.t) =
   let comments = p.comments in
 
   match p.Parser.token with
-  | At -> (
+  | At | DocComment (_, _) -> (
     let attrs = parse_attributes p in
     match p.Parser.token with
     | And -> attrs

jscomp/syntax/tests/parsing/other/docComments.res

@@ -14,4 +14,8 @@ let q = 11
   * is a multi-line
   multiline doc comment
   */
-type h = int
+type h = int
+
+type pathItem = {}
+/** Issue 6844: doc comment before "and" */
+and operation =  {}

jscomp/syntax/tests/parsing/other/expected/docComments.res.txt

@@ -4,4 +4,8 @@ let z = 34[@@res.doc " This is a doc \226\156\133 comment "]
 [@@@res.doc {js|And this is a res.doc module annotation|js}]
 let q = 11[@@res.doc {js|And this is a res.doc ✅ annotation|js}]
 type nonrec h = int[@@res.doc
-                     " This\n  * is a multi-line\n  multiline doc comment\n  "]
+                     " This\n  * is a multi-line\n  multiline doc comment\n  "]
+type nonrec pathItem = {
+  }
+and operation = {
+  }[@@res.doc " Issue 6844: doc comment before \"and\" "]

jscomp/syntax/tests/printer/comments/docComments.res

@@ -26,4 +26,8 @@ type h = int
 @foo @bar @baz let x = 10
 
 /** doc comment and 0 attributes */
-let x = 10
+let x = 10
+
+type pathItem = {}
+/** Issue 6844: doc comment before "and" */
+and operation =  {}

jscomp/syntax/tests/printer/comments/expected/docComments.res.txt

@@ -31,3 +31,6 @@ let x = 10
 
 /** doc comment and 0 attributes */
 let x = 10
+
+type pathItem = {}
+/** Issue 6844: doc comment before "and" */ and operation = {}