fix multi-line inside HTML interpolations (fix #3062)

yyx990803 · yyx990803 · commit d5c46b555579 · 2016-06-16T18:16:39.000-04:00
diff --git a/src/parsers/text.js b/src/parsers/text.js
@@ -27,7 +27,7 @@ export function compileRegex () {
     'g'
   )
   htmlRE = new RegExp(
-    '^' + unsafeOpen + '.*' + unsafeClose + '$'
+    '^' + unsafeOpen + '((?:.|\\n)+?)' + unsafeClose + '$'
   )
   // reset cache
   cache = new Cache(1000)
diff --git a/test/unit/specs/parsers/text_spec.js b/test/unit/specs/parsers/text_spec.js
@@ -50,6 +50,13 @@ var testCases = [
       { tag: true, value: 'value', html: false, oneTime: false }
     ]
   },
+  // multiline HTML
+  {
+    text: '{{{\n code \n}}}',
+    expected: [
+      { tag: true, value: 'code', html: true, oneTime: false }
+    ]
+  },
   // new lines preserved outside of tags
   {
     text: 'hello\n{{value}}\nworld',

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ export function compileRegex () {`
`27`	`27`	`'g'`
`28`	`28`	`)`
`29`	`29`	`htmlRE = new RegExp(`
`30`		`- '^' + unsafeOpen + '.*' + unsafeClose + '$'`
	`30`	`+ '^' + unsafeOpen + '((?:.\|\\n)+?)' + unsafeClose + '$'`
`31`	`31`	`)`
`32`	`32`	`// reset cache`
`33`	`33`	`cache = new Cache(1000)`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,13 @@ var testCases = [`
`50`	`50`	`{ tag: true, value: 'value', html: false, oneTime: false }`
`51`	`51`	`]`
`52`	`52`	`},`
	`53`	`+ // multiline HTML`
	`54`	`+ {`
	`55`	`+ text: '{{{\n code \n}}}',`
	`56`	`+ expected: [`
	`57`	`+ { tag: true, value: 'code', html: true, oneTime: false }`
	`58`	`+ ]`
	`59`	`+ },`
`53`	`60`	`// new lines preserved outside of tags`
`54`	`61`	`{`
`55`	`62`	`text: 'hello\n{{value}}\nworld',`