diff --git a/pkg/analyzer_utilities/analysis_options.yaml b/pkg/analyzer_utilities/analysis_options.yaml index d6c8a1a18f7..3596ce5c235 100644 --- a/pkg/analyzer_utilities/analysis_options.yaml +++ b/pkg/analyzer_utilities/analysis_options.yaml @@ -1,8 +1,10 @@ include: package:lints/recommended.yaml analyzer: - strong-mode: - implicit-casts: false + language: + strict-casts: true + strict-inference: true + strict-raw-types: true linter: rules: @@ -10,14 +12,10 @@ linter: # Enable when we require Dart 2.19.0. #- dangling_library_doc_comments - depend_on_referenced_packages - - empty_constructor_bodies - - empty_statements - enable_null_safety - implicit_call_tearoffs - library_annotations - unawaited_futures - - unnecessary_brace_in_string_interps - unnecessary_library_directive - unnecessary_parenthesis - unreachable_from_main - - valid_regexps diff --git a/pkg/analyzer_utilities/lib/testing/map_entry_matcher.dart b/pkg/analyzer_utilities/lib/testing/map_entry_matcher.dart index 9556ee1ea51..c0c5f0dbb4c 100644 --- a/pkg/analyzer_utilities/lib/testing/map_entry_matcher.dart +++ b/pkg/analyzer_utilities/lib/testing/map_entry_matcher.dart @@ -5,13 +5,14 @@ import 'package:test/test.dart'; /// Matches a [MapEntry] with matching [MapEntry.key] and [MapEntry.value]. -MapEntryMatcher isMapEntry(key, value) => MapEntryMatcher(key, value); +MapEntryMatcher isMapEntry(Object? key, Object? value) => + MapEntryMatcher(key, value); class MapEntryMatcher extends Matcher { final Matcher keyMatcher; final Matcher valueMatcher; - MapEntryMatcher(key, value) + MapEntryMatcher(Object? key, Object? value) : keyMatcher = wrapMatcher(key), valueMatcher = wrapMatcher(value); @@ -24,7 +25,7 @@ class MapEntryMatcher extends Matcher { .add(')'); @override - bool matches(item, Map matchState) => + bool matches(item, Map matchState) => item is MapEntry && keyMatcher.matches(item.key, {}) && valueMatcher.matches(item.value, {});