rubocop 1.9.1 → 1.22.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +17 -14
- data/assets/output.html.erb +1 -1
- data/config/default.yml +326 -73
- data/config/obsoletion.yml +4 -0
- data/exe/rubocop +1 -3
- data/lib/rubocop/cached_data.rb +1 -3
- data/lib/rubocop/cli/command/auto_genenerate_config.rb +9 -19
- data/lib/rubocop/cli/command/execute_runner.rb +1 -1
- data/lib/rubocop/cli/command/init_dotfile.rb +1 -3
- data/lib/rubocop/cli/command/show_cops.rb +1 -4
- data/lib/rubocop/cli/command/suggest_extensions.rb +6 -5
- data/lib/rubocop/cli.rb +21 -5
- data/lib/rubocop/comment_config.rb +45 -101
- data/lib/rubocop/config.rb +16 -26
- data/lib/rubocop/config_loader.rb +11 -15
- data/lib/rubocop/config_loader_resolver.rb +44 -21
- data/lib/rubocop/config_obsoletion/cop_rule.rb +1 -2
- data/lib/rubocop/config_store.rb +1 -2
- data/lib/rubocop/config_validator.rb +37 -21
- data/lib/rubocop/cop/autocorrect_logic.rb +3 -8
- data/lib/rubocop/cop/badge.rb +1 -2
- data/lib/rubocop/cop/base.rb +13 -11
- data/lib/rubocop/cop/bundler/duplicated_gem.rb +4 -4
- data/lib/rubocop/cop/bundler/gem_comment.rb +43 -10
- data/lib/rubocop/cop/bundler/gem_filename.rb +103 -0
- data/lib/rubocop/cop/bundler/gem_version.rb +133 -0
- data/lib/rubocop/cop/bundler/insecure_protocol_source.rb +46 -21
- data/lib/rubocop/cop/bundler/ordered_gems.rb +5 -16
- data/lib/rubocop/cop/commissioner.rb +2 -8
- data/lib/rubocop/cop/cop.rb +4 -18
- data/lib/rubocop/cop/corrector.rb +5 -8
- data/lib/rubocop/cop/correctors/alignment_corrector.rb +6 -12
- data/lib/rubocop/cop/correctors/each_to_for_corrector.rb +2 -4
- data/lib/rubocop/cop/correctors/for_to_each_corrector.rb +1 -2
- data/lib/rubocop/cop/correctors/lambda_literal_to_method_corrector.rb +2 -2
- data/lib/rubocop/cop/correctors/line_break_corrector.rb +3 -6
- data/lib/rubocop/cop/correctors/multiline_literal_brace_corrector.rb +1 -3
- data/lib/rubocop/cop/correctors/ordered_gem_corrector.rb +11 -12
- data/lib/rubocop/cop/correctors/percent_literal_corrector.rb +2 -8
- data/lib/rubocop/cop/correctors/require_library_corrector.rb +23 -0
- data/lib/rubocop/cop/documentation.rb +1 -1
- data/lib/rubocop/cop/gemspec/date_assignment.rb +57 -0
- data/lib/rubocop/cop/gemspec/duplicated_assignment.rb +3 -2
- data/lib/rubocop/cop/gemspec/ordered_dependencies.rb +5 -16
- data/lib/rubocop/cop/gemspec/required_ruby_version.rb +32 -23
- data/lib/rubocop/cop/gemspec/ruby_version_globals_usage.rb +2 -0
- data/lib/rubocop/cop/generator/configuration_injector.rb +1 -2
- data/lib/rubocop/cop/generator/require_file_injector.rb +2 -5
- data/lib/rubocop/cop/generator.rb +18 -15
- data/lib/rubocop/cop/internal_affairs/example_description.rb +8 -5
- data/lib/rubocop/cop/internal_affairs/inherit_deprecated_cop_class.rb +34 -0
- data/lib/rubocop/cop/internal_affairs/location_line_equality_comparison.rb +60 -0
- data/lib/rubocop/cop/internal_affairs/method_name_equal.rb +3 -5
- data/lib/rubocop/cop/internal_affairs/node_destructuring.rb +3 -3
- data/lib/rubocop/cop/internal_affairs/node_matcher_directive.rb +151 -0
- data/lib/rubocop/cop/internal_affairs/node_type_predicate.rb +2 -3
- data/lib/rubocop/cop/internal_affairs/offense_location_keyword.rb +3 -2
- data/lib/rubocop/cop/internal_affairs/redundant_described_class_as_subject.rb +1 -0
- data/lib/rubocop/cop/internal_affairs/redundant_let_rubocop_config_new.rb +1 -0
- data/lib/rubocop/cop/internal_affairs/redundant_location_argument.rb +1 -0
- data/lib/rubocop/cop/internal_affairs/redundant_message_argument.rb +3 -0
- data/lib/rubocop/cop/internal_affairs/style_detected_api_use.rb +5 -2
- data/lib/rubocop/cop/internal_affairs/undefined_config.rb +71 -0
- data/lib/rubocop/cop/internal_affairs/useless_message_assertion.rb +3 -3
- data/lib/rubocop/cop/internal_affairs.rb +4 -0
- data/lib/rubocop/cop/layout/access_modifier_indentation.rb +12 -10
- data/lib/rubocop/cop/layout/argument_alignment.rb +36 -19
- data/lib/rubocop/cop/layout/array_alignment.rb +9 -8
- data/lib/rubocop/cop/layout/assignment_indentation.rb +9 -8
- data/lib/rubocop/cop/layout/begin_end_alignment.rb +1 -4
- data/lib/rubocop/cop/layout/block_alignment.rb +12 -23
- data/lib/rubocop/cop/layout/block_end_newline.rb +4 -8
- data/lib/rubocop/cop/layout/case_indentation.rb +57 -11
- data/lib/rubocop/cop/layout/class_structure.rb +12 -12
- data/lib/rubocop/cop/layout/closing_parenthesis_indentation.rb +24 -30
- data/lib/rubocop/cop/layout/comment_indentation.rb +18 -22
- data/lib/rubocop/cop/layout/def_end_alignment.rb +2 -6
- data/lib/rubocop/cop/layout/dot_position.rb +42 -9
- data/lib/rubocop/cop/layout/else_alignment.rb +10 -9
- data/lib/rubocop/cop/layout/empty_comment.rb +6 -13
- data/lib/rubocop/cop/layout/empty_line_after_guard_clause.rb +44 -23
- data/lib/rubocop/cop/layout/empty_line_between_defs.rb +2 -6
- data/lib/rubocop/cop/layout/empty_lines.rb +1 -3
- data/lib/rubocop/cop/layout/empty_lines_around_access_modifier.rb +8 -18
- data/lib/rubocop/cop/layout/empty_lines_around_exception_handling_keywords.rb +9 -12
- data/lib/rubocop/cop/layout/end_alignment.rb +10 -4
- data/lib/rubocop/cop/layout/end_of_line.rb +1 -1
- data/lib/rubocop/cop/layout/extra_spacing.rb +5 -9
- data/lib/rubocop/cop/layout/first_argument_indentation.rb +12 -6
- data/lib/rubocop/cop/layout/first_array_element_indentation.rb +13 -11
- data/lib/rubocop/cop/layout/first_array_element_line_break.rb +1 -2
- data/lib/rubocop/cop/layout/first_hash_element_indentation.rb +37 -21
- data/lib/rubocop/cop/layout/first_hash_element_line_break.rb +1 -2
- data/lib/rubocop/cop/layout/first_method_argument_line_break.rb +1 -2
- data/lib/rubocop/cop/layout/first_method_parameter_line_break.rb +1 -2
- data/lib/rubocop/cop/layout/first_parameter_indentation.rb +8 -7
- data/lib/rubocop/cop/layout/hash_alignment.rb +58 -31
- data/lib/rubocop/cop/layout/heredoc_argument_closing_parenthesis.rb +4 -11
- data/lib/rubocop/cop/layout/heredoc_indentation.rb +2 -13
- data/lib/rubocop/cop/layout/indentation_consistency.rb +9 -6
- data/lib/rubocop/cop/layout/indentation_style.rb +25 -30
- data/lib/rubocop/cop/layout/indentation_width.rb +34 -13
- data/lib/rubocop/cop/layout/initial_indentation.rb +1 -4
- data/lib/rubocop/cop/layout/leading_comment_space.rb +2 -2
- data/lib/rubocop/cop/layout/line_end_string_concatenation_indentation.rb +141 -0
- data/lib/rubocop/cop/layout/line_length.rb +13 -22
- data/lib/rubocop/cop/layout/multiline_array_brace_layout.rb +6 -6
- data/lib/rubocop/cop/layout/multiline_array_line_breaks.rb +1 -2
- data/lib/rubocop/cop/layout/multiline_assignment_layout.rb +29 -3
- data/lib/rubocop/cop/layout/multiline_block_layout.rb +10 -18
- data/lib/rubocop/cop/layout/multiline_hash_brace_layout.rb +6 -6
- data/lib/rubocop/cop/layout/multiline_hash_key_line_breaks.rb +1 -2
- data/lib/rubocop/cop/layout/multiline_method_argument_line_breaks.rb +4 -2
- data/lib/rubocop/cop/layout/multiline_method_call_brace_layout.rb +6 -6
- data/lib/rubocop/cop/layout/multiline_method_call_indentation.rb +22 -15
- data/lib/rubocop/cop/layout/multiline_method_definition_brace_layout.rb +6 -6
- data/lib/rubocop/cop/layout/multiline_operation_indentation.rb +13 -8
- data/lib/rubocop/cop/layout/parameter_alignment.rb +8 -7
- data/lib/rubocop/cop/layout/redundant_line_break.rb +140 -0
- data/lib/rubocop/cop/layout/rescue_ensure_alignment.rb +26 -16
- data/lib/rubocop/cop/layout/single_line_block_chain.rb +64 -0
- data/lib/rubocop/cop/layout/space_after_colon.rb +1 -3
- data/lib/rubocop/cop/layout/space_after_method_name.rb +2 -4
- data/lib/rubocop/cop/layout/space_after_not.rb +1 -0
- data/lib/rubocop/cop/layout/space_around_block_parameters.rb +6 -14
- data/lib/rubocop/cop/layout/space_around_equals_in_parameter_default.rb +2 -2
- data/lib/rubocop/cop/layout/space_around_keyword.rb +33 -8
- data/lib/rubocop/cop/layout/space_around_operators.rb +23 -11
- data/lib/rubocop/cop/layout/space_before_block_braces.rb +2 -3
- data/lib/rubocop/cop/layout/space_before_brackets.rb +3 -4
- data/lib/rubocop/cop/layout/space_before_comment.rb +3 -5
- data/lib/rubocop/cop/layout/space_before_first_arg.rb +5 -11
- data/lib/rubocop/cop/layout/space_in_lambda_literal.rb +2 -4
- data/lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb +5 -10
- data/lib/rubocop/cop/layout/space_inside_array_percent_literal.rb +2 -7
- data/lib/rubocop/cop/layout/space_inside_block_braces.rb +6 -11
- data/lib/rubocop/cop/layout/space_inside_hash_literal_braces.rb +1 -2
- data/lib/rubocop/cop/layout/space_inside_parens.rb +78 -32
- data/lib/rubocop/cop/layout/space_inside_reference_brackets.rb +1 -2
- data/lib/rubocop/cop/layout/trailing_whitespace.rb +24 -1
- data/lib/rubocop/cop/legacy/corrections_proxy.rb +2 -8
- data/lib/rubocop/cop/legacy/corrector.rb +1 -3
- data/lib/rubocop/cop/lint/ambiguous_assignment.rb +1 -6
- data/lib/rubocop/cop/lint/ambiguous_block_association.rb +14 -7
- data/lib/rubocop/cop/lint/ambiguous_operator_precedence.rb +111 -0
- data/lib/rubocop/cop/lint/ambiguous_range.rb +105 -0
- data/lib/rubocop/cop/lint/ambiguous_regexp_literal.rb +5 -2
- data/lib/rubocop/cop/lint/assignment_in_condition.rb +7 -5
- data/lib/rubocop/cop/lint/big_decimal_new.rb +1 -0
- data/lib/rubocop/cop/lint/binary_operator_with_identical_operands.rb +18 -5
- data/lib/rubocop/cop/lint/boolean_symbol.rb +7 -2
- data/lib/rubocop/cop/lint/constant_definition_in_block.rb +2 -0
- data/lib/rubocop/cop/lint/constant_resolution.rb +2 -2
- data/lib/rubocop/cop/lint/debugger.rb +59 -15
- data/lib/rubocop/cop/lint/deprecated_class_methods.rb +83 -41
- data/lib/rubocop/cop/lint/deprecated_constants.rb +5 -4
- data/lib/rubocop/cop/lint/deprecated_open_ssl_constant.rb +16 -9
- data/lib/rubocop/cop/lint/disjunctive_assignment_in_constructor.rb +24 -1
- data/lib/rubocop/cop/lint/duplicate_branch.rb +4 -4
- data/lib/rubocop/cop/lint/duplicate_hash_key.rb +1 -3
- data/lib/rubocop/cop/lint/duplicate_methods.rb +14 -12
- data/lib/rubocop/cop/lint/duplicate_require.rb +3 -2
- data/lib/rubocop/cop/lint/each_with_object_argument.rb +1 -0
- data/lib/rubocop/cop/lint/else_layout.rb +12 -10
- data/lib/rubocop/cop/lint/empty_block.rb +18 -2
- data/lib/rubocop/cop/lint/empty_ensure.rb +1 -3
- data/lib/rubocop/cop/lint/empty_file.rb +1 -3
- data/lib/rubocop/cop/lint/empty_in_pattern.rb +62 -0
- data/lib/rubocop/cop/lint/empty_interpolation.rb +1 -3
- data/lib/rubocop/cop/lint/ensure_return.rb +1 -3
- data/lib/rubocop/cop/lint/erb_new_arguments.rb +4 -7
- data/lib/rubocop/cop/lint/float_out_of_range.rb +1 -2
- data/lib/rubocop/cop/lint/format_parameter_mismatch.rb +4 -6
- data/lib/rubocop/cop/lint/hash_compare_by_identity.rb +13 -3
- data/lib/rubocop/cop/lint/heredoc_method_call_position.rb +1 -2
- data/lib/rubocop/cop/lint/implicit_string_concatenation.rb +1 -2
- data/lib/rubocop/cop/lint/incompatible_io_select_with_fiber_scheduler.rb +67 -0
- data/lib/rubocop/cop/lint/ineffective_access_modifier.rb +4 -7
- data/lib/rubocop/cop/lint/inherit_exception.rb +2 -2
- data/lib/rubocop/cop/lint/interpolation_check.rb +8 -11
- data/lib/rubocop/cop/lint/literal_as_condition.rb +13 -1
- data/lib/rubocop/cop/lint/literal_in_interpolation.rb +3 -6
- data/lib/rubocop/cop/lint/loop.rb +5 -5
- data/lib/rubocop/cop/lint/missing_cop_enable_directive.rb +32 -21
- data/lib/rubocop/cop/lint/missing_super.rb +1 -2
- data/lib/rubocop/cop/lint/mixed_regexp_capture_types.rb +1 -2
- data/lib/rubocop/cop/lint/multiple_comparison.rb +5 -4
- data/lib/rubocop/cop/lint/nested_method_definition.rb +4 -2
- data/lib/rubocop/cop/lint/nested_percent_literal.rb +2 -4
- data/lib/rubocop/cop/lint/next_without_accumulator.rb +1 -0
- data/lib/rubocop/cop/lint/non_deterministic_require_order.rb +13 -4
- data/lib/rubocop/cop/lint/non_local_exit_from_iterator.rb +3 -0
- data/lib/rubocop/cop/lint/number_conversion.rb +25 -6
- data/lib/rubocop/cop/lint/numbered_parameter_assignment.rb +1 -1
- data/lib/rubocop/cop/lint/or_assignment_to_constant.rb +4 -2
- data/lib/rubocop/cop/lint/ordered_magic_comments.rb +1 -2
- data/lib/rubocop/cop/lint/out_of_range_regexp_ref.rb +18 -3
- data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb +1 -3
- data/lib/rubocop/cop/lint/percent_string_array.rb +11 -1
- data/lib/rubocop/cop/lint/percent_symbol_array.rb +2 -4
- data/lib/rubocop/cop/lint/raise_exception.rb +7 -2
- data/lib/rubocop/cop/lint/rand_one.rb +2 -2
- data/lib/rubocop/cop/lint/redundant_cop_disable_directive.rb +108 -90
- data/lib/rubocop/cop/lint/redundant_cop_enable_directive.rb +5 -0
- data/lib/rubocop/cop/lint/redundant_require_statement.rb +1 -0
- data/lib/rubocop/cop/lint/redundant_safe_navigation.rb +7 -7
- data/lib/rubocop/cop/lint/redundant_splat_expansion.rb +10 -10
- data/lib/rubocop/cop/lint/redundant_string_coercion.rb +2 -2
- data/lib/rubocop/cop/lint/redundant_with_index.rb +2 -4
- data/lib/rubocop/cop/lint/redundant_with_object.rb +2 -4
- data/lib/rubocop/cop/lint/regexp_as_condition.rb +1 -3
- data/lib/rubocop/cop/lint/require_parentheses.rb +2 -4
- data/lib/rubocop/cop/lint/require_relative_self_path.rb +50 -0
- data/lib/rubocop/cop/lint/rescue_exception.rb +1 -2
- data/lib/rubocop/cop/lint/rescue_type.rb +2 -7
- data/lib/rubocop/cop/lint/return_in_void_context.rb +1 -2
- data/lib/rubocop/cop/lint/safe_navigation_chain.rb +2 -2
- data/lib/rubocop/cop/lint/safe_navigation_consistency.rb +4 -10
- data/lib/rubocop/cop/lint/safe_navigation_with_empty.rb +2 -2
- data/lib/rubocop/cop/lint/send_with_mixin_argument.rb +3 -7
- data/lib/rubocop/cop/lint/shadowed_argument.rb +6 -12
- data/lib/rubocop/cop/lint/shadowed_exception.rb +7 -8
- data/lib/rubocop/cop/lint/shadowing_outer_local_variable.rb +2 -1
- data/lib/rubocop/cop/lint/struct_new_override.rb +2 -2
- data/lib/rubocop/cop/lint/suppressed_exception.rb +44 -1
- data/lib/rubocop/cop/lint/symbol_conversion.rb +86 -11
- data/lib/rubocop/cop/lint/syntax.rb +1 -3
- data/lib/rubocop/cop/lint/to_enum_arguments.rb +3 -0
- data/lib/rubocop/cop/lint/to_json.rb +1 -2
- data/lib/rubocop/cop/lint/trailing_comma_in_attribute_declaration.rb +1 -3
- data/lib/rubocop/cop/lint/triple_quotes.rb +1 -1
- data/lib/rubocop/cop/lint/underscore_prefixed_variable_name.rb +1 -3
- data/lib/rubocop/cop/lint/unexpected_block_arity.rb +8 -3
- data/lib/rubocop/cop/lint/unified_integer.rb +1 -0
- data/lib/rubocop/cop/lint/unmodified_reduce_accumulator.rb +5 -0
- data/lib/rubocop/cop/lint/unreachable_code.rb +3 -5
- data/lib/rubocop/cop/lint/unreachable_loop.rb +15 -7
- data/lib/rubocop/cop/lint/unused_block_argument.rb +10 -8
- data/lib/rubocop/cop/lint/unused_method_argument.rb +4 -5
- data/lib/rubocop/cop/lint/uri_escape_unescape.rb +1 -0
- data/lib/rubocop/cop/lint/useless_access_modifier.rb +6 -4
- data/lib/rubocop/cop/lint/useless_assignment.rb +5 -10
- data/lib/rubocop/cop/lint/useless_method_definition.rb +3 -2
- data/lib/rubocop/cop/lint/useless_setter_call.rb +9 -7
- data/lib/rubocop/cop/lint/useless_times.rb +8 -4
- data/lib/rubocop/cop/lint/void.rb +5 -12
- data/lib/rubocop/cop/message_annotator.rb +1 -3
- data/lib/rubocop/cop/metrics/abc_size.rb +6 -0
- data/lib/rubocop/cop/metrics/block_nesting.rb +2 -7
- data/lib/rubocop/cop/metrics/class_length.rb +1 -3
- data/lib/rubocop/cop/metrics/cyclomatic_complexity.rb +1 -2
- data/lib/rubocop/cop/metrics/module_length.rb +3 -6
- data/lib/rubocop/cop/metrics/parameter_lists.rb +8 -7
- data/lib/rubocop/cop/metrics/perceived_complexity.rb +2 -3
- data/lib/rubocop/cop/metrics/utils/abc_size_calculator.rb +5 -8
- data/lib/rubocop/cop/metrics/utils/code_length_calculator.rb +8 -6
- data/lib/rubocop/cop/metrics/utils/repeated_attribute_discount.rb +4 -7
- data/lib/rubocop/cop/migration/department_name.rb +4 -6
- data/lib/rubocop/cop/mixin/alignment.rb +12 -7
- data/lib/rubocop/cop/mixin/annotation_comment.rb +57 -34
- data/lib/rubocop/cop/mixin/check_line_breakable.rb +29 -4
- data/lib/rubocop/cop/mixin/code_length.rb +2 -4
- data/lib/rubocop/cop/mixin/comments_help.rb +5 -1
- data/lib/rubocop/cop/mixin/configurable_enforced_style.rb +2 -2
- data/lib/rubocop/cop/mixin/configurable_formatting.rb +3 -8
- data/lib/rubocop/cop/mixin/def_node.rb +3 -5
- data/lib/rubocop/cop/mixin/documentation_comment.rb +8 -8
- data/lib/rubocop/cop/mixin/empty_lines_around_body.rb +6 -7
- data/lib/rubocop/cop/mixin/empty_parameter.rb +2 -3
- data/lib/rubocop/cop/mixin/end_keyword_alignment.rb +2 -5
- data/lib/rubocop/cop/mixin/enforce_superclass.rb +4 -6
- data/lib/rubocop/cop/mixin/first_element_line_break.rb +1 -3
- data/lib/rubocop/cop/mixin/frozen_string_literal.rb +30 -8
- data/lib/rubocop/cop/mixin/gem_declaration.rb +13 -0
- data/lib/rubocop/cop/mixin/hash_alignment_styles.rb +17 -9
- data/lib/rubocop/cop/mixin/hash_transform_method.rb +16 -25
- data/lib/rubocop/cop/mixin/heredoc.rb +5 -0
- data/lib/rubocop/cop/mixin/interpolation.rb +1 -3
- data/lib/rubocop/cop/mixin/line_length_help.rb +13 -10
- data/lib/rubocop/cop/mixin/match_range.rb +2 -5
- data/lib/rubocop/cop/mixin/method_complexity.rb +2 -3
- data/lib/rubocop/cop/mixin/method_preference.rb +1 -2
- data/lib/rubocop/cop/mixin/multiline_element_indentation.rb +5 -4
- data/lib/rubocop/cop/mixin/multiline_element_line_breaks.rb +1 -3
- data/lib/rubocop/cop/mixin/multiline_expression_indentation.rb +13 -42
- data/lib/rubocop/cop/mixin/multiline_literal_brace_layout.rb +2 -3
- data/lib/rubocop/cop/mixin/negative_conditional.rb +4 -2
- data/lib/rubocop/cop/mixin/ordered_gem_node.rb +10 -5
- data/lib/rubocop/cop/mixin/percent_array.rb +17 -8
- data/lib/rubocop/cop/mixin/percent_literal.rb +0 -6
- data/lib/rubocop/cop/mixin/preceding_following_alignment.rb +14 -12
- data/lib/rubocop/cop/mixin/preferred_delimiters.rb +6 -9
- data/lib/rubocop/cop/mixin/range_help.rb +10 -13
- data/lib/rubocop/cop/mixin/rational_literal.rb +1 -0
- data/lib/rubocop/cop/mixin/require_library.rb +59 -0
- data/lib/rubocop/cop/mixin/rescue_node.rb +2 -6
- data/lib/rubocop/cop/mixin/safe_assignment.rb +6 -2
- data/lib/rubocop/cop/mixin/space_after_punctuation.rb +2 -4
- data/lib/rubocop/cop/mixin/space_before_punctuation.rb +3 -4
- data/lib/rubocop/cop/mixin/statement_modifier.rb +2 -4
- data/lib/rubocop/cop/mixin/string_literals_help.rb +7 -5
- data/lib/rubocop/cop/mixin/symbol_help.rb +13 -0
- data/lib/rubocop/cop/mixin/trailing_body.rb +2 -3
- data/lib/rubocop/cop/mixin/trailing_comma.rb +1 -2
- data/lib/rubocop/cop/mixin/uncommunicative_name.rb +7 -13
- data/lib/rubocop/cop/mixin/unused_argument.rb +1 -3
- data/lib/rubocop/cop/mixin/visibility_help.rb +1 -0
- data/lib/rubocop/cop/naming/ascii_identifiers.rb +2 -7
- data/lib/rubocop/cop/naming/binary_operator_parameter_name.rb +2 -2
- data/lib/rubocop/cop/naming/block_parameter_name.rb +1 -1
- data/lib/rubocop/cop/naming/constant_name.rb +3 -1
- data/lib/rubocop/cop/naming/file_name.rb +7 -16
- data/lib/rubocop/cop/naming/inclusive_language.rb +266 -0
- data/lib/rubocop/cop/naming/memoized_instance_variable_name.rb +11 -5
- data/lib/rubocop/cop/naming/method_name.rb +4 -2
- data/lib/rubocop/cop/naming/predicate_name.rb +2 -2
- data/lib/rubocop/cop/naming/rescued_exceptions_variable_name.rb +17 -0
- data/lib/rubocop/cop/offense.rb +3 -8
- data/lib/rubocop/cop/registry.rb +13 -12
- data/lib/rubocop/cop/security/eval.rb +1 -0
- data/lib/rubocop/cop/security/io_methods.rb +49 -0
- data/lib/rubocop/cop/security/json_load.rb +9 -7
- data/lib/rubocop/cop/security/marshal_load.rb +1 -0
- data/lib/rubocop/cop/security/open.rb +5 -0
- data/lib/rubocop/cop/security/yaml_load.rb +5 -0
- data/lib/rubocop/cop/style/access_modifier_declarations.rb +4 -5
- data/lib/rubocop/cop/style/accessor_grouping.rb +3 -5
- data/lib/rubocop/cop/style/alias.rb +6 -12
- data/lib/rubocop/cop/style/and_or.rb +8 -1
- data/lib/rubocop/cop/style/arguments_forwarding.rb +17 -5
- data/lib/rubocop/cop/style/array_coercion.rb +23 -3
- data/lib/rubocop/cop/style/array_join.rb +1 -0
- data/lib/rubocop/cop/style/ascii_comments.rb +1 -5
- data/lib/rubocop/cop/style/attr.rb +2 -3
- data/lib/rubocop/cop/style/auto_resource_cleanup.rb +2 -5
- data/lib/rubocop/cop/style/bisected_attr_accessor/macro.rb +60 -0
- data/lib/rubocop/cop/style/bisected_attr_accessor.rb +59 -71
- data/lib/rubocop/cop/style/block_delimiters.rb +50 -2
- data/lib/rubocop/cop/style/case_equality.rb +8 -10
- data/lib/rubocop/cop/style/case_like_if.rb +21 -6
- data/lib/rubocop/cop/style/character_literal.rb +2 -4
- data/lib/rubocop/cop/style/class_and_module_children.rb +42 -10
- data/lib/rubocop/cop/style/class_equality_comparison.rb +3 -0
- data/lib/rubocop/cop/style/class_methods.rb +1 -3
- data/lib/rubocop/cop/style/collection_compact.rb +10 -8
- data/lib/rubocop/cop/style/collection_methods.rb +8 -6
- data/lib/rubocop/cop/style/colon_method_call.rb +2 -3
- data/lib/rubocop/cop/style/combinable_loops.rb +6 -4
- data/lib/rubocop/cop/style/command_literal.rb +4 -9
- data/lib/rubocop/cop/style/comment_annotation.rb +57 -30
- data/lib/rubocop/cop/style/commented_keyword.rb +16 -16
- data/lib/rubocop/cop/style/conditional_assignment.rb +31 -29
- data/lib/rubocop/cop/style/constant_visibility.rb +28 -0
- data/lib/rubocop/cop/style/copyright.rb +3 -6
- data/lib/rubocop/cop/style/date_time.rb +10 -5
- data/lib/rubocop/cop/style/def_with_parentheses.rb +1 -2
- data/lib/rubocop/cop/style/dir.rb +1 -0
- data/lib/rubocop/cop/style/disable_cops_within_source_code_directive.rb +2 -2
- data/lib/rubocop/cop/style/document_dynamic_eval_definition.rb +1 -1
- data/lib/rubocop/cop/style/documentation.rb +52 -10
- data/lib/rubocop/cop/style/documentation_method.rb +1 -0
- data/lib/rubocop/cop/style/double_cop_disable_directive.rb +1 -7
- data/lib/rubocop/cop/style/double_negation.rb +30 -8
- data/lib/rubocop/cop/style/each_for_simple_loop.rb +2 -2
- data/lib/rubocop/cop/style/each_with_object.rb +1 -0
- data/lib/rubocop/cop/style/empty_case_condition.rb +2 -7
- data/lib/rubocop/cop/style/empty_else.rb +3 -9
- data/lib/rubocop/cop/style/empty_literal.rb +21 -9
- data/lib/rubocop/cop/style/empty_method.rb +3 -7
- data/lib/rubocop/cop/style/encoding.rb +26 -15
- data/lib/rubocop/cop/style/end_block.rb +1 -2
- data/lib/rubocop/cop/style/endless_method.rb +2 -3
- data/lib/rubocop/cop/style/eval_with_location.rb +91 -31
- data/lib/rubocop/cop/style/even_odd.rb +1 -0
- data/lib/rubocop/cop/style/expand_path_arguments.rb +4 -3
- data/lib/rubocop/cop/style/explicit_block_argument.rb +48 -15
- data/lib/rubocop/cop/style/exponential_notation.rb +6 -7
- data/lib/rubocop/cop/style/float_division.rb +14 -2
- data/lib/rubocop/cop/style/format_string.rb +2 -0
- data/lib/rubocop/cop/style/format_string_token.rb +2 -4
- data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +15 -12
- data/lib/rubocop/cop/style/global_std_stream.rb +5 -0
- data/lib/rubocop/cop/style/guard_clause.rb +3 -7
- data/lib/rubocop/cop/style/hash_as_last_array_item.rb +11 -0
- data/lib/rubocop/cop/style/hash_conversion.rb +133 -0
- data/lib/rubocop/cop/style/hash_each_methods.rb +25 -3
- data/lib/rubocop/cop/style/hash_except.rb +5 -3
- data/lib/rubocop/cop/style/hash_like_case.rb +2 -2
- data/lib/rubocop/cop/style/hash_syntax.rb +21 -25
- data/lib/rubocop/cop/style/hash_transform_keys.rb +8 -9
- data/lib/rubocop/cop/style/hash_transform_values.rb +8 -6
- data/lib/rubocop/cop/style/identical_conditional_branches.rb +83 -8
- data/lib/rubocop/cop/style/if_unless_modifier.rb +40 -13
- data/lib/rubocop/cop/style/if_with_boolean_literal_branches.rb +20 -4
- data/lib/rubocop/cop/style/implicit_runtime_error.rb +1 -0
- data/lib/rubocop/cop/style/in_pattern_then.rb +56 -0
- data/lib/rubocop/cop/style/infinite_loop.rb +6 -8
- data/lib/rubocop/cop/style/inverse_methods.rb +14 -9
- data/lib/rubocop/cop/style/ip_addresses.rb +1 -2
- data/lib/rubocop/cop/style/lambda.rb +2 -4
- data/lib/rubocop/cop/style/lambda_call.rb +1 -2
- data/lib/rubocop/cop/style/line_end_concatenation.rb +19 -13
- data/lib/rubocop/cop/style/method_call_with_args_parentheses/omit_parentheses.rb +32 -21
- data/lib/rubocop/cop/style/method_call_with_args_parentheses.rb +47 -3
- data/lib/rubocop/cop/style/method_call_without_args_parentheses.rb +1 -2
- data/lib/rubocop/cop/style/method_called_on_do_end_block.rb +2 -4
- data/lib/rubocop/cop/style/method_def_parentheses.rb +14 -9
- data/lib/rubocop/cop/style/min_max.rb +2 -2
- data/lib/rubocop/cop/style/missing_else.rb +9 -4
- data/lib/rubocop/cop/style/missing_respond_to_missing.rb +1 -2
- data/lib/rubocop/cop/style/mixin_grouping.rb +4 -10
- data/lib/rubocop/cop/style/mixin_usage.rb +3 -2
- data/lib/rubocop/cop/style/module_function.rb +16 -15
- data/lib/rubocop/cop/style/multiline_block_chain.rb +1 -2
- data/lib/rubocop/cop/style/multiline_in_pattern_then.rb +62 -0
- data/lib/rubocop/cop/style/multiline_method_signature.rb +11 -6
- data/lib/rubocop/cop/style/multiline_ternary_operator.rb +1 -2
- data/lib/rubocop/cop/style/multiline_when_then.rb +3 -12
- data/lib/rubocop/cop/style/multiple_comparison.rb +23 -6
- data/lib/rubocop/cop/style/mutable_constant.rb +85 -23
- data/lib/rubocop/cop/style/negated_if.rb +1 -2
- data/lib/rubocop/cop/style/negated_if_else_condition.rb +24 -2
- data/lib/rubocop/cop/style/negated_unless.rb +1 -2
- data/lib/rubocop/cop/style/nested_modifier.rb +3 -7
- data/lib/rubocop/cop/style/nested_ternary_operator.rb +2 -3
- data/lib/rubocop/cop/style/next.rb +4 -9
- data/lib/rubocop/cop/style/nil_comparison.rb +3 -0
- data/lib/rubocop/cop/style/nil_lambda.rb +30 -12
- data/lib/rubocop/cop/style/non_nil_check.rb +11 -7
- data/lib/rubocop/cop/style/not.rb +2 -2
- data/lib/rubocop/cop/style/numbered_parameters.rb +46 -0
- data/lib/rubocop/cop/style/numbered_parameters_limit.rb +50 -0
- data/lib/rubocop/cop/style/numeric_literals.rb +6 -15
- data/lib/rubocop/cop/style/numeric_predicate.rb +10 -7
- data/lib/rubocop/cop/style/one_line_conditional.rb +1 -2
- data/lib/rubocop/cop/style/option_hash.rb +2 -3
- data/lib/rubocop/cop/style/optional_arguments.rb +6 -5
- data/lib/rubocop/cop/style/optional_boolean_parameter.rb +14 -4
- data/lib/rubocop/cop/style/or_assignment.rb +4 -6
- data/lib/rubocop/cop/style/parallel_assignment.rb +13 -10
- data/lib/rubocop/cop/style/parentheses_around_condition.rb +1 -0
- data/lib/rubocop/cop/style/percent_literal_delimiters.rb +2 -4
- data/lib/rubocop/cop/style/percent_q_literals.rb +3 -4
- data/lib/rubocop/cop/style/perl_backrefs.rb +2 -9
- data/lib/rubocop/cop/style/preferred_hash_methods.rb +10 -8
- data/lib/rubocop/cop/style/proc.rb +2 -2
- data/lib/rubocop/cop/style/quoted_symbols.rb +114 -0
- data/lib/rubocop/cop/style/raise_args.rb +6 -8
- data/lib/rubocop/cop/style/random_with_offset.rb +8 -8
- data/lib/rubocop/cop/style/redundant_argument.rb +21 -20
- data/lib/rubocop/cop/style/redundant_assignment.rb +2 -3
- data/lib/rubocop/cop/style/redundant_begin.rb +72 -7
- data/lib/rubocop/cop/style/redundant_capital_w.rb +1 -2
- data/lib/rubocop/cop/style/redundant_condition.rb +4 -8
- data/lib/rubocop/cop/style/redundant_conditional.rb +5 -6
- data/lib/rubocop/cop/style/redundant_exception.rb +5 -6
- data/lib/rubocop/cop/style/redundant_fetch_block.rb +6 -0
- data/lib/rubocop/cop/style/redundant_file_extension_in_require.rb +13 -3
- data/lib/rubocop/cop/style/redundant_freeze.rb +6 -6
- data/lib/rubocop/cop/style/redundant_interpolation.rb +2 -3
- data/lib/rubocop/cop/style/redundant_parentheses.rb +21 -20
- data/lib/rubocop/cop/style/redundant_percent_q.rb +3 -5
- data/lib/rubocop/cop/style/redundant_regexp_character_class.rb +1 -1
- data/lib/rubocop/cop/style/redundant_regexp_escape.rb +1 -4
- data/lib/rubocop/cop/style/redundant_return.rb +6 -4
- data/lib/rubocop/cop/style/redundant_self.rb +42 -10
- data/lib/rubocop/cop/style/redundant_self_assignment.rb +8 -5
- data/lib/rubocop/cop/style/redundant_self_assignment_branch.rb +83 -0
- data/lib/rubocop/cop/style/redundant_sort.rb +56 -25
- data/lib/rubocop/cop/style/redundant_sort_by.rb +1 -0
- data/lib/rubocop/cop/style/regexp_literal.rb +15 -10
- data/lib/rubocop/cop/style/rescue_modifier.rb +21 -14
- data/lib/rubocop/cop/style/rescue_standard_error.rb +5 -7
- data/lib/rubocop/cop/style/return_nil.rb +8 -2
- data/lib/rubocop/cop/style/safe_navigation.rb +25 -23
- data/lib/rubocop/cop/style/sample.rb +1 -0
- data/lib/rubocop/cop/style/select_by_regexp.rb +139 -0
- data/lib/rubocop/cop/style/semicolon.rb +32 -24
- data/lib/rubocop/cop/style/send.rb +1 -2
- data/lib/rubocop/cop/style/signal_exception.rb +6 -7
- data/lib/rubocop/cop/style/single_argument_dig.rb +7 -2
- data/lib/rubocop/cop/style/single_line_block_params.rb +5 -6
- data/lib/rubocop/cop/style/single_line_methods.rb +45 -18
- data/lib/rubocop/cop/style/slicing_with_range.rb +14 -0
- data/lib/rubocop/cop/style/sole_nested_conditional.rb +35 -7
- data/lib/rubocop/cop/style/special_global_vars.rb +33 -20
- data/lib/rubocop/cop/style/stabby_lambda_parentheses.rb +1 -2
- data/lib/rubocop/cop/style/static_class.rb +5 -5
- data/lib/rubocop/cop/style/stderr_puts.rb +3 -6
- data/lib/rubocop/cop/style/string_chars.rb +41 -0
- data/lib/rubocop/cop/style/string_concatenation.rb +45 -15
- data/lib/rubocop/cop/style/string_hash_keys.rb +6 -0
- data/lib/rubocop/cop/style/string_literals.rb +5 -7
- data/lib/rubocop/cop/style/string_literals_in_interpolation.rb +1 -0
- data/lib/rubocop/cop/style/strip.rb +1 -0
- data/lib/rubocop/cop/style/struct_inheritance.rb +15 -0
- data/lib/rubocop/cop/style/swap_values.rb +5 -3
- data/lib/rubocop/cop/style/symbol_array.rb +3 -3
- data/lib/rubocop/cop/style/symbol_literal.rb +1 -3
- data/lib/rubocop/cop/style/symbol_proc.rb +55 -10
- data/lib/rubocop/cop/style/ternary_parentheses.rb +4 -6
- data/lib/rubocop/cop/style/top_level_method_definition.rb +83 -0
- data/lib/rubocop/cop/style/trailing_body_on_method_definition.rb +6 -2
- data/lib/rubocop/cop/style/trailing_comma_in_block_args.rb +21 -6
- data/lib/rubocop/cop/style/trailing_method_end_statement.rb +3 -6
- data/lib/rubocop/cop/style/trailing_underscore_variable.rb +4 -10
- data/lib/rubocop/cop/style/trivial_accessors.rb +69 -5
- data/lib/rubocop/cop/style/unless_else.rb +1 -2
- data/lib/rubocop/cop/style/unless_logical_operators.rb +105 -0
- data/lib/rubocop/cop/style/unpack_first.rb +2 -1
- data/lib/rubocop/cop/style/variable_interpolation.rb +1 -1
- data/lib/rubocop/cop/style/when_then.rb +4 -2
- data/lib/rubocop/cop/style/while_until_modifier.rb +1 -2
- data/lib/rubocop/cop/style/word_array.rb +22 -5
- data/lib/rubocop/cop/style/yoda_condition.rb +28 -18
- data/lib/rubocop/cop/style/zero_length_predicate.rb +12 -2
- data/lib/rubocop/cop/team.rb +2 -5
- data/lib/rubocop/cop/util.rb +29 -16
- data/lib/rubocop/cop/utils/format_string.rb +1 -3
- data/lib/rubocop/cop/variable_force/assignment.rb +1 -2
- data/lib/rubocop/cop/variable_force/branch.rb +16 -2
- data/lib/rubocop/cop/variable_force/reference.rb +1 -3
- data/lib/rubocop/cop/variable_force/scope.rb +4 -8
- data/lib/rubocop/cop/variable_force/variable.rb +2 -4
- data/lib/rubocop/cop/variable_force/variable_table.rb +1 -1
- data/lib/rubocop/cop/variable_force.rb +6 -15
- data/lib/rubocop/cops_documentation_generator.rb +24 -26
- data/lib/rubocop/directive_comment.rb +123 -11
- data/lib/rubocop/ext/regexp_parser.rb +3 -6
- data/lib/rubocop/file_finder.rb +1 -3
- data/lib/rubocop/formatter/clang_style_formatter.rb +4 -2
- data/lib/rubocop/formatter/disabled_config_formatter.rb +3 -8
- data/lib/rubocop/formatter/git_hub_actions_formatter.rb +2 -6
- data/lib/rubocop/formatter/html_formatter.rb +4 -10
- data/lib/rubocop/formatter/json_formatter.rb +1 -5
- data/lib/rubocop/formatter/junit_formatter.rb +23 -14
- data/lib/rubocop/formatter/offense_count_formatter.rb +1 -1
- data/lib/rubocop/formatter/progress_formatter.rb +1 -3
- data/lib/rubocop/formatter/tap_formatter.rb +4 -2
- data/lib/rubocop/formatter/worst_offenders_formatter.rb +1 -1
- data/lib/rubocop/magic_comment.rb +45 -16
- data/lib/rubocop/name_similarity.rb +1 -1
- data/lib/rubocop/options.rb +153 -159
- data/lib/rubocop/path_util.rb +1 -3
- data/lib/rubocop/rake_task.rb +4 -1
- data/lib/rubocop/remote_config.rb +13 -8
- data/lib/rubocop/result_cache.rb +8 -15
- data/lib/rubocop/rspec/cop_helper.rb +3 -3
- data/lib/rubocop/rspec/expect_offense.rb +11 -12
- data/lib/rubocop/rspec/parallel_formatter.rb +90 -0
- data/lib/rubocop/rspec/shared_contexts.rb +8 -15
- data/lib/rubocop/rspec/support.rb +1 -0
- data/lib/rubocop/runner.rb +9 -17
- data/lib/rubocop/target_finder.rb +20 -17
- data/lib/rubocop/target_ruby.rb +25 -21
- data/lib/rubocop/version.rb +1 -1
- data/lib/rubocop.rb +30 -3
- metadata +44 -11
- data/lib/rubocop/core_ext/hash.rb +0 -20
@@ -5,14 +5,22 @@ module RuboCop
|
|
5
5
|
module Style
|
6
6
|
# This cop is designed to help you transition from mutable string literals
|
7
7
|
# to frozen string literals.
|
8
|
-
# It will add the
|
9
|
-
# files to enable frozen string literals. Frozen string literals may be
|
8
|
+
# It will add the `# frozen_string_literal: true` magic comment to the top
|
9
|
+
# of files to enable frozen string literals. Frozen string literals may be
|
10
10
|
# default in future Ruby. The comment will be added below a shebang and
|
11
11
|
# encoding comment.
|
12
12
|
#
|
13
|
-
# Note that the cop will
|
13
|
+
# Note that the cop will accept files where the comment exists but is set
|
14
14
|
# to `false` instead of `true`.
|
15
15
|
#
|
16
|
+
# To require a blank line after this comment, please see
|
17
|
+
# `Layout/EmptyLineAfterMagicComment` cop.
|
18
|
+
#
|
19
|
+
# @safety
|
20
|
+
# This cop's autocorrection is unsafe since any strings mutations will
|
21
|
+
# change from being accepted to raising `FrozenError`, as all strings
|
22
|
+
# will become frozen by default, and will need to be manually refactored.
|
23
|
+
#
|
16
24
|
# @example EnforcedStyle: always (default)
|
17
25
|
# # The `always` style will always add the frozen string literal comment
|
18
26
|
# # to a file, regardless of the Ruby version or if `freeze` or `<<` are
|
@@ -79,8 +87,7 @@ module RuboCop
|
|
79
87
|
include RangeHelp
|
80
88
|
extend AutoCorrector
|
81
89
|
|
82
|
-
MSG_MISSING_TRUE = 'Missing magic comment `# frozen_string_literal: '
|
83
|
-
'true`.'
|
90
|
+
MSG_MISSING_TRUE = 'Missing magic comment `# frozen_string_literal: true`.'
|
84
91
|
MSG_MISSING = 'Missing frozen string literal comment.'
|
85
92
|
MSG_UNNECESSARY = 'Unnecessary frozen string literal comment.'
|
86
93
|
MSG_DISABLED = 'Frozen string literal comment must be set to `true`.'
|
@@ -139,24 +146,20 @@ module RuboCop
|
|
139
146
|
|
140
147
|
def frozen_string_literal_comment(processed_source)
|
141
148
|
processed_source.find_token do |token|
|
142
|
-
token.text.start_with?(
|
149
|
+
token.text.start_with?(FROZEN_STRING_LITERAL)
|
143
150
|
end
|
144
151
|
end
|
145
152
|
|
146
153
|
def missing_offense(processed_source)
|
147
154
|
range = source_range(processed_source.buffer, 0, 0)
|
148
155
|
|
149
|
-
add_offense(range, message: MSG_MISSING)
|
150
|
-
insert_comment(corrector)
|
151
|
-
end
|
156
|
+
add_offense(range, message: MSG_MISSING) { |corrector| insert_comment(corrector) }
|
152
157
|
end
|
153
158
|
|
154
159
|
def missing_true_offense(processed_source)
|
155
160
|
range = source_range(processed_source.buffer, 0, 0)
|
156
161
|
|
157
|
-
add_offense(range, message: MSG_MISSING_TRUE)
|
158
|
-
insert_comment(corrector)
|
159
|
-
end
|
162
|
+
add_offense(range, message: MSG_MISSING_TRUE) { |corrector| insert_comment(corrector) }
|
160
163
|
end
|
161
164
|
|
162
165
|
def unnecessary_comment_offense(processed_source)
|
@@ -8,6 +8,10 @@ module RuboCop
|
|
8
8
|
# reassign (possibly to redirect some stream) constants in Ruby, you'll get
|
9
9
|
# an interpreter warning if you do so.
|
10
10
|
#
|
11
|
+
# @safety
|
12
|
+
# Autocorrection is unsafe because `STDOUT` and `$stdout` may point to different
|
13
|
+
# objects, for example.
|
14
|
+
#
|
11
15
|
# @example
|
12
16
|
# # bad
|
13
17
|
# STDOUT.puts('hello')
|
@@ -34,6 +38,7 @@ module RuboCop
|
|
34
38
|
|
35
39
|
STD_STREAMS = %i[STDIN STDOUT STDERR].to_set.freeze
|
36
40
|
|
41
|
+
# @!method const_to_gvar_assignment?(node, name)
|
37
42
|
def_node_matcher :const_to_gvar_assignment?, <<~PATTERN
|
38
43
|
(gvasgn %1 (const nil? _))
|
39
44
|
PATTERN
|
@@ -99,12 +99,9 @@ module RuboCop
|
|
99
99
|
|
100
100
|
def register_offense(node, scope_exiting_keyword, conditional_keyword)
|
101
101
|
condition, = node.node_parts
|
102
|
-
example = [scope_exiting_keyword,
|
103
|
-
conditional_keyword,
|
104
|
-
condition.source].join(' ')
|
102
|
+
example = [scope_exiting_keyword, conditional_keyword, condition.source].join(' ')
|
105
103
|
if too_long_for_single_line?(node, example)
|
106
|
-
example = "#{conditional_keyword} #{condition.source}; "
|
107
|
-
"#{scope_exiting_keyword}; end"
|
104
|
+
example = "#{conditional_keyword} #{condition.source}; #{scope_exiting_keyword}; end"
|
108
105
|
end
|
109
106
|
|
110
107
|
add_offense(node.loc.keyword, message: format(MSG, example: example))
|
@@ -126,8 +123,7 @@ module RuboCop
|
|
126
123
|
end
|
127
124
|
|
128
125
|
def accepted_form?(node, ending: false)
|
129
|
-
accepted_if?(node, ending) || node.condition.multiline? ||
|
130
|
-
node.parent&.assignment?
|
126
|
+
accepted_if?(node, ending) || node.condition.multiline? || node.parent&.assignment?
|
131
127
|
end
|
132
128
|
|
133
129
|
def accepted_if?(node, ending)
|
@@ -29,6 +29,7 @@ module RuboCop
|
|
29
29
|
# # good
|
30
30
|
# [{ one: 1 }, { two: 2 }]
|
31
31
|
class HashAsLastArrayItem < Base
|
32
|
+
include RangeHelp
|
32
33
|
include ConfigurableEnforcedStyle
|
33
34
|
extend AutoCorrector
|
34
35
|
|
@@ -74,6 +75,7 @@ module RuboCop
|
|
74
75
|
return if node.children.empty? # Empty hash cannot be "unbraced"
|
75
76
|
|
76
77
|
add_offense(node, message: 'Omit the braces around the hash.') do |corrector|
|
78
|
+
remove_last_element_trailing_comma(corrector, node.parent)
|
77
79
|
corrector.remove(node.loc.begin)
|
78
80
|
corrector.remove(node.loc.end)
|
79
81
|
end
|
@@ -82,6 +84,15 @@ module RuboCop
|
|
82
84
|
def braces_style?
|
83
85
|
style == :braces
|
84
86
|
end
|
87
|
+
|
88
|
+
def remove_last_element_trailing_comma(corrector, node)
|
89
|
+
range = range_with_surrounding_space(
|
90
|
+
range: node.children.last.source_range,
|
91
|
+
side: :right
|
92
|
+
).end.resize(1)
|
93
|
+
|
94
|
+
corrector.remove(range) if range.source == ','
|
95
|
+
end
|
85
96
|
end
|
86
97
|
end
|
87
98
|
end
|
@@ -0,0 +1,133 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module RuboCop
|
4
|
+
module Cop
|
5
|
+
module Style
|
6
|
+
# This cop checks the usage of pre-2.1 `Hash[args]` method of converting enumerables and
|
7
|
+
# sequences of values to hashes.
|
8
|
+
#
|
9
|
+
# Correction code from splat argument (`Hash[*ary]`) is not simply determined. For example,
|
10
|
+
# `Hash[*ary]` can be replaced with `ary.each_slice(2).to_h` but it will be complicated.
|
11
|
+
# So, `AllowSplatArgument` option is true by default to allow splat argument for simple code.
|
12
|
+
#
|
13
|
+
# @example
|
14
|
+
# # bad
|
15
|
+
# Hash[ary]
|
16
|
+
#
|
17
|
+
# # good
|
18
|
+
# ary.to_h
|
19
|
+
#
|
20
|
+
# # bad
|
21
|
+
# Hash[key1, value1, key2, value2]
|
22
|
+
#
|
23
|
+
# # good
|
24
|
+
# {key1 => value1, key2 => value2}
|
25
|
+
#
|
26
|
+
# @example AllowSplatArgument: true (default)
|
27
|
+
# # good
|
28
|
+
# Hash[*ary]
|
29
|
+
#
|
30
|
+
# @example AllowSplatArgument: false
|
31
|
+
# # bad
|
32
|
+
# Hash[*ary]
|
33
|
+
#
|
34
|
+
class HashConversion < Base
|
35
|
+
extend AutoCorrector
|
36
|
+
|
37
|
+
MSG_TO_H = 'Prefer ary.to_h to Hash[ary].'
|
38
|
+
MSG_LITERAL_MULTI_ARG = 'Prefer literal hash to Hash[arg1, arg2, ...].'
|
39
|
+
MSG_LITERAL_HASH_ARG = 'Prefer literal hash to Hash[key: value, ...].'
|
40
|
+
MSG_SPLAT = 'Prefer array_of_pairs.to_h to Hash[*array].'
|
41
|
+
RESTRICT_ON_SEND = %i[[]].freeze
|
42
|
+
|
43
|
+
# @!method hash_from_array?(node)
|
44
|
+
def_node_matcher :hash_from_array?, '(send (const {nil? cbase} :Hash) :[] ...)'
|
45
|
+
|
46
|
+
def on_send(node)
|
47
|
+
return unless hash_from_array?(node)
|
48
|
+
|
49
|
+
# There are several cases:
|
50
|
+
# If there is one argument:
|
51
|
+
# Hash[ary] => ary.to_h
|
52
|
+
# Hash[*ary] => don't suggest corrections
|
53
|
+
# If there is 0 or 2+ arguments:
|
54
|
+
# Hash[a1, a2, a3, a4] => {a1 => a2, a3 => a4}
|
55
|
+
# ...but don't suggest correction if there is odd number of them (it is a bug)
|
56
|
+
node.arguments.count == 1 ? single_argument(node) : multi_argument(node)
|
57
|
+
end
|
58
|
+
|
59
|
+
private
|
60
|
+
|
61
|
+
def single_argument(node)
|
62
|
+
first_argument = node.first_argument
|
63
|
+
if first_argument.hash_type?
|
64
|
+
register_offense_for_hash(node, first_argument)
|
65
|
+
elsif first_argument.splat_type?
|
66
|
+
add_offense(node, message: MSG_SPLAT) unless allowed_splat_argument?
|
67
|
+
elsif use_zip_method_without_argument?(first_argument)
|
68
|
+
register_offense_for_zip_method(node, first_argument)
|
69
|
+
else
|
70
|
+
add_offense(node, message: MSG_TO_H) do |corrector|
|
71
|
+
replacement = first_argument.source
|
72
|
+
replacement = "(#{replacement})" if requires_parens?(first_argument)
|
73
|
+
corrector.replace(node, "#{replacement}.to_h")
|
74
|
+
end
|
75
|
+
end
|
76
|
+
end
|
77
|
+
|
78
|
+
def use_zip_method_without_argument?(first_argument)
|
79
|
+
return false unless first_argument&.send_type?
|
80
|
+
|
81
|
+
first_argument.method?(:zip) && first_argument.arguments.empty?
|
82
|
+
end
|
83
|
+
|
84
|
+
def register_offense_for_hash(node, hash_argument)
|
85
|
+
add_offense(node, message: MSG_LITERAL_HASH_ARG) do |corrector|
|
86
|
+
corrector.replace(node, "{#{hash_argument.source}}")
|
87
|
+
|
88
|
+
parent = node.parent
|
89
|
+
add_parentheses(parent, corrector) if parent&.send_type? && !parent.parenthesized?
|
90
|
+
end
|
91
|
+
end
|
92
|
+
|
93
|
+
def register_offense_for_zip_method(node, zip_method)
|
94
|
+
add_offense(node, message: MSG_TO_H) do |corrector|
|
95
|
+
if zip_method.parenthesized?
|
96
|
+
corrector.insert_before(zip_method.loc.end, '[]')
|
97
|
+
else
|
98
|
+
corrector.insert_after(zip_method, '([])')
|
99
|
+
end
|
100
|
+
end
|
101
|
+
end
|
102
|
+
|
103
|
+
def requires_parens?(node)
|
104
|
+
node.call_type? && node.arguments.any? && !node.parenthesized?
|
105
|
+
end
|
106
|
+
|
107
|
+
def multi_argument(node)
|
108
|
+
if node.arguments.count.odd?
|
109
|
+
add_offense(node, message: MSG_LITERAL_MULTI_ARG)
|
110
|
+
else
|
111
|
+
add_offense(node, message: MSG_LITERAL_MULTI_ARG) do |corrector|
|
112
|
+
corrector.replace(node, args_to_hash(node.arguments))
|
113
|
+
|
114
|
+
parent = node.parent
|
115
|
+
add_parentheses(parent, corrector) if parent&.send_type? && !parent.parenthesized?
|
116
|
+
end
|
117
|
+
end
|
118
|
+
end
|
119
|
+
|
120
|
+
def args_to_hash(args)
|
121
|
+
content = args.each_slice(2)
|
122
|
+
.map { |arg1, arg2| "#{arg1.source} => #{arg2.source}" }
|
123
|
+
.join(', ')
|
124
|
+
"{#{content}}"
|
125
|
+
end
|
126
|
+
|
127
|
+
def allowed_splat_argument?
|
128
|
+
cop_config.fetch('AllowSplatArgument', true)
|
129
|
+
end
|
130
|
+
end
|
131
|
+
end
|
132
|
+
end
|
133
|
+
end
|
@@ -9,6 +9,11 @@ module RuboCop
|
|
9
9
|
# parentheses around the block arguments to indicate that you're not
|
10
10
|
# working with a hash, and suppress RuboCop offenses.
|
11
11
|
#
|
12
|
+
# @safety
|
13
|
+
# This cop is unsafe because it cannot be guaranteed that the receiver
|
14
|
+
# is a `Hash`. The `AllowedReceivers` configuration can mitigate,
|
15
|
+
# but not fully resolve, this safety issue.
|
16
|
+
#
|
12
17
|
# @example
|
13
18
|
# # bad
|
14
19
|
# hash.keys.each { |k| p k }
|
@@ -17,12 +22,18 @@ module RuboCop
|
|
17
22
|
# # good
|
18
23
|
# hash.each_key { |k| p k }
|
19
24
|
# hash.each_value { |v| p v }
|
25
|
+
#
|
26
|
+
# @example AllowedReceivers: ['execute']
|
27
|
+
# # good
|
28
|
+
# execute(sql).keys.each { |v| p v }
|
29
|
+
# execute(sql).values.each { |v| p v }
|
20
30
|
class HashEachMethods < Base
|
21
31
|
include Lint::UnusedArgument
|
22
32
|
extend AutoCorrector
|
23
33
|
|
24
34
|
MSG = 'Use `%<prefer>s` instead of `%<current>s`.'
|
25
35
|
|
36
|
+
# @!method kv_each(node)
|
26
37
|
def_node_matcher :kv_each, <<~PATTERN
|
27
38
|
(block $(send (send _ ${:keys :values}) :each) ...)
|
28
39
|
PATTERN
|
@@ -35,10 +46,11 @@ module RuboCop
|
|
35
46
|
|
36
47
|
def register_kv_offense(node)
|
37
48
|
kv_each(node) do |target, method|
|
38
|
-
|
49
|
+
parent_receiver = target.receiver.receiver
|
50
|
+
return unless parent_receiver
|
51
|
+
return if allowed_receiver?(parent_receiver)
|
39
52
|
|
40
|
-
msg = format(message, prefer: "each_#{method[0..-2]}",
|
41
|
-
current: "#{method}.each")
|
53
|
+
msg = format(message, prefer: "each_#{method[0..-2]}", current: "#{method}.each")
|
42
54
|
|
43
55
|
add_offense(kv_range(target), message: msg) do |corrector|
|
44
56
|
correct_key_value_each(target, corrector)
|
@@ -80,6 +92,16 @@ module RuboCop
|
|
80
92
|
def kv_range(outer_node)
|
81
93
|
outer_node.receiver.loc.selector.join(outer_node.loc.selector)
|
82
94
|
end
|
95
|
+
|
96
|
+
def allowed_receiver?(receiver)
|
97
|
+
receiver_name = receiver.send_type? ? receiver.method_name.to_s : receiver.source
|
98
|
+
|
99
|
+
allowed_receivers.include?(receiver_name)
|
100
|
+
end
|
101
|
+
|
102
|
+
def allowed_receivers
|
103
|
+
cop_config.fetch('AllowedReceivers', [])
|
104
|
+
end
|
83
105
|
end
|
84
106
|
end
|
85
107
|
end
|
@@ -33,6 +33,7 @@ module RuboCop
|
|
33
33
|
MSG = 'Use `%<prefer>s` instead.'
|
34
34
|
RESTRICT_ON_SEND = %i[reject select filter].freeze
|
35
35
|
|
36
|
+
# @!method bad_method?(node)
|
36
37
|
def_node_matcher :bad_method?, <<~PATTERN
|
37
38
|
(block
|
38
39
|
(send _ _)
|
@@ -48,7 +49,7 @@ module RuboCop
|
|
48
49
|
return unless bad_method?(block) && semantically_except_method?(node, block)
|
49
50
|
|
50
51
|
except_key = except_key(block)
|
51
|
-
return
|
52
|
+
return if except_key.nil? || !safe_to_register_offense?(block, except_key)
|
52
53
|
|
53
54
|
range = offense_range(node)
|
54
55
|
preferred_method = "except(#{except_key.source})"
|
@@ -80,10 +81,11 @@ module RuboCop
|
|
80
81
|
end
|
81
82
|
|
82
83
|
def except_key(node)
|
83
|
-
key_argument = node.argument_list.first
|
84
|
+
key_argument = node.argument_list.first.source
|
84
85
|
lhs, _method_name, rhs = *node.body
|
86
|
+
return if [lhs, rhs].map(&:source).none?(key_argument)
|
85
87
|
|
86
|
-
[lhs, rhs].find { |operand| operand.source != key_argument
|
88
|
+
[lhs, rhs].find { |operand| operand.source != key_argument }
|
87
89
|
end
|
88
90
|
|
89
91
|
def offense_range(node)
|
@@ -39,6 +39,7 @@ module RuboCop
|
|
39
39
|
class HashLikeCase < Base
|
40
40
|
MSG = 'Consider replacing `case-when` with a hash lookup.'
|
41
41
|
|
42
|
+
# @!method hash_like_case?(node)
|
42
43
|
def_node_matcher :hash_like_case?, <<~PATTERN
|
43
44
|
(case
|
44
45
|
_
|
@@ -51,8 +52,7 @@ module RuboCop
|
|
51
52
|
return if node.when_branches.size < min_branches_count
|
52
53
|
|
53
54
|
hash_like_case?(node) do |condition_nodes, body_nodes|
|
54
|
-
if nodes_of_same_type?(condition_nodes) &&
|
55
|
-
nodes_of_same_type?(body_nodes)
|
55
|
+
if nodes_of_same_type?(condition_nodes) && nodes_of_same_type?(body_nodes)
|
56
56
|
add_offense(node)
|
57
57
|
end
|
58
58
|
end
|
@@ -54,9 +54,10 @@ module RuboCop
|
|
54
54
|
# # good
|
55
55
|
# {a: 1, b: 2}
|
56
56
|
# {:c => 3, 'd' => 4}
|
57
|
-
class HashSyntax <
|
57
|
+
class HashSyntax < Base
|
58
58
|
include ConfigurableEnforcedStyle
|
59
59
|
include RangeHelp
|
60
|
+
extend AutoCorrector
|
60
61
|
|
61
62
|
MSG_19 = 'Use the new Ruby 1.9 hash syntax.'
|
62
63
|
MSG_NO_MIXED_KEYS = "Don't mix styles in the same hash."
|
@@ -73,7 +74,7 @@ module RuboCop
|
|
73
74
|
ruby19_no_mixed_keys_check(pairs)
|
74
75
|
elsif style == :no_mixed_keys
|
75
76
|
no_mixed_keys_check(pairs)
|
76
|
-
|
77
|
+
else
|
77
78
|
ruby19_check(pairs)
|
78
79
|
end
|
79
80
|
end
|
@@ -104,18 +105,6 @@ module RuboCop
|
|
104
105
|
end
|
105
106
|
end
|
106
107
|
|
107
|
-
def autocorrect(node)
|
108
|
-
lambda do |corrector|
|
109
|
-
if style == :hash_rockets || force_hash_rockets?(node.parent.pairs)
|
110
|
-
autocorrect_hash_rockets(corrector, node)
|
111
|
-
elsif style == :ruby19_no_mixed_keys || style == :no_mixed_keys
|
112
|
-
autocorrect_no_mixed_keys(corrector, node)
|
113
|
-
else
|
114
|
-
autocorrect_ruby19(corrector, node)
|
115
|
-
end
|
116
|
-
end
|
117
|
-
end
|
118
|
-
|
119
108
|
def alternative_style
|
120
109
|
case style
|
121
110
|
when :hash_rockets
|
@@ -127,6 +116,16 @@ module RuboCop
|
|
127
116
|
|
128
117
|
private
|
129
118
|
|
119
|
+
def autocorrect(corrector, node)
|
120
|
+
if style == :hash_rockets || force_hash_rockets?(node.parent.pairs)
|
121
|
+
autocorrect_hash_rockets(corrector, node)
|
122
|
+
elsif style == :ruby19_no_mixed_keys || style == :no_mixed_keys
|
123
|
+
autocorrect_no_mixed_keys(corrector, node)
|
124
|
+
else
|
125
|
+
autocorrect_ruby19(corrector, node)
|
126
|
+
end
|
127
|
+
end
|
128
|
+
|
130
129
|
def sym_indices?(pairs)
|
131
130
|
pairs.all? { |p| word_symbol_pair?(p) }
|
132
131
|
end
|
@@ -138,7 +137,7 @@ module RuboCop
|
|
138
137
|
end
|
139
138
|
|
140
139
|
def acceptable_19_syntax_symbol?(sym_name)
|
141
|
-
sym_name.
|
140
|
+
sym_name.delete_prefix!(':')
|
142
141
|
|
143
142
|
if cop_config['PreferHashRocketsForNonAlnumEndingSymbols'] &&
|
144
143
|
# Prefer { :production? => false } over { production?: false } and
|
@@ -152,14 +151,16 @@ module RuboCop
|
|
152
151
|
return true if /\A[_a-z]\w*[?!]?\z/i.match?(sym_name)
|
153
152
|
|
154
153
|
# For more complicated hash keys, let the parser validate the syntax.
|
155
|
-
|
154
|
+
ProcessedSource.new("{ #{sym_name}: :foo }", target_ruby_version).valid_syntax?
|
156
155
|
end
|
157
156
|
|
158
157
|
def check(pairs, delim, msg)
|
159
158
|
pairs.each do |pair|
|
160
159
|
if pair.delimiter == delim
|
161
160
|
location = pair.source_range.begin.join(pair.loc.operator)
|
162
|
-
add_offense(
|
161
|
+
add_offense(location, message: msg) do |corrector|
|
162
|
+
autocorrect(corrector, pair)
|
163
|
+
|
163
164
|
opposite_style_detected
|
164
165
|
end
|
165
166
|
else
|
@@ -173,10 +174,7 @@ module RuboCop
|
|
173
174
|
|
174
175
|
space = argument_without_space?(pair_node.parent) ? ' ' : ''
|
175
176
|
|
176
|
-
corrector.replace(
|
177
|
-
range,
|
178
|
-
range.source.sub(/^:(.*\S)\s*=>\s*$/, "#{space}\\1: ")
|
179
|
-
)
|
177
|
+
corrector.replace(range, range.source.sub(/^:(.*\S)\s*=>\s*$/, "#{space}\\1: "))
|
180
178
|
|
181
179
|
hash_node = pair_node.parent
|
182
180
|
return unless hash_node.parent&.return_type? && !hash_node.braces?
|
@@ -193,8 +191,7 @@ module RuboCop
|
|
193
191
|
end
|
194
192
|
|
195
193
|
def argument_without_space?(node)
|
196
|
-
node.argument? &&
|
197
|
-
node.loc.expression.begin_pos == node.parent.loc.selector.end_pos
|
194
|
+
node.argument? && node.loc.expression.begin_pos == node.parent.loc.selector.end_pos
|
198
195
|
end
|
199
196
|
|
200
197
|
def autocorrect_hash_rockets(corrector, pair_node)
|
@@ -214,8 +211,7 @@ module RuboCop
|
|
214
211
|
end
|
215
212
|
|
216
213
|
def force_hash_rockets?(pairs)
|
217
|
-
cop_config['UseHashRocketsWithSymbolValues'] &&
|
218
|
-
pairs.map(&:value).any?(&:sym_type?)
|
214
|
+
cop_config['UseHashRocketsWithSymbolValues'] && pairs.map(&:value).any?(&:sym_type?)
|
219
215
|
end
|
220
216
|
end
|
221
217
|
end
|
@@ -8,12 +8,10 @@ module RuboCop
|
|
8
8
|
# transforming the keys of a hash, and tries to use a simpler & faster
|
9
9
|
# call to `transform_keys` instead.
|
10
10
|
#
|
11
|
-
#
|
12
|
-
#
|
13
|
-
#
|
14
|
-
#
|
15
|
-
# This cop should only be enabled on Ruby version 2.5 or newer
|
16
|
-
# (`transform_keys` was added in Ruby 2.5.)
|
11
|
+
# @safety
|
12
|
+
# This cop is unsafe, as it can produce false positives if we are
|
13
|
+
# transforming an enumerable of key-value-like pairs that isn't actually
|
14
|
+
# a hash, e.g.: `[[k1, v1], [k2, v2], ...]`
|
17
15
|
#
|
18
16
|
# @example
|
19
17
|
# # bad
|
@@ -27,11 +25,9 @@ module RuboCop
|
|
27
25
|
# {a: 1, b: 2}.transform_keys { |k| k.to_s }
|
28
26
|
class HashTransformKeys < Base
|
29
27
|
include HashTransformMethod
|
30
|
-
extend TargetRubyVersion
|
31
28
|
extend AutoCorrector
|
32
29
|
|
33
|
-
|
34
|
-
|
30
|
+
# @!method on_bad_each_with_object(node)
|
35
31
|
def_node_matcher :on_bad_each_with_object, <<~PATTERN
|
36
32
|
(block
|
37
33
|
({send csend} !#array_receiver? :each_with_object (hash))
|
@@ -43,6 +39,7 @@ module RuboCop
|
|
43
39
|
({send csend} (lvar _memo) :[]= $!`_memo $(lvar _val)))
|
44
40
|
PATTERN
|
45
41
|
|
42
|
+
# @!method on_bad_hash_brackets_map(node)
|
46
43
|
def_node_matcher :on_bad_hash_brackets_map, <<~PATTERN
|
47
44
|
(send
|
48
45
|
(const _ :Hash)
|
@@ -55,6 +52,7 @@ module RuboCop
|
|
55
52
|
(array $_ $(lvar _val))))
|
56
53
|
PATTERN
|
57
54
|
|
55
|
+
# @!method on_bad_map_to_h(node)
|
58
56
|
def_node_matcher :on_bad_map_to_h, <<~PATTERN
|
59
57
|
({send csend}
|
60
58
|
(block
|
@@ -66,6 +64,7 @@ module RuboCop
|
|
66
64
|
:to_h)
|
67
65
|
PATTERN
|
68
66
|
|
67
|
+
# @!method on_bad_to_h(node)
|
69
68
|
def_node_matcher :on_bad_to_h, <<~PATTERN
|
70
69
|
(block
|
71
70
|
({send csend} !#array_receiver? :to_h)
|
@@ -8,12 +8,10 @@ module RuboCop
|
|
8
8
|
# transforming the values of a hash, and tries to use a simpler & faster
|
9
9
|
# call to `transform_values` instead.
|
10
10
|
#
|
11
|
-
#
|
12
|
-
#
|
13
|
-
#
|
14
|
-
#
|
15
|
-
# This cop should only be enabled on Ruby version 2.4 or newer
|
16
|
-
# (`transform_values` was added in Ruby 2.4.)
|
11
|
+
# @safety
|
12
|
+
# This cop is unsafe, as it can produce false positives if we are
|
13
|
+
# transforming an enumerable of key-value-like pairs that isn't actually
|
14
|
+
# a hash, e.g.: `[[k1, v1], [k2, v2], ...]`
|
17
15
|
#
|
18
16
|
# @example
|
19
17
|
# # bad
|
@@ -29,6 +27,7 @@ module RuboCop
|
|
29
27
|
include HashTransformMethod
|
30
28
|
extend AutoCorrector
|
31
29
|
|
30
|
+
# @!method on_bad_each_with_object(node)
|
32
31
|
def_node_matcher :on_bad_each_with_object, <<~PATTERN
|
33
32
|
(block
|
34
33
|
({send csend} !#array_receiver? :each_with_object (hash))
|
@@ -40,6 +39,7 @@ module RuboCop
|
|
40
39
|
({send csend} (lvar _memo) :[]= $(lvar _key) $!`_memo))
|
41
40
|
PATTERN
|
42
41
|
|
42
|
+
# @!method on_bad_hash_brackets_map(node)
|
43
43
|
def_node_matcher :on_bad_hash_brackets_map, <<~PATTERN
|
44
44
|
(send
|
45
45
|
(const _ :Hash)
|
@@ -52,6 +52,7 @@ module RuboCop
|
|
52
52
|
(array $(lvar _key) $_)))
|
53
53
|
PATTERN
|
54
54
|
|
55
|
+
# @!method on_bad_map_to_h(node)
|
55
56
|
def_node_matcher :on_bad_map_to_h, <<~PATTERN
|
56
57
|
({send csend}
|
57
58
|
(block
|
@@ -63,6 +64,7 @@ module RuboCop
|
|
63
64
|
:to_h)
|
64
65
|
PATTERN
|
65
66
|
|
67
|
+
# @!method on_bad_to_h(node)
|
66
68
|
def_node_matcher :on_bad_to_h, <<~PATTERN
|
67
69
|
(block
|
68
70
|
({send csend} !#array_receiver? :to_h)
|