Skip to content

Commit

Permalink
refactor: use more strict analysis options (#203)
Browse files Browse the repository at this point in the history
  • Loading branch information
felangel committed Jul 25, 2023
1 parent f8d6757 commit b3f7a37
Show file tree
Hide file tree
Showing 19 changed files with 504 additions and 368 deletions.
201 changes: 201 additions & 0 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
analyzer:
language:
strict-casts: true
strict-inference: true
strict-raw-types: true

errors:
close_sinks: ignore
missing_required_param: error
missing_return: error
record_literal_one_positional_no_trailing_comma: error

linter:
rules:
- always_declare_return_types
- always_put_required_named_parameters_first
- always_use_package_imports
- annotate_overrides
- avoid_bool_literals_in_conditional_expressions
- avoid_catching_errors
- avoid_double_and_int_checks
- avoid_dynamic_calls
- avoid_empty_else
- avoid_equals_and_hash_code_on_mutable_classes
- avoid_escaping_inner_quotes
- avoid_field_initializers_in_const_classes
- avoid_final_parameters
- avoid_function_literals_in_foreach_calls
- avoid_init_to_null
- avoid_js_rounded_ints
- avoid_multiple_declarations_per_line
- avoid_null_checks_in_equality_operators
- avoid_print
- avoid_private_typedef_functions
- avoid_redundant_argument_values
- avoid_relative_lib_imports
- avoid_renaming_method_parameters
- avoid_return_types_on_setters
- avoid_returning_null_for_void
- avoid_returning_this
- avoid_setters_without_getters
- avoid_shadowing_type_parameters
- avoid_single_cascade_in_expression_statements
- avoid_slow_async_io
- avoid_type_to_string
- avoid_types_as_parameter_names
- avoid_unnecessary_containers
- avoid_unused_constructor_parameters
- avoid_void_async
- avoid_web_libraries_in_flutter
- await_only_futures
- camel_case_extensions
- camel_case_types
- cancel_subscriptions
- cascade_invocations
- cast_nullable_to_non_nullable
- collection_methods_unrelated_type
- comment_references
- conditional_uri_does_not_exist
- constant_identifier_names
- control_flow_in_finally
- curly_braces_in_flow_control_structures
- dangling_library_doc_comments
- depend_on_referenced_packages
- deprecated_consistency
- directives_ordering
- empty_catches
- empty_constructor_bodies
- empty_statements
- eol_at_end_of_file
- exhaustive_cases
- file_names
- flutter_style_todos
- hash_and_equals
- implementation_imports
- implicit_call_tearoffs
- implicit_reopen
- invalid_case_patterns
- iterable_contains_unrelated_type
- join_return_with_assignment
- leading_newlines_in_multiline_strings
- library_annotations
- library_names
- library_prefixes
- library_private_types_in_public_api
- lines_longer_than_80_chars
- list_remove_unrelated_type
- literal_only_boolean_expressions
- missing_whitespace_between_adjacent_strings
- no_adjacent_strings_in_list
- no_default_cases
- no_duplicate_case_values
- no_leading_underscores_for_library_prefixes
- no_leading_underscores_for_local_identifiers
- no_logic_in_create_state
- no_runtimeType_toString
- non_constant_identifier_names
- noop_primitive_operations
- null_check_on_nullable_type_parameter
- null_closures
- omit_local_variable_types
- one_member_abstracts
- only_throw_errors
- overridden_fields
- package_api_docs
- package_names
- package_prefixed_library_names
- prefer_adjacent_string_concatenation
- prefer_asserts_in_initializer_lists
- prefer_asserts_with_message
- prefer_collection_literals
- prefer_conditional_assignment
- prefer_const_constructors
- prefer_const_constructors_in_immutables
- prefer_const_declarations
- prefer_const_literals_to_create_immutables
- prefer_constructors_over_static_methods
- prefer_contains
- prefer_final_fields
- prefer_final_in_for_each
- prefer_final_locals
- prefer_for_elements_to_map_fromIterable
- prefer_function_declarations_over_variables
- prefer_generic_function_type_aliases
- prefer_if_elements_to_conditional_expressions
- prefer_if_null_operators
- prefer_initializing_formals
- prefer_inlined_adds
- prefer_int_literals
- prefer_interpolation_to_compose_strings
- prefer_is_empty
- prefer_is_not_empty
- prefer_is_not_operator
- prefer_iterable_whereType
- prefer_null_aware_method_calls
- prefer_null_aware_operators
- prefer_single_quotes
- prefer_spread_collections
- prefer_typing_uninitialized_variables
- prefer_void_to_null
- provide_deprecation_message
- public_member_api_docs
- recursive_getters
- require_trailing_commas
- secure_pubspec_urls
- sized_box_for_whitespace
- sized_box_shrink_expand
- slash_for_doc_comments
- sort_child_properties_last
- sort_constructors_first
- sort_pub_dependencies
- sort_unnamed_constructors_first
- test_types_in_equals
- throw_in_finally
- tighten_type_of_initializing_formals
- type_annotate_public_apis
- type_init_formals
- unawaited_futures
- unnecessary_await_in_return
- unnecessary_brace_in_string_interps
- unnecessary_breaks
- unnecessary_const
- unnecessary_constructor_name
- unnecessary_getters_setters
- unnecessary_lambdas
- unnecessary_late
- unnecessary_library_directive
- unnecessary_new
- unnecessary_null_aware_assignments
- unnecessary_null_checks
- unnecessary_null_in_if_null_operators
- unnecessary_nullable_for_final_variable_declarations
- unnecessary_overrides
- unnecessary_parenthesis
- unnecessary_raw_strings
- unnecessary_statements
- unnecessary_string_escapes
- unnecessary_string_interpolations
- unnecessary_this
- unnecessary_to_list_in_spreads
- unrelated_type_equality_checks
- use_build_context_synchronously
- use_colored_box
- use_enums
- use_full_hex_values_for_flutter_colors
- use_function_type_syntax_for_parameters
- use_if_null_to_convert_nulls_to_bools
- use_is_even_rather_than_modulo
- use_key_in_widget_constructors
- use_late_for_private_fields_and_variables
- use_named_constants
- use_raw_strings
- use_rethrow_when_possible
- use_setters_to_change_properties
- use_string_buffers
- use_string_in_part_of_directives
- use_super_parameters
- use_test_throws_matchers
- use_to_and_as_if_applicable
- valid_regexps
- void_checks
81 changes: 1 addition & 80 deletions packages/mocktail/analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -1,80 +1 @@
analyzer:
strong-mode:
implicit-casts: false
implicit-dynamic: false
errors:
close_sinks: ignore

linter:
rules:
- public_member_api_docs
- annotate_overrides
- avoid_empty_else
- avoid_function_literals_in_foreach_calls
- avoid_init_to_null
- avoid_null_checks_in_equality_operators
- avoid_relative_lib_imports
- avoid_renaming_method_parameters
- avoid_return_types_on_setters
- avoid_returning_null
- avoid_types_as_parameter_names
- avoid_unused_constructor_parameters
- await_only_futures
- camel_case_types
- cancel_subscriptions
- cascade_invocations
- comment_references
- constant_identifier_names
- control_flow_in_finally
- directives_ordering
- empty_catches
- empty_constructor_bodies
- empty_statements
- hash_and_equals
- implementation_imports
- iterable_contains_unrelated_type
- library_names
- library_prefixes
- list_remove_unrelated_type
- lines_longer_than_80_chars
- no_adjacent_strings_in_list
- no_duplicate_case_values
- non_constant_identifier_names
- null_closures
- omit_local_variable_types
- only_throw_errors
- overridden_fields
- package_api_docs
- package_names
- package_prefixed_library_names
- prefer_adjacent_string_concatenation
- prefer_collection_literals
- prefer_conditional_assignment
- prefer_const_constructors
- prefer_contains
- prefer_equal_for_default_values
- prefer_final_fields
- prefer_initializing_formals
- prefer_interpolation_to_compose_strings
- prefer_is_empty
- prefer_is_not_empty
- prefer_single_quotes
- prefer_typing_uninitialized_variables
- recursive_getters
- slash_for_doc_comments
- sort_constructors_first
- test_types_in_equals
- throw_in_finally
- type_init_formals
- unawaited_futures
- unnecessary_brace_in_string_interps
- unnecessary_const
- unnecessary_getters_setters
- unnecessary_lambdas
- unnecessary_new
- unnecessary_null_aware_assignments
- unnecessary_statements
- unnecessary_this
- unrelated_type_equality_checks
- use_rethrow_when_possible
- valid_regexps
include: ../../analysis_options.yaml
1 change: 1 addition & 0 deletions packages/mocktail/lib/mocktail.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export 'src/mocktail.dart'
verifyNoMoreInteractions,
verifyZeroInteractions,
VerificationResult,
Verify,
ListOfVerificationResult,

// -- misc
Expand Down
6 changes: 3 additions & 3 deletions packages/mocktail/lib/src/_invocation_matcher.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class InvocationMatcher {
/// matches function which determines whether the current
/// [roleInvocation] matches the provided [invocation].
bool matches(Invocation invocation) {
var isMatching =
final isMatching =
_isMethodMatches(invocation) && _isArgumentsMatches(invocation);
if (isMatching) {
_captureArguments(invocation);
Expand Down Expand Up @@ -83,8 +83,8 @@ class InvocationMatcher {
typeArgIndex++;
}

Set roleKeys = roleInvocation.namedArguments.keys.toSet();
Set actKeys = invocation.namedArguments.keys.toSet();
final roleKeys = roleInvocation.namedArguments.keys.toSet();
final actKeys = invocation.namedArguments.keys.toSet();
if (roleKeys.difference(actKeys).isNotEmpty ||
actKeys.difference(roleKeys).isNotEmpty) {
return false;
Expand Down
28 changes: 15 additions & 13 deletions packages/mocktail/lib/src/_is_invocation.dart
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ class _InvocationMatcher implements Matcher {

// Returns named arguments as an iterable of '<name>: <value>'.
static Iterable<String> _namedArgsAndValues(Invocation invocation) =>
invocation.namedArguments.keys.map((name) =>
'${_symbolToString(name)}: ${invocation.namedArguments[name]}');
invocation.namedArguments.keys.map(
(name) =>
'${_symbolToString(name)}: ${invocation.namedArguments[name]}',
);

// This will give is a mangled symbol in dart2js/aot with minification
// enabled, but it's safe to assume very few people will use the invocation
Expand Down Expand Up @@ -114,16 +116,6 @@ Invocation _useMatchedInvocationIfSet(Invocation invocation) {
/// An Invocation implementation that takes arguments from [_storedArgs] and
/// [_storedNamedArgs].
class _InvocationForMatchedArguments extends Invocation {
_InvocationForMatchedArguments._(
this.memberName,
this.positionalArguments,
this.namedArguments,
this.typeArguments,
this.isGetter,
this.isMethod,
this.isSetter,
);

@override
factory _InvocationForMatchedArguments(Invocation invocation) {
// Handle named arguments first, so that we can provide useful errors for
Expand All @@ -147,6 +139,16 @@ class _InvocationForMatchedArguments extends Invocation {
);
}

_InvocationForMatchedArguments._(
this.memberName,
this.positionalArguments,
this.namedArguments,
this.typeArguments,
this.isGetter,
this.isMethod,
this.isSetter,
);

@override
final Symbol memberName;
@override
Expand Down Expand Up @@ -192,7 +194,7 @@ class _InvocationForMatchedArguments extends Invocation {
// Iterate through the stored named args, validate them, and add them to
// the return map.
_storedNamedArgs.forEach((name, arg) {
var nameSymbol = Symbol(name);
final nameSymbol = Symbol(name);
if (!invocation.namedArguments.containsKey(nameSymbol)) {
// Clear things out for the next call.
_storedArgs.clear();
Expand Down
4 changes: 2 additions & 2 deletions packages/mocktail/lib/src/_real_call.dart
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ extension on Invocation {
/// improve readability.
String toPrettyString() {
String argString;
var args = positionalArguments.map((dynamic v) => '$v');
final args = positionalArguments.map((dynamic v) => '$v');
if (args.any((arg) => arg.contains('\n'))) {
// As one or more arg contains newlines, put each on its own line, and
// indent each, for better readability.
Expand Down Expand Up @@ -82,7 +82,7 @@ extension on Invocation {

method = '$method$typeArgsString($argString)';
} else if (isGetter) {
method = '$method';
// no-op
} else if (isSetter) {
method = '$method=$argString';
} else {
Expand Down

0 comments on commit b3f7a37

Please sign in to comment.