Add ignoreStandalone compiler option

kpdecker · kpdecker · commit ea3a5a1eb6e4 · 2015-08-13T01:51:17.000-05:00
Fixes #1072
diff --git a/lib/handlebars/compiler/base.js b/lib/handlebars/compiler/base.js
@@ -20,6 +20,6 @@ export function parse(input, options) {
     return new yy.SourceLocation(options && options.srcName, locInfo);
   };
 
-  let strip = new WhitespaceControl();
+  let strip = new WhitespaceControl(options);
   return strip.accept(parser.parse(input));
 }
diff --git a/lib/handlebars/compiler/whitespace-control.js b/lib/handlebars/compiler/whitespace-control.js
@@ -1,10 +1,13 @@
 import Visitor from './visitor';
 
-function WhitespaceControl() {
+function WhitespaceControl(options = {}) {
+  this.options = options;
 }
 WhitespaceControl.prototype = new Visitor();
 
 WhitespaceControl.prototype.Program = function(program) {
+  const doStandalone = !this.options.ignoreStandalone;
+
   let isRoot = !this.isRootSeen;
   this.isRootSeen = true;
 
@@ -31,7 +34,7 @@ WhitespaceControl.prototype.Program = function(program) {
       omitLeft(body, i, true);
     }
 
-    if (inlineStandalone) {
+    if (doStandalone && inlineStandalone) {
       omitRight(body, i);
 
       if (omitLeft(body, i)) {
@@ -42,13 +45,13 @@ WhitespaceControl.prototype.Program = function(program) {
         }
       }
     }
-    if (openStandalone) {
+    if (doStandalone && openStandalone) {
       omitRight((current.program || current.inverse).body);
 
       // Strip out the previous content node if it's whitespace only
       omitLeft(body, i);
     }
-    if (closeStandalone) {
+    if (doStandalone && closeStandalone) {
       // Always strip the next node
       omitRight(body, i);
 
@@ -106,7 +109,8 @@ WhitespaceControl.prototype.BlockStatement = function(block) {
     }
 
     // Find standalone else statments
-    if (isPrevWhitespace(program.body)
+    if (!this.options.ignoreStandalone
+        && isPrevWhitespace(program.body)
         && isNextWhitespace(firstInverse.body)) {
       omitLeft(program.body);
       omitRight(firstInverse.body);
diff --git a/spec/blocks.js b/spec/blocks.js
@@ -125,6 +125,16 @@ describe('blocks', function() {
       shouldCompileTo('{{#people}}\n{{name}}\n{{^}}\n{{none}}\n{{/people}}\n', {none: 'No people'},
         'No people\n');
     });
+    it('block standalone else sections can be disabled', function() {
+      shouldCompileTo(
+        '{{#people}}\n{{name}}\n{{^}}\n{{none}}\n{{/people}}\n',
+        [{none: 'No people'}, {}, {}, {ignoreStandalone: true}],
+        '\nNo people\n\n');
+      shouldCompileTo(
+        '{{#none}}\n{{.}}\n{{^}}\nFail\n{{/none}}\n',
+        [{none: 'No people'}, {}, {}, {ignoreStandalone: true}],
+        '\nNo people\n\n');
+    });
     it('block standalone chained else sections', function() {
       shouldCompileTo('{{#people}}\n{{name}}\n{{else if none}}\n{{none}}\n{{/people}}\n', {none: 'No people'},
         'No people\n');

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@ export function parse(input, options) {`
`20`	`20`	`return new yy.SourceLocation(options && options.srcName, locInfo);`
`21`	`21`	`};`
`22`	`22`
`23`		`- let strip = new WhitespaceControl();`
	`23`	`+ let strip = new WhitespaceControl(options);`
`24`	`24`	`return strip.accept(parser.parse(input));`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,13 @@`
`1`	`1`	`import Visitor from './visitor';`
`2`	`2`
`3`		`-function WhitespaceControl() {`
	`3`	`+function WhitespaceControl(options = {}) {`
	`4`	`+ this.options = options;`
`4`	`5`	`}`
`5`	`6`	`WhitespaceControl.prototype = new Visitor();`
`6`	`7`
`7`	`8`	`WhitespaceControl.prototype.Program = function(program) {`
	`9`	`+ const doStandalone = !this.options.ignoreStandalone;`
	`10`	`+`
`8`	`11`	`let isRoot = !this.isRootSeen;`
`9`	`12`	`this.isRootSeen = true;`
`10`	`13`
`@@ -31,7 +34,7 @@ WhitespaceControl.prototype.Program = function(program) {`
`31`	`34`	`omitLeft(body, i, true);`
`32`	`35`	`}`
`33`	`36`
`34`		`- if (inlineStandalone) {`
	`37`	`+ if (doStandalone && inlineStandalone) {`
`35`	`38`	`omitRight(body, i);`
`36`	`39`
`37`	`40`	`if (omitLeft(body, i)) {`
`@@ -42,13 +45,13 @@ WhitespaceControl.prototype.Program = function(program) {`
`42`	`45`	`}`
`43`	`46`	`}`
`44`	`47`	`}`
`45`		`- if (openStandalone) {`
	`48`	`+ if (doStandalone && openStandalone) {`
`46`	`49`	`omitRight((current.program \|\| current.inverse).body);`
`47`	`50`
`48`	`51`	`// Strip out the previous content node if it's whitespace only`
`49`	`52`	`omitLeft(body, i);`
`50`	`53`	`}`
`51`		`- if (closeStandalone) {`
	`54`	`+ if (doStandalone && closeStandalone) {`
`52`	`55`	`// Always strip the next node`
`53`	`56`	`omitRight(body, i);`
`54`	`57`
`@@ -106,7 +109,8 @@ WhitespaceControl.prototype.BlockStatement = function(block) {`
`106`	`109`	`}`
`107`	`110`
`108`	`111`	`// Find standalone else statments`
`109`		`- if (isPrevWhitespace(program.body)`
	`112`	`+ if (!this.options.ignoreStandalone`
	`113`	`+ && isPrevWhitespace(program.body)`
`110`	`114`	`&& isNextWhitespace(firstInverse.body)) {`
`111`	`115`	`omitLeft(program.body);`
`112`	`116`	`omitRight(firstInverse.body);`