done

trdthg · Aug 9, 2024 · 534d7ac · 534d7ac
1 parent 2bb72e7
commit 534d7ac
Show file tree

Hide file tree

Showing 13 changed files with 404 additions and 138 deletions.
diff --git a/sail_config.json b/sail_config.json
@@ -0,0 +1,8 @@
+{
+    "fmt": {
+        "indent": 2,
+        "preserve_structure": false,
+        "line_width": 120,
+        "ribbon_width": 1.0
+    }
+}                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
diff --git a/src/lib/chunk_ast.ml b/src/lib/chunk_ast.ml
@@ -423,7 +423,14 @@ let rec pop_header_comments comments chunks l lnum =
       | Some (s, _) when e.pos_cnum < s.pos_cnum && comment_s.pos_lnum = lnum ->
           let _ = Stack.pop comments in
           Queue.add
-            (Comment (comment_type, 0, comment_s.pos_cnum - comment_s.pos_bol, contents, e.pos_lnum == lnum))
+            (Comment
+               ( comment_type,
+                 0,
+                 comment_s.pos_cnum - comment_s.pos_bol,
+                 contents,
+                 comment_type = Lexer.Comment_line && e.pos_lnum == lnum
+               )
+            )
             chunks;
           Queue.add (Spacer (true, 1)) chunks;
           pop_header_comments comments chunks l (lnum + 1)
@@ -444,7 +451,12 @@ let rec pop_comments ?(spacer = true) comments chunks l =
           let _ = Stack.pop comments in
           Queue.add
             (Comment
-               (comment_type, 0, comment_s.pos_cnum - comment_s.pos_bol, contents, comment_s.pos_lnum == e.pos_lnum)
+               ( comment_type,
+                 0,
+                 comment_s.pos_cnum - comment_s.pos_bol,
+                 contents,
+                 comment_type = Lexer.Comment_line && comment_s.pos_lnum == e.pos_lnum
+               )
             )
             chunks;
           if spacer && comment_e.pos_lnum < s.pos_lnum then Queue.add (Spacer (true, 1)) chunks;
@@ -461,7 +473,12 @@ let rec pop_comments_until_loc_end comments chunks l =
           let _ = Stack.pop comments in
           Queue.add
             (Comment
-               (comment_type, 0, comment_s.pos_cnum - comment_s.pos_bol, contents, comment_s.pos_lnum == e.pos_lnum)
+               ( comment_type,
+                 0,
+                 comment_s.pos_cnum - comment_s.pos_bol,
+                 contents,
+                 comment_type = Lexer.Comment_line && comment_s.pos_lnum == e.pos_lnum
+               )
             )
             chunks;
           pop_comments_until_loc_end comments chunks l