Skip to content

Fix erroneous template string whitespace formatting in Svelte #332

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 5 commits into from
Jan 6, 2025
Merged

Fix erroneous template string whitespace formatting in Svelte #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fec0c5d
Fix erroneous template string whitespace formatting in Svelte
mcous Dec 1, 2024
e6d18ce
Update test
thecrypticace Jan 6, 2025
52145c2
Merge branch 'main' into fix/svelte-template-strings
thecrypticace Jan 6, 2025
44793df
Merge branch 'main' into fix/svelte-template-strings
thecrypticace Jan 6, 2025
bbeb196
Update changelog
thecrypticace Jan 6, 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
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 @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Add support for `@zackad/prettier-plugin-twig` ([#308](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/pull/308))
- Dropped support for `@zackad/prettier-plugin-twig-melody` ([#308](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/pull/308))
- Updated Prettier options types ([#325](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/pull/325))
- Don't remove whitespace inside template literals in Svelte ([#332](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/pull/332))

## [0.6.9] - 2024-11-19

Expand Down
4 changes: 2 additions & 2 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ function sortTemplateLiteral(
// And does not end with a space
ignoreLast: i < node.expressions.length && !/\s$/.test(quasi.value.raw),

collapseWhitespace: {
collapseWhitespace: collapseWhitespace && {
start: collapseWhitespace && collapseWhitespace.start && i === 0,
end:
collapseWhitespace &&
Expand All @@ -553,7 +553,7 @@ function sortTemplateLiteral(
ignoreFirst: i > 0 && !/^\s/.test(quasi.value.cooked),
ignoreLast:
i < node.expressions.length && !/\s$/.test(quasi.value.cooked),
collapseWhitespace: {
collapseWhitespace: collapseWhitespace && {
start: collapseWhitespace && collapseWhitespace.start && i === 0,
end:
collapseWhitespace &&
Expand Down
10 changes: 9 additions & 1 deletion tests/plugins.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,6 @@ import Custom from '../components/Custom.astro'
`<div class="sm:p-0 p-0 {someVar}sm:block md:inline flex" />`,
`<div class="p-0 sm:p-0 {someVar}sm:block flex md:inline" />`,
],
['<div class={`sm:p-0\np-0`} />', '<div class={`p-0 sm:p-0`} />'],
t`{#await promise()} <div class="${yes}" /> {:then} <div class="${yes}" /> {/await}`,
t`{#await promise() then} <div class="${yes}" /> {/await}`,

Expand All @@ -436,6 +435,15 @@ import Custom from '../components/Custom.astro'

// Escapes
t`<div class={"before:content-['\\\\2248']"}></div>`,

// Preserve whitespace in template strings
// This test has lots of whitespace to ensure that the Svelte
// parser doesn't produce invalid syntax as output since it breaks
// when changing the length of the text.
[
`<div\n class={\`underline \n flex\`}></div>`,
`<div\n class={\`flex \n underline\`}\n></div>`,
],
],
},
},
Expand Down