Skip to content

Fix theme lookup when variable names contain escaped dots #1466

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 4 commits into from
Sep 23, 2025
Merged

Fix theme lookup when variable names contain escaped dots #1466

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
cf47476
Fix variable lookup when it contains escaped dots
thecrypticace Sep 23, 2025
26174a3
Update changelog
thecrypticace Sep 23, 2025
a161140
Simplify
thecrypticace Sep 23, 2025
1c5bb86
update
thecrypticace Sep 23, 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
6 changes: 6 additions & 0 deletions packages/tailwindcss-language-service/src/util/rewriting/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ test('Inlining calc expressions using the design system', () => {
let map = new Map<string, string>([
['--spacing', '0.25rem'],
['--color-red-500', 'oklch(0.637 0.237 25.331)'],
['--font-size.md', '1rem'],
])

let state: State = {
Expand Down Expand Up @@ -240,4 +241,9 @@ test('Inlining calc expressions using the design system', () => {
expect(addThemeValues('var(--color-red-500)', state, settings)).toBe(
'var(--color-red-500) /* oklch(0.637 0.237 25.331) = #fb2c36 */',
)

// Variables containing dots
expect(addThemeValues('var(--font-size\\.md)', state, settings)).toBe(
'var(--font-size\\.md) /* 1rem = 10px */',
)
})
4 changes: 4 additions & 0 deletions packages/tailwindcss-language-service/src/util/rewriting/lookup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,9 @@ export function resolveVariableValue(design: DesignSystem, name: string): string
name = `--${name.slice(prefix.length + 3)}`
}

// Variables have to escape the `.` but the theme system in v4 does not store
// the values with escapes so name lookups will fail.
name = name.replaceAll('\\.', '.')

return design.resolveThemeValue?.(name, true) ?? null
}
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 @@ -7,6 +7,7 @@
- Show color swatches for OKLCH colors with units in all positions ([#1442](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1442))
- Fix incorrect diagnostic for `--theme(--some-var inline)` ([#1443](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1443))
- Bump precision of evaluated calc expressions ([#1449](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1449))
- Fix theme lookup when variable names contain escaped dots ([#1466](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1466))

## 0.14.26

Expand Down