Skip to content

Add selector name to PURE error message #1039

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

Draft
mischnic wants to merge 1 commit into
base: master
Choose a base branch
from
+40 −14
Draft

Add selector name to PURE error message #1039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,10 @@ pub enum MinifyErrorKind {
custom_media_loc: Location,
},
/// A CSS module selector did not contain at least one class or id selector.
ImpureCSSModuleSelector,
ImpureCSSModuleSelector {
/// The impure selector.
selector: String,
},
}

impl fmt::Display for MinifyErrorKind {
Expand All @@ -377,9 +380,10 @@ impl fmt::Display for MinifyErrorKind {
f,
"Boolean logic with media types in @custom-media rules is not supported by Lightning CSS"
),
ImpureCSSModuleSelector => write!(
ImpureCSSModuleSelector { selector } => write!(
f,
"A selector in CSS modules should contain at least one class or ID selector"
"Selector \"{}\" is not pure. Pure selectors must contain at least one local class or id.",
selector
),
}
}
Expand Down
32 changes: 24 additions & 8 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7062,22 +7062,30 @@ mod tests {

minify_error_test_with_options(
"div {width: 20px}",
MinifyErrorKind::ImpureCSSModuleSelector,
MinifyErrorKind::ImpureCSSModuleSelector {
selector: "div".to_string(),
},
pure_css_module_options.clone(),
);
minify_error_test_with_options(
":global(.foo) {width: 20px}",
MinifyErrorKind::ImpureCSSModuleSelector,
MinifyErrorKind::ImpureCSSModuleSelector {
selector: ".foo".to_string(),
},
pure_css_module_options.clone(),
);
minify_error_test_with_options(
"[foo=bar] {width: 20px}",
MinifyErrorKind::ImpureCSSModuleSelector,
MinifyErrorKind::ImpureCSSModuleSelector {
selector: "[foo=\"bar\"]".to_string(),
},
pure_css_module_options.clone(),
);
minify_error_test_with_options(
"div, .foo {width: 20px}",
MinifyErrorKind::ImpureCSSModuleSelector,
MinifyErrorKind::ImpureCSSModuleSelector {
selector: "div, .foo".to_string(),
},
pure_css_module_options.clone(),
);
minify_test_with_options(
Expand Down Expand Up @@ -7127,7 +7135,9 @@ mod tests {
);
minify_error_test_with_options(
"html { .foo { span { color: red; } } }",
MinifyErrorKind::ImpureCSSModuleSelector,
MinifyErrorKind::ImpureCSSModuleSelector {
selector: "html".to_string(),
},
pure_css_module_options.clone(),
);
minify_test_with_options(
Expand All @@ -7137,17 +7147,23 @@ mod tests {
);
minify_error_test_with_options(
"@scope (div) { .foo { color: red } }",
MinifyErrorKind::ImpureCSSModuleSelector,
MinifyErrorKind::ImpureCSSModuleSelector {
selector: "div".to_string(),
},
pure_css_module_options.clone(),
);
minify_error_test_with_options(
"@scope (.a) to (div) { .foo { color: red } }",
MinifyErrorKind::ImpureCSSModuleSelector,
MinifyErrorKind::ImpureCSSModuleSelector {
selector: "div".to_string(),
},
pure_css_module_options.clone(),
);
minify_error_test_with_options(
"@scope (.a) to (.b) { div { color: red } }",
MinifyErrorKind::ImpureCSSModuleSelector,
MinifyErrorKind::ImpureCSSModuleSelector {
selector: "div".to_string(),
},
pure_css_module_options.clone(),
);
minify_test_with_options(
Expand Down
8 changes: 6 additions & 2 deletions src/rules/scope.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ impl<'i, T: Clone> ScopeRule<'i, T> {
if let Some(scope_start) = &self.scope_start {
if !scope_start.0.iter().all(is_pure_css_modules_selector) {
return Err(MinifyError {
kind: crate::error::MinifyErrorKind::ImpureCSSModuleSelector,
kind: crate::error::MinifyErrorKind::ImpureCSSModuleSelector {
selector: scope_start.to_string(),
},
loc: self.loc,
});
}
Expand All @@ -52,7 +54,9 @@ impl<'i, T: Clone> ScopeRule<'i, T> {
if let Some(scope_end) = &self.scope_end {
if !scope_end.0.iter().all(is_pure_css_modules_selector) {
return Err(MinifyError {
kind: crate::error::MinifyErrorKind::ImpureCSSModuleSelector,
kind: crate::error::MinifyErrorKind::ImpureCSSModuleSelector {
selector: scope_end.to_string(),
},
loc: self.loc,
});
}
Expand Down
4 changes: 3 additions & 1 deletion src/rules/style.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ impl<'i, T: Clone> StyleRule<'i, T> {
if context.pure_css_modules {
if !self.selectors.0.iter().all(is_pure_css_modules_selector) {
return Err(MinifyError {
kind: crate::error::MinifyErrorKind::ImpureCSSModuleSelector,
kind: crate::error::MinifyErrorKind::ImpureCSSModuleSelector {
selector: self.selectors.to_string(),
},
loc: self.loc,
});
}
Expand Down
Loading