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

fix(css/prefixer): Reduce the number of vars in debug build #4078

Merged
merged 5 commits into from Mar 18, 2022
Merged
Changes from all commits
Commits
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
65 changes: 38 additions & 27 deletions crates/swc_stylis/src/prefixer.rs
@@ -1,5 +1,6 @@
use std::mem::take;

use swc_atoms::JsWord;
use swc_common::DUMMY_SP;
use swc_css_ast::*;
use swc_css_utils::{
Expand Down Expand Up @@ -195,6 +196,41 @@ struct Prefixer {
added_declarations: Vec<Declaration>,
}

impl Prefixer {
fn simple(&mut self, name: JsWord, val: JsWord, n: &Declaration) {
let val = ComponentValue::Ident(Ident {
span: DUMMY_SP,
value: val.clone(),
raw: val,
});
let name = DeclarationName::Ident(Ident {
span: DUMMY_SP,
value: name.clone(),
raw: name,
});
self.added_declarations.push(Declaration {
span: n.span,
name,
value: vec![val],
important: n.important.clone(),
});
}

fn same_name(&mut self, name: JsWord, n: &Declaration) {
let val = Ident {
span: DUMMY_SP,
value: name.clone(),
raw: name,
};
self.added_declarations.push(Declaration {
span: n.span,
name: n.name.clone(),
value: vec![ComponentValue::Ident(val)],
important: n.important.clone(),
});
}
}

pub enum Prefix {
Webkit,
Moz,
Expand Down Expand Up @@ -438,38 +474,13 @@ impl VisitMut for Prefixer {

macro_rules! simple {
($name:expr,$val:expr) => {{
let val = ComponentValue::Ident(Ident {
span: DUMMY_SP,
value: $val.into(),
raw: $val.into(),
});
let name = DeclarationName::Ident(Ident {
span: DUMMY_SP,
value: $name.into(),
raw: $name.into(),
});
self.added_declarations.push(Declaration {
span: n.span,
name,
value: vec![val],
important: n.important.clone(),
});
self.simple($name.into(), $val.into(), &n);
}};
}

macro_rules! same_name {
($name:expr) => {{
let val = Ident {
span: DUMMY_SP,
value: $name.into(),
raw: $name.into(),
};
self.added_declarations.push(Declaration {
span: n.span,
name: n.name.clone(),
value: vec![ComponentValue::Ident(val)],
important: n.important.clone(),
});
self.same_name($name.into(), &n);
}};
}

Expand Down