Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Fix markdown task list marker lookup (#60646)
Qiu shaofd5cd9398db1
diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rsindex 7f556351428..43189be5fd7 100644--- a/crates/markdown/src/markdown.rs+++ b/crates/markdown/src/markdown.rs@@ -2636,44 +2636,36 @@ impl Element for MarkdownElement {builder.push_div(div().pl_2p5(), range, markdown_end);}MarkdownTag::Item => {- let bullet =- if let Some((task_range, MarkdownEvent::TaskListMarker(checked))) =- parsed_markdown.events.get(index.saturating_add(1))- {- let source = &parsed_markdown.source()[range.clone()];- let checked = *checked;- let toggle_state = if checked {- ToggleState::Selected- } else {- ToggleState::Unselected- };-- let checkbox = Checkbox::new(- ElementId::Name(source.to_string().into()),- toggle_state,- )- .fill();-- if let Some(on_toggle) = self.on_checkbox_toggle.clone() {- let task_source_range = task_range.clone();- checkbox- .on_click(move |_state, window, cx| {- on_toggle(- task_source_range.clone(),- !checked,- window,- cx,- );- })- .into_any_element()- } else {- checkbox.visualization_only(true).into_any_element()- }- } else if let Some(bullet_index) = builder.next_bullet_index() {- div().child(format!("{}.", bullet_index)).into_any_element()+ let bullet = if let Some((task_range, checked)) =+ task_list_marker_for_item(&parsed_markdown.events, index)+ {+ let source = &parsed_markdown.source()[range.clone()];+ let checkbox = Checkbox::new(+ ElementId::Name(source.to_string().into()),+ ToggleState::from(checked),+ )+ .fill();++ if let Some(on_toggle) = self.on_checkbox_toggle.clone() {+ let task_source_range = task_range.clone();+ checkbox+ .on_click(move |_state, window, cx| {+ on_toggle(+ task_source_range.clone(),+ !checked,+ window,+ cx,+ );+ })+ .into_any_element()} else {- div().child("•").into_any_element()- };+ checkbox.visualization_only(true).into_any_element()+ }+ } else if let Some(bullet_index) = builder.next_bullet_index() {+ div().child(format!("{}.", bullet_index)).into_any_element()+ } else {+ div().child("•").into_any_element()+ };self.push_markdown_list_item(&mut builder, bullet, range, markdown_end);}MarkdownTag::Emphasis => builder.push_text_style(TextStyleRefinement {@@ -3414,6 +3406,25 @@ fn alignment_to_text_align(alignment: Alignment) -> Option<TextAlign> {}}+// The contents of loose list items are wrapped in a paragraph, so their task+// marker follows `Start(Paragraph)` rather than `Start(Item)`.+fn task_list_marker_for_item(+ events: &[(Range<usize>, MarkdownEvent)],+ item_index: usize,+) -> Option<(Range<usize>, bool)> {+ let next_index = item_index.checked_add(1)?;+ let marker_index = match &events.get(next_index)?.1 {+ MarkdownEvent::Start(MarkdownTag::Paragraph) => next_index.checked_add(1)?,+ MarkdownEvent::TaskListMarker(_) => next_index,+ _ => return None,+ };++ match events.get(marker_index)? {+ (range, MarkdownEvent::TaskListMarker(checked)) => Some((range.clone(), *checked)),+ _ => None,+ }+}+struct MetadataCellStyle {row_index: usize,is_key: bool,@@ -5414,10 +5425,49 @@ mod tests {assert_eq!(table.current_cell_alignment(), None);}+ #[test]+ fn test_task_list_marker_for_item() {+ // Small helper that takes the Markdown contents and returns a vector of+ // all task list marker strings as well as whether they are checked or+ // not.+ let task_marker_states = |markdown: &str| -> Vec<(String, bool)> {+ let events = parse_markdown_with_options(markdown, false, false, false).events;++ events+ .iter()+ .enumerate()+ .filter_map(|(index, (_, event))| {+ matches!(event, MarkdownEvent::Start(MarkdownTag::Item))+ .then(|| task_list_marker_for_item(&events, index))+ .flatten()+ })+ .map(|(range, checked)| (markdown[range].to_string(), checked))+ .collect::<Vec<_>>()+ };++ assert_eq!(+ task_marker_states("- [ ] task"),+ vec![("[ ]".to_string(), false)]+ );+ assert_eq!(+ task_marker_states("- [x] first\n\n- [ ] second"),+ vec![("[x]".to_string(), true), ("[ ]".to_string(), false)]+ );+ assert_eq!(+ task_marker_states("- [ ] top task\n\n- [x] done task\n\n - [x] nested done\n"),+ vec![+ ("[ ]".to_string(), false),+ ("[x]".to_string(), true),+ ("[x]".to_string(), true)+ ]+ );+ assert_eq!(task_marker_states("- ordinary item"), vec![]);+ }+#[test]fn test_table_checkbox_detection() {let md = "| Done |\n|------|\n| [x] |\n| [ ] |";- let events = crate::parser::parse_markdown_with_options(md, false, false, false).events;+ let events = parse_markdown_with_options(md, false, false, false).events;let mut in_table = false;let mut cell_texts: Vec<String> = Vec::new();@@ -5459,7 +5509,7 @@ mod tests {#[test]fn test_table_checkbox_marker_source_range() {let md = "| Done |\n|------|\n| [x] |\n| [ ] |";- let events = crate::parser::parse_markdown_with_options(md, false, false, false).events;+ let events = parse_markdown_with_options(md, false, false, false).events;let mut in_cell = false;let mut pending_text = String::new();