tweak template compilation error output

yyx990803 · yyx990803 · commit 1f4cf63e8a7b · 2017-02-06T19:50:13.000-05:00
diff --git a/src/compiler/error-detector.js b/src/compiler/error-detector.js
@@ -55,7 +55,7 @@ function checkFor (node: ASTElement, text: string, errors: Array<string>) {
 
 function checkIdentifier (ident: ?string, type: string, text: string, errors: Array<string>) {
   if (typeof ident === 'string' && !identRE.test(ident)) {
-    errors.push(`- invalid ${type} "${ident}" in expression: ${text}`)
+    errors.push(`invalid ${type} "${ident}" in expression: ${text.trim()}`)
   }
 }
 
@@ -66,11 +66,11 @@ function checkExpression (exp: string, text: string, errors: Array<string>) {
     const keywordMatch = exp.replace(stripStringRE, '').match(prohibitedKeywordRE)
     if (keywordMatch) {
       errors.push(
-        `- avoid using JavaScript keyword as property name: ` +
-        `"${keywordMatch[0]}" in expression ${text}`
+        `avoid using JavaScript keyword as property name: ` +
+        `"${keywordMatch[0]}" in expression ${text.trim()}`
       )
     } else {
-      errors.push(`- invalid expression: ${text}`)
+      errors.push(`invalid expression: ${text.trim()}`)
     }
   }
 }
diff --git a/src/platforms/web/compiler/index.js b/src/platforms/web/compiler/index.js
@@ -111,11 +111,10 @@ export function compileToFunctions (
       res.render === noop ||
       res.staticRenderFns.some(fn => fn === noop)
     ) {
-      const expressionErrors = detectErrors(compiled.ast)
+      const allErrors = errors.concat(detectErrors(compiled.ast))
       _warn(
         `Error compiling template:\n\n${template}\n\n` +
-        (errors.length ? errors.map(e => `- ${e}`).join('\n') + '\n' : '') +
-        (expressionErrors.length ? expressionErrors.join('\n') + '\n' : ''),
+        (allErrors.length ? allErrors.map(e => `- ${e}`).join('\n') + '\n' : ''),
         vm
       )
     }

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ function checkFor (node: ASTElement, text: string, errors: Array<string>) {`
`55`	`55`
`56`	`56`	`function checkIdentifier (ident: ?string, type: string, text: string, errors: Array<string>) {`
`57`	`57`	`if (typeof ident === 'string' && !identRE.test(ident)) {`
`58`		- errors.push(`- invalid ${type} "${ident}" in expression: ${text}`)
	`58`	+ errors.push(`invalid ${type} "${ident}" in expression: ${text.trim()}`)
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`@@ -66,11 +66,11 @@ function checkExpression (exp: string, text: string, errors: Array<string>) {`
`66`	`66`	`const keywordMatch = exp.replace(stripStringRE, '').match(prohibitedKeywordRE)`
`67`	`67`	`if (keywordMatch) {`
`68`	`68`	`errors.push(`
`69`		- `- avoid using JavaScript keyword as property name: ` +
`70`		- `"${keywordMatch[0]}" in expression ${text}`
	`69`	+ `avoid using JavaScript keyword as property name: ` +
	`70`	+ `"${keywordMatch[0]}" in expression ${text.trim()}`
`71`	`71`	`)`
`72`	`72`	`} else {`
`73`		- errors.push(`- invalid expression: ${text}`)
	`73`	+ errors.push(`invalid expression: ${text.trim()}`)
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,11 +111,10 @@ export function compileToFunctions (`
`111`	`111`	`res.render === noop \|\|`
`112`	`112`	`res.staticRenderFns.some(fn => fn === noop)`
`113`	`113`	`) {`
`114`		`- const expressionErrors = detectErrors(compiled.ast)`
	`114`	`+ const allErrors = errors.concat(detectErrors(compiled.ast))`
`115`	`115`	`_warn(`
`116`	`116`	`Error compiling template:\n\n${template}\n\n` +
`117`		- (errors.length ? errors.map(e => `- ${e}`).join('\n') + '\n' : '') +
`118`		`- (expressionErrors.length ? expressionErrors.join('\n') + '\n' : ''),`
	`117`	+ (allErrors.length ? allErrors.map(e => `- ${e}`).join('\n') + '\n' : ''),
`119`	`118`	`vm`
`120`	`119`	`)`
`121`	`120`	`}`