Rename IfExpression to LegacyIfExpression

nex3 · nex3 · commit fe234113cb38 · 2025-12-02T12:24:29.000-08:00
diff --git a/lib/src/ast/sass.dart b/lib/src/ast/sass.dart
@@ -13,8 +13,8 @@ export 'sass/expression/binary_operation.dart';
 export 'sass/expression/boolean.dart';
 export 'sass/expression/color.dart';
 export 'sass/expression/function.dart';
-export 'sass/expression/if.dart';
 export 'sass/expression/interpolated_function.dart';
+export 'sass/expression/legacy_if.dart';
 export 'sass/expression/list.dart';
 export 'sass/expression/map.dart';
 export 'sass/expression/null.dart';
diff --git a/lib/src/ast/sass/expression/legacy_if.dart b/lib/src/ast/sass/expression/legacy_if.dart
@@ -14,7 +14,8 @@ import '../../../visitor/interface/expression.dart';
 /// evaluated.
 ///
 /// {@category AST}
-final class IfExpression extends Expression implements CallableInvocation {
+final class LegacyIfExpression extends Expression
+    implements CallableInvocation {
   /// The declaration of `if()`, as though it were a normal function.
   static final declaration = ParameterList.parse(
     r"@function if($condition, $if-true, $if-false) {",
@@ -25,9 +26,10 @@ final class IfExpression extends Expression implements CallableInvocation {
 
   final FileSpan span;
 
-  IfExpression(this.arguments, this.span);
+  LegacyIfExpression(this.arguments, this.span);
 
-  T accept<T>(ExpressionVisitor<T> visitor) => visitor.visitIfExpression(this);
+  T accept<T>(ExpressionVisitor<T> visitor) =>
+      visitor.visitLegacyIfExpression(this);
 
   String toString() => "if$arguments";
 }
diff --git a/lib/src/functions.dart b/lib/src/functions.dart
@@ -29,7 +29,7 @@ final List<BuiltInCallable> globalFunctions = UnmodifiableListView([
   ...meta.global,
 
   // This is only invoked using `call()`. Hand-authored `if()`s are parsed as
-  // [IfExpression]s.
+  // [LegacyIfExpression]s.
   BuiltInCallable.function(
     "if",
     r"$condition, $if-true, $if-false",
diff --git a/lib/src/functions/README.md b/lib/src/functions/README.md
@@ -10,13 +10,13 @@ built-in modules. Each of the files here exports a corresponding
 There are a few functions that Sass supports that aren't defined here:
 
 * The `if()` function is defined directly in the [`functions.dart`] file,
-  although in most cases this is actually parsed as an [`IfExpression`] and
+  although in most cases this is actually parsed as a [`LegacyIfExpression`] and
   handled directly by [the evaluator] since it has special behavior about when
   its arguments are evaluated. The function itself only exists for edge cases
   like `if(...$args)` or `meta.get-function("if")`.
 
   [`functions.dart`]: ../functions.dart
-  [`IfExpression`]: ../ast/sass/expression/if.dart
+  [`LegacyIfExpression`]: ../ast/sass/expression/legacy_if.dart
   [the evaluator]: ../visitor/async_evaluate.dart
 
 * Certain functions in the `sass:meta` module require runtime information that's
diff --git a/lib/src/js/parser.dart b/lib/src/js/parser.dart
@@ -144,8 +144,8 @@ void _updateAstPrototypes() {
     FunctionExpression('a', arguments, bogusSpan),
   ).defineGetter('arguments', (FunctionExpression self) => self.arguments);
   getJSClass(
-    IfExpression(arguments, bogusSpan),
-  ).defineGetter('arguments', (IfExpression self) => self.arguments);
+    LegacyIfExpression(arguments, bogusSpan),
+  ).defineGetter('arguments', (LegacyIfExpression self) => self.arguments);
   getJSClass(
     InterpolatedFunctionExpression(_interpolation, arguments, bogusSpan),
   ).defineGetter(
diff --git a/lib/src/js/visitor/expression.dart b/lib/src/js/visitor/expression.dart
@@ -25,8 +25,8 @@ class JSExpressionVisitor implements ExpressionVisitor<Object?> {
       _inner.visitInterpolatedFunctionExpression(node);
   Object? visitFunctionExpression(FunctionExpression node) =>
       _inner.visitFunctionExpression(node);
-  Object? visitIfExpression(IfExpression node) =>
-      _inner.visitIfExpression(node);
+  Object? visitLegacyIfExpression(LegacyIfExpression node) =>
+      _inner.visitLegacyIfExpression(node);
   Object? visitListExpression(ListExpression node) =>
       _inner.visitListExpression(node);
   Object? visitMapExpression(MapExpression node) =>
@@ -62,7 +62,7 @@ class JSExpressionVisitorObject {
     InterpolatedFunctionExpression node,
   );
   external Object? visitFunctionExpression(FunctionExpression node);
-  external Object? visitIfExpression(IfExpression node);
+  external Object? visitLegacyIfExpression(LegacyIfExpression node);
   external Object? visitListExpression(ListExpression node);
   external Object? visitMapExpression(MapExpression node);
   external Object? visitNullExpression(NullExpression node);
diff --git a/lib/src/parse/stylesheet.dart b/lib/src/parse/stylesheet.dart
@@ -2939,7 +2939,7 @@ abstract class StylesheetParser extends Parser {
     if (plain != null) {
       if (plain == "if" && scanner.peekChar() == $lparen) {
         var invocation = _argumentInvocation();
-        return IfExpression(
+        return LegacyIfExpression(
           invocation,
           identifier.span.expand(invocation.span),
         );
diff --git a/lib/src/visitor/ast_search.dart b/lib/src/visitor/ast_search.dart
@@ -117,7 +117,8 @@ mixin AstSearchVisitor<T> on StatementSearchVisitor<T>
   T? visitInterpolatedFunctionExpression(InterpolatedFunctionExpression node) =>
       visitInterpolation(node.name) ?? visitArgumentList(node.arguments);
 
-  T? visitIfExpression(IfExpression node) => visitArgumentList(node.arguments);
+  T? visitLegacyIfExpression(LegacyIfExpression node) =>
+      visitArgumentList(node.arguments);
 
   T? visitListExpression(ListExpression node) =>
       node.contents.search((item) => item.accept(this));
diff --git a/lib/src/visitor/async_evaluate.dart b/lib/src/visitor/async_evaluate.dart
@@ -2831,9 +2831,10 @@ final class _EvaluateVisitor
   Future<SassBoolean> visitBooleanExpression(BooleanExpression node) async =>
       SassBoolean(node.value);
 
-  Future<Value> visitIfExpression(IfExpression node) async {
+  Future<Value> visitLegacyIfExpression(LegacyIfExpression node) async {
     var (positional, named) = await _evaluateMacroArguments(node);
-    _verifyArguments(positional.length, named, IfExpression.declaration, node);
+    _verifyArguments(
+        positional.length, named, LegacyIfExpression.declaration, node);
 
     // ignore: prefer_is_empty
     var condition = positional.elementAtOrNull(0) ?? named["condition"]!;
@@ -3204,7 +3205,7 @@ final class _EvaluateVisitor
       case NumberExpression() ||
             VariableExpression() ||
             FunctionExpression() ||
-            IfExpression():
+            LegacyIfExpression():
         return switch (await node.accept(this)) {
           SassNumber result => result,
           SassCalculation result => result,
diff --git a/lib/src/visitor/evaluate.dart b/lib/src/visitor/evaluate.dart
@@ -5,7 +5,7 @@
 // DO NOT EDIT. This file was generated from async_evaluate.dart.
 // See tool/grind/synchronize.dart for details.
 //
-// Checksum: 979f29f32c16550e87b78d760d5958b9d2fbe451
+// Checksum: 72aeb044260f1f64f121280996c97a762b7313b0
 //
 // ignore_for_file: unused_import
 
@@ -2834,9 +2834,10 @@ final class _EvaluateVisitor
   SassBoolean visitBooleanExpression(BooleanExpression node) =>
       SassBoolean(node.value);
 
-  Value visitIfExpression(IfExpression node) {
+  Value visitLegacyIfExpression(LegacyIfExpression node) {
     var (positional, named) = _evaluateMacroArguments(node);
-    _verifyArguments(positional.length, named, IfExpression.declaration, node);
+    _verifyArguments(
+        positional.length, named, LegacyIfExpression.declaration, node);
 
     // ignore: prefer_is_empty
     var condition = positional.elementAtOrNull(0) ?? named["condition"]!;
@@ -3205,7 +3206,7 @@ final class _EvaluateVisitor
       case NumberExpression() ||
             VariableExpression() ||
             FunctionExpression() ||
-            IfExpression():
+            LegacyIfExpression():
         return switch (node.accept(this)) {
           SassNumber result => result,
           SassCalculation result => result,
diff --git a/lib/src/visitor/interface/expression.dart b/lib/src/visitor/interface/expression.dart
@@ -15,7 +15,7 @@ abstract interface class ExpressionVisitor<T> {
   T visitColorExpression(ColorExpression node);
   T visitInterpolatedFunctionExpression(InterpolatedFunctionExpression node);
   T visitFunctionExpression(FunctionExpression node);
-  T visitIfExpression(IfExpression node);
+  T visitLegacyIfExpression(LegacyIfExpression node);
   T visitListExpression(ListExpression node);
   T visitMapExpression(MapExpression node);
   T visitNullExpression(NullExpression node);
diff --git a/lib/src/visitor/is_calculation_safe.dart b/lib/src/visitor/is_calculation_safe.dart
@@ -41,7 +41,7 @@ class IsCalculationSafeVisitor implements ExpressionVisitor<bool> {
   ) =>
       true;
 
-  bool visitIfExpression(IfExpression node) => true;
+  bool visitLegacyIfExpression(LegacyIfExpression node) => true;
 
   bool visitListExpression(ListExpression node) =>
       node.separator == ListSeparator.space &&
diff --git a/lib/src/visitor/recursive_ast.dart b/lib/src/visitor/recursive_ast.dart
@@ -169,7 +169,7 @@ mixin RecursiveAstVisitor on RecursiveStatementVisitor
     visitArgumentList(node.arguments);
   }
 
-  void visitIfExpression(IfExpression node) {
+  void visitLegacyIfExpression(LegacyIfExpression node) {
     visitArgumentList(node.arguments);
   }
 
diff --git a/lib/src/visitor/replace_expression.dart b/lib/src/visitor/replace_expression.dart
@@ -50,8 +50,8 @@ mixin ReplaceExpressionVisitor implements ExpressionVisitor<Expression> {
         node.span,
       );
 
-  Expression visitIfExpression(IfExpression node) =>
-      IfExpression(visitArgumentList(node.arguments), node.span);
+  Expression visitLegacyIfExpression(LegacyIfExpression node) =>
+      LegacyIfExpression(visitArgumentList(node.arguments), node.span);
 
   Expression visitListExpression(ListExpression node) => ListExpression(
         node.contents.map((item) => item.accept(this)),
diff --git a/lib/src/visitor/source_interpolation.dart b/lib/src/visitor/source_interpolation.dart
@@ -54,7 +54,7 @@ class SourceInterpolationVisitor implements ExpressionVisitor<void> {
     buffer?.write(arguments.span.after(arguments.positional.last.span).text);
   }
 
-  void visitIfExpression(IfExpression node) => buffer = null;
+  void visitLegacyIfExpression(LegacyIfExpression node) => buffer = null;
 
   void visitListExpression(ListExpression node) {
     if (node.contents.length <= 1 && !node.hasBrackets) {
diff --git a/pkg/sass-parser/lib/src/sass-internal.ts b/pkg/sass-parser/lib/src/sass-internal.ts
@@ -349,7 +349,7 @@ declare namespace SassInternal {
     readonly arguments: ArgumentList;
   }
 
-  class IfExpression extends Expression {
+  class LegacyIfExpression extends Expression {
     readonly arguments: ArgumentList;
   }
 
@@ -539,7 +539,7 @@ export type Interpolation = SassInternal.Interpolation;
 export type Expression = SassInternal.Expression;
 export type BinaryOperationExpression = SassInternal.BinaryOperationExpression;
 export type FunctionExpression = SassInternal.FunctionExpression;
-export type IfExpression = SassInternal.IfExpression;
+export type LegacyIfExpression = SassInternal.LegacyIfExpression;
 export type InterpolatedFunctionExpression =
   SassInternal.InterpolatedFunctionExpression;
 export type ListExpression = SassInternal.ListExpression;
@@ -605,7 +605,7 @@ export interface ExpressionVisitorObject<T> {
   visitBooleanExpression(node: BooleanExpression): T;
   visitColorExpression(node: ColorExpression): T;
   visitFunctionExpression(node: FunctionExpression): T;
-  visitIfExpression(node: IfExpression): T;
+  visitIfExpression(node: LegacyIfExpression): T;
   visitInterpolatedFunctionExpression(node: InterpolatedFunctionExpression): T;
   visitListExpression(node: ListExpression): T;
   visitMapExpression(node: MapExpression): T;
