From a4f5a5f287303631717b3b1ecb6aba0ab8fb4da6 Mon Sep 17 00:00:00 2001
From: Brad Cornes <bradlc41@gmail.com>
Date: Wed, 29 Sep 2021 16:38:23 +0100
Subject: [PATCH] tweak style block regexes

---
 .../src/util/getLanguageBoundaries.ts                           | 2 +-
 packages/tailwindcss-language-service/src/util/html.ts          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/tailwindcss-language-service/src/util/getLanguageBoundaries.ts b/packages/tailwindcss-language-service/src/util/getLanguageBoundaries.ts
index 8977311..aa33dce 100644
--- a/packages/tailwindcss-language-service/src/util/getLanguageBoundaries.ts
+++ b/packages/tailwindcss-language-service/src/util/getLanguageBoundaries.ts
@@ -42,7 +42,7 @@ export function getLanguageBoundaries(state: State, doc: TextDocument): Language
   if (isHtmlDoc(state, doc) || isJsDoc(state, doc) || isSvelteDoc(doc)) {
     let text = doc.getText()
     let styleBlocks = findAll(
-      /(?<open><style(?:\s[^>]*[^\/]>|>|[^\/]>)).*?(?<close><\/style>|$)/gis,
+      /(?<open><style(?:\s[^>]*[^\/]>|\s*>)).*?(?<close><\/style>|$)/gis,
       text
     )
     let htmlRanges: Range[] = []
diff --git a/packages/tailwindcss-language-service/src/util/html.ts b/packages/tailwindcss-language-service/src/util/html.ts
index af0ab80..a74a537 100644
--- a/packages/tailwindcss-language-service/src/util/html.ts
+++ b/packages/tailwindcss-language-service/src/util/html.ts
@@ -44,7 +44,7 @@ export function isInsideTag(str: string, tag: string | string[]): boolean {
   let close = 0
   let match: RegExpExecArray
   let tags = Array.isArray(tag) ? tag : [tag]
-  let regex = new RegExp(`<(?<slash>/?)(?:${tags.join('|')})(?:\\s[^>]*[^\/]>|>|[^\/]>)`, 'ig')
+  let regex = new RegExp(`<(?<slash>/?)(?:${tags.join('|')})(?:\\s[^>]*[^\/]>|\\s*>)`, 'ig')
   while ((match = regex.exec(str)) !== null) {
     if (match.groups.slash) {
       close += 1