Skip to content

Passthrough the rootFontSize to the canonicalizeCandidates #1476

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
Oct 10, 2025
Merged

Passthrough the rootFontSize to the canonicalizeCandidates #1476

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
78c186d
passthrough the `rootFontSize` to the `canonicalizeCandidates`
RobinMalfait Oct 10, 2025
23ac205
bump insiders
RobinMalfait Oct 10, 2025
9cdb021
Put options behind an interface
thecrypticace Oct 10, 2025
dcf1c73
Add test validating the `rem` option is passed
thecrypticace Oct 10, 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
15 changes: 13 additions & 2 deletions packages/tailwindcss-language-server/tests/diagnostics/diagnostics.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ defineTest({
'package.json': json`
{
"dependencies": {
"tailwindcss": "0.0.0-insiders.efe084b"
"tailwindcss": "0.0.0-insiders.249bed0"
}
}
`,
Expand All @@ -447,14 +447,15 @@ defineTest({
settings: {
tailwindCSS: {
lint: { suggestCanonicalClasses: 'warning' },
rootFontSize: 16,
},
},
}),
}),
handle: async ({ client }) => {
let doc = await client.open({
lang: 'html',
text: '<div class="[@media_print]:flex [color:red]/50">',
text: '<div class="[@media_print]:flex [color:red]/50 mt-[16px]">',
})

let diagnostics = await doc.diagnostics()
Expand All @@ -480,6 +481,16 @@ defineTest({
severity: 2,
suggestions: ['text-[red]/50'],
},
{
code: 'suggestCanonicalClasses',
message: 'The class `mt-[16px]` can be written as `mt-4`',
range: {
start: { line: 0, character: 47 },
end: { line: 0, character: 56 },
},
severity: 2,
suggestions: ['mt-4'],
},
])
},
})
4 changes: 3 additions & 1 deletion packages/tailwindcss-language-service/src/diagnostics/canonical-classes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ export async function getSuggestCanonicalClassesDiagnostics(
// diagnostics in a given class list.

for (let className of classNames) {
let canonicalized = state.designSystem.canonicalizeCandidates([className.className])[0]
let canonicalized = state.designSystem.canonicalizeCandidates([className.className], {
rem: settings.tailwindCSS.rootFontSize,
})[0]
let isCanonical = canonicalized === className.className

if (isCanonical) continue
Expand Down
6 changes: 5 additions & 1 deletion packages/tailwindcss-language-service/src/util/v4/design-system.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ export interface ThemeEntry {
name: string
}

export interface CanonicalizeOptions {
rem?: number
}

export interface DesignSystem {
theme: Theme
variants: Map<string, VariantFn>
Expand All @@ -45,7 +49,7 @@ export interface DesignSystem {
invalidCandidates?: Set<string>

// Added in v4.1.15
canonicalizeCandidates?(classes: string[]): string[]
canonicalizeCandidates?(classes: string[], options?: CanonicalizeOptions): string[]
}

export interface DesignSystem {
Expand Down