Skip to content

Don't show syntax error for *s inside --value and --modifier functions #1215

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
thecrypticace merged 4 commits into from
Feb 21, 2025
Merged

Don't show syntax error for *s inside --value and --modifier functions #1215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e0fdcd
Fix `—value([*])` syntax error
thecrypticace Feb 20, 2025
a5d01a6
Make sure theme namespaces don’t get flagged as syntax errors
thecrypticace Feb 20, 2025
27b6e65
Update changelog
thecrypticace Feb 20, 2025
d25dd24
Update packages/tailwindcss-language-server/src/language/rewriting.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 @@ -177,6 +177,30 @@ test('@import', () => {
expect(rewriteCss(input.join('\n'))).toBe(output.join('\n'))
})

test('--value(namespace) / --modifier(namespace)', () => {
let input = [
//
'.foo {',
' color: --value(--color-*)',
' background: --modifier(--color-*)',
' z-index: --value([*])',
' z-index: --modifier([*])',
'}',
]

let output = [
//
'.foo {',
' color: --value(--color-_)',
' background: --modifier(--color-_)',
' z-index: --value([_])',
' z-index: --modifier([_])',
'}',
]

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

describe('v3', () => {
test('@screen', () => {
let input = [
Expand Down
8 changes: 8 additions & 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 @@ -68,5 +68,13 @@ export function rewriteCss(css: string) {

css = css.replace(/(?<=\b(?:theme|config)\([^)]*)[.[\]]/g, '_')

// Ignore `*` in in --value and --modifier functions
css = css.replace(/--(value|modifier)\((.*?)\)/g, (match) => {
return match.replace(/[*]/g, '_')
})

// Replace `--some-var-*` with `--some-var-_`
css = css.replace(/--([a-zA-Z0-9]+)-[*]/g, '--$1_')

return css
}
28 changes: 27 additions & 1 deletion 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 @@ -218,6 +218,7 @@ defineTest({
@import 'tailwindcss';
@theme {
--color-primary: #333;
--leading-*: initial;
}
`,
})
Expand All @@ -234,7 +235,7 @@ defineTest({
uri: '{workspace:default}/file-1.css',
range: {
start: { line: 1, character: 0 },
end: { line: 3, character: 1 },
end: { line: 4, character: 1 },
},
},
},
Expand Down Expand Up @@ -351,6 +352,31 @@ defineTest({
},
})

defineTest({
name: '--value(namespace) + --modifier(namespace)',
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`
.foo {
width: --value(--spacing-*);
height: --modifier(--spacing-*);
height: --modifier([*]);
}
`,
})

expect(await doc.diagnostics()).toEqual([])
},
})

// Legacy
defineTest({
name: '@screen',
Expand Down
2 changes: 2 additions & 0 deletions packages/vscode-tailwindcss/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
- 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))
- Don't show syntax error when `*` appear inside `—value(…)` and `--modifier(…)` ([#1226](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1226))
- Don't show syntax error for theme namespaces inside `@theme` ([#1226](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1226))

## 0.14.6

Expand Down