From 2d473e0f2ac0fa375a986bf3352f03c383f67d86 Mon Sep 17 00:00:00 2001
From: tizu <60812901+tizu69@users.noreply.github.com>
Date: Mon, 17 Feb 2025 17:25:01 +0100
Subject: [PATCH] Fix odd v4 behavior with custom @-rules (#1212)

Fixes #1211

---------

Co-authored-by: Jordan Pittman <jordan@cryptica.me>
---
 .../src/language/cssServer.ts                   | 17 ++++++++++++-----
 packages/vscode-tailwindcss/CHANGELOG.md        |  2 ++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/packages/tailwindcss-language-server/src/language/cssServer.ts b/packages/tailwindcss-language-server/src/language/cssServer.ts
index d46eeda5..ecf3e318 100644
--- a/packages/tailwindcss-language-server/src/language/cssServer.ts
+++ b/packages/tailwindcss-language-server/src/language/cssServer.ts
@@ -215,9 +215,16 @@ connection.onDocumentSymbol(({ textDocument }) =>
       if (symbol.name === `@media (${MEDIA_MARKER})`) {
         let doc = documents.get(symbol.location.uri)
         let text = doc.getText(symbol.location.range)
-        let match = text.trim().match(/^(@[^\s]+)([^{]+){/)
+        let match = text.trim().match(/^(@[^\s]+)(?:([^{]+)[{]|([^;{]+);)/)
         if (match) {
-          symbol.name = `${match[1]} ${match[2].trim()}`
+          symbol.name = `${match[1]} ${match[2]?.trim() ?? match[3]?.trim()}`
+        }
+      } else if (symbol.name === `.placeholder`) {
+        let doc = documents.get(symbol.location.uri)
+        let text = doc.getText(symbol.location.range)
+        let match = text.trim().match(/^(@[^\s]+)(?:([^{]+)[{]|([^;{]+);)/)
+        if (match) {
+          symbol.name = `${match[1]} ${match[2]?.trim() ?? match[3]?.trim()}`
         }
       }
       return symbol
@@ -337,7 +344,7 @@ function replace(delta = 0) {
 function replaceWithStyleRule(delta = 0) {
   return (_match: string, p1: string) => {
     let spaces = ' '.repeat(p1.length + delta)
-    return `.foo${spaces}{`
+    return `.placeholder${spaces}{`
   }
 }
 
@@ -354,9 +361,9 @@ function createVirtualCssDocument(textDocument: TextDocument): TextDocument {
     .replace(/@variants(\s+[^{]+){/g, replace())
     .replace(/@responsive(\s*){/g, replace())
     .replace(/@utility(\s+[^{]+){/g, replaceWithStyleRule())
-    .replace(/@custom-variant(\s+[^;]+);/g, (match: string) => {
+    .replace(/@custom-variant(\s+[^;{]+);/g, (match: string) => {
       let spaces = ' '.repeat(match.length - 11)
-      return `@media(p)${spaces}{}`
+      return `@media (${MEDIA_MARKER})${spaces}{}`
     })
     .replace(/@custom-variant(\s+[^{]+){/g, replaceWithStyleRule())
     .replace(/@variant(\s+[^{]+){/g, replaceWithStyleRule())
diff --git a/packages/vscode-tailwindcss/CHANGELOG.md b/packages/vscode-tailwindcss/CHANGELOG.md
index 8896fc88..718b33c4 100644
--- a/packages/vscode-tailwindcss/CHANGELOG.md
+++ b/packages/vscode-tailwindcss/CHANGELOG.md
@@ -7,6 +7,8 @@
 - Show source diagnostics when imports contain a layer ([#1204](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1204))
 - Only detect project roots in v4 when using certain CSS features ([#1205](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1205))
 - Update Tailwind CSS v4 version to v4.0.6 ([#1207](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1207))
+- Fix parsing of `@custom-variant` block syntax containg declarations and/or `@slot` ([#1212](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1212))
+- Fix display of custom at-rules in symbol listing ([#1212](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1212))
 
 ## 0.14.4