refactor comments options with ASTText type

Author: kingwl

flow/compiler.js

@@ -64,7 +64,7 @@ declare type ASTDirective = {
   modifiers: ?ASTModifiers;
 };
 
-declare type ASTNode = ASTElement | ASTText | ASTExpression | ASTComment;
+declare type ASTNode = ASTElement | ASTText | ASTExpression;
 
 declare type ASTElement = {
   type: 1;
@@ -154,15 +154,7 @@ declare type ASTText = {
   type: 3;
   text: string;
   static?: boolean;
-  // 2.4 ssr optimization
-  ssrOptimizability?: number;
-};
-
-declare type ASTComment = {
-  type: 4;
-  text: string;
-  static?: boolean;
-
+  isComment?: boolean;
   // 2.4 ssr optimization
   ssrOptimizability?: number;
 };

src/compiler/codegen/index.js

@@ -423,7 +423,7 @@ function needsNormalization (el: ASTElement): boolean {
 function genNode (node: ASTNode, state: CodegenState): string {
   if (node.type === 1) {
     return genElement(node, state)
-  } if (node.type === 4) {
+  } if (node.type === 3 && node.isComment) {
     return genComment(node)
   } else {
     return genText(node)
@@ -437,7 +437,7 @@ export function genText (text: ASTText | ASTExpression): string {
   })`
 }
 
-export function genComment (comment: ASTComment): string {
+export function genComment (comment: ASTText): string {
   return `_e('${comment.text}')`
 }
 

src/compiler/optimizer.js

@@ -77,7 +77,7 @@ function markStaticRoots (node: ASTNode, isInFor: boolean) {
     // outweigh the benefits and it's better off to just always render it fresh.
     if (node.static && node.children.length && !(
       node.children.length === 1 &&
-      (node.children[0].type === 3 || node.children[0].type === 4)
+      node.children[0].type === 3
     )) {
       node.staticRoot = true
       return
@@ -104,9 +104,6 @@ function isStatic (node: ASTNode): boolean {
   if (node.type === 3) { // text
     return true
   }
-  if (node.type === 4) { // comment
-    return true
-  }
   return !!(node.pre || (
     !node.hasBindings && // no dynamic bindings
     !node.if && !node.for && // not v-if or v-for or v-else

src/compiler/parser/index.js

@@ -278,8 +278,9 @@ export function parse (
     },
     comment (text: string) {
       currentParent.children.push({
-        type: 4,
-        text
+        type: 3,
+        text,
+        isComment: true
       })
     }
   })

src/server/optimizing-compiler/optimizer.js

@@ -107,8 +107,7 @@ function optimizeSiblings (el) {
 }
 
 function isUnOptimizableTree (node: ASTNode): boolean {
-  // text or expression or comment
-  if (node.type === 2 || node.type === 3 || node.type === 4) {
+  if (node.type === 2 || node.type === 3) { // text or expression
     return false
   }
   return (

test/unit/modules/compiler/parser.spec.js

@@ -567,7 +567,8 @@ describe('parser', () => {
     expect(ast.children.length).toBe(2)
     expect(ast.children[0].type).toBe(3)
     expect(ast.children[0].text).toBe('123')
-    expect(ast.children[1].type).toBe(4)
+    expect(ast.children[1].type).toBe(3) // parse comment with ASTText
+    expect(ast.children[1].isComment).toBe(true) // parse comment with ASTText
     expect(ast.children[1].text).toBe('comment here')
   })
 })