fix: should never fold with line comments

src/pretty/list.rs

@@ -18,6 +18,7 @@ pub struct ListStylist<'a> {
     free_comments: Vec<ArenaDoc<'a>>,
     items: Vec<Item<'a>>,
     item_count: usize,
+    has_line_comment: bool,
     fold_style: FoldStyle,
 }
 
@@ -45,6 +46,7 @@ impl<'a> ListStylist<'a> {
             free_comments: Default::default(),
             items: Default::default(),
             item_count: 0,
+            has_line_comment: false,
             fold_style: FoldStyle::Fit,
         }
     }
@@ -190,6 +192,7 @@ impl<'a> ListStylist<'a> {
             } else if is_comment_node(node) {
                 // Line comment cannot appear in single line block
                 if node.kind() == SyntaxKind::LineComment {
+                    self.has_line_comment = true;
                     self.fold_style = FoldStyle::Never;
                 }
                 self.free_comments.push(self.printer.convert_comment(node));
@@ -244,7 +247,7 @@ impl<'a> ListStylist<'a> {
             };
         }
         let (open, close) = delim;
-        let multi = {
+        let multi = || {
             let mut inner = self.arena.nil();
             for item in self.items.iter() {
                 match item {
@@ -286,9 +289,14 @@ impl<'a> ListStylist<'a> {
                 inner.enclose(open, close)
             }
         };
-        match self.fold_style {
-            FoldStyle::Never => multi,
-            FoldStyle::Fit => multi.clone().flat_alt(flat()).group(),
+        let fold_style = if self.has_line_comment {
+            FoldStyle::Never
+        } else {
+            self.fold_style
+        };
+        match fold_style {
+            FoldStyle::Never => multi(),
+            FoldStyle::Fit => multi().flat_alt(flat()).group(),
             FoldStyle::Always => flat(),
         }
     }

src/pretty/style.rs

@@ -1,4 +1,5 @@
 /// A style for formatting items
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum FoldStyle {
     /// Fold items if them can fit in a single line
     Fit,

tests/assets/unit/comment/comment-in-destruct.typ

@@ -21,3 +21,6 @@ a, /* 1 */b, /* 2 */c, /* 3 */
 #let (a, b:/* 8 */ (../* 9 */, /* 10 */d), ..c) = (a:1, b:(c: 4, d: 5))
 #let (a/* 11 */,) = (a:1, b:(c: 4, d: 5))
 #let (../* 12 */) = (a:1, b:(c: 4, d: 5))
+
+#let ( // b
+  /* 2 */ (a )  , /* 3 */) = (    (  ),  )

tests/assets/unit/comment/comment-in-params.typ

@@ -0,0 +1,31 @@
+#let f( // aaa
+  a   // bbb
+)   =   {}
+
+#let f(// aaa
+  a   // bbb
+)   =   {}
+
+#let g = (  // ccc
+  a  //  ddd
+)   =>   { }
+
+#let g = (// ccc
+  a  //  ddd
+)   =>   { }
+
+#let g = (a// ccc
+   //  ddd
+)   =>   { }
+
+#let f( (// aaa
+  a   // bbb
+)) = {}
+
+#let g = ((// ccc
+  a  //  ddd
+))  =>   { }
+
+#let g = ((a// ccc
+   //  ddd
+))   =>  { }

tests/snapshots/assets__check_file@unit-comment-comment-in-destruct.typ-0.snap

@@ -85,3 +85,13 @@ snapshot_kind: text
     d: 5,
   ),
 )
+
+#let (
+  // b
+  /* 2 */
+  (
+    a
+  ), /* 3 */
+) = (
+  (),
+)

tests/snapshots/assets__check_file@unit-comment-comment-in-destruct.typ-120.snap

@@ -31,3 +31,8 @@ snapshot_kind: text
 #let (a, b: /* 8 */ (.. /* 9 */, /* 10 */ d), ..c) = (a: 1, b: (c: 4, d: 5))
 #let (a /* 11 */,) = (a: 1, b: (c: 4, d: 5))
 #let (.. /* 12 */) = (a: 1, b: (c: 4, d: 5))
+
+#let (
+  // b
+  /* 2 */ (a), /* 3 */
+) = ((),)

tests/snapshots/assets__check_file@unit-comment-comment-in-destruct.typ-40.snap

@@ -41,3 +41,8 @@ snapshot_kind: text
   a: 1,
   b: (c: 4, d: 5),
 )
+
+#let (
+  // b
+  /* 2 */ (a), /* 3 */
+) = ((),)

tests/snapshots/assets__check_file@unit-comment-comment-in-destruct.typ-80.snap

@@ -31,3 +31,8 @@ snapshot_kind: text
 #let (a, b: /* 8 */ (.. /* 9 */, /* 10 */ d), ..c) = (a: 1, b: (c: 4, d: 5))
 #let (a /* 11 */,) = (a: 1, b: (c: 4, d: 5))
 #let (.. /* 12 */) = (a: 1, b: (c: 4, d: 5))
+
+#let (
+  // b
+  /* 2 */ (a), /* 3 */
+) = ((),)

tests/snapshots/assets__check_file@unit-comment-comment-in-params.typ-0.snap

@@ -0,0 +1,48 @@
+---
+source: tests/assets.rs
+expression: doc_string
+input_file: tests/assets/unit/comment/comment-in-params.typ
+snapshot_kind: text
+---
+#let f(
+  // aaa
+  a, // bbb
+) = { }
+
+#let f(
+  // aaa
+  a, // bbb
+) = { }
+
+#let g = (
+  // ccc
+  a, //  ddd
+) => { }
+
+#let g = (
+  // ccc
+  a, //  ddd
+) => { }
+
+#let g = (
+  a, // ccc
+  //  ddd
+) => { }
+
+#let f(
+  (// aaa
+  a   // bbb
+),
+) = { }
+
+#let g = (
+  (// ccc
+  a  //  ddd
+),
+) => { }
+
+#let g = (
+  (a// ccc
+   //  ddd
+),
+) => { }

tests/snapshots/assets__check_file@unit-comment-comment-in-params.typ-120.snap

@@ -0,0 +1,48 @@
+---
+source: tests/assets.rs
+expression: doc_string
+input_file: tests/assets/unit/comment/comment-in-params.typ
+snapshot_kind: text
+---
+#let f(
+  // aaa
+  a, // bbb
+) = { }
+
+#let f(
+  // aaa
+  a, // bbb
+) = { }
+
+#let g = (
+  // ccc
+  a, //  ddd
+) => { }
+
+#let g = (
+  // ccc
+  a, //  ddd
+) => { }
+
+#let g = (
+  a, // ccc
+  //  ddd
+) => { }
+
+#let f(
+  (// aaa
+  a   // bbb
+),
+) = { }
+
+#let g = (
+  (// ccc
+  a  //  ddd
+),
+) => { }
+
+#let g = (
+  (a// ccc
+   //  ddd
+),
+) => { }

tests/snapshots/assets__check_file@unit-comment-comment-in-params.typ-40.snap

@@ -0,0 +1,48 @@
+---
+source: tests/assets.rs
+expression: doc_string
+input_file: tests/assets/unit/comment/comment-in-params.typ
+snapshot_kind: text
+---
+#let f(
+  // aaa
+  a, // bbb
+) = { }
+
+#let f(
+  // aaa
+  a, // bbb
+) = { }
+
+#let g = (
+  // ccc
+  a, //  ddd
+) => { }
+
+#let g = (
+  // ccc
+  a, //  ddd
+) => { }
+
+#let g = (
+  a, // ccc
+  //  ddd
+) => { }
+
+#let f(
+  (// aaa
+  a   // bbb
+),
+) = { }
+
+#let g = (
+  (// ccc
+  a  //  ddd
+),
+) => { }
+
+#let g = (
+  (a// ccc
+   //  ddd
+),
+) => { }

tests/snapshots/assets__check_file@unit-comment-comment-in-params.typ-80.snap

@@ -0,0 +1,48 @@
+---
+source: tests/assets.rs
+expression: doc_string
+input_file: tests/assets/unit/comment/comment-in-params.typ
+snapshot_kind: text
+---
+#let f(
+  // aaa
+  a, // bbb
+) = { }
+
+#let f(
+  // aaa
+  a, // bbb
+) = { }
+
+#let g = (
+  // ccc
+  a, //  ddd
+) => { }
+
+#let g = (
+  // ccc
+  a, //  ddd
+) => { }
+
+#let g = (
+  a, // ccc
+  //  ddd
+) => { }
+
+#let f(
+  (// aaa
+  a   // bbb
+),
+) = { }
+
+#let g = (
+  (// ccc
+  a  //  ddd
+),
+) => { }
+
+#let g = (
+  (a// ccc
+   //  ddd
+),
+) => { }