starkware-libs
diff --git a/‎crates/cairo-lang-formatter/src/formatter_impl.rs‎
Lines changed: 4 additions & 3 deletions b/‎crates/cairo-lang-formatter/src/formatter_impl.rs‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎crates/cairo-lang-formatter/src/node_properties.rs‎
Lines changed: 7 additions & 5 deletions b/‎crates/cairo-lang-formatter/src/node_properties.rs‎
Lines changed: 7 additions & 5 deletions
diff --git a/‎crates/cairo-lang-formatter/src/test.rs‎
Lines changed: 9 additions & 0 deletions b/‎crates/cairo-lang-formatter/src/test.rs‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎crates/cairo-lang-formatter/test_data/cairo_files/match_arm_doc_comment.cairo‎
Lines changed: 19 additions & 0 deletions b/‎crates/cairo-lang-formatter/test_data/cairo_files/match_arm_doc_comment.cairo‎
Lines changed: 19 additions & 0 deletions
diff --git a/‎crates/cairo-lang-formatter/test_data/expected_results/match_arm_doc_comment.cairo‎
Lines changed: 19 additions & 0 deletions b/‎crates/cairo-lang-formatter/test_data/expected_results/match_arm_doc_comment.cairo‎
Lines changed: 19 additions & 0 deletions
@@ -780,9 +780,10 @@ impl fmt::Display for CommentLine {
     }
 }
 
-/// Formats a comment to fit in the line width. There are no merges of lines, as this is not clear
-/// when to merge two lines the user chose to write on separate lines, so all original line breaks
-/// are preserved.
+/// Formats a comment to fit in the line width. Line breaks the user wrote are preserved, as it is
+/// not clear when to merge two lines the user chose to write separately; the only merges are of
+/// continuation lines that the formatter itself broke off an over-long open line (see the
+/// `is_open_line` check below).
 fn format_leading_comment(content: &str, cur_indent: usize, max_line_width: usize) -> String {
     let mut formatted_comment = String::new();
     let mut prev_comment_line = CommentLine::from_string("".to_string());
 
@@ -1084,10 +1084,12 @@ fn is_statement_list_break_point_optional(db: &dyn Database, node: &SyntaxNode<'
         node.grandparent_kind(db),
         Some(SyntaxKind::MatchArm | SyntaxKind::GenericArgNamed | SyntaxKind::GenericArgUnnamed)
     ) && node.get_children(db).len() == 1
-        && node.descendants(db).all(|d| {
-            d.kind(db) != SyntaxKind::Trivia
-                || ast::Trivia::from_syntax_node(db, d)
-                    .elements(db)
-                    .all(|t| !matches!(t, ast::Trivium::SingleLineComment(_)))
+        && !node.descendants(db).any(|d| {
+            matches!(
+                d.kind(db),
+                SyntaxKind::TokenSingleLineComment
+                    | SyntaxKind::TokenSingleLineDocComment
+                    | SyntaxKind::TokenSingleLineInnerComment
+            )
         })
 }
@@ -107,6 +107,15 @@ use crate::{FormatterConfig, get_formatted_file};
     false,
     false
 )]
+#[test_case(
+    "test_data/cairo_files/match_arm_doc_comment.cairo",
+    "test_data/expected_results/match_arm_doc_comment.cairo",
+    false,
+    false,
+    false,
+    false,
+    false
+)]
 #[test_case(
     "test_data/cairo_files/use_merge.cairo",
     "test_data/expected_results/use_merge.cairo",
 
@@ -0,0 +1,19 @@
+fn inner(x: felt252) -> felt252 {
+    match x {
+        0 => {
+            //! inner comment
+            1
+        },
+        _ => 2,
+    }
+}
+
+fn doc(x: felt252) -> felt252 {
+    match x {
+        0 => {
+            /// doc comment
+            1
+        },
+        _ => 2,
+    }
+}
@@ -0,0 +1,19 @@
+fn inner(x: felt252) -> felt252 {
+    match x {
+        0 => {
+            //! inner comment
+            1
+        },
+        _ => 2,
+    }
+}
+
+fn doc(x: felt252) -> felt252 {
+    match x {
+        0 => {
+            /// doc comment
+            1
+        },
+        _ => 2,
+    }
+}
Original file line number	Diff line number	Diff line change
`@@ -780,9 +780,10 @@ impl fmt::Display for CommentLine {`
`780`	`780`	`}`
`781`	`781`	`}`
`782`	`782`
`783`		`-/// Formats a comment to fit in the line width. There are no merges of lines, as this is not clear`
`784`		`-/// when to merge two lines the user chose to write on separate lines, so all original line breaks`
`785`		`-/// are preserved.`
	`783`	`+/// Formats a comment to fit in the line width. Line breaks the user wrote are preserved, as it is`
	`784`	`+/// not clear when to merge two lines the user chose to write separately; the only merges are of`
	`785`	`+/// continuation lines that the formatter itself broke off an over-long open line (see the`
	`786`	+/// `is_open_line` check below).
`786`	`787`	`fn format_leading_comment(content: &str, cur_indent: usize, max_line_width: usize) -> String {`
`787`	`788`	`let mut formatted_comment = String::new();`
`788`	`789`	`let mut prev_comment_line = CommentLine::from_string("".to_string());`