Skip to content

Commit adc3769

Browse files
Improve CSS completions (#1165)
- [x] Support property and variable completions inside `@utility` (behave like a style rule) - [x] Support style-rule like completions inside `@custom-variant` - [x] Support style-rule like completions inside `@variant` - [x] Make sure `@slot` isn't considered an unknown at-rule Fixes #1146
1 parent b9b40d5 commit adc3769

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

packages/tailwindcss-language-server/src/language/cssServer.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,12 @@ function replace(delta = 0) {
334334
return `@media(${MEDIA_MARKER})${' '.repeat(p1.length + delta)}{`
335335
}
336336
}
337+
function replaceWithStyleRule(delta = 0) {
338+
return (_match: string, p1: string) => {
339+
let spaces = ' '.repeat(p1.length + delta)
340+
return `.foo${spaces}{`
341+
}
342+
}
337343

338344
function createVirtualCssDocument(textDocument: TextDocument): TextDocument {
339345
let content = textDocument
@@ -347,6 +353,9 @@ function createVirtualCssDocument(textDocument: TextDocument): TextDocument {
347353
.replace(/@screen(\s+[^{]+){/g, replace(-2))
348354
.replace(/@variants(\s+[^{]+){/g, replace())
349355
.replace(/@responsive(\s*){/g, replace())
356+
.replace(/@utility(\s+[^{]+){/g, replaceWithStyleRule())
357+
.replace(/@custom-variant(\s+[^{]+){/g, replaceWithStyleRule())
358+
.replace(/@variant(\s+[^{]+){/g, replaceWithStyleRule())
350359
.replace(/@layer(\s+[^{]{2,}){/g, replace(-3))
351360
.replace(/@reference\s*([^;]{2,})/g, '@import $1')
352361
.replace(
@@ -401,7 +410,7 @@ async function validateTextDocument(textDocument: TextDocument): Promise<void> {
401410
.filter((diagnostic) => {
402411
if (
403412
diagnostic.code === 'unknownAtRules' &&
404-
/Unknown at rule @(tailwind|apply|config|theme|plugin|source|utility|variant|custom-variant)/.test(
413+
/Unknown at rule @(tailwind|apply|config|theme|plugin|source|utility|variant|custom-variant|slot)/.test(
405414
diagnostic.message,
406415
)
407416
) {

packages/vscode-tailwindcss/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
- Ignore preprocessor files when looking for v4 configs ([#1159](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1159))
77
- Allow language service to be used in native ESM environments ([#1122](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1122))
88
- Don't create v4 projects for CSS files that don't look like v4 configs [#1164](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1164)
9+
- Support property and variable completions inside `@utility` ([#1165](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1165))
10+
- Support style-rule like completions inside `@custom-variant` ([#1165](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1165))
11+
- Support style-rule like completions inside `@variant` ([#1165](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1165))
12+
- Make sure `@slot` isn't considered an unknown at-rule ([#1165](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1165))
913

1014
## 0.14.2
1115

0 commit comments

Comments
 (0)