Merge pull request #163 from hronro/main

Implement rm_newline

Thanks @hronro !

Author: vthg2themax

sailfish-compiler/src/compiler.rs

@@ -66,7 +66,9 @@ impl Compiler {
         output: &Path,
     ) -> Result<(), Error> {
         let analyzer = Analyzer::new();
-        let optimizer = Optimizer::new().rm_whitespace(self.config.rm_whitespace);
+        let optimizer = Optimizer::new()
+            .rm_whitespace(self.config.rm_whitespace)
+            .rm_newline(self.config.rm_newline);
 
         let compile_file = |mut tsource: TranslatedSource,
                             output: &Path|
@@ -116,7 +118,9 @@ impl Compiler {
         let parser = Parser::new().delimiter(self.config.delimiter);
         let translator = Translator::new().escape(self.config.escape);
         let resolver = Resolver::new().include_handler(include_handler);
-        let optimizer = Optimizer::new().rm_whitespace(self.config.rm_whitespace);
+        let optimizer = Optimizer::new()
+            .rm_whitespace(self.config.rm_whitespace)
+            .rm_newline(self.config.rm_newline);
 
         let compile = || -> Result<String, Error> {
             let stream = parser.parse(input);

sailfish-compiler/src/config.rs

@@ -5,6 +5,7 @@ pub struct Config {
     pub delimiter: char,
     pub escape: bool,
     pub rm_whitespace: bool,
+    pub rm_newline: bool,
     pub template_dirs: Vec<PathBuf>,
     #[doc(hidden)]
     pub cache_dir: PathBuf,
@@ -20,6 +21,7 @@ impl Default for Config {
             escape: true,
             cache_dir: Path::new(env!("OUT_DIR")).join("cache"),
             rm_whitespace: false,
+            rm_newline: false,
             _non_exhaustive: (),
         }
     }
@@ -82,6 +84,10 @@ mod imp {
                         if let Some(rm_whitespace) = optimizations.rm_whitespace {
                             config.rm_whitespace = rm_whitespace;
                         }
+
+                        if let Some(rm_newline) = optimizations.rm_newline {
+                            config.rm_newline = rm_newline;
+                        }
                     }
                 }
 
@@ -96,6 +102,7 @@ mod imp {
     #[serde(deny_unknown_fields)]
     struct Optimizations {
         rm_whitespace: Option<bool>,
+        rm_newline: Option<bool>,
     }
 
     #[derive(Deserialize, Debug)]

sailfish-compiler/src/optimizer.rs

@@ -9,13 +9,15 @@ use syn::{
 
 pub struct Optimizer {
     rm_whitespace: bool,
+    rm_newline: bool,
 }
 
 impl Optimizer {
     #[inline]
     pub fn new() -> Self {
         Self {
             rm_whitespace: false,
+            rm_newline: false,
         }
     }
 
@@ -25,17 +27,45 @@ impl Optimizer {
         self
     }
 
+    #[inline]
+    pub fn rm_newline(mut self, new: bool) -> Self {
+        self.rm_newline = new;
+        self
+    }
+
     #[inline]
     pub fn optimize(&self, i: &mut Block) {
         OptmizerImpl {
             rm_whitespace: self.rm_whitespace,
+            rm_newline: self.rm_newline,
         }
         .visit_block_mut(i);
     }
 }
 
 struct OptmizerImpl {
     rm_whitespace: bool,
+    rm_newline: bool,
+}
+
+impl OptmizerImpl {
+    fn apply_optimizations(&self, v: String) -> Option<TokenStream> {
+        let mut optimized = v.to_string();
+
+        if self.rm_whitespace {
+            optimized = remove_whitespace(&optimized);
+        }
+        if self.rm_newline {
+            optimized = remove_newlines(&optimized);
+        }
+
+        // Only return a token stream if the string was actually modified
+        if optimized != v {
+            Some(quote! { __sf_buf, #optimized })
+        } else {
+            None
+        }
+    }
 }
 
 impl VisitMut for OptmizerImpl {
@@ -120,12 +150,8 @@ impl VisitMut for OptmizerImpl {
     }
 
     fn visit_stmt_macro_mut(&mut self, i: &mut StmtMacro) {
-        if self.rm_whitespace {
-            if let Some(v) = get_rendertext_value(&i.mac) {
-                let ts = match remove_whitespace(v) {
-                    Some(value) => value,
-                    None => return,
-                };
+        if let Some(v) = get_rendertext_value(&i.mac) {
+            if let Some(ts) = self.apply_optimizations(v) {
                 i.mac.tokens = ts;
                 return;
             }
@@ -135,12 +161,8 @@ impl VisitMut for OptmizerImpl {
     }
 
     fn visit_expr_macro_mut(&mut self, i: &mut ExprMacro) {
-        if self.rm_whitespace {
-            if let Some(v) = get_rendertext_value(&i.mac) {
-                let ts = match remove_whitespace(v) {
-                    Some(value) => value,
-                    None => return,
-                };
+        if let Some(v) = get_rendertext_value(&i.mac) {
+            if let Some(ts) = self.apply_optimizations(v) {
                 i.mac.tokens = ts;
                 return;
             }
@@ -150,15 +172,15 @@ impl VisitMut for OptmizerImpl {
     }
 }
 
-fn remove_whitespace(v: String) -> Option<TokenStream> {
+fn remove_whitespace(v: &str) -> String {
     let mut buffer = String::new();
     let mut it = v.lines().peekable();
     if let Some(line) = it.next() {
         if it.peek().is_some() {
             buffer.push_str(line.trim_end());
             buffer.push('\n');
         } else {
-            return None;
+            return v.to_string();
         }
     }
     while let Some(line) = it.next() {
@@ -174,8 +196,11 @@ fn remove_whitespace(v: String) -> Option<TokenStream> {
             buffer.push_str(line.trim_start());
         }
     }
+    buffer
+}
 
-    Some(quote! { __sf_buf, #buffer })
+fn remove_newlines(v: &str) -> String {
+    v.replace(['\n', '\r'], "")
 }
 
 fn get_rendertext_value(mac: &Macro) -> Option<String> {

sailfish-compiler/src/procmacro.rs

@@ -24,6 +24,7 @@ struct DeriveTemplateOptions {
     delimiter: Option<LitChar>,
     escape: Option<LitBool>,
     rm_whitespace: Option<LitBool>,
+    rm_newline: Option<LitBool>,
 }
 
 impl DeriveTemplateOptions {
@@ -49,6 +50,8 @@ impl DeriveTemplateOptions {
                     self.escape = Some(s.parse::<LitBool>()?);
                 } else if key == "rm_whitespace" {
                     self.rm_whitespace = Some(s.parse::<LitBool>()?);
+                } else if key == "rm_newline" {
+                    self.rm_newline = Some(s.parse::<LitBool>()?);
                 } else {
                     return Err(syn::Error::new(
                         key.span(),
@@ -81,6 +84,9 @@ fn merge_config_options(config: &mut Config, options: &DeriveTemplateOptions) {
     if let Some(ref rm_whitespace) = options.rm_whitespace {
         config.rm_whitespace = rm_whitespace.value;
     }
+    if let Some(ref rm_newline) = options.rm_newline {
+        config.rm_newline = rm_newline.value;
+    }
 }
 
 fn resolve_template_file(path: &str, template_dirs: &[PathBuf]) -> Option<PathBuf> {

sailfish-tests/integration-tests/templates/rm_newline.out

@@ -0,0 +1 @@
+<div>  <span>1</span>  <span>2</span>  <span>3</span></div><div>  trailing spaces     This line should be appeared on the same line as the previous line</div>  <div>foo</div>  <div>bar</div>

sailfish-tests/integration-tests/templates/rm_newline.stpl

@@ -0,0 +1,13 @@
+<div>
+  <span>1</span>
+  <span>2</span>
+
+  <span>3</span>
+</div>
+<div>
+  trailing spaces   
+  This line should be appeared on the same line as the previous line
+</div>
+<% for msg in self.messages { %>
+  <div><%= msg %></div>
+<% } %>

sailfish-tests/integration-tests/templates/rm_newline_s.stpl

@@ -0,0 +1,13 @@
+<div>
+  <span>1</span>
+  <span>2</span>
+
+  <span>3</span>
+</div>
+<div>
+  trailing spaces   
+  This line should be appeared on the same line as the previous line
+</div>
+<% for msg in messages { %>
+  <div><%= msg %></div>
+<% } %>

sailfish-tests/integration-tests/templates/rm_whitespace_newline.out

@@ -0,0 +1 @@
+<div><span>1</span><span>2</span><span>3</span></div><div>trailing spacesThis line should be appeared on the same line as the previous line</div><div>foo</div><div>bar</div>

sailfish-tests/integration-tests/templates/rm_whitespace_newline.stpl

@@ -0,0 +1,13 @@
+<div>
+  <span>1</span>
+  <span>2</span>
+
+  <span>3</span>
+</div>
+<div>
+  trailing spaces   
+  This line should be appeared on the same line as the previous line
+</div>
+<% for msg in self.messages { %>
+  <div><%= msg %></div>
+<% } %>

sailfish-tests/integration-tests/templates/rm_whitespace_newline_s.stpl

@@ -0,0 +1,13 @@
+<div>
+  <span>1</span>
+  <span>2</span>
+
+  <span>3</span>
+</div>
+<div>
+  trailing spaces   
+  This line should be appeared on the same line as the previous line
+</div>
+<% for msg in messages { %>
+  <div><%= msg %></div>
+<% } %>