Merge branch 'fix-1336'

vuejs · Nov 26, 2020 · b0c57a2 · b0c57a2
2 parents 980a4a7 + 87244e1
commit b0c57a2
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/server/src/embeddedSupport/vueDocumentRegionParser.ts b/server/src/embeddedSupport/vueDocumentRegionParser.ts
@@ -23,6 +23,7 @@ export function parseVueDocumentRegions(document: TextDocument) {
   let lastAttributeName = '';
   let languageIdFromType: LanguageId | '' = '';
   const importedScripts: string[] = [];
+  let stakes = 0;
 
   let token = scanner.scan();
   while (token !== TokenType.EOS) {
@@ -48,8 +49,9 @@ export function parseVueDocumentRegions(document: TextDocument) {
         languageIdFromType = '';
         break;
       case TokenType.StartTag:
+        stakes++;
         const tagName = scanner.getTokenText();
-        if (tagName === 'template') {
+        if (tagName === 'template' && stakes === 1) {
           const templateRegion = scanTemplateRegion(scanner, text);
           if (templateRegion) {
             regions.push(templateRegion);
@@ -75,7 +77,9 @@ export function parseVueDocumentRegions(document: TextDocument) {
         }
         lastAttributeName = '';
         break;
+      case TokenType.StartTagSelfClose:
       case TokenType.EndTagClose:
+        stakes--;
         lastAttributeName = '';
         languageIdFromType = '';
         break;

diff --git a/test/lsp/features/diagnostics/issue-1336.test.ts b/test/lsp/features/diagnostics/issue-1336.test.ts
@@ -0,0 +1,10 @@
+import { testNoDiagnostics } from '../../../diagnosticHelper';
+import { getDocUri } from '../../path';
+
+describe('Should find no error when no root template element', () => {
+  const docUri = getDocUri('diagnostics/issue-1336.vue');
+
+  it('shows no diagnostics error without root template element area', async () => {
+    await testNoDiagnostics(docUri);
+  });
+});
diff --git a/test/lsp/fixture/diagnostics/issue-1336.vue b/test/lsp/fixture/diagnostics/issue-1336.vue
@@ -0,0 +1,14 @@
+<template>
+  <div>hello world</div>
+</template>
+
+<docs>
+` ``vue
+<foo>
+  <template>
+    <div>1</div>
+    <div>2</div>
+  </template>
+</foo>
+` ``
+</docs>