Merge pull request #2797 from sass/lints

Enable additional recommended lints

Author: nex3

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.101.2
+
+* Fix a bug where the deprecation warning for vendor-prefixed `expression()`
+  functions would incorrectly indicate whether or not the function would be
+  invalid Sass in Dart Sass 2.0.0.
+
 ## 1.101.1
 
 * Sass stack trace entries are now always either absolute URLs, absolute paths,

analysis/lib/analysis_options.yaml

@@ -10,13 +10,4 @@ analyzer:
     # These are necessary for matching the JS API.
     avoid_types_as_parameter_names: ignore
 
-    # These are style preferences rather than potential semantic issues. While
-    # we're not intrinsically opposed to adopting them for consistency with the
-    # Dart ecosystem, there aren't currently any automated tools to help us
-    # migrate to and remain consistent with these style rules, so achieving
-    # consistency isn't worth the engineering time we'd spend getting there.
-    annotate_overrides: ignore
-    use_function_type_syntax_for_parameters: ignore
-    prefer_interpolation_to_compose_strings: ignore
-
 include: package:lints/recommended.yaml

lib/sass.dart

@@ -375,7 +375,7 @@ String compile(
   bool quietDeps = false,
   bool verbose = false,
   @Deprecated("Use CompileResult.sourceMap from compileToResult() instead.")
-  void sourceMap(SingleMapping map)?,
+  void Function(SingleMapping map)? sourceMap,
   bool charset = true,
 }) {
   var result = compileToResult(
@@ -434,7 +434,7 @@ String compileString(
   @Deprecated(
     "Use CompileResult.sourceMap from compileStringToResult() instead.",
   )
-  void sourceMap(SingleMapping map)?,
+  void Function(SingleMapping map)? sourceMap,
   bool charset = true,
   @Deprecated("Use syntax instead.") bool indented = false,
 }) {
@@ -480,7 +480,7 @@ Future<String> compileAsync(
   @Deprecated(
     "Use CompileResult.sourceMap from compileToResultAsync() instead.",
   )
-  void sourceMap(SingleMapping map)?,
+  void Function(SingleMapping map)? sourceMap,
 }) async {
   var result = await compileToResultAsync(
     path,
@@ -523,7 +523,7 @@ Future<String> compileStringAsync(
   @Deprecated(
     "Use CompileResult.sourceMap from compileStringToResultAsync() instead.",
   )
-  void sourceMap(SingleMapping map)?,
+  void Function(SingleMapping map)? sourceMap,
   bool charset = true,
   @Deprecated("Use syntax instead.") bool indented = false,
 }) async {
@@ -552,4 +552,4 @@ Future<String> compileStringAsync(
 ///
 /// This is only intended for use when testing custom importers.
 @visibleForTesting
-T fakeFromImport<T>(T callback()) => inImportRule(callback);
+T fakeFromImport<T>(T Function() callback) => inImportRule(callback);

lib/src/ast/css/at_rule.dart

@@ -17,5 +17,6 @@ abstract interface class CssAtRule implements CssParentNode {
   ///
   /// This implies `children.isEmpty`, but the reverse is not true—for a rule
   /// like `@foo {}`, [children] is empty but [isChildless] is `false`.
+  @override
   bool get isChildless;
 }

lib/src/ast/css/media_query.dart

@@ -184,14 +184,17 @@ final class CssMediaQuery {
     );
   }
 
+  @override
   bool operator ==(Object other) =>
       other is CssMediaQuery &&
       other.modifier == modifier &&
       other.type == type &&
       listEquals(other.conditions, conditions);
 
+  @override
   int get hashCode => modifier.hashCode ^ type.hashCode ^ listHash(conditions);
 
+  @override
   String toString() {
     var buffer = StringBuffer();
     if (modifier != null) buffer.write("$modifier ");
@@ -232,5 +235,6 @@ class MediaQuerySuccessfulMergeResult implements MediaQueryMergeResult {
 
   MediaQuerySuccessfulMergeResult._(this.query);
 
+  @override
   String toString() => query.toString();
 }

lib/src/ast/css/modifiable/at_rule.dart

@@ -12,9 +12,16 @@ import 'node.dart';
 /// A modifiable version of [CssAtRule] for use in the evaluation step.
 final class ModifiableCssAtRule extends ModifiableCssParentNode
     implements CssAtRule {
+  @override
   final CssValue<String> name;
+
+  @override
   final CssValue<String>? value;
+
+  @override
   final bool isChildless;
+
+  @override
   final FileSpan span;
 
   ModifiableCssAtRule(
@@ -24,17 +31,21 @@ final class ModifiableCssAtRule extends ModifiableCssParentNode
     this.value,
   }) : isChildless = childless;
 
+  @override
   T accept<T>(ModifiableCssVisitor<T> visitor) => visitor.visitCssAtRule(this);
 
+  @override
   bool equalsIgnoringChildren(ModifiableCssNode other) =>
       other is ModifiableCssAtRule &&
       name == other.name &&
       value == other.value &&
       isChildless == other.isChildless;
 
+  @override
   ModifiableCssAtRule copyWithoutChildren() =>
       ModifiableCssAtRule(name, span, childless: isChildless, value: value);
 
+  @override
   void addChild(ModifiableCssNode child) {
     assert(!isChildless);
     super.addChild(child);

lib/src/ast/css/modifiable/comment.dart

@@ -12,12 +12,17 @@ import 'node.dart';
 /// A modifiable version of [CssComment] for use in the evaluation step.
 final class ModifiableCssComment extends ModifiableCssNode
     implements CssComment {
+  @override
   final String text;
+
+  @override
   final FileSpan span;
 
+  @override
   bool get isPreserved => text.codeUnitAt(2) == $exclamation;
 
   ModifiableCssComment(this.text, this.span);
 
+  @override
   T accept<T>(ModifiableCssVisitor<T> visitor) => visitor.visitCssComment(this);
 }

lib/src/ast/css/modifiable/declaration.dart

@@ -13,12 +13,22 @@ import 'node.dart';
 /// A modifiable version of [CssDeclaration] for use in the evaluation step.
 final class ModifiableCssDeclaration extends ModifiableCssNode
     implements CssDeclaration {
+  @override
   final CssValue<String> name;
+
+  @override
   final CssValue<Value> value;
+
+  @override
   final bool parsedAsSassScript;
+
+  @override
   final FileSpan valueSpanForMap;
+
+  @override
   final FileSpan span;
 
+  @override
   bool get isCustomProperty => name.value.startsWith('--');
 
   /// Returns a new CSS declaration with the given properties.
@@ -39,8 +49,10 @@ final class ModifiableCssDeclaration extends ModifiableCssNode
     }
   }
 
+  @override
   T accept<T>(ModifiableCssVisitor<T> visitor) =>
       visitor.visitCssDeclaration(this);
 
+  @override
   String toString() => "$name: $value;";
 }

lib/src/ast/css/modifiable/import.dart

@@ -14,13 +14,17 @@ final class ModifiableCssImport extends ModifiableCssNode implements CssImport {
   /// The URL being imported.
   ///
   /// This includes quotes.
+  @override
   final CssValue<String> url;
 
+  @override
   final CssValue<String>? modifiers;
 
+  @override
   final FileSpan span;
 
   ModifiableCssImport(this.url, this.span, {this.modifiers});
 
+  @override
   T accept<T>(ModifiableCssVisitor<T> visitor) => visitor.visitCssImport(this);
 }

lib/src/ast/css/modifiable/keyframe_block.dart

@@ -13,18 +13,24 @@ import 'node.dart';
 /// A modifiable version of [CssKeyframeBlock] for use in the evaluation step.
 final class ModifiableCssKeyframeBlock extends ModifiableCssParentNode
     implements CssKeyframeBlock {
+  @override
   final CssValue<List<String>> selector;
+
+  @override
   final FileSpan span;
 
   ModifiableCssKeyframeBlock(this.selector, this.span);
 
+  @override
   T accept<T>(ModifiableCssVisitor<T> visitor) =>
       visitor.visitCssKeyframeBlock(this);
 
+  @override
   bool equalsIgnoringChildren(ModifiableCssNode other) =>
       other is ModifiableCssKeyframeBlock &&
       listEquals(selector.value, other.selector.value);
 
+  @override
   ModifiableCssKeyframeBlock copyWithoutChildren() =>
       ModifiableCssKeyframeBlock(selector, span);
 }