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

Jump to bottom

refactor(css/parser): many fixes #6281

Merged
merged 13 commits into from Oct 28, 2022
Merged

refactor(css/parser): many fixes #6281

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
136ad3b
refactor(css/parser): refactor
alexander-akait Oct 27, 2022
0a9c5a6
fix: error repoting
alexander-akait Oct 27, 2022
4da55b5
fix: error reporting
alexander-akait Oct 27, 2022
64bf9b2
fix: error reporting
alexander-akait Oct 27, 2022
3202c0e
refactor: declaration parsing
alexander-akait Oct 28, 2022
061bca7
fix: prefixer
alexander-akait Oct 28, 2022
0dc04ee
fix: avoid parsing broken functions
alexander-akait Oct 28, 2022
ceb7d9c
fix: codegen
alexander-akait Oct 28, 2022
3bb2cb4
fix: report
alexander-akait Oct 28, 2022
83e459c
fix: report
alexander-akait Oct 28, 2022
729109b
fix: clippy
alexander-akait Oct 28, 2022
b807239
fix: clippy
alexander-akait Oct 28, 2022
6368fe5
Merge branch 'main' into refactor-parser
swc-bot Oct 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
532 changes: 291 additions & 241 deletions crates/swc_css_parser/src/parser/syntax/mod.rs
View file
Open in desktop

Large diffs are not rendered by default.

460 changes: 342 additions & 118 deletions crates/swc_css_parser/src/parser/values_and_units/mod.rs
View file
Open in desktop

Large diffs are not rendered by default.

251 changes: 120 additions & 131 deletions crates/swc_css_parser/tests/fixture/csstree/1/output.json
View file
Open in desktop
Expand Up @@ -2331,7 +2331,7 @@
"type": "Declaration",
"span": {
"start": 815,
"end": 827,
"end": 850,
"ctxt": 0
},
"name": {
Expand All @@ -2346,102 +2346,103 @@
},
"value": [
{
"type": "PreservedToken",
"type": "SimpleBlock",
"span": {
"start": 826,
"end": 827,
"ctxt": 0
},
"token": "LBrace"
},
{
"type": "PreservedToken",
"span": {
"start": 827,
"end": 828,
"ctxt": 0
},
"token": {
"WhiteSpace": {
"value": " "
}
}
},
{
"type": "PreservedToken",
"span": {
"start": 828,
"end": 837,
"ctxt": 0
},
"token": {
"Ident": {
"value": "something",
"raw": "something"
}
}
},
{
"type": "PreservedToken",
"span": {
"start": 837,
"end": 838,
"ctxt": 0
},
"token": {
"WhiteSpace": {
"value": " "
}
}
},
{
"type": "PreservedToken",
"span": {
"start": 838,
"end": 839,
"ctxt": 0
},
"token": {
"Delim": {
"value": "!"
}
}
},
{
"type": "PreservedToken",
"span": {
"start": 839,
"end": 848,
"end": 850,
"ctxt": 0
},
"token": {
"Ident": {
"value": "important",
"raw": "important"
}
}
},
{
"type": "PreservedToken",
"span": {
"start": 848,
"end": 849,
"ctxt": 0
"name": {
"type": "PreservedToken",
"span": {
"start": 826,
"end": 827,
"ctxt": 0
},
"token": "LBrace"
},
"token": {
"WhiteSpace": {
"value": " "
"value": [
{
"type": "PreservedToken",
"span": {
"start": 827,
"end": 828,
"ctxt": 0
},
"token": {
"WhiteSpace": {
"value": " "
}
}
},
{
"type": "PreservedToken",
"span": {
"start": 828,
"end": 837,
"ctxt": 0
},
"token": {
"Ident": {
"value": "something",
"raw": "something"
}
}
},
{
"type": "PreservedToken",
"span": {
"start": 837,
"end": 838,
"ctxt": 0
},
"token": {
"WhiteSpace": {
"value": " "
}
}
},
{
"type": "PreservedToken",
"span": {
"start": 838,
"end": 839,
"ctxt": 0
},
"token": {
"Delim": {
"value": "!"
}
}
},
{
"type": "PreservedToken",
"span": {
"start": 839,
"end": 848,
"ctxt": 0
},
"token": {
"Ident": {
"value": "important",
"raw": "important"
}
}
},
{
"type": "PreservedToken",
"span": {
"start": 848,
"end": 849,
"ctxt": 0
},
"token": {
"WhiteSpace": {
"value": " "
}
}
}
}
},
{
"type": "PreservedToken",
"span": {
"start": 849,
"end": 850,
"ctxt": 0
},
"token": "RBrace"
]
}
],
"important": null
Expand All @@ -2465,53 +2466,41 @@
},
"value": [
{
"type": "PreservedToken",
"type": "SimpleBlock",
"span": {
"start": 871,
"end": 872,
"ctxt": 0
},
"token": "LParen"
},
{
"type": "PreservedToken",
"span": {
"start": 872,
"end": 873,
"ctxt": 0
},
"token": "LBracket"
},
{
"type": "PreservedToken",
"span": {
"start": 873,
"end": 874,
"ctxt": 0
},
"token": "RBracket"
},
{
"type": "PreservedToken",
"span": {
"start": 874,
"end": 875,
"ctxt": 0
},
"token": "RParen"
},
{
"type": "PreservedToken",
"span": {
"start": 875,
"end": 876,
"ctxt": 0
"name": {
"type": "PreservedToken",
"span": {
"start": 871,
"end": 872,
"ctxt": 0
},
"token": "LParen"
},
"token": {
"WhiteSpace": {
"value": " "
"value": [
{
"type": "SimpleBlock",
"span": {
"start": 872,
"end": 874,
"ctxt": 0
},
"name": {
"type": "PreservedToken",
"span": {
"start": 872,
"end": 873,
"ctxt": 0
},
"token": "LBracket"
},
"value": []
}
}
]
}
],
"important": {
Expand Down