From a21ca3dccc6a0c3822d15b6b2b1d22a2d1a4dd67 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 19 Jul 2021 19:29:28 -0400
Subject: [PATCH] fix(compiler-core): fix self-closing tags with v-pre

---
 .../compiler-core/__tests__/parse.spec.ts     | 57 +++++++++++++++++++
 packages/compiler-core/src/parse.ts           |  3 +
 2 files changed, 60 insertions(+)

diff --git a/packages/compiler-core/__tests__/parse.spec.ts b/packages/compiler-core/__tests__/parse.spec.ts
index dbc982b9..0e839d26 100644
--- a/packages/compiler-core/__tests__/parse.spec.ts
+++ b/packages/compiler-core/__tests__/parse.spec.ts
@@ -1644,6 +1644,54 @@ describe('compiler: parse', () => {
       })
     })
 
+    test('self-closing v-pre', () => {
+      const ast = baseParse(
+        `<div v-pre/>\n<div :id="foo"><Comp/>{{ bar }}</div>`
+      )
+      // should not affect siblings after it
+      const divWithoutPre = ast.children[1] as ElementNode
+      expect(divWithoutPre.props).toMatchObject([
+        {
+          type: NodeTypes.DIRECTIVE,
+          name: `bind`,
+          arg: {
+            type: NodeTypes.SIMPLE_EXPRESSION,
+            isStatic: true,
+            content: `id`
+          },
+          exp: {
+            type: NodeTypes.SIMPLE_EXPRESSION,
+            isStatic: false,
+            content: `foo`
+          },
+          loc: {
+            source: `:id="foo"`,
+            start: {
+              line: 2,
+              column: 6
+            },
+            end: {
+              line: 2,
+              column: 15
+            }
+          }
+        }
+      ])
+      expect(divWithoutPre.children[0]).toMatchObject({
+        type: NodeTypes.ELEMENT,
+        tagType: ElementTypes.COMPONENT,
+        tag: `Comp`
+      })
+      expect(divWithoutPre.children[1]).toMatchObject({
+        type: NodeTypes.INTERPOLATION,
+        content: {
+          type: NodeTypes.SIMPLE_EXPRESSION,
+          content: `bar`,
+          isStatic: false
+        }
+      })
+    })
+
     test('end tags are case-insensitive.', () => {
       const ast = baseParse('<div>hello</DIV>after')
       const element = ast.children[0] as ElementNode
@@ -1884,6 +1932,15 @@ foo
       )
     })
 
+    it('self-closing pre tag', () => {
+      const ast = baseParse(`<pre/><span>\n  foo   bar</span>`, {
+        isPreTag: tag => tag === 'pre'
+      })
+      const elementAfterPre = ast.children[1] as ElementNode
+      // should not affect the <span> and condense its whitepsace inside
+      expect((elementAfterPre.children[0] as TextNode).content).toBe(` foo bar`)
+    })
+
     it('should NOT condense whitespaces in RCDATA text mode', () => {
       const ast = baseParse(`<textarea>Text:\n   foo</textarea>`, {
         getTextMode: ({ tag }) =>
diff --git a/packages/compiler-core/src/parse.ts b/packages/compiler-core/src/parse.ts
index 47c6b4f7..31076634 100644
--- a/packages/compiler-core/src/parse.ts
+++ b/packages/compiler-core/src/parse.ts
@@ -430,6 +430,9 @@ function parseElement(
     if (isPreBoundary) {
       context.inPre = false
     }
+    if (isVPreBoundary) {
+      context.inVPre = false
+    }
     return element
   }