fix: task list marker indentation in paragraph (#116)

Author: dsherret

src/generation/generate.rs

@@ -281,7 +281,11 @@ fn gen_paragraph(paragraph: &Paragraph, context: &mut Context) -> PrintItems {
     }
   }
 
-  items.extend(gen_nodes(&paragraph.children, context));
+  items.extend(gen_task_list_marker_children(
+    &paragraph.children,
+    paragraph.marker.as_ref(),
+    context,
+  ));
   items
 }
 
@@ -736,42 +740,55 @@ fn gen_item(item: &Item, context: &mut Context) -> PrintItems {
     }
   }
 
+  items.extend(gen_task_list_marker_children(
+    &item.children,
+    item.marker.as_ref(),
+    context,
+  ));
+
+  if !item.sub_lists.is_empty() {
+    items.push_signal(Signal::NewLine);
+    if utils::has_leading_blankline(item.sub_lists.first().unwrap().range().start, context.file_text) {
+      items.push_signal(Signal::NewLine);
+    }
+    items.extend(gen_nodes(&item.sub_lists, context));
+  }
+
+  items
+}
+
+fn gen_task_list_marker_children(
+  children: &[Node],
+  marker: Option<&TaskListMarker>,
+  context: &mut Context,
+) -> PrintItems {
+  let mut items = PrintItems::new();
   // indent the children to beyond the task list marker
-  let marker_indent = if item.marker.is_some() { 4 } else { 0 };
+  let marker_indent = if marker.is_some() { 4 } else { 0 };
   context.raw_indent_level += marker_indent;
-  let indent_child_index_end = item
-    .children
+  let indent_child_index_end = children
     .iter()
     .position(|c| {
       matches!(
         c,
         Node::List(_) | Node::CodeBlock(_) | Node::BlockQuote(_) | Node::Heading(_) | Node::Table(_)
       ) || utils::has_leading_blankline(c.range().start, context.file_text)
     })
-    .unwrap_or(item.children.len());
+    .unwrap_or(children.len());
   items.extend(with_indent_times(
-    gen_nodes(&item.children[..indent_child_index_end], context),
+    gen_nodes(&children[..indent_child_index_end], context),
     marker_indent,
   ));
   context.raw_indent_level -= marker_indent;
 
   // insert the remaining children without indent
-  if indent_child_index_end > 0 && indent_child_index_end != item.children.len() {
-    items.push_signal(Signal::NewLine);
-    if utils::has_leading_blankline(item.children[indent_child_index_end].range().start, context.file_text) {
-      items.push_signal(Signal::NewLine);
-    }
-  }
-  items.extend(gen_nodes(&item.children[indent_child_index_end..], context));
-
-  if !item.sub_lists.is_empty() {
+  if indent_child_index_end > 0 && indent_child_index_end != children.len() {
     items.push_signal(Signal::NewLine);
-    if utils::has_leading_blankline(item.sub_lists.first().unwrap().range().start, context.file_text) {
+    if utils::has_leading_blankline(children[indent_child_index_end].range().start, context.file_text) {
       items.push_signal(Signal::NewLine);
     }
-    items.extend(gen_nodes(&item.sub_lists, context));
   }
-
+  items.extend(gen_nodes(&children[indent_child_index_end..], context));
   items
 }
 

tests/specs/TaskListMarker/HtmlInParagraph.txt

@@ -0,0 +1,18 @@
+~~ deno: true ~~
+!! should indent the task list marker's second line !!
+## Test
+
+- [ ] Go to the "cargo_publish" workflow in the CLI repo's actions:
+      https://github.com/denoland/deno/actions/workflows/cargo_publish.yml
+  1. Test
+
+  <details></details>
+
+[expect]
+## Test
+
+- [ ] Go to the "cargo_publish" workflow in the CLI repo's actions:
+      https://github.com/denoland/deno/actions/workflows/cargo_publish.yml
+  1. Test
+
+  <details></details>

tests/specs/TaskListMarker/TaskListMarker_All.txt

@@ -71,3 +71,17 @@
   ```ts
   test
   ```
+
+!! should format across multiple lines !!
+### Some text
+
+- [ ] Some text goes here. Testing testing testing testing testing testing testing.
+      Here is some text on the next line
+  1. Tesitng this out
+
+[expect]
+### Some text
+
+- [ ] Some text goes here. Testing testing testing testing testing testing testing.
+      Here is some text on the next line
+  1. Tesitng this out

tests/specs/TaskListMarker/TaskListMarker_TextWrap_Always.txt

@@ -11,3 +11,19 @@
         testing testing
 - [ ] some more text that will also wrap
       beyond the line width
+
+!! should format across multiple lines !!
+### Some text
+
+- [ ] Some text goes here. Testing testing testing testing testing testing testing.
+      Here is some text on the next line
+  1. Tesitng this out
+
+[expect]
+### Some text
+
+- [ ] Some text goes here. Testing
+      testing testing testing testing
+      testing testing. Here is some text
+      on the next line
+  1. Tesitng this out