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

Link templates support single-colons and inject the value at the end if no %s is found.

This commit is contained in:
Tom Alexander 2023-10-06 23:55:21 -04:00
parent aa0a0b890e
commit 65e142a215
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org_mode_samples/object/regular_link/template.org
View File

@ -4,3 +4,4 @@
[[cat::bat]]
#+LINK: cat dog%s
[[cat:bat]]

10
src/parser/regular_link.rs
View File

@ -2,6 +2,7 @@ use std::borrow::Cow;
use nom::branch::alt;
use nom::bytes::complete::escaped;
use nom::bytes::complete::is_a;
use nom::bytes::complete::tag;
use nom::bytes::complete::take_till1;
use nom::bytes::complete::take_until;
@ -183,8 +184,8 @@ fn apply_link_templates<'b, 'g, 'r, 's>(
) -> Option<String> {
let (remaining, key) = opt(map(
tuple((
recognize(take_until::<_, _, nom::error::Error<_>>("::")),
tag("::"),
recognize(take_until::<_, _, nom::error::Error<_>>(":")),
is_a(":"),
)),
|(key, _)| key,
))(input)
@ -205,6 +206,7 @@ fn apply_link_templates<'b, 'g, 'r, 's>(
let inject_value = Into::<&str>::into(remaining);
let mut ret = String::with_capacity(replacement_template.len() + inject_value.len());
let mut state = ParserState::Normal;
let mut injected_value = false;
for c in replacement_template.chars() {
state = match (&state, c) {
(ParserState::Normal, '%') => ParserState::Percent,
@ -214,6 +216,7 @@ fn apply_link_templates<'b, 'g, 'r, 's>(
}
(ParserState::Percent, 's') => {
ret.push_str(inject_value);
injected_value = true;
ParserState::Normal
}
(ParserState::Percent, _) => {
@ -228,6 +231,9 @@ fn apply_link_templates<'b, 'g, 'r, 's>(
}
_ => {}
}
if !injected_value {
ret.push_str(inject_value);
}
Some(ret)
}