Small refactor for template parser (#4613)

* refactor isSpecialTag and remove useless argument of parseEndTag

* remove const

* remove useless isSpecialTag because template node is guarded by sfc parser.

Author: defcc

src/compiler/parser/html-parser.js

@@ -47,22 +47,6 @@ let IS_REGEX_CAPTURING_BROKEN = false
 
 // Special Elements (can contain anything)
 const isScriptOrStyle = makeMap('script,style', true)
-const hasLang = attr => attr.name === 'lang' && attr.value !== 'html'
-const isSpecialTag = (tag, isSFC, stack) => {
-  if (isScriptOrStyle(tag)) {
-    return true
-  }
-  if (isSFC && stack.length === 1) {
-    // top-level template that has no pre-processor
-    if (tag === 'template' && !stack[0].attrs.some(hasLang)) {
-      return false
-    } else {
-      return true
-    }
-  }
-  return false
-}
-
 const reCache = {}
 
 const ltRE = /</g
@@ -91,7 +75,7 @@ export function parseHTML (html, options) {
   while (html) {
     last = html
     // Make sure we're not in a script or style element
-    if (!lastTag || !isSpecialTag(lastTag, options.sfc, stack)) {
+    if (!lastTag || !isScriptOrStyle(lastTag)) {
       let textEnd = html.indexOf('<')
       if (textEnd === 0) {
         // Comment:
@@ -126,7 +110,7 @@ export function parseHTML (html, options) {
         if (endTagMatch) {
           const curIndex = index
           advance(endTagMatch[0].length)
-          parseEndTag(endTagMatch[0], endTagMatch[1], curIndex, index)
+          parseEndTag(endTagMatch[1], curIndex, index)
           continue
         }
 
@@ -183,7 +167,7 @@ export function parseHTML (html, options) {
       })
       index += html.length - rest.length
       html = rest
-      parseEndTag('</' + stackedTag + '>', stackedTag, index - endTagLength, index)
+      parseEndTag(stackedTag, index - endTagLength, index)
     }
 
     if (html === last && options.chars) {
@@ -229,10 +213,10 @@ export function parseHTML (html, options) {
 
     if (expectHTML) {
       if (lastTag === 'p' && isNonPhrasingTag(tagName)) {
-        parseEndTag('', lastTag)
+        parseEndTag(lastTag)
       }
       if (canBeLeftOpenTag(tagName) && lastTag === tagName) {
-        parseEndTag('', tagName)
+        parseEndTag(tagName)
       }
     }
 
@@ -259,7 +243,7 @@ export function parseHTML (html, options) {
     }
 
     if (!unary) {
-      stack.push({ tag: tagName, attrs: attrs })
+      stack.push({ tag: tagName, lowerCasedTag: tagName.toLowerCase(), attrs: attrs })
       lastTag = tagName
       unarySlash = ''
     }
@@ -269,16 +253,19 @@ export function parseHTML (html, options) {
     }
   }
 
-  function parseEndTag (tag, tagName, start, end) {
-    let pos
+  function parseEndTag (tagName, start, end) {
+    let pos, lowerCasedTagName
     if (start == null) start = index
     if (end == null) end = index
 
+    if (tagName) {
+      lowerCasedTagName = tagName.toLowerCase()
+    }
+
     // Find the closest opened tag of the same type
     if (tagName) {
-      const needle = tagName.toLowerCase()
       for (pos = stack.length - 1; pos >= 0; pos--) {
-        if (stack[pos].tag.toLowerCase() === needle) {
+        if (stack[pos].lowerCasedTag === lowerCasedTagName) {
           break
         }
       }
@@ -298,11 +285,11 @@ export function parseHTML (html, options) {
       // Remove the open elements from the stack
       stack.length = pos
       lastTag = pos && stack[pos - 1].tag
-    } else if (tagName.toLowerCase() === 'br') {
+    } else if (lowerCasedTagName === 'br') {
       if (options.start) {
         options.start(tagName, [], true, start, end)
       }
-    } else if (tagName.toLowerCase() === 'p') {
+    } else if (lowerCasedTagName === 'p') {
       if (options.start) {
         options.start(tagName, [], false, start, end)
       }

src/sfc/parser.js

@@ -109,8 +109,7 @@ export function parseComponent (
 
   parseHTML(content, {
     start,
-    end,
-    sfc: true
+    end
   })
 
   return sfc