aboutsummaryrefslogtreecommitdiffstats
path: root/askama_derive
diff options
context:
space:
mode:
Diffstat (limited to 'askama_derive')
-rw-r--r--askama_derive/src/generator.rs17
1 files changed, 13 insertions, 4 deletions
diff --git a/askama_derive/src/generator.rs b/askama_derive/src/generator.rs
index bc009f9..49c0d02 100644
--- a/askama_derive/src/generator.rs
+++ b/askama_derive/src/generator.rs
@@ -597,18 +597,27 @@ impl<'a> Generator<'a> {
fn write_lit(&mut self, buf: &mut Buffer, lws: &'a str, val: &str, rws: &'a str) {
assert!(self.next_ws.is_none());
- if !lws.is_empty() {
+ let lws_write = if !lws.is_empty() {
if self.skip_ws {
self.skip_ws = false;
+ false
} else if val.is_empty() {
assert!(rws.is_empty());
self.next_ws = Some(lws);
+ false
} else {
- buf.writeln(&format!("writer.write_str({:#?})?;", lws));
+ true
}
- }
+ } else {
+ false
+ };
+
if !val.is_empty() {
- buf.writeln(&format!("writer.write_str({:#?})?;", val));
+ if lws_write {
+ buf.writeln(&format!("writer.write_str({:#?})?;", [lws, val].join("")));
+ } else {
+ buf.writeln(&format!("writer.write_str({:#?})?;", val));
+ }
}
if !rws.is_empty() {
self.next_ws = Some(rws);