Fix analysis issues (#2294)

jathak · web-flow · commit 9f786f459017 · 2024-07-30T15:48:05.000-07:00
diff --git a/analysis/pubspec.yaml b/analysis/pubspec.yaml
@@ -6,7 +6,7 @@ homepage: https://github.com/sass/dart-sass/tree/master/analysis
 publish_to: none
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
+  sdk: ">=3.0.0 <4.0.0"
 
 dependencies:
-  lints: ^2.0.0
+  lints: ^4.0.0
diff --git a/lib/src/async_import_cache.dart b/lib/src/async_import_cache.dart
@@ -318,8 +318,7 @@ final class AsyncImportCache {
       // If multiple original URLs canonicalize to the same thing, choose the
       // shortest one.
       minBy<Uri, int>(
-              _canonicalizeCache.values
-                  .whereNotNull()
+              _canonicalizeCache.values.nonNulls
                   .where((result) => result.$2 == canonicalUrl)
                   .map((result) => result.originalUrl),
               (url) => url.path.length)
diff --git a/lib/src/extend/functions.dart b/lib/src/extend/functions.dart
@@ -916,4 +916,4 @@ Iterable<SelectorList> _selectorPseudoArgs(
         .whereType<PseudoSelector>()
         .where((pseudo) => pseudo.isClass == isClass && pseudo.name == name)
         .map((pseudo) => pseudo.selector)
-        .whereNotNull();
+        .nonNulls;
diff --git a/lib/src/import_cache.dart b/lib/src/import_cache.dart
@@ -5,7 +5,7 @@
 // DO NOT EDIT. This file was generated from async_import_cache.dart.
 // See tool/grind/synchronize.dart for details.
 //
-// Checksum: 4362e28e5cd425786c235d2a6a2bb60539403799
+// Checksum: f70eea612e1613ef93bad353803ad9479cda04aa
 //
 // ignore_for_file: unused_import
 
@@ -313,8 +313,7 @@ final class ImportCache {
       // If multiple original URLs canonicalize to the same thing, choose the
       // shortest one.
       minBy<Uri, int>(
-              _canonicalizeCache.values
-                  .whereNotNull()
+              _canonicalizeCache.values.nonNulls
                   .where((result) => result.$2 == canonicalUrl)
                   .map((result) => result.originalUrl),
               (url) => url.path.length)
diff --git a/lib/src/importer/node_package.dart b/lib/src/importer/node_package.dart
@@ -3,7 +3,6 @@
 // https://opensource.org/licenses/MIT.
 
 import 'package:cli_pkg/js.dart';
-import 'package:collection/collection.dart';
 import 'package:sass/src/util/map.dart';
 import 'package:sass/src/util/nullable.dart';
 
@@ -239,7 +238,7 @@ class NodePackageImporter extends Importer {
 
           return null;
         })
-        .whereNotNull()
+        .nonNulls
         .toList();
 
     return switch (matches) {
diff --git a/lib/src/io/js.dart b/lib/src/io/js.dart
@@ -105,9 +105,9 @@ Future<String> readStdin() async {
   process.stdin.on('data', allowInterop(([Object? chunk]) {
     sink.add(chunk as List<int>);
   }));
-  process.stdin.on('end', allowInterop(([Object? _]) {
+  process.stdin.on('end', allowInterop(([Object? arg]) {
     // Callback for 'end' receives no args.
-    assert(_ == null);
+    assert(arg == null);
     sink.close();
   }));
   process.stdin.on('error', allowInterop(([Object? e]) {
diff --git a/lib/src/js/value/calculation.dart b/lib/src/js/value/calculation.dart
@@ -55,15 +55,10 @@ final JSClass calculationClass = () {
       if ((value == null && !_isValidClampArg(min)) ||
           (max == null && ![min, value].any(_isValidClampArg))) {
         jsThrow(JsError('Expected at least one SassString or '
-            'CalculationInterpolation in `${[
-          min,
-          value,
-          max
-        ].whereNotNull()}`'));
+            'CalculationInterpolation in `${[min, value, max].nonNulls}`'));
       }
-      [min, value, max].whereNotNull().forEach(_assertCalculationValue);
-      return SassCalculation.unsimplified(
-          'clamp', [min, value, max].whereNotNull());
+      [min, value, max].nonNulls.forEach(_assertCalculationValue);
+      return SassCalculation.unsimplified('clamp', [min, value, max].nonNulls);
     }
   });
 
diff --git a/test/browser_test.dart b/test/browser_test.dart
@@ -1,4 +1,5 @@
 @TestOn('browser')
+library;
 
 import 'package:js/js.dart';
 import 'package:node_interop/js.dart';
diff --git a/test/cli/dart/colon_args_test.dart b/test/cli/dart/colon_args_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'package:test/test.dart';
 
diff --git a/test/cli/dart/deprecations_test.dart b/test/cli/dart/deprecations_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'package:test/test.dart';
 
diff --git a/test/cli/dart/errors_test.dart b/test/cli/dart/errors_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'package:test/test.dart';
 import 'package:test_descriptor/test_descriptor.dart' as d;
diff --git a/test/cli/dart/repl_test.dart b/test/cli/dart/repl_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'package:test/test.dart';
 
diff --git a/test/cli/dart/source_maps_test.dart b/test/cli/dart/source_maps_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'package:test/test.dart';
 
diff --git a/test/cli/dart/update_test.dart b/test/cli/dart/update_test.dart
@@ -4,6 +4,7 @@
 
 // OS X's modification time reporting is flaky, so we skip these tests on it.
 @TestOn('vm && !mac-os')
+library;
 
 import 'package:test/test.dart';
 
diff --git a/test/cli/dart/watch_test.dart b/test/cli/dart/watch_test.dart
@@ -8,6 +8,7 @@
 // File watching is inherently flaky at the OS level. To mitigate this, we do a
 // few retries when the tests fail.
 @Retry(3)
+library;
 
 import 'package:test/test.dart';
 
diff --git a/test/cli/dart_test.dart b/test/cli/dart_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'dart:convert';
 
diff --git a/test/cli/node/colon_args_test.dart b/test/cli/node/colon_args_test.dart
@@ -4,6 +4,7 @@
 
 @TestOn('vm')
 @Tags(['node'])
+library;
 
 import 'package:test/test.dart';
 
diff --git a/test/cli/node/deprecations_test.dart b/test/cli/node/deprecations_test.dart
@@ -4,6 +4,7 @@
 
 @TestOn('vm')
 @Tags(['node'])
+library;
 
 import 'package:test/test.dart';
 
diff --git a/test/cli/node/errors_test.dart b/test/cli/node/errors_test.dart
@@ -4,6 +4,7 @@
 
 @TestOn('vm')
 @Tags(['node'])
+library;
 
 import 'package:test/test.dart';
 import 'package:test_descriptor/test_descriptor.dart' as d;
diff --git a/test/cli/node/repl_test.dart b/test/cli/node/repl_test.dart
@@ -4,6 +4,7 @@
 
 @TestOn('vm')
 @Tags(['node'])
+library;
 
 import 'package:test/test.dart';
 
diff --git a/test/cli/node/source_maps_test.dart b/test/cli/node/source_maps_test.dart
@@ -4,6 +4,7 @@
 
 @TestOn('vm')
 @Tags(['node'])
+library;
 
 import 'package:test/test.dart';
 
diff --git a/test/cli/node/update_test.dart b/test/cli/node/update_test.dart
@@ -5,6 +5,7 @@
 // OS X's modification time reporting is flaky, so we skip these tests on it.
 @TestOn('vm && !mac-os')
 @Tags(['node'])
+library;
 
 import 'package:test/test.dart';
 
diff --git a/test/cli/node/watch_test.dart b/test/cli/node/watch_test.dart
@@ -9,6 +9,7 @@
 // File watching is inherently flaky at the OS level. To mitigate this, we do a
 // few retries when the tests fail.
 @Retry(3)
+library;
 
 import 'package:test/test.dart';
 
diff --git a/test/cli/node_test.dart b/test/cli/node_test.dart
@@ -4,6 +4,7 @@
 
 @TestOn('vm')
 @Tags(['node'])
+library;
 
 import 'dart:convert';
 
diff --git a/test/compressed_test.dart b/test/compressed_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'package:test/test.dart';
 
diff --git a/test/dart_api/function_test.dart b/test/dart_api/function_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'package:test/test.dart';
 
diff --git a/test/dart_api/importer_test.dart b/test/dart_api/importer_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'dart:convert';
 
diff --git a/test/dart_api/logger_test.dart b/test/dart_api/logger_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'package:test/test.dart';
 import 'package:source_span/source_span.dart';
diff --git a/test/dart_api/value/boolean_test.dart b/test/dart_api/value/boolean_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'package:test/test.dart';
 
diff --git a/test/dart_api/value/calculation_test.dart b/test/dart_api/value/calculation_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'package:test/test.dart';
 
diff --git a/test/dart_api/value/color_test.dart b/test/dart_api/value/color_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'package:test/test.dart';
 
diff --git a/test/dart_api/value/function_test.dart b/test/dart_api/value/function_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'package:test/test.dart';
 
diff --git a/test/dart_api/value/list_test.dart b/test/dart_api/value/list_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'package:test/test.dart';
 
diff --git a/test/dart_api/value/map_test.dart b/test/dart_api/value/map_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'package:test/test.dart';
 
diff --git a/test/dart_api/value/null_test.dart b/test/dart_api/value/null_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'package:test/test.dart';
 
diff --git a/test/dart_api/value/number_test.dart b/test/dart_api/value/number_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'dart:math' as math;
 
diff --git a/test/dart_api/value/string_test.dart b/test/dart_api/value/string_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'package:test/test.dart';
 
diff --git a/test/dart_api_test.dart b/test/dart_api_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'package:package_config/package_config.dart';
 import 'package:path/path.dart' as p;
diff --git a/test/deprecations_test.dart b/test/deprecations_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'package:test/test.dart';
 
diff --git a/test/doc_comments_test.dart b/test/doc_comments_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'package:sass/src/ast/sass.dart';
 import 'package:test/test.dart';
diff --git a/test/double_check_test.dart b/test/double_check_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'dart:io';
 import 'dart:convert';
diff --git a/test/embedded/embedded_process.dart b/test/embedded/embedded_process.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'dart:async';
 import 'dart:convert';
diff --git a/test/embedded/file_importer_test.dart b/test/embedded/file_importer_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
diff --git a/test/embedded/function_test.dart b/test/embedded/function_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'package:test/test.dart';
 
diff --git a/test/embedded/importer_test.dart b/test/embedded/importer_test.dart
@@ -3,6 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 @TestOn('vm')
+library;
 
 import 'package:source_maps/source_maps.dart' as source_maps;
 import 'package:test/test.dart';
diff --git a/test/embedded/length_delimited_test.dart b/test/embedded/length_delimited_test.dart
diff --git a/test/embedded/protocol_test.dart b/test/embedded/protocol_test.dart
diff --git a/test/output_test.dart b/test/output_test.dart
diff --git a/test/repo_test.dart b/test/repo_test.dart
diff --git a/test/source_map_test.dart b/test/source_map_test.dart

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`@TestOn('browser')`
	`2`	`+library;`
`2`	`3`
`3`	`4`	`import 'package:js/js.dart';`
`4`	`5`	`import 'package:node_interop/js.dart';`