Fix --fatal-deprecation adding obsolete ones

Using `--fatal-deprecation 1.92.0` would emit: "Warning: mixed-decls
deprecation is obsolete, so does not need to be made fatal".
This commit avoids these warnings by excluding obsolete deprecations.
See also #2647

Author: halo

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.94.2
+
+* Using `--fatal-deprecation 1.92.0` no longer emits warnings about
+  deprecations that are obsolete.
+
 ## 1.94.1
 
 * No user-visible changes.

lib/src/deprecation.dart

@@ -224,7 +224,8 @@ enum Deprecation {
     var range = VersionRange(max: version, includeMax: true);
     return {
       for (var deprecation in Deprecation.values)
-        if (deprecation.deprecatedIn.andThen(range.allows) ?? false)
+        if ((deprecation.deprecatedIn.andThen(range.allows) ?? false) &&
+            deprecation.obsoleteIn == null)
           deprecation,
     };
   }

pkg/sass-parser/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.35
+
+* No user-visible changes.
+
 ## 0.4.34
 
 * No user-visible changes.

pkg/sass_api/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 16.0.2
+
+* No user-visible changes.
+
 ## 16.0.1
 
 * No user-visible changes.

pkg/sass_api/pubspec.yaml

@@ -2,15 +2,15 @@ name: sass_api
 # Note: Every time we add a new Sass AST node, we need to bump the *major*
 # version because it's a breaking change for anyone who's implementing the
 # visitor interface(s).
-version: 16.0.1
+version: 16.0.2
 description: Additional APIs for Dart Sass.
 homepage: https://github.com/sass/dart-sass
 
 environment:
   sdk: ">=3.6.0 <4.0.0"
 
 dependencies:
-  sass: 1.94.1
+  sass: 1.94.2
 
 dev_dependencies:
   dartdoc: ">=8.0.14 <10.0.0"

pubspec.yaml

@@ -1,5 +1,5 @@
 name: sass
-version: 1.94.1
+version: 1.94.2
 description: A Sass implementation in Dart.
 homepage: https://github.com/sass/dart-sass
 

test/deprecations_test.dart

@@ -8,6 +8,7 @@ library;
 import 'package:test/test.dart';
 
 import 'package:sass/sass.dart';
+import 'package:pub_semver/pub_semver.dart';
 
 void main() {
   // Deprecated in all version of Dart Sass
@@ -151,6 +152,41 @@ void main() {
       );
     });
   });
+
+  group('Deprecation.forVersion', () {
+    test('includes deprecations as of that version', () {
+      final version = Version.parse('1.79.0');
+      final deprecations = Deprecation.forVersion(version);
+
+      expect(
+        deprecations,
+        contains(Deprecation.colorFunctions),
+        reason: 'color-functions deprecated in 1.79 (and not obsolete)',
+      );
+    });
+
+    test('excludes deprecations of newer versions', () {
+      final version = Version.parse('1.79.0');
+      final deprecations = Deprecation.forVersion(version);
+
+      expect(
+        deprecations,
+        isNot(contains(Deprecation.import)),
+        reason: 'import deprecated as of 1.80',
+      );
+    });
+
+    test('excludes deprecations that are obsolete', () {
+      final version = Version.parse('1.79.0');
+      final deprecations = Deprecation.forVersion(version);
+
+      expect(
+        deprecations,
+        isNot(contains(Deprecation.mixedDecls)),
+        reason: 'mixed-decls deprecated in 1.77.7 but obsolete in 1.92.0',
+      );
+    });
+  });
 }
 
 /// Confirms that [source] will error if [deprecation] is fatal.