From 604823c499d0a5ab67c02f240b5a883eaca5c28f Mon Sep 17 00:00:00 2001
From: Brad Cornes <hello@bradley.dev>
Date: Tue, 19 Apr 2022 15:01:49 +0100
Subject: [PATCH] Fix language features when using nested Vue `<template>`

---
 .../src/util/getLanguageBoundaries.ts         | 35 +++++++++++++------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/packages/tailwindcss-language-service/src/util/getLanguageBoundaries.ts b/packages/tailwindcss-language-service/src/util/getLanguageBoundaries.ts
index bbe36ba6..a01a34ed 100644
--- a/packages/tailwindcss-language-service/src/util/getLanguageBoundaries.ts
+++ b/packages/tailwindcss-language-service/src/util/getLanguageBoundaries.ts
@@ -81,6 +81,17 @@ let vueStates = {
   },
   html: {
     htmlBlockEnd: { match: '</template>', pop: 1 },
+    nestedBlockStart: { match: '<template', push: 'nestedBlock' },
+    ...text,
+  },
+  nestedBlock: {
+    nestedStart: { match: '>', next: 'nested' },
+    nestedBlockEnd: { match: '/>', pop: 1 },
+    ...text,
+  },
+  nested: {
+    nestedBlockEnd: { match: '</template>', pop: 1 },
+    nestedBlockStart: { match: '<template', push: 'nestedBlock' },
     ...text,
   },
 }
@@ -124,19 +135,21 @@ export function getLanguageBoundaries(
 
   try {
     for (let token of lexer) {
-      if (token.type.endsWith('BlockStart')) {
-        let position = indexToPosition(text, offset)
-        if (!boundaries[boundaries.length - 1].range.end) {
+      if (!token.type.startsWith('nested')) {
+        if (token.type.endsWith('BlockStart')) {
+          let position = indexToPosition(text, offset)
+          if (!boundaries[boundaries.length - 1].range.end) {
+            boundaries[boundaries.length - 1].range.end = position
+          }
+          type = token.type.replace(/BlockStart$/, '')
+          boundaries.push({ type, range: { start: position, end: undefined } })
+        } else if (token.type.endsWith('BlockEnd')) {
+          let position = indexToPosition(text, offset)
           boundaries[boundaries.length - 1].range.end = position
+          boundaries.push({ type: defaultType, range: { start: position, end: undefined } })
+        } else if (token.type === 'lang') {
+          boundaries[boundaries.length - 1].type = token.text
         }
-        type = token.type.replace(/BlockStart$/, '')
-        boundaries.push({ type, range: { start: position, end: undefined } })
-      } else if (token.type.endsWith('BlockEnd')) {
-        let position = indexToPosition(text, offset)
-        boundaries[boundaries.length - 1].range.end = position
-        boundaries.push({ type: defaultType, range: { start: position, end: undefined } })
-      } else if (token.type === 'lang') {
-        boundaries[boundaries.length - 1].type = token.text
       }
       offset += token.text.length
     }