Fix --fatal-deprecation adding obsolete ones

See also #2647

Author: halo

lib/src/deprecation.dart

@@ -220,11 +220,23 @@ enum Deprecation {
       );
 
   /// Returns the set of all deprecations done in or before [version].
-  static Set<Deprecation> forVersion(Version version) {
-    var range = VersionRange(max: version, includeMax: true);
+  static Set<Deprecation> forVersion(Version version, [Version? current]) {
+    final sassVersion = current ??
+        Version.parse(
+          const bool.hasEnvironment('version')
+              ? const String.fromEnvironment('version')
+              : '0.0.0',
+        );
+
+    final deprecatedRange = VersionRange(max: version, includeMax: true);
+    final obsoleteRange = VersionRange(max: sassVersion, includeMax: true);
+
     return {
       for (var deprecation in Deprecation.values)
-        if (deprecation.deprecatedIn.andThen(range.allows) ?? false)
+        if ((deprecation.deprecatedIn.andThen(deprecatedRange.allows) ??
+                false) &&
+            (deprecation.obsoleteIn.andThen((v) => !obsoleteRange.allows(v)) ??
+                true))
           deprecation,
     };
   }

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,75 @@ void main() {
       );
     });
   });
+
+  group('Deprecation.forVersion', () {
+    test('includes deprecations that are not obsolete', () {
+      final version = Version.parse('1.79.0');
+      final sassVersion = Version.parse('1.91.0');
+      final deprecations = Deprecation.forVersion(version, sassVersion);
+
+      expect(
+        deprecations,
+        equals({
+          Deprecation.callString,
+          Deprecation.elseif,
+          Deprecation.mozDocument,
+          Deprecation.relativeCanonical,
+          Deprecation.newGlobal,
+          Deprecation.colorModuleCompat,
+          Deprecation.slashDiv,
+          Deprecation.bogusCombinators,
+          Deprecation.strictUnary,
+          Deprecation.functionUnits,
+          Deprecation.duplicateVarFlags,
+          Deprecation.nullAlpha,
+          Deprecation.absPercent,
+          Deprecation.fsImporterCwd,
+          Deprecation.cssFunctionMixin,
+          Deprecation.mixedDecls,
+          Deprecation.featureExists,
+          Deprecation.color4Api,
+          Deprecation.colorFunctions,
+          Deprecation.legacyJsApi
+        }),
+        reason:
+            'type-function not deprecated yet in 1.79.0, mixed-decls not obsolete in 1.91.0',
+      );
+    });
+
+    test('includes deprecations that are not obsolete', () {
+      final version = Version.parse('1.79.0');
+      final sassVersion = Version.parse('1.92.0');
+      final deprecations = Deprecation.forVersion(version, sassVersion);
+
+      expect(
+        deprecations,
+        equals({
+          Deprecation.callString,
+          Deprecation.elseif,
+          Deprecation.mozDocument,
+          Deprecation.relativeCanonical,
+          Deprecation.newGlobal,
+          Deprecation.colorModuleCompat,
+          Deprecation.slashDiv,
+          Deprecation.bogusCombinators,
+          Deprecation.strictUnary,
+          Deprecation.functionUnits,
+          Deprecation.duplicateVarFlags,
+          Deprecation.nullAlpha,
+          Deprecation.absPercent,
+          Deprecation.fsImporterCwd,
+          Deprecation.cssFunctionMixin,
+          Deprecation.featureExists,
+          Deprecation.color4Api,
+          Deprecation.colorFunctions,
+          Deprecation.legacyJsApi
+        }),
+        reason:
+            'mixed-decls obsolete in 1.92.0',
+      );
+    });
+  });
 }
 
 /// Confirms that [source] will error if [deprecation] is fatal.