Merge branch 'main' of https://github.com/sass/dart-sass into feature.package-importer

Author: jamesnw

CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.69.6
+
+* Produce better output for numbers with complex units in `meta.inspect()` and
+  debugging messages.
+
+* When generating CSS error messages to display in-browser, escape all code
+  points that aren't in the US-ASCII region. Previously only code points U+0100
+  LATIN CAPITAL LETTER A WITH MACRON were escaped.
+
+### JS API
+
+* Fix a bug where certain exceptions could produce `SourceSpan`s that didn't
+  follow the documented `SourceSpan` API.
+
 ## 1.69.5
 
 ### JS API

lib/src/ast/sass/statement/function_rule.dart

@@ -6,11 +6,8 @@ import 'package:source_span/source_span.dart';
 
 import '../../../util/span.dart';
 import '../../../visitor/interface/statement.dart';
-import '../argument_declaration.dart';
 import '../declaration.dart';
-import '../statement.dart';
 import 'callable_declaration.dart';
-import 'silent_comment.dart';
 
 /// A function declaration.
 ///
@@ -21,10 +18,8 @@ final class FunctionRule extends CallableDeclaration
     implements SassDeclaration {
   FileSpan get nameSpan => span.withoutInitialAtRule().initialIdentifier();
 
-  FunctionRule(String name, ArgumentDeclaration arguments,
-      Iterable<Statement> children, FileSpan span,
-      {SilentComment? comment})
-      : super(name, arguments, children, span, comment: comment);
+  FunctionRule(super.name, super.arguments, super.children, super.span,
+      {super.comment});
 
   T accept<T>(StatementVisitor<T> visitor) => visitor.visitFunctionRule(this);
 

lib/src/ast/sass/statement/if_rule.dart

@@ -94,7 +94,7 @@ final class IfClause extends IfRuleClause {
 ///
 /// {@category AST}
 final class ElseClause extends IfRuleClause {
-  ElseClause(Iterable<Statement> children) : super(children);
+  ElseClause(super.children);
 
   String toString() => "@else {${children.join(' ')}}";
 }

lib/src/ast/sass/statement/mixin_rule.dart

@@ -7,12 +7,9 @@ import 'package:source_span/source_span.dart';
 import '../../../util/span.dart';
 import '../../../visitor/interface/statement.dart';
 import '../../../visitor/statement_search.dart';
-import '../argument_declaration.dart';
 import '../declaration.dart';
-import '../statement.dart';
 import 'callable_declaration.dart';
 import 'content_rule.dart';
-import 'silent_comment.dart';
 
 /// A mixin declaration.
 ///
@@ -31,10 +28,8 @@ final class MixinRule extends CallableDeclaration implements SassDeclaration {
     return startSpan.initialIdentifier();
   }
 
-  MixinRule(String name, ArgumentDeclaration arguments,
-      Iterable<Statement> children, FileSpan span,
-      {SilentComment? comment})
-      : super(name, arguments, children, span, comment: comment);
+  MixinRule(super.name, super.arguments, super.children, super.span,
+      {super.comment});
 
   T accept<T>(StatementVisitor<T> visitor) => visitor.visitMixinRule(this);
 

lib/src/ast/selector/complex.dart

@@ -70,11 +70,10 @@ final class ComplexSelector extends Selector {
   }
 
   ComplexSelector(Iterable<CssValue<Combinator>> leadingCombinators,
-      Iterable<ComplexSelectorComponent> components, FileSpan span,
+      Iterable<ComplexSelectorComponent> components, super.span,
       {this.lineBreak = false})
       : leadingCombinators = List.unmodifiable(leadingCombinators),
-        components = List.unmodifiable(components),
-        super(span) {
+        components = List.unmodifiable(components) {
     if (this.leadingCombinators.isEmpty && this.components.isEmpty) {
       throw ArgumentError(
           "leadingCombinators and components may not both be empty.");

lib/src/ast/selector/compound.dart

@@ -3,7 +3,6 @@
 // https://opensource.org/licenses/MIT.
 
 import 'package:meta/meta.dart';
-import 'package:source_span/source_span.dart';
 
 import '../../extend/functions.dart';
 import '../../logger.dart';
@@ -43,9 +42,8 @@ final class CompoundSelector extends Selector {
   SimpleSelector? get singleSimple =>
       components.length == 1 ? components.first : null;
 
-  CompoundSelector(Iterable<SimpleSelector> components, FileSpan span)
-      : components = List.unmodifiable(components),
-        super(span) {
+  CompoundSelector(Iterable<SimpleSelector> components, super.span)
+      : components = List.unmodifiable(components) {
     if (this.components.isEmpty) {
       throw ArgumentError("components may not be empty.");
     }

lib/src/ast/selector/list.dart

@@ -3,7 +3,6 @@
 // https://opensource.org/licenses/MIT.
 
 import 'package:meta/meta.dart';
-import 'package:source_span/source_span.dart';
 
 import '../../exception.dart';
 import '../../extend/functions.dart';
@@ -49,9 +48,8 @@ final class SelectorList extends Selector {
     }), ListSeparator.comma);
   }
 
-  SelectorList(Iterable<ComplexSelector> components, FileSpan span)
-      : components = List.unmodifiable(components),
-        super(span) {
+  SelectorList(Iterable<ComplexSelector> components, super.span)
+      : components = List.unmodifiable(components) {
     if (this.components.isEmpty) {
       throw ArgumentError("components may not be empty.");
     }

lib/src/ast/selector/parent.dart

@@ -3,7 +3,6 @@
 // https://opensource.org/licenses/MIT.
 
 import 'package:meta/meta.dart';
-import 'package:source_span/source_span.dart';
 
 import '../../visitor/interface/selector.dart';
 import '../selector.dart';
@@ -22,7 +21,7 @@ final class ParentSelector extends SimpleSelector {
   /// indicating that the parent selector will not be modified.
   final String? suffix;
 
-  ParentSelector(FileSpan span, {this.suffix}) : super(span);
+  ParentSelector(super.span, {this.suffix});
 
   T accept<T>(SelectorVisitor<T> visitor) => visitor.visitParentSelector(this);
 

lib/src/ast/selector/simple.dart

@@ -3,7 +3,6 @@
 // https://opensource.org/licenses/MIT.
 
 import 'package:meta/meta.dart';
-import 'package:source_span/source_span.dart';
 
 import '../../exception.dart';
 import '../../logger.dart';
@@ -35,7 +34,7 @@ abstract base class SimpleSelector extends Selector {
   /// sequence will contain 1000 simple selectors.
   int get specificity => 1000;
 
-  SimpleSelector(FileSpan span) : super(span);
+  SimpleSelector(super.span);
 
   /// Parses a simple selector from [contents].
   ///

lib/src/ast/selector/universal.dart

@@ -3,7 +3,6 @@
 // https://opensource.org/licenses/MIT.
 
 import 'package:meta/meta.dart';
-import 'package:source_span/source_span.dart';
 
 import '../../extend/functions.dart';
 import '../../visitor/interface/selector.dart';
@@ -23,7 +22,7 @@ final class UniversalSelector extends SimpleSelector {
 
   int get specificity => 0;
 
-  UniversalSelector(FileSpan span, {this.namespace}) : super(span);
+  UniversalSelector(super.span, {this.namespace});
 
   T accept<T>(SelectorVisitor<T> visitor) =>
       visitor.visitUniversalSelector(this);