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

refactor(es/preset-env): Rename parameter to avoid confusion #8106

Merged
merged 3 commits into from
Oct 12, 2023
Merged

refactor(es/preset-env): Rename parameter to avoid confusion #8106

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a38bc96
Rename
kdy1 Oct 12, 2023
ef4a25d
Rename
kdy1 Oct 12, 2023
96bd088
Merge branch 'main' into issue-8103
swc-bot Oct 12, 2023
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
34 changes: 22 additions & 12 deletions crates/swc_ecma_preset_env/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ mod regenerator;
mod transform_data;

pub fn preset_env<C>(
global_mark: Mark,
unresolved_mark: Mark,
comments: Option<C>,
c: Config,
assumptions: Assumptions,
Expand Down Expand Up @@ -178,7 +178,7 @@ where
no_document_all: loose || assumptions.no_document_all,
pure_getter: loose || assumptions.pure_getters
},
global_mark
unresolved_mark
)
);

Expand Down Expand Up @@ -206,7 +206,7 @@ where
ignore_function_length: loose || assumptions.ignore_function_length,
},
comments.clone(),
global_mark
unresolved_mark
)
);

Expand Down Expand Up @@ -245,7 +245,7 @@ where
);
let pass = add!(pass, ObjectSuper, es2015::object_super());
let pass = add!(pass, FunctionName, es2015::function_name());
let pass = add!(pass, ArrowFunctions, es2015::arrow(global_mark));
let pass = add!(pass, ArrowFunctions, es2015::arrow(unresolved_mark));
let pass = add!(pass, DuplicateKeys, es2015::duplicate_keys());
let pass = add!(pass, StickyRegex, es2015::sticky_regex());
// TODO: InstanceOf,
Expand All @@ -258,7 +258,7 @@ where
es2015::parameters::Config {
ignore_function_length: loose || assumptions.ignore_function_length
},
global_mark
unresolved_mark
)
);
let pass = add!(
Expand All @@ -282,8 +282,18 @@ where
es2015::destructuring(es2015::destructuring::Config { loose }),
true
);
let pass = add!(pass, BlockScoping, es2015::block_scoping(global_mark), true);
let pass = add!(pass, Regenerator, generator(global_mark, comments), true);
let pass = add!(
pass,
BlockScoping,
es2015::block_scoping(unresolved_mark),
true
);
let pass = add!(
pass,
Regenerator,
generator(unresolved_mark, comments),
true
);

let pass = add!(pass, NewTarget, es2015::new_target(), true);

Expand Down Expand Up @@ -311,7 +321,7 @@ where
let pass = add!(
pass,
BugfixAsyncArrowsInClass,
bugfixes::async_arrows_in_class(global_mark)
bugfixes::async_arrows_in_class(unresolved_mark)
);
let pass = add!(
pass,
Expand Down Expand Up @@ -342,7 +352,7 @@ where
targets,
includes: included_modules,
excludes: excluded_modules,
global_mark
unresolved_mark,
})
)
}
Expand All @@ -356,7 +366,7 @@ struct Polyfills {
regenerator: bool,
includes: AHashSet<String>,
excludes: AHashSet<String>,
global_mark: Mark,
unresolved_mark: Mark,
}
impl Polyfills {
fn collect<T>(&mut self, m: &mut T) -> Vec<JsWord>
Expand Down Expand Up @@ -496,7 +506,7 @@ impl VisitMut for Polyfills {
expr: CallExpr {
span,
callee: Expr::Ident(Ident {
span: DUMMY_SP.apply_mark(self.global_mark),
span: DUMMY_SP.apply_mark(self.unresolved_mark),
sym: "require".into(),
optional: false,
})
Expand All @@ -522,7 +532,7 @@ impl VisitMut for Polyfills {
expr: CallExpr {
span,
callee: Expr::Ident(Ident {
span: DUMMY_SP.apply_mark(self.global_mark),
span: DUMMY_SP.apply_mark(self.unresolved_mark),
sym: "require".into(),
optional: false,
})
Expand Down
Loading