parse and process nested metadata

Author: cscheid

crates/quarto-markdown-pandoc/src/pandoc/treesitter.rs

@@ -986,6 +986,14 @@ fn process_fenced_div_block<T: Write>(
             PandocNativeIntermediate::IntermediateSection(blocks) => {
                 content.extend(blocks);
             }
+            PandocNativeIntermediate::IntermediateMetadataString(text, range) => {
+                // for now we assume it's metadata and emit it as a rawblock
+                content.push(Block::RawBlock(RawBlock {
+                    format: "quarto_minus_metadata".to_string(),
+                    text,
+                    source_info: SourceInfo::with_range(range),
+                }));
+            }
             _ => {
                 writeln!(
                     buf,
@@ -1030,6 +1038,14 @@ fn process_block_quote<T: Write>(
             PandocNativeIntermediate::IntermediateSection(section) => {
                 content.extend(section);
             }
+            PandocNativeIntermediate::IntermediateMetadataString(text, range) => {
+                // for now we assume it's metadata and emit it as a rawblock
+                content.push(Block::RawBlock(RawBlock {
+                    format: "quarto_minus_metadata".to_string(),
+                    text,
+                    source_info: SourceInfo::with_range(range),
+                }));
+            }
             _ => {
                 writeln!(
                 buf,
@@ -1394,7 +1410,7 @@ fn process_list_item(
     let mut list_attr: Option<ListAttributes> = None;
     let children = children
         .into_iter()
-        .filter(|(node, child)| {
+        .filter_map(|(node, child)| {
             if node == "list_marker_dot" || node == "list_marker_parenthesis" {
                 // this is an ordered list, so we need to set the flag
                 let PandocNativeIntermediate::IntermediateOrderedListMarker(marker_number, _) =
@@ -1403,23 +1419,28 @@ fn process_list_item(
                     panic!("Expected OrderedListMarker in list_item, got {:?}", child);
                 };
                 list_attr = Some((
-                    *marker_number,
+                    marker_number,
                     ListNumberStyle::Decimal,
                     match node.as_str() {
                         "list_marker_parenthesis" => ListNumberDelim::OneParen,
                         "list_marker_dot" => ListNumberDelim::Period,
                         _ => panic!("Unexpected list marker node: {}", node),
                     },
                 ));
-                return false; // skip the marker node
+                return None; // skip the marker node
+            }
+            match child {
+                PandocNativeIntermediate::IntermediateBlock(block) => Some(block),
+                PandocNativeIntermediate::IntermediateMetadataString(text, range) => {
+                    // for now we assume it's metadata and emit it as a rawblock
+                    Some(Block::RawBlock(RawBlock {
+                        format: "quarto_minus_metadata".to_string(),
+                        text,
+                        source_info: SourceInfo::with_range(range),
+                    }))
+                }
+                _ => None,
             }
-            matches!(child, PandocNativeIntermediate::IntermediateBlock(_))
-        })
-        .map(|(_, child)| {
-            let PandocNativeIntermediate::IntermediateBlock(block) = child else {
-                panic!("Expected Block in paragraph, got {:?}", child);
-            };
-            block
         })
         .collect();
     PandocNativeIntermediate::IntermediateListItem(children, node_location(node), list_attr)

crates/tree-sitter-qmd/tree-sitter-markdown/grammar.js

@@ -45,6 +45,7 @@ module.exports = grammar({
             $.fenced_div_block,
             $._blank_line,
             $.pipe_table,
+            prec(-1, $.minus_metadata),
         ),
         section: $ => choice($._section1, $._section2, $._section3, $._section4, $._section5, $._section6),
         _section1: $ => prec.right(seq(

crates/tree-sitter-qmd/tree-sitter-markdown/src/grammar.json

@@ -2177,6 +2177,14 @@
         {
           "type": "SYMBOL",
           "name": "pipe_table"
+        },
+        {
+          "type": "PREC",
+          "value": -1,
+          "content": {
+            "type": "SYMBOL",
+            "name": "minus_metadata"
+          }
         }
       ]
     },

crates/tree-sitter-qmd/tree-sitter-markdown/src/node-types.json

@@ -112,6 +112,10 @@
           "type": "list",
           "named": true
         },
+        {
+          "type": "minus_metadata",
+          "named": true
+        },
         {
           "type": "paragraph",
           "named": true
@@ -276,6 +280,10 @@
           "type": "list",
           "named": true
         },
+        {
+          "type": "minus_metadata",
+          "named": true
+        },
         {
           "type": "paragraph",
           "named": true
@@ -464,6 +472,10 @@
           "type": "list_marker_star",
           "named": true
         },
+        {
+          "type": "minus_metadata",
+          "named": true
+        },
         {
           "type": "paragraph",
           "named": true
@@ -688,6 +700,10 @@
           "type": "list",
           "named": true
         },
+        {
+          "type": "minus_metadata",
+          "named": true
+        },
         {
           "type": "paragraph",
           "named": true