emelie/zola
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix ignored shortcode swallowing whitespace

Browse source 
Fix #383
This commit is contained in:
Vincent Prouillet 2018-09-12 16:44:52 +02:00
parent e9d59239d6
commit 4571b067ea
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/rendering/src/content.pest
View file

@ -54,7 +54,7 @@ ignored_sc_body_start = !{ "{%/*" ~ sc_def ~ "*/%}" }
ignored_sc_body_end = !{ "{%/*" ~ "end" ~ "*/%}" } ignored_sc_body_end = !{ "{%/*" ~ "end" ~ "*/%}" }
shortcode_with_body = !{ sc_body_start ~ text_in_body_sc ~ sc_body_end } shortcode_with_body = !{ sc_body_start ~ text_in_body_sc ~ sc_body_end }
ignored_shortcode_with_body = !{ ignored_sc_body_start ~ text_in_ignored_body_sc ~ ignored_sc_body_end } ignored_shortcode_with_body = { ignored_sc_body_start ~ text_in_ignored_body_sc ~ ignored_sc_body_end }
text_in_body_sc = ${ (!(sc_body_end) ~ any)+ } text_in_body_sc = ${ (!(sc_body_end) ~ any)+ }
text_in_ignored_body_sc = ${ (!(ignored_sc_body_end) ~ any)+ } text_in_ignored_body_sc = ${ (!(ignored_sc_body_end) ~ any)+ }

10
components/rendering/src/shortcode.rs
View file

@ -310,6 +310,16 @@ Hello World
assert_eq!(res, "\nHello World\n{% youtube() %}Some body {{ hello() }}{% end %}"); assert_eq!(res, "\nHello World\n{% youtube() %}Some body {{ hello() }}{% end %}");
} }
// https://github.com/Keats/gutenberg/issues/383
#[test]
fn unignore_shortcode_with_body_does_not_swallow_initial_whitespace() {
let res = render_shortcodes(r#"
Hello World
{%/* youtube() */%}
Some body {{ hello() }}{%/* end */%}"#, &Tera::default());
assert_eq!(res, "\nHello World\n{% youtube() %}\nSome body {{ hello() }}{% end %}");
}
#[test] #[test]
fn can_parse_shortcode_arguments() { fn can_parse_shortcode_arguments() {
let inputs = vec![ let inputs = vec![