Fix handling of documents containing only whitespace.

main
Tom Alexander 5 months ago
parent 2046603d01
commit 4b94dc60d2
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE

@ -3,6 +3,7 @@ use std::path::Path;
use nom::combinator::all_consuming; use nom::combinator::all_consuming;
use nom::combinator::opt; use nom::combinator::opt;
use nom::multi::many0; use nom::multi::many0;
use nom::InputTake;
use super::headline::heading; use super::headline::heading;
use super::in_buffer_settings::apply_in_buffer_settings; use super::in_buffer_settings::apply_in_buffer_settings;
@ -195,9 +196,9 @@ fn _document<'b, 'g, 'r, 's>(
zeroth_section, zeroth_section,
children, children,
contents: if contents.len() > 0 { contents: if contents.len() > 0 {
Some(Into::<&str>::into(contents)) Into::<&str>::into(contents)
} else { } else {
None Into::<&str>::into(remaining.take(0))
}, },
}, },
)) ))

@ -17,7 +17,7 @@ pub struct Document<'s> {
pub path: Option<PathBuf>, pub path: Option<PathBuf>,
pub zeroth_section: Option<Section<'s>>, pub zeroth_section: Option<Section<'s>>,
pub children: Vec<Heading<'s>>, pub children: Vec<Heading<'s>>,
pub contents: Option<&'s str>, pub contents: &'s str,
} }
#[derive(Debug)] #[derive(Debug)]
@ -64,7 +64,7 @@ impl<'s> StandardProperties<'s> for Document<'s> {
} }
fn get_contents<'b>(&'b self) -> Option<&'s str> { fn get_contents<'b>(&'b self) -> Option<&'s str> {
self.contents Some(self.contents)
} }
fn get_post_blank(&self) -> PostBlank { fn get_post_blank(&self) -> PostBlank {

Loading…
Cancel
Save