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

Add support for indenting greater blocks.

Browse Source
This commit is contained in:
Tom Alexander 2023-04-07 16:18:13 -04:00
parent ab329f367f
commit 42fca12e41
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/parser/greater_block.rs
View File

@ -15,6 +15,7 @@ use nom::branch::alt;
use nom::bytes::complete::is_not; use nom::bytes::complete::is_not;
use nom::bytes::complete::tag_no_case; use nom::bytes::complete::tag_no_case;
use nom::character::complete::line_ending; use nom::character::complete::line_ending;
use nom::character::complete::space0;
use nom::character::complete::space1; use nom::character::complete::space1;
use nom::combinator::eof; use nom::combinator::eof;
use nom::combinator::opt; use nom::combinator::opt;
@ -27,6 +28,8 @@ pub fn greater_block<'r, 's>(
context: Context<'r, 's>, context: Context<'r, 's>,
input: &'s str, input: &'s str,
) -> Res<&'s str, GreaterBlock<'s>> { ) -> Res<&'s str, GreaterBlock<'s>> {
start_of_line(context, input)?;
let (remaining, _leading_whitespace) = space0(input)?;
// TODO: Not handling indentation before start of block // TODO: Not handling indentation before start of block
let (remaining, (_begin, name)) = tuple(( let (remaining, (_begin, name)) = tuple((
tag_no_case("#+begin_"), tag_no_case("#+begin_"),
@ -34,7 +37,7 @@ pub fn greater_block<'r, 's>(
"comment" | "example" | "export" | "src" | "verse" => false, "comment" | "example" | "export" | "src" | "verse" => false,
_ => true, _ => true,
}), }),
))(input)?; ))(remaining)?;
let (remaining, parameters) = opt(tuple((space1, parameters)))(remaining)?; let (remaining, parameters) = opt(tuple((space1, parameters)))(remaining)?;
let (remaining, _nl) = line_ending(remaining)?; let (remaining, _nl) = line_ending(remaining)?;
let parser_context = context let parser_context = context
@ -81,11 +84,12 @@ fn greater_block_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'
let current_name: &str = get_context_greater_block_name(context).ok_or(nom::Err::Error( let current_name: &str = get_context_greater_block_name(context).ok_or(nom::Err::Error(
CustomError::MyError(MyError("Not inside a greater block")), CustomError::MyError(MyError("Not inside a greater block")),
))?; ))?;
let (remaining, _leading_whitespace) = space0(input)?;
let (remaining, (_begin, _name, _ws)) = tuple(( let (remaining, (_begin, _name, _ws)) = tuple((
tag_no_case("#+end_"), tag_no_case("#+end_"),
tag_no_case(current_name), tag_no_case(current_name),
alt((eof, line_ending)), alt((eof, line_ending)),
))(input)?; ))(remaining)?;
let source = get_consumed(input, remaining); let source = get_consumed(input, remaining);
Ok((remaining, source)) Ok((remaining, source))
} }