Merge pull request #1060 from ericbn/issue-1056

#1056 Fixed grammar for nested raw blocks

Author: kpdecker

lib/handlebars/compiler/helpers.js

@@ -70,15 +70,15 @@ export function prepareMustache(path, params, hash, open, strip, locInfo) {
   return new this.MustacheStatement(path, params, hash, escaped, strip, this.locInfo(locInfo));
 }
 
-export function prepareRawBlock(openRawBlock, content, close, locInfo) {
+export function prepareRawBlock(openRawBlock, contents, close, locInfo) {
   if (openRawBlock.path.original !== close) {
     let errorNode = {loc: openRawBlock.path.loc};
 
     throw new Exception(openRawBlock.path.original + " doesn't match " + close, errorNode);
   }
 
   locInfo = this.locInfo(locInfo);
-  let program = new this.Program([content], null, {}, locInfo);
+  let program = new this.Program(contents, null, {}, locInfo);
 
   return new this.BlockStatement(
       openRawBlock.path, openRawBlock.params, openRawBlock.hash,

spec/helpers.js

@@ -28,6 +28,16 @@ describe('helpers', function() {
                     'raw block helper gets raw content');
   });
 
+  it('helper for nested raw block gets raw content', function() {
+    var string = '{{{{a}}}} {{{{b}}}} {{{{/b}}}} {{{{/a}}}}';
+    var helpers = {
+        a: function(options) {
+          return options.fn();
+      }
+    };
+    shouldCompileTo(string, [{}, helpers], ' {{{{b}}}} {{{{/b}}}} ', 'raw block helper should get nested raw block as raw content');
+  });
+
   it('helper block with complex lookup expression', function() {
     var string = '{{#goodbyes}}{{../name}}{{/goodbyes}}';
     var hash = {name: 'Alan'};

src/handlebars.l

@@ -49,12 +49,21 @@ ID    [^\s!"#%-,\.\/;->@\[-\^`\{-~]+/{LOOKAHEAD}
                                    return 'CONTENT';
                                  }
 
+// nested raw block will create stacked 'raw' condition
+<raw>"{{{{"/[^/]                 this.begin('raw'); return 'CONTENT';
 <raw>"{{{{/"[^\s!"#%-,\.\/;->@\[-\^`\{-~]+/[=}\s\/.]"}}}}" {
-                                  yytext = yytext.substr(5, yyleng-9);
                                   this.popState();
-                                  return 'END_RAW_BLOCK';
+                                  // Should be using `this.topState()` below, but it currently
+                                  // returns the second top instead of the first top. Opened an
+                                  // issue about it at https://github.com/zaach/jison/issues/291
+                                  if (this.conditionStack[this.conditionStack.length-1] === 'raw') {
+                                    return 'CONTENT';
+                                  } else {
+                                    yytext = yytext.substr(5, yyleng-9);
+                                    return 'END_RAW_BLOCK';
+                                  }
                                  }
-<raw>[^\x00]*?/("{{{{/")         { return 'CONTENT'; }
+<raw>[^\x00]*?/("{{{{")          { return 'CONTENT'; }
 
 <com>[\s\S]*?"--"{RIGHT_STRIP}?"}}" {
   this.popState();

src/handlebars.yy

@@ -26,7 +26,7 @@ content
   ;
 
 rawBlock
-  : openRawBlock content END_RAW_BLOCK -> yy.prepareRawBlock($1, $2, $3, @$)
+  : openRawBlock content+ END_RAW_BLOCK -> yy.prepareRawBlock($1, $2, $3, @$)
   ;
 
 openRawBlock