Skip to content

Fix: JSXText node trims whitespace too often #328

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 5 commits into from
Jul 6, 2024
Merged

Fix: JSXText node trims whitespace too often #328

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
36c8421
cause jsx_text to include whitespace, update tests, regenerate
jackschu Jul 2, 2024
43cd020
uphold the no-empty node work in the newline case
jackschu Jul 2, 2024
a58fe38
take ws suggestion
jackschu Jul 5, 2024
67ec600
negate all whitespace in non-whitespace part of regex
amaanq Jul 6, 2024
fbe1c47
regenerate
amaanq Jul 6, 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
7 changes: 4 additions & 3 deletions grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,10 +608,11 @@ module.exports = grammar({
field('close_tag', $.jsx_closing_element),
),

// Should not contain new lines and should not start or end with a space
jsx_text: _ => choice(
/[^{}<>\n& ]([^{}<>\n&]*[^{}<>\n& ])?/,
/\/\/[^\n]*/,
// if there is a newline, only capture if there's non-whitespace-text
token.immediate(/[^{}<>&]*[^{}<>\s\p{Zs}\uFEFF\u2028\u2029\u2060\u200B&][^{}<>&]*/),
// whitespace between jsx_tags should be captured if there's no newline
token.immediate(/[^{}<>\n&]+/),
),

// An entity can be named, numeric (decimal), or numeric (hexadecimal). The
Expand Down
14 changes: 10 additions & 4 deletions src/grammar.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading