From 22681b6a58d0974051edd5ab8975c2991e848849 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Thu, 14 Sep 2023 03:15:31 -0400 Subject: [PATCH] Support trailing whitespace in fixed-width areas. --- src/parser/fixed_width_area.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/parser/fixed_width_area.rs b/src/parser/fixed_width_area.rs index 449774f..b905579 100644 --- a/src/parser/fixed_width_area.rs +++ b/src/parser/fixed_width_area.rs @@ -3,15 +3,17 @@ use nom::bytes::complete::is_not; use nom::bytes::complete::tag; use nom::character::complete::line_ending; use nom::character::complete::space0; -use nom::character::complete::space1; use nom::combinator::eof; use nom::combinator::not; -use nom::combinator::opt; +use nom::combinator::recognize; use nom::multi::many0; use nom::sequence::preceded; use nom::sequence::tuple; use super::org_source::OrgSource; +use super::util::org_line_ending; +use super::util::org_spaces0; +use super::util::org_spaces1; use crate::context::parser_with_context; use crate::context::RefContext; use crate::error::Res; @@ -47,10 +49,10 @@ fn fixed_width_area_line<'b, 'g, 'r, 's>( ) -> Res, OrgSource<'s>> { start_of_line(input)?; let (remaining, _indent) = space0(input)?; - let (remaining, (_colon, _leading_whitespace_and_content, _line_ending)) = tuple(( + let (remaining, _) = tuple(( tag(":"), - opt(tuple((space1, is_not("\r\n")))), - alt((line_ending, eof)), + alt((recognize(tuple((org_spaces1, is_not("\r\n")))), org_spaces0)), + org_line_ending, ))(remaining)?; let source = get_consumed(input, remaining); Ok((remaining, source))