talexander/organic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix post blank for comment.

Browse Source
This commit is contained in:
Tom Alexander 2023-12-11 12:58:05 -05:00
parent 4af0d3141f
commit 670209e9fc
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/parser/comment.rs
View File

@ -46,7 +46,7 @@ pub(crate) fn comment<'b, 'g, 'r, 's>(
let (remaining, mut remaining_lines) = let (remaining, mut remaining_lines) =
many0(preceded(not(exit_matcher), comment_line_matcher))(remaining)?; many0(preceded(not(exit_matcher), comment_line_matcher))(remaining)?;
let (remaining, _trailing_ws) = let (remaining, post_blank) =
maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?; maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
let source = get_consumed(input, remaining); let source = get_consumed(input, remaining);
let mut value = Vec::with_capacity(remaining_lines.len() + 1); let mut value = Vec::with_capacity(remaining_lines.len() + 1);
@ -67,6 +67,7 @@ pub(crate) fn comment<'b, 'g, 'r, 's>(
Comment { Comment {
source: source.into(), source: source.into(),
value, value,
post_blank: post_blank.map(Into::<&str>::into),
}, },
)) ))
} }

7
src/types/lesser_element.rs
View File

@ -35,6 +35,7 @@ pub struct Paragraph<'s> {
pub struct Comment<'s> { pub struct Comment<'s> {
pub source: &'s str, pub source: &'s str,
pub value: Vec<&'s str>, pub value: Vec<&'s str>,
pub post_blank: Option<&'s str>,
} }
#[derive(Debug)] #[derive(Debug)]
@ -242,7 +243,11 @@ impl<'s> StandardProperties<'s> for Comment<'s> {
} }
fn get_post_blank(&self) -> PostBlank { fn get_post_blank(&self) -> PostBlank {
0 self.post_blank
.map(|text| text.lines().count())
.unwrap_or(0)
.try_into()
.expect("Too much post-blank to fit into a PostBlank.")
} }
} }