Preserve empty newlines

mjackson · mjackson · commit cf9031c76ffa · 2012-01-14T10:38:40.000-08:00
diff --git a/mustache.js b/mustache.js
@@ -216,20 +216,22 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
       '\nsend("'
     ];
 
-    var spaces = [],      // indices of whitespace in code for the current line
+    var spaces = [],      // indices of whitespace in code on the current line
+        hasTag = false,   // is there a {{tag}} on the current line?
         nonSpace = false; // is there a non-space char on the current line?
 
     // Strips all space characters from the code array for the current line
     // if there was a {{tag}} on it and otherwise only spaces.
     var stripSpace = function () {
-      if (!nonSpace && !options.space) {
+      if (hasTag && !nonSpace && !options.space) {
         while (spaces.length) {
           code.splice(spaces.pop(), 1);
         }
       } else {
         spaces = [];
       }
 
+      hasTag = false;
       nonSpace = false;
     };
 
@@ -330,6 +332,7 @@ var Mustache = (typeof module !== "undefined" && module.exports) || {};
         updateLine = '\nline = ' + line + ';';
         nextOpenTag = openTag;
         nextCloseTag = closeTag;
+        hasTag = true;
 
         switch (c) {
         case "!": // comment
diff --git a/spec/_files/recursion_with_same_names.txt b/spec/_files/recursion_with_same_names.txt
@@ -1,5 +1,6 @@
 name
 desc
+
   t1
   0
   t2
diff --git a/spec/_files/whitespace.js b/spec/_files/whitespace.js
@@ -0,0 +1,4 @@
+var whitespace = {
+  tag1: "Hello",
+  tag2: "World"
+};
diff --git a/spec/_files/whitespace.mustache b/spec/_files/whitespace.mustache
@@ -0,0 +1,4 @@
+{{tag1}}
+
+
+{{tag2}}.
diff --git a/spec/_files/whitespace.txt b/spec/_files/whitespace.txt
@@ -0,0 +1,4 @@
+Hello
+
+
+World.

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`name`
`2`	`2`	`desc`
	`3`	`+`
`3`	`4`	`t1`
`4`	`5`	`0`
`5`	`6`	`t2`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{{tag1}}
++
++
 +{{tag2}}.