Simulate the trailing whitespace capture for empty drawer.

src/parser/drawer.rs

@@ -1,29 +1,28 @@
-use crate::error::CustomError;
-use crate::error::MyError;
-use crate::error::Res;
 use nom::branch::alt;
 use nom::bytes::complete::tag;
 use nom::bytes::complete::tag_no_case;
 use nom::bytes::complete::take_while;
 use nom::character::complete::line_ending;
 use nom::character::complete::space0;
-use nom::combinator::consumed;
 use nom::combinator::eof;
 use nom::combinator::recognize;
 use nom::multi::many_till;
 use nom::sequence::tuple;
 
 use super::Context;
+use crate::error::CustomError;
+use crate::error::MyError;
+use crate::error::Res;
 use crate::parser::element_parser::element;
 use crate::parser::exiting::ExitClass;
 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::util::WORD_CONSTITUENT_CHARACTERS;
 use crate::parser::Drawer;
@@ -56,17 +55,20 @@ pub fn drawer<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str,
 
     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))],
-        ),
-        Err(_) => {
-            let (remaining, (children, _exit_contents)) =
-                many_till(element_matcher, exit_matcher)(remaining)?;
-            (remaining, children)
-        }
-    };
+    let (remaining, children) =
+        match tuple((blank_line, many_till(blank_line, exit_matcher)))(remaining) {
+            Ok((remain, (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)?;
+                (remaining, children)
+            }
+        };
     let (remaining, _end) = drawer_end(&parser_context, remaining)?;
 
     let source = get_consumed(input, remaining);