From 4d4d30c597d3fbb3a42abd8ab2de5754f7455eec Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Sat, 22 Apr 2023 21:43:11 -0400
Subject: [PATCH] Simulate trailing whitespace in empty dynamic blocks just
 like drawers.

---
 src/parser/dynamic_block.rs | 45 ++++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/parser/dynamic_block.rs b/src/parser/dynamic_block.rs
index d523920..ed7fbe1 100644
--- a/src/parser/dynamic_block.rs
+++ b/src/parser/dynamic_block.rs
@@ -1,3 +1,17 @@
+use nom::branch::alt;
+use nom::bytes::complete::is_not;
+use nom::bytes::complete::tag_no_case;
+use nom::character::complete::line_ending;
+use nom::character::complete::space0;
+use nom::character::complete::space1;
+use nom::combinator::consumed;
+use nom::combinator::eof;
+use nom::combinator::not;
+use nom::combinator::opt;
+use nom::combinator::recognize;
+use nom::multi::many_till;
+use nom::sequence::tuple;
+
 use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
@@ -9,25 +23,13 @@ use crate::parser::lesser_element::Paragraph;
 use crate::parser::parser_context::ContextElement;
 use crate::parser::parser_context::ExitMatcherNode;
 use crate::parser::parser_with_context::parser_with_context;
+use crate::parser::source::SetSource;
 use crate::parser::util::blank_line;
 use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;
 use crate::parser::util::immediate_in_section;
-
 use crate::parser::util::start_of_line;
 use crate::parser::Element;
-use nom::branch::alt;
-use nom::bytes::complete::is_not;
-use nom::bytes::complete::tag_no_case;
-use nom::character::complete::line_ending;
-use nom::character::complete::space0;
-use nom::character::complete::space1;
-use nom::combinator::consumed;
-use nom::combinator::eof;
-use nom::combinator::opt;
-use nom::combinator::recognize;
-use nom::multi::many_till;
-use nom::sequence::tuple;
 
 #[tracing::instrument(ret, level = "debug")]
 pub fn dynamic_block<'r, 's>(
@@ -61,11 +63,18 @@ pub fn dynamic_block<'r, 's>(
     };
     let element_matcher = parser_with_context!(element(true))(&parser_context);
     let exit_matcher = parser_with_context!(exit_matcher_parser)(&parser_context);
-    let (remaining, children) = match consumed(many_till(blank_line, exit_matcher))(remaining) {
-        Ok((remaining, (whitespace, (_children, _exit_contents)))) => (
-            remaining,
-            vec![Element::Paragraph(Paragraph::of_text(whitespace))],
-        ),
+    let (remaining, children) = match tuple((
+        not(exit_matcher),
+        blank_line,
+        many_till(blank_line, exit_matcher),
+    ))(remaining)
+    {
+        Ok((remain, (_not_immediate_exit, first_line, (_trailing_whitespace, _exit_contents)))) => {
+            let mut element = Element::Paragraph(Paragraph::of_text(first_line));
+            let source = get_consumed(remaining, remain);
+            element.set_source(source);
+            (remain, vec![element])
+        }
         Err(_) => {
             let (remaining, (children, _exit_contents)) =
                 many_till(element_matcher, exit_matcher)(remaining)?;