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.

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

refactor(css/lints): Support stable rust #8384

Merged
merged 4 commits into from
Dec 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 1 deletion crates/swc_css_lints/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#![deny(clippy::all)]
#![feature(box_patterns)]

mod config;
mod dataset;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ impl FontFamilyNoDuplicateNames {
Option::<(String, Span)>::None,
),
|(mut fonts, last_identifier), item| match item {
ComponentValue::Ident(box Ident { value, span, .. }) => {
ComponentValue::Ident(ident) => {
let Ident { value, span, .. } = &**ident;
if let Some((mut identifier, last_span)) = last_identifier {
identifier.push(' ');
identifier.push_str(value);
Expand All @@ -56,18 +57,12 @@ impl FontFamilyNoDuplicateNames {
(fonts, Some((value.to_string(), *span)))
}
}
ComponentValue::Str(box Str {
raw: Some(raw),
span,
..
}) => {
fonts.push((FontNameKind::from(raw), *span));
ComponentValue::Str(s) if s.raw.is_some() => {
let raw = s.raw.as_ref().unwrap();
fonts.push((FontNameKind::from(raw), s.span));
(fonts, None)
}
ComponentValue::Delimiter(box Delimiter {
value: DelimiterValue::Comma,
..
}) => {
ComponentValue::Delimiter(delimiter) if delimiter.value.is_comma() => {
if let Some((identifier, span)) = last_identifier {
fonts.push((FontNameKind::from(identifier), span));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,51 +43,50 @@ impl Visit for NoInvalidPositionAtImportRule {
fn visit_stylesheet(&mut self, stylesheet: &Stylesheet) {
stylesheet.rules.iter().fold(false, |seen, rule| {
if seen
&& matches!(
rule,
Rule::AtRule(box AtRule {
prelude: Some(box AtRulePrelude::ImportPrelude(_)),
..
})
)
&& rule
.as_at_rule()
.and_then(|at_rule| at_rule.prelude.as_ref())
.map(|prelude| prelude.is_import_prelude())
.unwrap_or_default()
{
self.ctx.report(rule, MESSAGE);
}

// TODO improve me https://www.w3.org/TR/css-cascade-5/#layer-empty - @import and @namespace rules must be consecutive
match rule {
Rule::AtRule(
box AtRule {
prelude: Some(box AtRulePrelude::CharsetPrelude(_)),
..
}
| box AtRule {
prelude: Some(box AtRulePrelude::ImportPrelude(_)),
..
},
) => seen,
Rule::AtRule(box AtRule {
prelude: Some(box AtRulePrelude::LayerPrelude(_)),
block,
..
}) => match block {
Some(block) if block.value.is_empty() => seen,
None => seen,
_ => true,
},
Rule::AtRule(box AtRule { name, .. }) => {
let name = match name {
AtRuleName::DashedIdent(dashed_ident) => &dashed_ident.value,
AtRuleName::Ident(ident) => &ident.value,
};
let Rule::AtRule(at_rule) = rule else {
return true;
};

let AtRule {
name,
prelude,
block,
..
} = &**at_rule;

if self.ignored.iter().any(|item| item.is_match(name)) {
seen
} else {
true
if let Some(prelude) = prelude {
match &**prelude {
AtRulePrelude::CharsetPrelude(_) | AtRulePrelude::ImportPrelude(_) => {
return seen
}
AtRulePrelude::LayerPrelude(_) => match block {
Some(block) if block.value.is_empty() => return seen,
None => return seen,
_ => return true,
},
_ => {}
}
_ => true,
};

let name = match name {
AtRuleName::DashedIdent(dashed_ident) => &dashed_ident.value,
AtRuleName::Ident(ident) => &ident.value,
};

if self.ignored.iter().any(|item| item.is_match(name)) {
seen
} else {
true
}
});

Expand Down
19 changes: 9 additions & 10 deletions crates/swc_css_lints/src/rules/unit_no_unknown.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,15 @@ impl Visit for UnitNoUnknown {
}

fn visit_component_value(&mut self, component_value: &ComponentValue) {
if let ComponentValue::PreservedToken(
token_and_span @ box TokenAndSpan {
token: Token::Dimension(box DimensionToken { unit, .. }),
..
},
) = component_value
{
if self.ignored_units.iter().all(|item| !item.is_match(unit)) {
let message = format!("Unexpected unknown unit \"{}\".", unit);
self.ctx.report(token_and_span, message);
if let Some(token_and_span) = component_value.as_preserved_token() {
if let Some(unit) = match &token_and_span.token {
Token::Dimension(dimension_token) => Some(dimension_token.unit.as_ref()),
_ => None,
} {
if self.ignored_units.iter().all(|item| !item.is_match(unit)) {
let message = format!("Unexpected unknown unit \"{}\".", unit);
self.ctx.report(token_and_span, message);
}
}
}

Expand Down
Loading