fix sfc parser hanging on trailing ill-formatted brackets (fix vue-lo…

…ader/#628)
vuejs · Feb 6, 2017 · a0a619f · defcc · Feb 7, 2017 · yyx990803
1 parent bf1f5f1
commit a0a619f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/compiler/parser/html-parser.js b/src/compiler/parser/html-parser.js
@@ -168,8 +168,8 @@ export function parseHTML (html, options) {
       parseEndTag(stackedTag, index - endTagLength, index)
     }
 
-    if (html === last && options.chars) {
-      options.chars(html)
+    if (html === last) {
+      options.chars && options.chars(html)
       break
     }
   }

diff --git a/test/unit/modules/sfc/sfc-parser.spec.js b/test/unit/modules/sfc/sfc-parser.spec.js
@@ -150,4 +150,9 @@ describe('Single File Component parser', () => {
     const res = parseComponent(`<template>${raw}</template>`)
     expect(res.template.content.trim()).toBe(raw)
   })
+
+  it('should not hang on trailing text', () => {
+    const res = parseComponent(`<template>hi</`)
+    expect(res.template.content).toBe('hi')
+  })
 })