github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix for #2175 - Spacebars block comment cause unexpected errors

Browse Source 
This fixes an edge case where a comment is followed immediately
by an {{else}} token.
This commit is contained in:
Matthew Arbesfeld
2014-05-27 03:36:50 -04:00
parent 399629e941
commit f90e09fbe5
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/html-tools/tokenize.js
View File

@@ -208,24 +208,24 @@ var getChars = makeRegexMatcher(/^[^&<\u0000][^&<\u0000{]*/);
getHTMLToken = HTMLTools.Parse.getHTMLToken = function (scanner, dataMode) {
var result = null;
if (scanner.getSpecialTag) {
var lastPos = -1;
// Try to parse a "special tag" by calling out to the provided
// `getSpecialTag` function. If the function returns `null` but
// consumes characters, it must have parsed a comment or something,
// so we loop and try it again. If it ever returns `null` without
// consumes characters, it must have parsed a comment, so we return null
// and allow the lexer to continue. If it ever returns `null` without
// consuming anything, that means it didn't see anything interesting
// so we look for a normal token. If it returns a truthy value,
// the value must be an object. We wrap it in a Special token.
while ((! result) && scanner.pos > lastPos) {
lastPos = scanner.pos;
result = scanner.getSpecialTag(
scanner,
(dataMode === 'rcdata' ? TEMPLATE_TAG_POSITION.IN_RCDATA :
(dataMode === 'rawtext' ? TEMPLATE_TAG_POSITION.IN_RAWTEXT :
TEMPLATE_TAG_POSITION.ELEMENT)));
}
var lastPos = scanner.pos;
result = scanner.getSpecialTag(
scanner,
(dataMode === 'rcdata' ? TEMPLATE_TAG_POSITION.IN_RCDATA :
(dataMode === 'rawtext' ? TEMPLATE_TAG_POSITION.IN_RAWTEXT :
TEMPLATE_TAG_POSITION.ELEMENT)));
if (result)
return { t: 'Special', v: result };
else if (scanner.pos > lastPos)
return null;
}
var chars = getChars(scanner);

14
packages/spacebars-compiler/compile_tests.js
View File

@@ -125,6 +125,20 @@ Tinytest.add("spacebars - compiler output", function (test) {
}));
});
run("{{!-- --}}{{#if cond}}aaa{{!\n}}{{else}}{{!}}bbb{{!-- --}}{{/if}}{{!}}",
function() {
var self = this;
return UI.If(function () {
return Spacebars.call(self.lookup("cond"));
}, UI.block(function() {
var self = this;
return "aaa";
}), UI.block(function() {
var self = this;
return "bbb";
}));
});
run("{{> foo bar}}",
function() {
var self = this;