Skip to content

fix: parser error when using semicolon inside quotes in style #10221

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 14 commits into from
Jan 26, 2024
Merged

fix: parser error when using semicolon inside quotes in style #10221

Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
209f022
fix error when using semicolon inside quotes in style
rogeriolaa Jan 18, 2024
2be35cd
refactor to include { like in the original code
rogeriolaa Jan 18, 2024
6fc7fe6
simplified version of regex
rogeriolaa Jan 18, 2024
ab8c66d
add changeset
rogeriolaa Jan 18, 2024
db95220
add changeset
rogeriolaa Jan 18, 2024
1726a1c
add test
rogeriolaa Jan 18, 2024
6faac2f
Update .changeset/seven-hornets-smile.md
rogeriolaa Jan 18, 2024
0535043
undo demo.css change
rogeriolaa Jan 18, 2024
dbf8078
fix support-font-face test not passing
Jan 19, 2024
b845535
add double quotes
rogeriolaa Jan 19, 2024
ff80c53
Merge branch 'main' into pr/10221
Rich-Harris Jan 26, 2024
62ea94f
beef up test
Rich-Harris Jan 26, 2024
fddaad3
robustify parsing
Rich-Harris Jan 26, 2024
a7226db
Update .changeset/seven-hornets-smile.md
Rich-Harris Jan 26, 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
2 changes: 1 addition & 1 deletion packages/svelte/src/compiler/phases/1-parse/read/style.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const REGEX_PERCENTAGE = /^\d+(\.\d+)?%/;
const REGEX_NTH_OF =
/^(even|odd|\+?(\d+|\d*n(\s*[+-]\s*\d+)?)|-\d*n(\s*\+\s*\d+))((?=\s*[,)])|\s+of\s+)/;
const REGEX_WHITESPACE_OR_COLON = /[\s:]/;
const REGEX_BRACE_OR_SEMICOLON = /[{;]/;
const REGEX_BRACE_OR_SEMICOLON = /[{;](?=(?:[^']*'[^']*')*[^']*$)/;
Copy link
Contributor

@navorite navorite Jan 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const REGEX_BRACE_OR_SEMICOLON = /[{;](?=(?:[^']*'[^']*')*[^']*$)/;
const REGEX_BRACE_OR_SEMICOLON = /[{;](?=[^"']*$)/;

I think the extra complexity here isn't needed — just checking that it doesn't end with a quote would be sufficient. Also don't forget the " character.

Copy link
Author

@n0n3br n0n3br Jan 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry about testing, I'm starting in this world of contributing to open source now and even don't know how I would write a test for that.
As for the changeset, is there a style guide or other PR that I could use as example ?

Copy link
Contributor

@navorite navorite Jan 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No worries! The test case for this should be added in parser-modern. You can read more about contributing to Svelte here.

Unfortunately, I can't help you add a test case as I don't have write access to this PR. You can look at similar tests inside parser-modern though to understand how it works. In short, it is a snapshot test, meaning it takes an input and expects a certain output, if the generated output is different than the expected it fails.

Copy link
Author

@n0n3br n0n3br Jan 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@navorite added a changeset and commited your sugestion. as for tests I'm still stucked

const REGEX_LEADING_HYPHEN_OR_DIGIT = /-?\d/;
const REGEX_VALID_IDENTIFIER_CHAR = /[a-zA-Z0-9_-]/;
const REGEX_COMMENT_CLOSE = /\*\//;
Expand Down