Skip to content
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

Optimize AST before printing for IntelliSense #15347

Merged
merged 3 commits into from
Dec 9, 2024
+24 −16
Merged

Optimize AST before printing for IntelliSense #15347

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
79f65f4
Optimize AST before printing for IntelliSense
thecrypticace Dec 9, 2024
a348490
Update test
thecrypticace Dec 9, 2024
e60cbd4
Update changelog
thecrypticace Dec 9, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fix dependency related warnings when using `@tailwindcss/postcss` on Windows ([#15321](https://github.com/tailwindlabs/tailwindcss/pull/15321))
- Skip creating a compiler for CSS files that should not be processed ([#15340](https://github.com/tailwindlabs/tailwindcss/pull/15340))
- Fix missing `shadow-none` suggestion in IntelliSense ([#15342](https://github.com/tailwindlabs/tailwindcss/pull/15342))
- Optimize AST before printing for IntelliSense ([#15347](https://github.com/tailwindlabs/tailwindcss/pull/15347))

## [4.0.0-beta.6] - 2024-12-06

Expand Down
6 changes: 4 additions & 2 deletions packages/tailwindcss/src/design-system.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { toCss } from './ast'
import { optimizeAst, toCss } from './ast'
import { parseCandidate, parseVariant, type Candidate, type Variant } from './candidate'
import { compileAstNodes, compileCandidates } from './compile'
import { getClassList, getVariants, type ClassEntry, type VariantEntry } from './intellisense'
Expand Down Expand Up @@ -60,11 +60,13 @@ export function buildDesignSystem(theme: Theme): DesignSystem {
let wasInvalid = false

let { astNodes } = compileCandidates([className], this, {
onInvalidCandidate(candidate) {
onInvalidCandidate() {
wasInvalid = true
},
})

astNodes = optimizeAst(astNodes)

if (astNodes.length === 0 || wasInvalid) {
result.push(null)
} else {
Expand Down
33 changes: 19 additions & 14 deletions packages/tailwindcss/src/intellisense.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,21 +118,26 @@ test('Can produce CSS per candidate using `candidatesToCss`', () => {
let design = loadDesignSystem()
design.invalidCandidates = new Set(['bg-[#fff]'])

expect(design.candidatesToCss(['underline', 'i-dont-exist', 'bg-[#fff]', 'bg-[#000]']))
expect(design.candidatesToCss(['underline', 'i-dont-exist', 'bg-[#fff]', 'bg-[#000]', 'text-xs']))
.toMatchInlineSnapshot(`
[
".underline {
text-decoration-line: underline;
}
",
null,
null,
".bg-\\[\\#000\\] {
background-color: #000;
}
",
]
`)
[
".underline {
text-decoration-line: underline;
}
",
null,
null,
".bg-\\[\\#000\\] {
background-color: #000;
}
",
".text-xs {
font-size: var(--text-xs);
line-height: var(--tw-leading, var(--text-xs--line-height));
}
",
]
`)
})

test('Utilities do not show wrapping selector in intellisense', async () => {
Expand Down