Skip to content

Make sure completions work when using prefixes in v4 #1129

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.

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 2 commits into from
Jan 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 14 additions & 1 deletion packages/tailwindcss-language-server/src/projects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1365,7 +1365,20 @@ function isAtRule(node: Node): node is AtRule {

function getVariants(state: State): Array<Variant> {
if (state.v4) {
return state.designSystem.getVariants()
let variants = Array.from(state.designSystem.getVariants())

let prefix = state.designSystem.theme.prefix ?? ''
if (prefix.length > 0) {
variants.unshift({
name: prefix,
values: [],
isArbitrary: false,
hasDash: true,
selectors: () => ['&'],
})
}

return variants
}

if (state.jitContext?.getVariants) {
Expand Down
31 changes: 31 additions & 0 deletions packages/tailwindcss-language-service/src/completionProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ export function completionsFromClassList(
}

if (state.v4) {
let prefix = state.designSystem.theme.prefix ?? ''

let { variants: existingVariants, offset } = getVariantsFromClassName(state, partialClassName)

if (
Expand Down Expand Up @@ -277,6 +279,35 @@ export function completionsFromClassList(
}
}

// TODO: This is a bit of a hack
if (prefix.length > 0) {
// No variants seen: suggest the prefix only
if (existingVariants.length === 0) {
items = items.slice(0, 1)

return withDefaults(
{
isIncomplete: false,
items,
},
{
data: {
...(state.completionItemData ?? {}),
...(important ? { important } : {}),
variants: existingVariants,
},
range: replacementRange,
},
state.editor.capabilities.itemDefaults,
)
}

// The first variant is not the prefix: don't suggest anything
if (existingVariants[0] !== prefix) {
return null
}
}

return withDefaults(
{
isIncomplete: false,
Expand Down
1 change: 1 addition & 0 deletions packages/vscode-tailwindcss/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- Add support for `@custom-variant` ([#1127](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1127))
- Add variant suggestions to `@variant` ([#1127](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1127))
- Don't suggest at-rules when nested that cannot be used in a nested context ([#1127](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1127))
- Make sure completions work when using prefixes in v4 ([#1129](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1129))

## 0.12.18

Expand Down