Skip to content

Commit 09e4063

Browse files
committed
refactor(minfier): clean up method names
1 parent 36386e4 commit 09e4063

10 files changed

+120
-124
lines changed

crates/oxc_minifier/src/peephole/minimize_conditional_expression.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ impl<'a> PeepholeOptimizations {
2020
ctx: &mut Ctx<'a, '_>,
2121
) -> Expression<'a> {
2222
let mut cond_expr = ctx.ast.conditional_expression(span, test, consequent, alternate);
23-
Self::try_minimize_conditional(&mut cond_expr, ctx)
23+
Self::minimize_conditional_expression(&mut cond_expr, ctx)
2424
.unwrap_or_else(|| Expression::ConditionalExpression(ctx.ast.alloc(cond_expr)))
2525
}
2626

2727
/// `MangleIfExpr`: <https://github.com/evanw/esbuild/blob/v0.24.2/internal/js_ast/js_ast_helpers.go#L2745>
28-
pub fn try_minimize_conditional(
28+
pub fn minimize_conditional_expression(
2929
expr: &mut ConditionalExpression<'a>,
3030
ctx: &mut Ctx<'a, '_>,
3131
) -> Option<Expression<'a>> {

crates/oxc_minifier/src/peephole/minimize_conditions.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ impl<'a> PeepholeOptimizations {
6666
// ^^^^^^^^^^^^^^ `ctx.expression_value_type(&e.left).is_boolean()` is `true`.
6767
// `x >> +y !== 0` -> `x >> +y`
6868
// ^^^^^^^ ctx.expression_value_type(&e.left).is_number()` is `true`.
69-
pub fn try_minimize_binary(expr: &mut Expression<'a>, ctx: &mut Ctx<'a, '_>) {
69+
pub fn minimize_binary(expr: &mut Expression<'a>, ctx: &mut Ctx<'a, '_>) {
7070
let Expression::BinaryExpression(e) = expr else { return };
7171
if !e.operator.is_equality() {
7272
return;
@@ -123,7 +123,7 @@ impl<'a> PeepholeOptimizations {
123123
///
124124
/// In `IsLooselyEqual`, `true` and `false` are converted to `1` and `0` first.
125125
/// <https://tc39.es/ecma262/multipage/abstract-operations.html#sec-islooselyequal>
126-
pub fn try_compress_is_loose_boolean(e: &mut Expression<'a>, ctx: &mut Ctx<'a, '_>) {
126+
pub fn minimize_loose_boolean(e: &mut Expression<'a>, ctx: &mut Ctx<'a, '_>) {
127127
let Expression::BinaryExpression(e) = e else { return };
128128
if !matches!(e.operator, BinaryOperator::Equality | BinaryOperator::Inequality) {
129129
return;
@@ -170,7 +170,7 @@ impl<'a> PeepholeOptimizations {
170170
/// Compress `a = a || b` to `a ||= b`
171171
///
172172
/// This can only be done for resolved identifiers as this would avoid setting `a` when `a` is truthy.
173-
pub fn try_compress_normal_assignment_to_combined_logical_assignment(
173+
pub fn minimize_normal_assignment_to_combined_logical_assignment(
174174
expr: &mut AssignmentExpression<'a>,
175175
ctx: &mut Ctx<'a, '_>,
176176
) {
@@ -207,7 +207,7 @@ impl<'a> PeepholeOptimizations {
207207
}
208208

209209
/// Compress `a = a + b` to `a += b`
210-
pub fn try_compress_normal_assignment_to_combined_assignment(
210+
pub fn minimize_normal_assignment_to_combined_assignment(
211211
expr: &mut AssignmentExpression<'a>,
212212
ctx: &mut Ctx<'a, '_>,
213213
) {
@@ -227,7 +227,7 @@ impl<'a> PeepholeOptimizations {
227227

228228
/// Compress `a -= 1` to `--a` and `a -= -1` to `++a`
229229
#[expect(clippy::float_cmp)]
230-
pub fn try_compress_assignment_to_update_expression(
230+
pub fn minimize_assignment_to_update_expression(
231231
expr: &mut Expression<'a>,
232232
ctx: &mut Ctx<'a, '_>,
233233
) {

crates/oxc_minifier/src/peephole/minimize_expression_in_boolean_context.rs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,17 @@ impl<'a> PeepholeOptimizations {
1111
/// Simplify syntax when we know it's used inside a boolean context, e.g. `if (boolean_context) {}`.
1212
///
1313
/// `SimplifyBooleanExpr`: <https://github.com/evanw/esbuild/blob/v0.24.2/internal/js_ast/js_ast_helpers.go#L2059>
14-
pub fn try_fold_expr_in_boolean_context(expr: &mut Expression<'a>, ctx: &mut Ctx<'a, '_>) {
14+
pub fn minimize_expression_in_boolean_context(
15+
expr: &mut Expression<'a>,
16+
ctx: &mut Ctx<'a, '_>,
17+
) {
1518
match expr {
1619
// "!!a" => "a"
1720
Expression::UnaryExpression(u1) if u1.operator.is_not() => {
1821
if let Expression::UnaryExpression(u2) = &mut u1.argument {
1922
if u2.operator.is_not() {
2023
let mut e = u2.argument.take_in(ctx.ast);
21-
Self::try_fold_expr_in_boolean_context(&mut e, ctx);
24+
Self::minimize_expression_in_boolean_context(&mut e, ctx);
2225
*expr = e;
2326
ctx.state.changed = true;
2427
}
@@ -44,8 +47,8 @@ impl<'a> PeepholeOptimizations {
4447
}
4548
// "if (!!a && !!b)" => "if (a && b)"
4649
Expression::LogicalExpression(e) if e.operator.is_and() => {
47-
Self::try_fold_expr_in_boolean_context(&mut e.left, ctx);
48-
Self::try_fold_expr_in_boolean_context(&mut e.right, ctx);
50+
Self::minimize_expression_in_boolean_context(&mut e.left, ctx);
51+
Self::minimize_expression_in_boolean_context(&mut e.right, ctx);
4952
// "if (anything && truthyNoSideEffects)" => "if (anything)"
5053
if e.right.get_side_free_boolean_value(ctx) == Some(true) {
5154
*expr = e.left.take_in(ctx.ast);
@@ -54,8 +57,8 @@ impl<'a> PeepholeOptimizations {
5457
}
5558
// "if (!!a ||!!b)" => "if (a || b)"
5659
Expression::LogicalExpression(e) if e.operator == LogicalOperator::Or => {
57-
Self::try_fold_expr_in_boolean_context(&mut e.left, ctx);
58-
Self::try_fold_expr_in_boolean_context(&mut e.right, ctx);
60+
Self::minimize_expression_in_boolean_context(&mut e.left, ctx);
61+
Self::minimize_expression_in_boolean_context(&mut e.right, ctx);
5962
// "if (anything || falsyNoSideEffects)" => "if (anything)"
6063
if e.right.get_side_free_boolean_value(ctx) == Some(false) {
6164
*expr = e.left.take_in(ctx.ast);
@@ -64,8 +67,8 @@ impl<'a> PeepholeOptimizations {
6467
}
6568
Expression::ConditionalExpression(e) => {
6669
// "if (a ? !!b : !!c)" => "if (a ? b : c)"
67-
Self::try_fold_expr_in_boolean_context(&mut e.consequent, ctx);
68-
Self::try_fold_expr_in_boolean_context(&mut e.alternate, ctx);
70+
Self::minimize_expression_in_boolean_context(&mut e.consequent, ctx);
71+
Self::minimize_expression_in_boolean_context(&mut e.alternate, ctx);
6972
if let Some(boolean) = e.consequent.get_side_free_boolean_value(ctx) {
7073
let right = e.alternate.take_in(ctx.ast);
7174
let left = e.test.take_in(ctx.ast);
@@ -98,7 +101,7 @@ impl<'a> PeepholeOptimizations {
98101
}
99102
Expression::SequenceExpression(seq_expr) => {
100103
if let Some(last) = seq_expr.expressions.last_mut() {
101-
Self::try_fold_expr_in_boolean_context(last, ctx);
104+
Self::minimize_expression_in_boolean_context(last, ctx);
102105
}
103106
}
104107
_ => {}

crates/oxc_minifier/src/peephole/minimize_not_expression.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ use super::PeepholeOptimizations;
1010
impl<'a> PeepholeOptimizations {
1111
pub fn minimize_not(span: Span, expr: Expression<'a>, ctx: &mut Ctx<'a, '_>) -> Expression<'a> {
1212
let mut unary = ctx.ast.expression_unary(span, UnaryOperator::LogicalNot, expr);
13-
Self::try_minimize_not(&mut unary, ctx);
13+
Self::minimize_unary(&mut unary, ctx);
1414
unary
1515
}
1616

1717
/// `MaybeSimplifyNot`: <https://github.com/evanw/esbuild/blob/v0.24.2/internal/js_ast/js_ast_helpers.go#L73>
18-
pub fn try_minimize_not(expr: &mut Expression<'a>, ctx: &mut Ctx<'a, '_>) {
18+
pub fn minimize_unary(expr: &mut Expression<'a>, ctx: &mut Ctx<'a, '_>) {
1919
let Expression::UnaryExpression(e) = expr else { return };
2020
if !e.operator.is_not() {
2121
return;
2222
}
23-
Self::try_fold_expr_in_boolean_context(&mut e.argument, ctx);
23+
Self::minimize_expression_in_boolean_context(&mut e.argument, ctx);
2424
match &mut e.argument {
2525
// `!!true` -> `true`
2626
// `!!false` -> `false`

crates/oxc_minifier/src/peephole/minimize_statements.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ impl<'a> PeepholeOptimizations {
557557
};
558558
let test = if_stmt.test.take_in(ctx.ast);
559559
let mut test = Self::minimize_not(test.span(), test, ctx);
560-
Self::try_fold_expr_in_boolean_context(&mut test, ctx);
560+
Self::minimize_expression_in_boolean_context(&mut test, ctx);
561561
let consequent = if body.len() == 1 {
562562
body.remove(0)
563563
} else {

0 commit comments

Comments
 (0)