Skip to content

Show @theme in symbol list #1227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 21, 2025
Merged

Show @theme in symbol list #1227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fee8bde
Show `@theme` in symbol list
thecrypticace Feb 19, 2025
f2fb5f3
Update changelog
thecrypticace Feb 20, 2025
f96c8a6
Update packages/tailwindcss-language-server/tests/css/css-server.test.ts
thecrypticace Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions packages/tailwindcss-language-server/src/language/rewriting.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,30 @@ test('@utility', () => {
expect(rewriteCss(input.join('\n'))).toBe(output.join('\n'))
})

test('@theme', () => {
let input = [
//
'@theme {',
' color: red;',
'}',
'@theme inline reference static default {',
' color: red;',
'}',
]

let output = [
//
'.placeholder {', // wrong
' color: red;',
'}',
'.placeholder {', // wrong
' color: red;',
'}',
]

expect(rewriteCss(input.join('\n'))).toBe(output.join('\n'))
})

test('@custom-variant', () => {
let input = [
//
Expand Down
1 change: 1 addition & 0 deletions packages/tailwindcss-language-server/src/language/rewriting.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export function rewriteCss(css: string) {
css = css.replace(/@variants(\s+[^{]+){/g, replaceWithAtRule())
css = css.replace(/@responsive(\s*){/g, replaceWithAtRule())
css = css.replace(/@utility(\s+[^{]+){/g, replaceWithStyleRule())
css = css.replace(/@theme(\s+[^{]*){/g, replaceWithStyleRule())

css = css.replace(/@custom-variant(\s+[^;{]+);/g, (match: string) => {
let spaces = ' '.repeat(match.length - 11)
Expand Down
40 changes: 40 additions & 0 deletions packages/tailwindcss-language-server/tests/css/css-server.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,46 @@ defineTest({
},
})

defineTest({
name: '@theme',
prepare: async ({ root }) => ({
client: await createClient({
server: 'css',
root,
}),
}),
handle: async ({ client }) => {
let doc = await client.open({
lang: 'tailwindcss',
name: 'file-1.css',
text: css`
@import 'tailwindcss';
@theme {
--color-primary: #333;
}
`,
})

// No errors
expect(await doc.diagnostics()).toEqual([])

// Symbols show up for @theme
expect(await doc.symbols()).toMatchObject([
{
kind: SymbolKind.Class,
name: '@theme ',
location: {
uri: '{workspace:default}/file-1.css',
range: {
start: { line: 1, character: 0 },
end: { line: 3, character: 1 },
},
},
},
])
},
})

defineTest({
name: '@layer statement',
prepare: async ({ root }) => ({
Expand Down
1 change: 1 addition & 0 deletions packages/vscode-tailwindcss/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

- LSP: Declare capability for handling workspace folder change notifications ([#1223](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1223))
- Don't throw when resolving paths containing a `#` character ([#1225](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1225))
- Show `@theme` in symbol list in CSS language mode ([#1227](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1227))

## 0.14.6

Expand Down