fix(compiler): fix formatter multiple data bug (#1282)

* Fixed an issue with multiple data declarations and comments * Formatted formatter Co-authored-by: Marcus Roberts <[email protected]>
grain-lang · May 29, 2022 · f6fd962 · f6fd962
1 parent 1590a37
commit f6fd962
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/compiler/grainformat/format.re b/compiler/grainformat/format.re
@@ -3723,13 +3723,20 @@ let data_print =
     Doc.concat([Doc.comma, Doc.hardLine]),
     List.map(
       data => {
-        let (expt, decl) = data;
+        let (expt, decl: Parsetree.data_declaration) = data;
+
+        let data_comments =
+          Comment_utils.get_comments_inside_location(
+            ~location=decl.pdata_loc,
+            comments,
+          );
+
         Doc.concat([
           switch ((expt: Asttypes.export_flag)) {
           | Nonexported => Doc.nil
           | Exported => Doc.text("export ")
           },
-          print_data(~original_source, ~comments, decl),
+          print_data(~original_source, ~comments=data_comments, decl),
         ]);
       },
       datas,

diff --git a/compiler/test/formatter_inputs/enum_long.gr b/compiler/test/formatter_inputs/enum_long.gr
@@ -6,3 +6,15 @@ export enum Test {
   Test( Shape< 
   String, String, String, String, String, String, String, String, String, String, String, String, String, String, String, String, String, String, String, String, String, String, String, String, String, String, String, String > ),
 }
+
+enum EvenNumber {
+  Zero, // comment 0
+  OddPlusOne(OddNumber), // comment 1
+  // comment 2
+  // comment 3
+},
+enum OddNumber {
+  // comment 4
+  // comment 5
+  EvenPlusOne(EvenNumber),
+} // comment 6
diff --git a/compiler/test/formatter_outputs/enum_long.gr b/compiler/test/formatter_outputs/enum_long.gr
@@ -94,3 +94,15 @@ export enum Test {
     >
   ),
 }
+
+enum EvenNumber {
+  Zero, // comment 0
+  OddPlusOne(OddNumber), // comment 1
+  // comment 2
+  // comment 3
+},
+enum OddNumber {
+  // comment 4
+  // comment 5
+  EvenPlusOne(EvenNumber),
+} // comment 6