Fix issue #5

padolsey · Jun 9, 2013 · bf67f2e · bf67f2e
1 parent ee71157
commit bf67f2e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/parser.pegjs b/src/parser.pegjs
@@ -25,22 +25,24 @@
 	function resolveStringToken(tok) {
 		return stringTokens[tok.substring('%%__STRING_TOKEN___%%'.length)]
 	}
+
+	// Replace HTML with string tokens first
+	input = input.replace(/(`+)((?:\\\1|[^\1])*?)\1/g, function($0, $1, $2) {
+		return '%%__HTML_TOKEN___%%' + (stringTokens.push(
+			$2.replace(/\\`/g, '\`')
+		) - 1);
+	});
+
 	input = input.replace(/(["'])((?:\\\1|[^\1])*?)\1/g, function($0, $1, $2) {
 		return '%%__STRING_TOKEN___%%' + (stringTokens.push(
 			$2.replace(/\\'/g, '\'').replace(/\\"/g, '"')
 		) - 1);
 	});
+
 	input = input.replace(/(^|\n)\s*\\([^\n\r]+)/g, function($0, $1, $2) {
 		return $1 + '%%__STRING_TOKEN___%%' + (stringTokens.push($2) - 1);
 	});
 
-	// Replace HTML with string tokens too
-	input = input.replace(/(`+)((?:\\\1|[^\1])*?)\1/g, function($0, $1, $2) {
-		return '%%__HTML_TOKEN___%%' + (stringTokens.push(
-			$2.replace(/\\`/g, '\`')
-		) - 1);
-	});
-
 	var isCurly = /\/\*\s*siml:curly=true\s*\*\//i.test(input);
 
 	// Remove comments:

diff --git a/test/DefaultGeneratorSpec.js b/test/DefaultGeneratorSpec.js
@@ -294,6 +294,9 @@ describe('DefaultParser: HTML Generation', function() {
 		it('Does not escape backticked text', function() {
 			expect('`O < K`').toGenerate('O < K');
 		});
+		it('Quotes strings are not parsed within backticks', function() {
+			expect('` "this" and \'this ... \' ..`').toGenerate(' "this" and \'this ... \' ..');
+		});
 		it('Does not escape backticked attribute values', function() {
 			expect('d { id: `<<` }').toGenerate('<d id="<<"></d>');
 		});