psimsa/handlebars.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-escapes' of github.com:dmarcotte/handlebars.js into dmarcotte-fix-escapes

Browse Source 
Conflicts:
	spec/tokenizer.js
This commit is contained in:
kpdecker
2013-12-23 19:22:30 -06:00
parent ddea5be2a4 9d353bd3dd
commit 40e1837b14
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec/tokenizer.js
+16 -6
View File
@@ -87,15 +87,15 @@ describe('Tokenizer', function() {
it('supports escaping multiple escape characters', function() { it('supports escaping multiple escape characters', function() {
var result = tokenize("{{foo}} \\\\{{bar}} \\\\{{baz}}"); var result = tokenize("{{foo}} \\\\{{bar}} \\\\{{baz}}");
shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE', 'CONTENT', 'OPEN', 'ID', 'CLOSE', 'CONTENT', 'OPEN', 'ID', 'CLOSE']); shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE', 'CONTENT', 'OPEN', 'ID', 'CLOSE', 'CONTENT', 'OPEN', 'ID', 'CLOSE']);
shouldBeToken(result[3], "CONTENT", " \\"); shouldBeToken(result[3], "CONTENT", " \\");
shouldBeToken(result[5], "ID", "bar"); shouldBeToken(result[5], "ID", "bar");
shouldBeToken(result[7], "CONTENT", " \\"); shouldBeToken(result[7], "CONTENT", " \\");
shouldBeToken(result[9], "ID", "baz"); shouldBeToken(result[9], "ID", "baz");
}); });
it('supports mixed escaped delimiters and escaped escape characters', function() { it('supports escaped mustaches after escaped escape characters', function() {
var result = tokenize("{{foo}} \\\\{{bar}} \\{{baz}}"); var result = tokenize("{{foo}} \\\\{{bar}} \\{{baz}}");
shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE', 'CONTENT', 'OPEN', 'ID', 'CLOSE', 'CONTENT', 'CONTENT', 'CONTENT']); shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE', 'CONTENT', 'OPEN', 'ID', 'CLOSE', 'CONTENT', 'CONTENT', 'CONTENT']);
@@ -106,6 +106,16 @@ describe('Tokenizer', function() {
shouldBeToken(result[8], "CONTENT", "{{baz}}"); shouldBeToken(result[8], "CONTENT", "{{baz}}");
}); });
it('supports escaped escape characters after escaped mustaches', function() {
var result = tokenize("{{foo}} \\{{bar}} \\\\{{baz}}");
shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE', 'CONTENT', 'CONTENT', 'CONTENT', 'OPEN', 'ID', 'CLOSE']);
shouldBeToken(result[4], "CONTENT", "{{bar}} ");
shouldBeToken(result[5], "CONTENT", "\\");
shouldBeToken(result[6], "OPEN", "{{");
shouldBeToken(result[7], "ID", "baz");
});
it('supports escaped escape character on a triple stash', function() { it('supports escaped escape character on a triple stash', function() {
var result = tokenize("{{foo}} \\\\{{{bar}}} {{baz}}"); var result = tokenize("{{foo}} \\\\{{{bar}}} {{baz}}");
shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE', 'CONTENT', 'OPEN_UNESCAPED', 'ID', 'CLOSE_UNESCAPED', 'CONTENT', 'OPEN', 'ID', 'CLOSE']); shouldMatchTokens(result, ['OPEN', 'ID', 'CLOSE', 'CONTENT', 'OPEN_UNESCAPED', 'ID', 'CLOSE_UNESCAPED', 'CONTENT', 'OPEN', 'ID', 'CLOSE']);
src/handlebars.l
+3 -3
View File
@@ -43,9 +43,9 @@ ID [^\s!"#%-,\.\/;->@\[-\^`\{-~]+/{LOOKAHEAD}
[^\x00]+ return 'CONTENT'; [^\x00]+ return 'CONTENT';
<emu>[^\x00]{2,}?/("{{"|<<EOF>>) { // marks CONTENT up to the next mustache or escaped mustache
if(yytext.slice(-1) !== "\\") this.popState(); <emu>[^\x00]{2,}?/("{{"|"\\{{"|"\\\\{{"|<<EOF>>) {
if(yytext.slice(-1) === "\\") strip(0,1); this.popState();
return 'CONTENT'; return 'CONTENT';
} }