[fix] Don't remove newlines during parseText

sirlancelot · yyx990803 · commit 125ea02d9211 · 2016-04-04T16:53:39.000-04:00
Since `text` is being used as the key in `cache.get(text)` and the

cache is checked *before* newlines were removed, the cache would always

miss if the input `text` had *any* newlines.



I updated `tagRe` to match tags which contain newlines, and added an

extra test case to ensure newlines outside of tags are preserved
diff --git a/src/parsers/text.js b/src/parsers/text.js
@@ -22,8 +22,8 @@ export function compileRegex () {
   var unsafeOpen = escapeRegex(config.unsafeDelimiters[0])
   var unsafeClose = escapeRegex(config.unsafeDelimiters[1])
   tagRE = new RegExp(
-    unsafeOpen + '(.+?)' + unsafeClose + '|' +
-    open + '(.+?)' + close,
+    unsafeOpen + '([^]+?)' + unsafeClose + '|' +
+    open + '([^]+?)' + close,
     'g'
   )
   htmlRE = new RegExp(
@@ -52,7 +52,6 @@ export function parseText (text) {
   if (hit) {
     return hit
   }
-  text = text.replace(/\n/g, '')
   if (!tagRE.test(text)) {
     return null
   }
diff --git a/test/unit/specs/parsers/text_spec.js b/test/unit/specs/parsers/text_spec.js
@@ -49,6 +49,15 @@ var testCases = [
     expected: [
       { tag: true, value: 'value', html: false, oneTime: false }
     ]
+  },
+  // new lines preserved outside of tags
+  {
+    text: 'hello\n{{value}}\nworld',
+    expected: [
+        { value: 'hello\n' },
+        { tag: true, value: 'value', html: false, oneTime: false },
+        { value: '\nworld' }
+    ]
   }
 ]
 

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ export function compileRegex () {`
`22`	`22`	`var unsafeOpen = escapeRegex(config.unsafeDelimiters[0])`
`23`	`23`	`var unsafeClose = escapeRegex(config.unsafeDelimiters[1])`
`24`	`24`	`tagRE = new RegExp(`
`25`		`- unsafeOpen + '(.+?)' + unsafeClose + '\|' +`
`26`		`- open + '(.+?)' + close,`
	`25`	`+ unsafeOpen + '([^]+?)' + unsafeClose + '\|' +`
	`26`	`+ open + '([^]+?)' + close,`
`27`	`27`	`'g'`
`28`	`28`	`)`
`29`	`29`	`htmlRE = new RegExp(`
`@@ -52,7 +52,6 @@ export function parseText (text) {`
`52`	`52`	`if (hit) {`
`53`	`53`	`return hit`
`54`	`54`	`}`
`55`		`- text = text.replace(/\n/g, '')`
`56`	`55`	`if (!tagRE.test(text)) {`
`57`	`56`	`return null`
`58`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,15 @@ var testCases = [`
`49`	`49`	`expected: [`
`50`	`50`	`{ tag: true, value: 'value', html: false, oneTime: false }`
`51`	`51`	`]`
	`52`	`+ },`
	`53`	`+ // new lines preserved outside of tags`
	`54`	`+ {`
	`55`	`+ text: 'hello\n{{value}}\nworld',`
	`56`	`+ expected: [`
	`57`	`+ { value: 'hello\n' },`
	`58`	`+ { tag: true, value: 'value', html: false, oneTime: false },`
	`59`	`+ { value: '\nworld' }`
	`60`	`+ ]`
`52`	`61`	`}`
`53`	`62`	`]`
`54`	`63`