Add ArgumentList.namedSpans

This makes it easier for the migrator to handle functions with named
arguments.

Author: nex3

lib/src/ast/sass/argument_list.dart

@@ -2,6 +2,7 @@
 // MIT-style license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
+import 'package:sass/src/utils.dart';
 import 'package:source_span/source_span.dart';
 
 import '../../value/list.dart';
@@ -20,6 +21,11 @@ final class ArgumentList implements SassNode {
   /// The arguments passed by name.
   final Map<String, Expression> named;
 
+  /// The spans for the arguments passed by name, including their argument names.
+  ///
+  /// This always has the same keys as [named] in the same order.
+  final Map<String, FileSpan> namedSpans;
+
   /// The first rest argument (as in `$args...`).
   final Expression? rest;
 
@@ -34,18 +40,22 @@ final class ArgumentList implements SassNode {
   ArgumentList(
     Iterable<Expression> positional,
     Map<String, Expression> named,
+    Map<String, FileSpan> namedSpans,
     this.span, {
     this.rest,
     this.keywordRest,
   })  : positional = List.unmodifiable(positional),
-        named = Map.unmodifiable(named) {
+        named = Map.unmodifiable(named),
+        namedSpans = Map.unmodifiable(namedSpans) {
     assert(rest != null || keywordRest == null);
+    assert(iterableEquals(named.keys, namedSpans.keys));
   }
 
   /// Creates an invocation that passes no arguments.
   ArgumentList.empty(this.span)
       : positional = const [],
         named = const {},
+        namedSpans = const {},
         rest = null,
         keywordRest = null;
 

lib/src/js/parser.dart

@@ -147,7 +147,7 @@ void _updateAstPrototypes() {
                 IfConditionExpressionVisitor<Object?> visitor) =>
             self.accept(visitor),
       );
-  var arguments = ArgumentList([], {}, bogusSpan);
+  var arguments = ArgumentList(const [], const {}, const {}, bogusSpan);
   getJSClass(
     IncludeRule('a', arguments, bogusSpan),
   ).defineGetter('arguments', (IncludeRule self) => self.arguments);

lib/src/parse/css.dart

@@ -203,7 +203,7 @@ class CssParser extends ScssParser {
 
     return FunctionExpression(
       plain,
-      ArgumentList(arguments, const {}, spanFrom(beforeArguments)),
+      ArgumentList(arguments, const {}, const {}, spanFrom(beforeArguments)),
       spanFrom(start),
     );
   }

lib/src/parse/stylesheet.dart

@@ -1862,6 +1862,7 @@ abstract class StylesheetParser extends Parser {
 
     var positional = <Expression>[];
     var named = <String, Expression>{};
+    var namedSpans = <String, FileSpan>{};
     Expression? rest;
     Expression? keywordRest;
     var emittedRestDeprecation = false;
@@ -1874,7 +1875,9 @@ abstract class StylesheetParser extends Parser {
         if (named.containsKey(expression.name)) {
           error("Duplicate argument.", expression.span);
         }
-        named[expression.name] = expressionUntilComma(singleEquals: !mixin);
+        var value = expressionUntilComma(singleEquals: !mixin);
+        named[expression.name] = value;
+        namedSpans[expression.name] = expression.span.expand(value.span);
 
         if (rest != null && !emittedRestDeprecation) {
           emittedRestDeprecation = true;
@@ -1935,6 +1938,7 @@ abstract class StylesheetParser extends Parser {
     return ArgumentList(
       positional,
       named,
+      namedSpans,
       spanFrom(start),
       rest: rest,
       keywordRest: keywordRest,

lib/src/visitor/async_evaluate.dart

@@ -517,8 +517,9 @@ final class _EvaluateVisitor
 
         var callableNode = _callableNode!;
         var invocation = ArgumentList(
-          [],
-          {},
+          const [],
+          const {},
+          const {},
           callableNode.span,
           rest: ValueExpression(args, callableNode.span),
           keywordRest: args.keywords.isEmpty
@@ -625,6 +626,7 @@ final class _EvaluateVisitor
           var invocation = ArgumentList(
             const [],
             const {},
+            const {},
             callableNode.span,
             rest: ValueExpression(args, callableNode.span),
           );

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: 0f55a90c029d7b2041baf51afba2694bc1aa115d
+// Checksum: aa53924147f65640b94768e22bb339b0d5c5714a
 //
 // ignore_for_file: unused_import
 
@@ -525,8 +525,9 @@ final class _EvaluateVisitor
 
         var callableNode = _callableNode!;
         var invocation = ArgumentList(
-          [],
-          {},
+          const [],
+          const {},
+          const {},
           callableNode.span,
           rest: ValueExpression(args, callableNode.span),
           keywordRest: args.keywords.isEmpty
@@ -633,6 +634,7 @@ final class _EvaluateVisitor
           var invocation = ArgumentList(
             const [],
             const {},
+            const {},
             callableNode.span,
             rest: ValueExpression(args, callableNode.span),
           );

lib/src/visitor/expression_to_calc.dart

@@ -16,6 +16,7 @@ FunctionExpression expressionToCalc(Expression expression) =>
       ArgumentList(
         [expression.accept(const _MakeExpressionCalculationSafe())],
         const {},
+        const {},
         expression.span,
       ),
       expression.span,
@@ -34,7 +35,7 @@ class _MakeExpressionCalculationSafe with ReplaceExpressionVisitor {
       // to work around it by wrapping the call in a Sass function.
       ? FunctionExpression(
           'max',
-          ArgumentList([node], const {}, node.span),
+          ArgumentList([node], const {}, const {}, node.span),
           node.span,
           namespace: 'math',
         )

lib/src/visitor/replace_expression.dart

@@ -134,6 +134,7 @@ mixin ReplaceExpressionVisitor
           for (var (name, value) in invocation.named.pairs)
             name: value.accept(this),
         },
+        invocation.namedSpans,
         invocation.span,
         rest: invocation.rest?.accept(this),
         keywordRest: invocation.keywordRest?.accept(this),

pkg/sass_api/CHANGELOG.md

@@ -13,6 +13,8 @@
 * Add an `ExpressionVisitable` interface for anything visitable by an
   `ExpressionVisitor` (currently `Expression` and `IfConditionExpression`).
 
+* Add a `ArgumentList.namedSpans` field.
+
 ## 16.0.3
 
 * Add the missing members of `RecursiveAstVisitor`.