GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-24 08:46:37 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

handle <%foo%> inside {{#conditional}}

Browse source 
https://forums.ankiweb.net/t/the-latest-version-of-ios-cannot-display-the-template-normally/2142
This commit is contained in:
Damien Elmes 2020-08-12 19:28:26 +10:00
parent 4086042970
commit 85e2db8ab0
1 changed files with 49 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
rslib/src/template.rs
View file

@ -107,13 +107,31 @@ fn classify_handle(s: &str) -> Token {
static ALT_HANDLEBAR_DIRECTIVE: &str = "{{=<% %>=}}";
fn legacy_text_token(s: &str) -> nom::IResult<&str, Token> {
map(
verify(
alt((take_until("{{"), take_until("<%"), rest)),
|out: &str| !out.is_empty(),
),
Token::Text,
)(s)
if s.is_empty() {
return Err(nom::Err::Error(nom::error::make_error(
s,
nom::error::ErrorKind::TakeUntil,
)));
}
// if we locate a starting normal or alternate handlebar, use
// whichever one we found first
let normal_result: nom::IResult<&str, &str> = take_until("{{")(s);
let (normal_remaining, normal_span) = normal_result.unwrap_or_else(|_e| ("", s));
let alt_result: nom::IResult<&str, &str> = take_until("<%")(s);
let (alt_remaining, alt_span) = alt_result.unwrap_or_else(|_e| ("", s));
match (normal_span.len(), alt_span.len()) {
(0, 0) => {
// neither handlebar kind found
map(rest, Token::Text)(s)
}
(n, a) => {
if n < a {
Ok((normal_remaining, Token::Text(normal_span)))
} else {
Ok((alt_remaining, Token::Text(alt_span)))
}
}
}
}
fn legacy_next_token(input: &str) -> nom::IResult<&str, Token> {
@ -966,6 +984,30 @@ mod test {
}
]
);
let input = "
{{=<% %>=}}
{{#foo}}
<%Front%>
{{/foo}}
";
assert_eq!(
PT::from_text(input).unwrap().0,
vec![
Text("\n".into()),
Conditional {
key: "foo".into(),
children: vec![
Text("\n".into()),
Replacement {
key: "Front".into(),
filters: vec![]
},
Text("\n".into())
]
},
Text("\n".into())
]
);
}
#[test]