rubocop 0.82.0 → 1.18.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/LICENSE.txt +1 -1
- data/README.md +69 -37
- data/assets/output.html.erb +1 -1
- data/config/default.yml +1025 -139
- data/config/obsoletion.yml +200 -0
- data/exe/rubocop +2 -4
- data/lib/rubocop.rb +137 -68
- data/lib/rubocop/ast_aliases.rb +8 -0
- data/lib/rubocop/cached_data.rb +4 -4
- data/lib/rubocop/cli.rb +11 -11
- data/lib/rubocop/cli/command.rb +1 -0
- data/lib/rubocop/cli/command/auto_genenerate_config.rb +46 -19
- data/lib/rubocop/cli/command/base.rb +2 -0
- data/lib/rubocop/cli/command/execute_runner.rb +36 -12
- data/lib/rubocop/cli/command/init_dotfile.rb +3 -4
- data/lib/rubocop/cli/command/show_cops.rb +6 -12
- data/lib/rubocop/cli/command/suggest_extensions.rb +81 -0
- data/lib/rubocop/cli/command/version.rb +3 -2
- data/lib/rubocop/cli/environment.rb +1 -0
- data/lib/rubocop/comment_config.rb +54 -103
- data/lib/rubocop/config.rb +45 -29
- data/lib/rubocop/config_loader.rb +101 -106
- data/lib/rubocop/config_loader_resolver.rb +100 -29
- data/lib/rubocop/config_obsoletion.rb +67 -242
- data/lib/rubocop/config_obsoletion/changed_enforced_styles.rb +33 -0
- data/lib/rubocop/config_obsoletion/changed_parameter.rb +21 -0
- data/lib/rubocop/config_obsoletion/cop_rule.rb +33 -0
- data/lib/rubocop/config_obsoletion/extracted_cop.rb +44 -0
- data/lib/rubocop/config_obsoletion/parameter_rule.rb +44 -0
- data/lib/rubocop/config_obsoletion/removed_cop.rb +41 -0
- data/lib/rubocop/config_obsoletion/renamed_cop.rb +34 -0
- data/lib/rubocop/config_obsoletion/rule.rb +41 -0
- data/lib/rubocop/config_obsoletion/split_cop.rb +27 -0
- data/lib/rubocop/config_regeneration.rb +33 -0
- data/lib/rubocop/config_store.rb +31 -7
- data/lib/rubocop/config_validator.rb +53 -28
- data/lib/rubocop/cop/autocorrect_logic.rb +37 -38
- data/lib/rubocop/cop/badge.rb +11 -27
- data/lib/rubocop/cop/base.rb +450 -0
- data/lib/rubocop/cop/bundler/duplicated_gem.rb +31 -7
- data/lib/rubocop/cop/bundler/gem_comment.rb +117 -10
- data/lib/rubocop/cop/bundler/gem_version.rb +133 -0
- data/lib/rubocop/cop/bundler/insecure_protocol_source.rb +13 -20
- data/lib/rubocop/cop/bundler/ordered_gems.rb +2 -4
- data/lib/rubocop/cop/commissioner.rb +98 -74
- data/lib/rubocop/cop/cop.rb +84 -234
- data/lib/rubocop/cop/corrector.rb +41 -119
- data/lib/rubocop/cop/correctors/alignment_corrector.rb +11 -21
- data/lib/rubocop/cop/correctors/condition_corrector.rb +3 -5
- data/lib/rubocop/cop/correctors/each_to_for_corrector.rb +2 -4
- data/lib/rubocop/cop/correctors/empty_line_corrector.rb +9 -10
- data/lib/rubocop/cop/correctors/for_to_each_corrector.rb +1 -2
- data/lib/rubocop/cop/correctors/lambda_literal_to_method_corrector.rb +1 -1
- data/lib/rubocop/cop/correctors/line_break_corrector.rb +8 -11
- data/lib/rubocop/cop/correctors/multiline_literal_brace_corrector.rb +35 -6
- data/lib/rubocop/cop/correctors/ordered_gem_corrector.rb +1 -3
- data/lib/rubocop/cop/correctors/parentheses_corrector.rb +5 -8
- data/lib/rubocop/cop/correctors/percent_literal_corrector.rb +10 -21
- data/lib/rubocop/cop/correctors/punctuation_corrector.rb +8 -10
- data/lib/rubocop/cop/correctors/space_corrector.rb +1 -3
- data/lib/rubocop/cop/correctors/string_literal_corrector.rb +6 -8
- data/lib/rubocop/cop/correctors/unused_arg_corrector.rb +15 -18
- data/lib/rubocop/cop/documentation.rb +22 -0
- data/lib/rubocop/cop/exclude_limit.rb +26 -0
- data/lib/rubocop/cop/force.rb +2 -1
- data/lib/rubocop/cop/gemspec/date_assignment.rb +57 -0
- data/lib/rubocop/cop/gemspec/duplicated_assignment.rb +6 -5
- data/lib/rubocop/cop/gemspec/ordered_dependencies.rb +3 -7
- data/lib/rubocop/cop/gemspec/required_ruby_version.rb +48 -20
- data/lib/rubocop/cop/gemspec/ruby_version_globals_usage.rb +4 -2
- data/lib/rubocop/cop/generator.rb +12 -22
- data/lib/rubocop/cop/generator/configuration_injector.rb +4 -5
- data/lib/rubocop/cop/generator/require_file_injector.rb +2 -5
- data/lib/rubocop/cop/ignored_node.rb +1 -3
- data/lib/rubocop/cop/internal_affairs.rb +7 -1
- data/lib/rubocop/cop/internal_affairs/empty_line_between_expect_offense_and_correction.rb +68 -0
- data/lib/rubocop/cop/internal_affairs/example_description.rb +92 -0
- data/lib/rubocop/cop/internal_affairs/method_name_equal.rb +8 -17
- data/lib/rubocop/cop/internal_affairs/node_destructuring.rb +4 -4
- data/lib/rubocop/cop/internal_affairs/node_matcher_directive.rb +151 -0
- data/lib/rubocop/cop/internal_affairs/node_type_predicate.rb +11 -14
- data/lib/rubocop/cop/internal_affairs/offense_location_keyword.rb +12 -10
- data/lib/rubocop/cop/internal_affairs/redundant_described_class_as_subject.rb +62 -0
- data/lib/rubocop/cop/internal_affairs/redundant_let_rubocop_config_new.rb +65 -0
- data/lib/rubocop/cop/internal_affairs/redundant_location_argument.rb +12 -7
- data/lib/rubocop/cop/internal_affairs/redundant_message_argument.rb +11 -8
- data/lib/rubocop/cop/internal_affairs/style_detected_api_use.rb +148 -0
- data/lib/rubocop/cop/internal_affairs/useless_message_assertion.rb +6 -6
- 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 +10 -8
- data/lib/rubocop/cop/layout/assignment_indentation.rb +8 -7
- data/lib/rubocop/cop/layout/begin_end_alignment.rb +74 -0
- data/lib/rubocop/cop/layout/block_alignment.rb +36 -44
- data/lib/rubocop/cop/layout/block_end_newline.rb +4 -8
- data/lib/rubocop/cop/layout/case_indentation.rb +72 -30
- data/lib/rubocop/cop/layout/class_structure.rb +62 -74
- data/lib/rubocop/cop/layout/closing_heredoc_indentation.rb +4 -6
- data/lib/rubocop/cop/layout/closing_parenthesis_indentation.rb +24 -30
- data/lib/rubocop/cop/layout/comment_indentation.rb +22 -26
- data/lib/rubocop/cop/layout/condition_position.rb +16 -8
- data/lib/rubocop/cop/layout/def_end_alignment.rb +9 -10
- data/lib/rubocop/cop/layout/dot_position.rb +26 -21
- data/lib/rubocop/cop/layout/else_alignment.rb +25 -11
- data/lib/rubocop/cop/layout/empty_comment.rb +29 -29
- data/lib/rubocop/cop/layout/empty_line_after_guard_clause.rb +51 -36
- data/lib/rubocop/cop/layout/empty_line_after_magic_comment.rb +13 -13
- data/lib/rubocop/cop/layout/empty_line_after_multiline_condition.rb +136 -0
- data/lib/rubocop/cop/layout/empty_line_between_defs.rb +140 -40
- data/lib/rubocop/cop/layout/empty_lines.rb +7 -12
- data/lib/rubocop/cop/layout/empty_lines_around_access_modifier.rb +29 -38
- data/lib/rubocop/cop/layout/empty_lines_around_arguments.rb +13 -9
- data/lib/rubocop/cop/layout/empty_lines_around_attribute_accessor.rb +118 -0
- data/lib/rubocop/cop/layout/empty_lines_around_begin_body.rb +2 -5
- data/lib/rubocop/cop/layout/empty_lines_around_block_body.rb +2 -5
- data/lib/rubocop/cop/layout/empty_lines_around_class_body.rb +2 -5
- data/lib/rubocop/cop/layout/empty_lines_around_exception_handling_keywords.rb +4 -14
- data/lib/rubocop/cop/layout/empty_lines_around_method_body.rb +2 -5
- data/lib/rubocop/cop/layout/empty_lines_around_module_body.rb +2 -5
- data/lib/rubocop/cop/layout/end_alignment.rb +24 -23
- data/lib/rubocop/cop/layout/end_of_line.rb +8 -8
- data/lib/rubocop/cop/layout/extra_spacing.rb +23 -42
- data/lib/rubocop/cop/layout/first_argument_indentation.rb +40 -13
- data/lib/rubocop/cop/layout/first_array_element_indentation.rb +13 -13
- data/lib/rubocop/cop/layout/first_array_element_line_break.rb +4 -8
- data/lib/rubocop/cop/layout/first_hash_element_indentation.rb +36 -20
- data/lib/rubocop/cop/layout/first_hash_element_line_break.rb +3 -7
- data/lib/rubocop/cop/layout/first_method_argument_line_break.rb +6 -13
- data/lib/rubocop/cop/layout/first_method_parameter_line_break.rb +3 -7
- data/lib/rubocop/cop/layout/first_parameter_indentation.rb +9 -8
- data/lib/rubocop/cop/layout/hash_alignment.rb +76 -57
- data/lib/rubocop/cop/layout/heredoc_argument_closing_parenthesis.rb +45 -29
- data/lib/rubocop/cop/layout/heredoc_indentation.rb +32 -116
- data/lib/rubocop/cop/layout/indentation_consistency.rb +9 -6
- data/lib/rubocop/cop/layout/indentation_style.rb +25 -32
- data/lib/rubocop/cop/layout/indentation_width.rb +34 -15
- data/lib/rubocop/cop/layout/initial_indentation.rb +7 -11
- data/lib/rubocop/cop/layout/leading_comment_space.rb +12 -10
- data/lib/rubocop/cop/layout/leading_empty_lines.rb +6 -11
- data/lib/rubocop/cop/layout/line_end_string_concatenation_indentation.rb +122 -0
- data/lib/rubocop/cop/layout/line_length.rb +37 -47
- data/lib/rubocop/cop/layout/multiline_array_brace_layout.rb +8 -11
- data/lib/rubocop/cop/layout/multiline_array_line_breaks.rb +3 -7
- data/lib/rubocop/cop/layout/multiline_assignment_layout.rb +38 -16
- data/lib/rubocop/cop/layout/multiline_block_layout.rb +41 -37
- data/lib/rubocop/cop/layout/multiline_hash_brace_layout.rb +8 -11
- data/lib/rubocop/cop/layout/multiline_hash_key_line_breaks.rb +3 -7
- data/lib/rubocop/cop/layout/multiline_method_argument_line_breaks.rb +6 -13
- data/lib/rubocop/cop/layout/multiline_method_call_brace_layout.rb +8 -11
- data/lib/rubocop/cop/layout/multiline_method_call_indentation.rb +29 -18
- data/lib/rubocop/cop/layout/multiline_method_definition_brace_layout.rb +8 -11
- data/lib/rubocop/cop/layout/multiline_operation_indentation.rb +26 -12
- data/lib/rubocop/cop/layout/parameter_alignment.rb +8 -7
- data/lib/rubocop/cop/layout/redundant_line_break.rb +139 -0
- data/lib/rubocop/cop/layout/rescue_ensure_alignment.rb +37 -30
- data/lib/rubocop/cop/layout/single_line_block_chain.rb +53 -0
- data/lib/rubocop/cop/layout/space_after_colon.rb +10 -8
- data/lib/rubocop/cop/layout/space_after_comma.rb +2 -5
- data/lib/rubocop/cop/layout/space_after_method_name.rb +7 -10
- data/lib/rubocop/cop/layout/space_after_not.rb +9 -11
- data/lib/rubocop/cop/layout/space_after_semicolon.rb +2 -5
- data/lib/rubocop/cop/layout/space_around_block_parameters.rb +45 -52
- data/lib/rubocop/cop/layout/space_around_equals_in_parameter_default.rb +19 -23
- data/lib/rubocop/cop/layout/space_around_keyword.rb +50 -26
- data/lib/rubocop/cop/layout/space_around_method_call_operator.rb +34 -69
- data/lib/rubocop/cop/layout/space_around_operators.rb +51 -25
- data/lib/rubocop/cop/layout/space_before_block_braces.rb +39 -23
- data/lib/rubocop/cop/layout/space_before_brackets.rb +65 -0
- data/lib/rubocop/cop/layout/space_before_comma.rb +3 -5
- data/lib/rubocop/cop/layout/space_before_comment.rb +8 -9
- data/lib/rubocop/cop/layout/space_before_first_arg.rb +9 -15
- data/lib/rubocop/cop/layout/space_before_semicolon.rb +2 -5
- data/lib/rubocop/cop/layout/space_in_lambda_literal.rb +11 -21
- data/lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb +30 -39
- data/lib/rubocop/cop/layout/space_inside_array_percent_literal.rb +5 -15
- data/lib/rubocop/cop/layout/space_inside_block_braces.rb +32 -37
- data/lib/rubocop/cop/layout/space_inside_hash_literal_braces.rb +22 -41
- data/lib/rubocop/cop/layout/space_inside_parens.rb +39 -22
- data/lib/rubocop/cop/layout/space_inside_percent_literal_delimiters.rb +5 -10
- data/lib/rubocop/cop/layout/space_inside_range_literal.rb +8 -17
- data/lib/rubocop/cop/layout/space_inside_reference_brackets.rb +18 -29
- data/lib/rubocop/cop/layout/space_inside_string_interpolation.rb +12 -13
- data/lib/rubocop/cop/layout/trailing_empty_lines.rb +10 -15
- data/lib/rubocop/cop/layout/trailing_whitespace.rb +42 -18
- data/lib/rubocop/cop/legacy/corrections_proxy.rb +43 -0
- data/lib/rubocop/cop/legacy/corrector.rb +27 -0
- data/lib/rubocop/cop/lint/ambiguous_assignment.rb +54 -0
- data/lib/rubocop/cop/lint/ambiguous_block_association.rb +21 -9
- data/lib/rubocop/cop/lint/ambiguous_operator.rb +53 -5
- data/lib/rubocop/cop/lint/ambiguous_regexp_literal.rb +36 -6
- data/lib/rubocop/cop/lint/assignment_in_condition.rb +2 -2
- data/lib/rubocop/cop/lint/big_decimal_new.rb +10 -10
- data/lib/rubocop/cop/lint/binary_operator_with_identical_operands.rb +55 -0
- data/lib/rubocop/cop/lint/boolean_symbol.rb +21 -13
- data/lib/rubocop/cop/lint/circular_argument_reference.rb +1 -1
- data/lib/rubocop/cop/lint/constant_definition_in_block.rb +100 -0
- data/lib/rubocop/cop/lint/constant_resolution.rb +89 -0
- data/lib/rubocop/cop/lint/debugger.rb +61 -21
- data/lib/rubocop/cop/lint/deprecated_class_methods.rb +86 -47
- data/lib/rubocop/cop/lint/deprecated_constants.rb +80 -0
- data/lib/rubocop/cop/lint/deprecated_open_ssl_constant.rb +148 -0
- data/lib/rubocop/cop/lint/disjunctive_assignment_in_constructor.rb +8 -2
- data/lib/rubocop/cop/lint/duplicate_branch.rb +155 -0
- data/lib/rubocop/cop/lint/duplicate_case_condition.rb +3 -13
- data/lib/rubocop/cop/lint/duplicate_elsif_condition.rb +39 -0
- data/lib/rubocop/cop/lint/duplicate_hash_key.rb +2 -4
- data/lib/rubocop/cop/lint/duplicate_methods.rb +12 -16
- data/lib/rubocop/cop/lint/duplicate_regexp_character_class_element.rb +77 -0
- data/lib/rubocop/cop/lint/duplicate_require.rb +47 -0
- data/lib/rubocop/cop/lint/duplicate_rescue_exception.rb +47 -0
- data/lib/rubocop/cop/lint/each_with_object_argument.rb +3 -1
- data/lib/rubocop/cop/lint/else_layout.rb +29 -5
- data/lib/rubocop/cop/lint/empty_block.rb +98 -0
- data/lib/rubocop/cop/lint/empty_class.rb +93 -0
- data/lib/rubocop/cop/lint/empty_conditional_body.rb +67 -0
- data/lib/rubocop/cop/lint/empty_ensure.rb +5 -7
- data/lib/rubocop/cop/lint/empty_expression.rb +2 -2
- data/lib/rubocop/cop/lint/empty_file.rb +48 -0
- data/lib/rubocop/cop/lint/empty_in_pattern.rb +62 -0
- data/lib/rubocop/cop/lint/empty_interpolation.rb +4 -7
- data/lib/rubocop/cop/lint/empty_when.rb +31 -8
- data/lib/rubocop/cop/lint/ensure_return.rb +29 -16
- data/lib/rubocop/cop/lint/erb_new_arguments.rb +18 -20
- data/lib/rubocop/cop/lint/flip_flop.rb +9 -3
- data/lib/rubocop/cop/lint/float_comparison.rb +93 -0
- data/lib/rubocop/cop/lint/float_out_of_range.rb +2 -3
- data/lib/rubocop/cop/lint/format_parameter_mismatch.rb +45 -10
- data/lib/rubocop/cop/lint/hash_compare_by_identity.rb +38 -0
- data/lib/rubocop/cop/lint/heredoc_method_call_position.rb +14 -16
- data/lib/rubocop/cop/lint/identity_comparison.rb +51 -0
- data/lib/rubocop/cop/lint/implicit_string_concatenation.rb +6 -6
- data/lib/rubocop/cop/lint/ineffective_access_modifier.rb +14 -20
- data/lib/rubocop/cop/lint/inherit_exception.rb +14 -9
- data/lib/rubocop/cop/lint/interpolation_check.rb +20 -7
- data/lib/rubocop/cop/lint/lambda_without_literal_block.rb +44 -0
- data/lib/rubocop/cop/lint/literal_as_condition.rb +37 -16
- data/lib/rubocop/cop/lint/literal_in_interpolation.rb +44 -15
- data/lib/rubocop/cop/lint/loop.rb +25 -5
- data/lib/rubocop/cop/lint/missing_cop_enable_directive.rb +35 -23
- data/lib/rubocop/cop/lint/missing_super.rb +101 -0
- data/lib/rubocop/cop/lint/mixed_regexp_capture_types.rb +36 -0
- data/lib/rubocop/cop/lint/multiple_comparison.rb +14 -14
- data/lib/rubocop/cop/lint/nested_method_definition.rb +19 -23
- data/lib/rubocop/cop/lint/nested_percent_literal.rb +18 -6
- data/lib/rubocop/cop/lint/next_without_accumulator.rb +2 -1
- data/lib/rubocop/cop/lint/no_return_in_begin_end_blocks.rb +58 -0
- data/lib/rubocop/cop/lint/non_deterministic_require_order.rb +95 -15
- data/lib/rubocop/cop/lint/non_local_exit_from_iterator.rb +12 -9
- data/lib/rubocop/cop/lint/number_conversion.rb +97 -23
- data/lib/rubocop/cop/lint/numbered_parameter_assignment.rb +47 -0
- data/lib/rubocop/cop/lint/or_assignment_to_constant.rb +39 -0
- data/lib/rubocop/cop/lint/ordered_magic_comments.rb +12 -15
- data/lib/rubocop/cop/lint/out_of_range_regexp_ref.rb +96 -0
- data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb +31 -12
- data/lib/rubocop/cop/lint/percent_string_array.rb +6 -11
- data/lib/rubocop/cop/lint/percent_symbol_array.rb +13 -14
- data/lib/rubocop/cop/lint/raise_exception.rb +19 -7
- data/lib/rubocop/cop/lint/rand_one.rb +5 -4
- data/lib/rubocop/cop/lint/redundant_cop_disable_directive.rb +142 -115
- data/lib/rubocop/cop/lint/redundant_cop_enable_directive.rb +44 -30
- data/lib/rubocop/cop/lint/redundant_dir_glob_sort.rb +50 -0
- data/lib/rubocop/cop/lint/redundant_require_statement.rb +9 -10
- data/lib/rubocop/cop/lint/redundant_safe_navigation.rb +77 -0
- data/lib/rubocop/cop/lint/redundant_splat_expansion.rb +72 -35
- data/lib/rubocop/cop/lint/redundant_string_coercion.rb +8 -15
- data/lib/rubocop/cop/lint/redundant_with_index.rb +13 -18
- data/lib/rubocop/cop/lint/redundant_with_object.rb +13 -18
- data/lib/rubocop/cop/lint/regexp_as_condition.rb +4 -2
- data/lib/rubocop/cop/lint/require_parentheses.rb +4 -6
- data/lib/rubocop/cop/lint/rescue_exception.rb +3 -4
- data/lib/rubocop/cop/lint/rescue_type.rb +10 -16
- data/lib/rubocop/cop/lint/return_in_void_context.rb +3 -6
- data/lib/rubocop/cop/lint/safe_navigation_chain.rb +5 -8
- data/lib/rubocop/cop/lint/safe_navigation_consistency.rb +15 -17
- data/lib/rubocop/cop/lint/safe_navigation_with_empty.rb +12 -4
- data/lib/rubocop/cop/lint/script_permission.rb +10 -7
- data/lib/rubocop/cop/lint/self_assignment.rb +78 -0
- data/lib/rubocop/cop/lint/send_with_mixin_argument.rb +11 -19
- data/lib/rubocop/cop/lint/shadowed_argument.rb +8 -14
- data/lib/rubocop/cop/lint/shadowed_exception.rb +18 -30
- data/lib/rubocop/cop/lint/shadowing_outer_local_variable.rb +21 -7
- data/lib/rubocop/cop/lint/struct_new_override.rb +4 -3
- data/lib/rubocop/cop/lint/suppressed_exception.rb +53 -6
- data/lib/rubocop/cop/lint/symbol_conversion.rb +178 -0
- data/lib/rubocop/cop/lint/syntax.rb +11 -30
- data/lib/rubocop/cop/lint/to_enum_arguments.rb +89 -0
- data/lib/rubocop/cop/lint/to_json.rb +21 -13
- data/lib/rubocop/cop/lint/top_level_return_with_argument.rb +34 -0
- data/lib/rubocop/cop/lint/trailing_comma_in_attribute_declaration.rb +55 -0
- data/lib/rubocop/cop/lint/triple_quotes.rb +71 -0
- data/lib/rubocop/cop/lint/underscore_prefixed_variable_name.rb +5 -7
- data/lib/rubocop/cop/lint/unexpected_block_arity.rb +85 -0
- data/lib/rubocop/cop/lint/unified_integer.rb +5 -6
- data/lib/rubocop/cop/lint/unmodified_reduce_accumulator.rb +204 -0
- data/lib/rubocop/cop/lint/unreachable_code.rb +5 -7
- data/lib/rubocop/cop/lint/unreachable_loop.rb +196 -0
- data/lib/rubocop/cop/lint/unused_block_argument.rb +18 -11
- data/lib/rubocop/cop/lint/unused_method_argument.rb +11 -6
- data/lib/rubocop/cop/lint/uri_escape_unescape.rb +5 -2
- data/lib/rubocop/cop/lint/uri_regexp.rb +12 -47
- data/lib/rubocop/cop/lint/useless_access_modifier.rb +38 -22
- data/lib/rubocop/cop/lint/useless_assignment.rb +10 -14
- data/lib/rubocop/cop/lint/useless_else_without_rescue.rb +7 -11
- data/lib/rubocop/cop/lint/useless_method_definition.rb +68 -0
- data/lib/rubocop/cop/lint/useless_setter_call.rb +12 -10
- data/lib/rubocop/cop/lint/useless_times.rb +109 -0
- data/lib/rubocop/cop/lint/void.rb +8 -19
- data/lib/rubocop/cop/message_annotator.rb +5 -4
- data/lib/rubocop/cop/metrics/abc_size.rb +26 -2
- data/lib/rubocop/cop/metrics/block_length.rb +40 -10
- data/lib/rubocop/cop/metrics/block_nesting.rb +5 -10
- data/lib/rubocop/cop/metrics/class_length.rb +40 -11
- data/lib/rubocop/cop/metrics/cyclomatic_complexity.rb +38 -6
- data/lib/rubocop/cop/metrics/method_length.rb +32 -4
- data/lib/rubocop/cop/metrics/module_length.rb +29 -9
- data/lib/rubocop/cop/metrics/parameter_lists.rb +74 -11
- data/lib/rubocop/cop/metrics/perceived_complexity.rb +7 -9
- data/lib/rubocop/cop/metrics/utils/abc_size_calculator.rb +76 -15
- data/lib/rubocop/cop/metrics/utils/code_length_calculator.rb +160 -0
- data/lib/rubocop/cop/metrics/utils/iterating_block.rb +61 -0
- data/lib/rubocop/cop/metrics/utils/repeated_attribute_discount.rb +143 -0
- data/lib/rubocop/cop/metrics/utils/repeated_csend_discount.rb +42 -0
- data/lib/rubocop/cop/migration/department_name.rb +25 -29
- data/lib/rubocop/cop/mixin/alignment.rb +18 -11
- data/lib/rubocop/cop/mixin/allowed_identifiers.rb +18 -0
- data/lib/rubocop/cop/mixin/allowed_methods.rb +21 -0
- data/lib/rubocop/cop/mixin/annotation_comment.rb +5 -0
- data/lib/rubocop/cop/mixin/array_min_size.rb +2 -4
- data/lib/rubocop/cop/mixin/auto_corrector.rb +12 -0
- data/lib/rubocop/cop/mixin/check_line_breakable.rb +51 -18
- data/lib/rubocop/cop/mixin/code_length.rb +29 -8
- data/lib/rubocop/cop/mixin/comments_help.rb +42 -0
- data/lib/rubocop/cop/mixin/configurable_enforced_style.rb +3 -5
- data/lib/rubocop/cop/mixin/configurable_formatting.rb +4 -11
- data/lib/rubocop/cop/mixin/configurable_max.rb +1 -0
- data/lib/rubocop/cop/mixin/configurable_naming.rb +2 -2
- data/lib/rubocop/cop/mixin/configurable_numbering.rb +4 -3
- data/lib/rubocop/cop/mixin/def_node.rb +3 -5
- data/lib/rubocop/cop/mixin/documentation_comment.rb +4 -7
- data/lib/rubocop/cop/mixin/empty_lines_around_body.rb +14 -14
- data/lib/rubocop/cop/mixin/empty_parameter.rb +2 -1
- data/lib/rubocop/cop/mixin/end_keyword_alignment.rb +11 -2
- data/lib/rubocop/cop/mixin/enforce_superclass.rb +16 -8
- data/lib/rubocop/cop/mixin/first_element_line_break.rb +3 -3
- data/lib/rubocop/cop/mixin/frozen_string_literal.rb +14 -5
- 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 +48 -31
- data/lib/rubocop/cop/mixin/ignored_methods.rb +36 -3
- data/lib/rubocop/cop/mixin/ignored_pattern.rb +1 -1
- data/lib/rubocop/cop/mixin/interpolation.rb +1 -3
- data/lib/rubocop/cop/mixin/line_length_help.rb +17 -15
- data/lib/rubocop/cop/mixin/match_range.rb +2 -5
- data/lib/rubocop/cop/mixin/method_complexity.rb +21 -6
- data/lib/rubocop/cop/mixin/method_preference.rb +1 -2
- data/lib/rubocop/cop/mixin/multiline_element_indentation.rb +4 -3
- data/lib/rubocop/cop/mixin/multiline_element_line_breaks.rb +1 -1
- data/lib/rubocop/cop/mixin/multiline_expression_indentation.rb +13 -42
- data/lib/rubocop/cop/mixin/multiline_literal_brace_layout.rb +14 -14
- data/lib/rubocop/cop/mixin/negative_conditional.rb +6 -4
- data/lib/rubocop/cop/mixin/nil_methods.rb +3 -5
- data/lib/rubocop/cop/mixin/ordered_gem_node.rb +7 -5
- data/lib/rubocop/cop/mixin/parentheses.rb +1 -2
- data/lib/rubocop/cop/mixin/percent_array.rb +14 -9
- data/lib/rubocop/cop/mixin/percent_literal.rb +0 -6
- data/lib/rubocop/cop/mixin/preceding_following_alignment.rb +6 -12
- data/lib/rubocop/cop/mixin/preferred_delimiters.rb +6 -9
- data/lib/rubocop/cop/mixin/range_help.rb +24 -13
- data/lib/rubocop/cop/mixin/rational_literal.rb +1 -0
- data/lib/rubocop/cop/mixin/rescue_node.rb +13 -7
- data/lib/rubocop/cop/mixin/safe_assignment.rb +6 -2
- data/lib/rubocop/cop/mixin/space_after_punctuation.rb +6 -7
- data/lib/rubocop/cop/mixin/space_before_punctuation.rb +5 -5
- data/lib/rubocop/cop/mixin/statement_modifier.rb +45 -23
- data/lib/rubocop/cop/mixin/string_help.rb +4 -1
- data/lib/rubocop/cop/mixin/string_literals_help.rb +3 -5
- data/lib/rubocop/cop/mixin/surrounding_space.rb +15 -31
- data/lib/rubocop/cop/mixin/symbol_help.rb +13 -0
- data/lib/rubocop/cop/mixin/target_ruby_version.rb +5 -1
- data/lib/rubocop/cop/mixin/trailing_body.rb +1 -2
- data/lib/rubocop/cop/mixin/trailing_comma.rb +12 -17
- data/lib/rubocop/cop/mixin/uncommunicative_name.rb +25 -32
- data/lib/rubocop/cop/mixin/unused_argument.rb +5 -9
- data/lib/rubocop/cop/mixin/visibility_help.rb +37 -0
- data/lib/rubocop/cop/naming/accessor_method_name.rb +19 -3
- data/lib/rubocop/cop/naming/ascii_identifiers.rb +29 -8
- data/lib/rubocop/cop/naming/binary_operator_parameter_name.rb +17 -7
- data/lib/rubocop/cop/naming/block_parameter_name.rb +1 -1
- data/lib/rubocop/cop/naming/class_and_module_camel_case.rb +13 -3
- data/lib/rubocop/cop/naming/constant_name.rb +4 -2
- data/lib/rubocop/cop/naming/file_name.rb +36 -34
- data/lib/rubocop/cop/naming/heredoc_delimiter_case.rb +12 -6
- data/lib/rubocop/cop/naming/heredoc_delimiter_naming.rb +3 -3
- data/lib/rubocop/cop/naming/inclusive_language.rb +249 -0
- data/lib/rubocop/cop/naming/memoized_instance_variable_name.rb +134 -26
- data/lib/rubocop/cop/naming/method_name.rb +6 -8
- data/lib/rubocop/cop/naming/method_parameter_name.rb +2 -2
- data/lib/rubocop/cop/naming/predicate_name.rb +10 -13
- data/lib/rubocop/cop/naming/rescued_exceptions_variable_name.rb +59 -15
- data/lib/rubocop/cop/naming/variable_name.rb +3 -1
- data/lib/rubocop/cop/naming/variable_number.rb +94 -9
- data/lib/rubocop/cop/offense.rb +35 -12
- data/lib/rubocop/cop/registry.rb +87 -23
- data/lib/rubocop/cop/security/eval.rb +4 -2
- data/lib/rubocop/cop/security/json_load.rb +8 -8
- data/lib/rubocop/cop/security/marshal_load.rb +4 -4
- data/lib/rubocop/cop/security/open.rb +15 -11
- data/lib/rubocop/cop/security/yaml_load.rb +8 -6
- data/lib/rubocop/cop/severity.rb +4 -14
- data/lib/rubocop/cop/style/access_modifier_declarations.rb +15 -11
- data/lib/rubocop/cop/style/accessor_grouping.rb +150 -0
- data/lib/rubocop/cop/style/alias.rb +46 -45
- data/lib/rubocop/cop/style/and_or.rb +25 -17
- data/lib/rubocop/cop/style/arguments_forwarding.rb +143 -0
- data/lib/rubocop/cop/style/array_coercion.rb +69 -0
- data/lib/rubocop/cop/style/array_join.rb +9 -9
- data/lib/rubocop/cop/style/ascii_comments.rb +6 -7
- data/lib/rubocop/cop/style/attr.rb +15 -15
- data/lib/rubocop/cop/style/auto_resource_cleanup.rb +9 -12
- data/lib/rubocop/cop/style/bare_percent_literals.rb +12 -14
- data/lib/rubocop/cop/style/begin_block.rb +2 -2
- data/lib/rubocop/cop/style/bisected_attr_accessor.rb +125 -0
- data/lib/rubocop/cop/style/bisected_attr_accessor/macro.rb +60 -0
- data/lib/rubocop/cop/style/block_comments.rb +14 -18
- data/lib/rubocop/cop/style/block_delimiters.rb +41 -34
- data/lib/rubocop/cop/style/case_equality.rb +34 -6
- data/lib/rubocop/cop/style/case_like_if.rb +258 -0
- data/lib/rubocop/cop/style/character_literal.rb +12 -15
- data/lib/rubocop/cop/style/class_and_module_children.rb +57 -24
- data/lib/rubocop/cop/style/class_check.rb +6 -11
- data/lib/rubocop/cop/style/class_equality_comparison.rb +67 -0
- data/lib/rubocop/cop/style/class_methods.rb +8 -14
- data/lib/rubocop/cop/style/class_methods_definitions.rb +157 -0
- data/lib/rubocop/cop/style/class_vars.rb +23 -7
- data/lib/rubocop/cop/style/collection_compact.rb +91 -0
- data/lib/rubocop/cop/style/collection_methods.rb +22 -15
- data/lib/rubocop/cop/style/colon_method_call.rb +7 -9
- data/lib/rubocop/cop/style/colon_method_definition.rb +6 -6
- data/lib/rubocop/cop/style/combinable_loops.rb +92 -0
- data/lib/rubocop/cop/style/command_literal.rb +22 -28
- data/lib/rubocop/cop/style/comment_annotation.rb +73 -26
- data/lib/rubocop/cop/style/commented_keyword.rb +34 -21
- data/lib/rubocop/cop/style/conditional_assignment.rb +71 -87
- data/lib/rubocop/cop/style/constant_visibility.rb +31 -2
- data/lib/rubocop/cop/style/copyright.rb +20 -23
- data/lib/rubocop/cop/style/date_time.rb +16 -5
- data/lib/rubocop/cop/style/def_with_parentheses.rb +9 -12
- data/lib/rubocop/cop/style/dir.rb +11 -12
- data/lib/rubocop/cop/style/disable_cops_within_source_code_directive.rb +51 -13
- data/lib/rubocop/cop/style/document_dynamic_eval_definition.rb +169 -0
- data/lib/rubocop/cop/style/documentation.rb +50 -14
- data/lib/rubocop/cop/style/documentation_method.rb +2 -1
- data/lib/rubocop/cop/style/double_cop_disable_directive.rb +7 -16
- data/lib/rubocop/cop/style/double_negation.rb +50 -6
- data/lib/rubocop/cop/style/each_for_simple_loop.rb +7 -10
- data/lib/rubocop/cop/style/each_with_object.rb +17 -19
- data/lib/rubocop/cop/style/empty_block_parameter.rb +9 -10
- data/lib/rubocop/cop/style/empty_case_condition.rb +22 -26
- data/lib/rubocop/cop/style/empty_else.rb +14 -22
- data/lib/rubocop/cop/style/empty_lambda_parameter.rb +9 -10
- data/lib/rubocop/cop/style/empty_literal.rb +46 -31
- data/lib/rubocop/cop/style/empty_method.rb +12 -23
- data/lib/rubocop/cop/style/encoding.rb +6 -10
- data/lib/rubocop/cop/style/end_block.rb +5 -8
- data/lib/rubocop/cop/style/endless_method.rb +101 -0
- data/lib/rubocop/cop/style/eval_with_location.rb +143 -54
- data/lib/rubocop/cop/style/even_odd.rb +9 -11
- data/lib/rubocop/cop/style/expand_path_arguments.rb +25 -23
- data/lib/rubocop/cop/style/explicit_block_argument.rb +114 -0
- data/lib/rubocop/cop/style/exponential_notation.rb +15 -18
- data/lib/rubocop/cop/style/float_division.rb +60 -11
- data/lib/rubocop/cop/style/for.rb +7 -13
- data/lib/rubocop/cop/style/format_string.rb +28 -22
- data/lib/rubocop/cop/style/format_string_token.rb +78 -22
- data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +24 -51
- data/lib/rubocop/cop/style/global_std_stream.rb +66 -0
- data/lib/rubocop/cop/style/global_vars.rb +2 -2
- data/lib/rubocop/cop/style/guard_clause.rb +32 -13
- data/lib/rubocop/cop/style/hash_as_last_array_item.rb +88 -0
- data/lib/rubocop/cop/style/hash_conversion.rb +133 -0
- data/lib/rubocop/cop/style/hash_each_methods.rb +26 -12
- data/lib/rubocop/cop/style/hash_except.rb +96 -0
- data/lib/rubocop/cop/style/hash_like_case.rb +77 -0
- data/lib/rubocop/cop/style/hash_syntax.rb +48 -41
- data/lib/rubocop/cop/style/hash_transform_keys.rb +23 -11
- data/lib/rubocop/cop/style/hash_transform_values.rb +22 -10
- data/lib/rubocop/cop/style/identical_conditional_branches.rb +64 -11
- data/lib/rubocop/cop/style/if_inside_else.rb +50 -2
- data/lib/rubocop/cop/style/if_unless_modifier.rb +58 -49
- data/lib/rubocop/cop/style/if_unless_modifier_of_if_unless.rb +11 -3
- data/lib/rubocop/cop/style/if_with_boolean_literal_branches.rb +122 -0
- data/lib/rubocop/cop/style/if_with_semicolon.rb +51 -3
- data/lib/rubocop/cop/style/implicit_runtime_error.rb +3 -1
- data/lib/rubocop/cop/style/in_pattern_then.rb +56 -0
- data/lib/rubocop/cop/style/infinite_loop.rb +27 -26
- data/lib/rubocop/cop/style/inline_comment.rb +4 -4
- data/lib/rubocop/cop/style/inverse_methods.rb +28 -40
- data/lib/rubocop/cop/style/ip_addresses.rb +3 -4
- data/lib/rubocop/cop/style/keyword_parameters_order.rb +75 -0
- data/lib/rubocop/cop/style/lambda.rb +9 -16
- data/lib/rubocop/cop/style/lambda_call.rb +18 -35
- data/lib/rubocop/cop/style/line_end_concatenation.rb +21 -25
- data/lib/rubocop/cop/style/method_call_with_args_parentheses.rb +62 -13
- data/lib/rubocop/cop/style/method_call_with_args_parentheses/omit_parentheses.rb +53 -32
- data/lib/rubocop/cop/style/method_call_with_args_parentheses/require_parentheses.rb +8 -18
- data/lib/rubocop/cop/style/method_call_without_args_parentheses.rb +19 -12
- data/lib/rubocop/cop/style/method_called_on_do_end_block.rb +14 -7
- data/lib/rubocop/cop/style/method_def_parentheses.rb +18 -24
- data/lib/rubocop/cop/style/min_max.rb +10 -14
- data/lib/rubocop/cop/style/missing_else.rb +13 -25
- data/lib/rubocop/cop/style/missing_respond_to_missing.rb +11 -5
- data/lib/rubocop/cop/style/mixin_grouping.rb +26 -39
- data/lib/rubocop/cop/style/mixin_usage.rb +12 -30
- data/lib/rubocop/cop/style/module_function.rb +18 -19
- data/lib/rubocop/cop/style/multiline_block_chain.rb +13 -5
- data/lib/rubocop/cop/style/multiline_if_modifier.rb +3 -10
- data/lib/rubocop/cop/style/multiline_if_then.rb +5 -11
- data/lib/rubocop/cop/style/multiline_in_pattern_then.rb +62 -0
- data/lib/rubocop/cop/style/multiline_memoization.rb +15 -13
- data/lib/rubocop/cop/style/multiline_method_signature.rb +33 -3
- data/lib/rubocop/cop/style/multiline_ternary_operator.rb +32 -11
- data/lib/rubocop/cop/style/multiline_when_then.rb +25 -18
- data/lib/rubocop/cop/style/multiple_comparison.rb +77 -12
- data/lib/rubocop/cop/style/mutable_constant.rb +45 -37
- data/lib/rubocop/cop/style/negated_if.rb +10 -11
- data/lib/rubocop/cop/style/negated_if_else_condition.rb +128 -0
- data/lib/rubocop/cop/style/negated_unless.rb +10 -11
- data/lib/rubocop/cop/style/negated_while.rb +7 -15
- data/lib/rubocop/cop/style/nested_modifier.rb +10 -17
- data/lib/rubocop/cop/style/nested_parenthesized_calls.rb +20 -17
- data/lib/rubocop/cop/style/nested_ternary_operator.rb +30 -4
- data/lib/rubocop/cop/style/next.rb +16 -25
- data/lib/rubocop/cop/style/nil_comparison.rb +19 -11
- data/lib/rubocop/cop/style/nil_lambda.rb +70 -0
- data/lib/rubocop/cop/style/non_nil_check.rb +56 -34
- data/lib/rubocop/cop/style/not.rb +20 -26
- data/lib/rubocop/cop/style/numeric_literal_prefix.rb +6 -11
- data/lib/rubocop/cop/style/numeric_literals.rb +19 -27
- data/lib/rubocop/cop/style/numeric_predicate.rb +15 -23
- data/lib/rubocop/cop/style/one_line_conditional.rb +73 -28
- data/lib/rubocop/cop/style/option_hash.rb +3 -4
- data/lib/rubocop/cop/style/optional_arguments.rb +4 -7
- data/lib/rubocop/cop/style/optional_boolean_parameter.rb +53 -0
- data/lib/rubocop/cop/style/or_assignment.rb +11 -10
- data/lib/rubocop/cop/style/parallel_assignment.rb +27 -24
- data/lib/rubocop/cop/style/parentheses_around_condition.rb +7 -6
- data/lib/rubocop/cop/style/percent_literal_delimiters.rb +16 -24
- data/lib/rubocop/cop/style/percent_q_literals.rb +9 -12
- data/lib/rubocop/cop/style/perl_backrefs.rb +84 -16
- data/lib/rubocop/cop/style/preferred_hash_methods.rb +12 -18
- data/lib/rubocop/cop/style/proc.rb +8 -8
- data/lib/rubocop/cop/style/quoted_symbols.rb +110 -0
- data/lib/rubocop/cop/style/raise_args.rb +41 -37
- data/lib/rubocop/cop/style/random_with_offset.rb +30 -35
- data/lib/rubocop/cop/style/redundant_argument.rb +85 -0
- data/lib/rubocop/cop/style/redundant_assignment.rb +106 -0
- data/lib/rubocop/cop/style/redundant_begin.rb +79 -13
- data/lib/rubocop/cop/style/redundant_capital_w.rb +7 -11
- data/lib/rubocop/cop/style/redundant_condition.rb +28 -15
- data/lib/rubocop/cop/style/redundant_conditional.rb +13 -14
- data/lib/rubocop/cop/style/redundant_exception.rb +21 -16
- data/lib/rubocop/cop/style/redundant_fetch_block.rb +115 -0
- data/lib/rubocop/cop/style/redundant_file_extension_in_require.rb +52 -0
- data/lib/rubocop/cop/style/redundant_freeze.rb +16 -14
- data/lib/rubocop/cop/style/redundant_interpolation.rb +32 -27
- data/lib/rubocop/cop/style/redundant_parentheses.rb +51 -38
- data/lib/rubocop/cop/style/redundant_percent_q.rb +13 -16
- data/lib/rubocop/cop/style/redundant_regexp_character_class.rb +104 -0
- data/lib/rubocop/cop/style/redundant_regexp_escape.rb +118 -0
- data/lib/rubocop/cop/style/redundant_return.rb +24 -22
- data/lib/rubocop/cop/style/redundant_self.rb +46 -26
- data/lib/rubocop/cop/style/redundant_self_assignment.rb +118 -0
- data/lib/rubocop/cop/style/redundant_sort.rb +30 -35
- data/lib/rubocop/cop/style/redundant_sort_by.rb +6 -9
- data/lib/rubocop/cop/style/regexp_literal.rb +24 -30
- data/lib/rubocop/cop/style/rescue_modifier.rb +39 -12
- data/lib/rubocop/cop/style/rescue_standard_error.rb +25 -23
- data/lib/rubocop/cop/style/return_nil.rb +12 -7
- data/lib/rubocop/cop/style/safe_navigation.rb +44 -39
- data/lib/rubocop/cop/style/sample.rb +14 -15
- data/lib/rubocop/cop/style/self_assignment.rb +26 -22
- data/lib/rubocop/cop/style/semicolon.rb +10 -10
- data/lib/rubocop/cop/style/send.rb +5 -7
- data/lib/rubocop/cop/style/signal_exception.rb +32 -27
- data/lib/rubocop/cop/style/single_argument_dig.rb +55 -0
- data/lib/rubocop/cop/style/single_line_block_params.rb +34 -12
- data/lib/rubocop/cop/style/single_line_methods.rb +81 -19
- data/lib/rubocop/cop/style/slicing_with_range.rb +38 -0
- data/lib/rubocop/cop/style/sole_nested_conditional.rb +176 -0
- data/lib/rubocop/cop/style/special_global_vars.rb +21 -54
- data/lib/rubocop/cop/style/stabby_lambda_parentheses.rb +18 -22
- data/lib/rubocop/cop/style/static_class.rb +97 -0
- data/lib/rubocop/cop/style/stderr_puts.rb +9 -13
- data/lib/rubocop/cop/style/string_chars.rb +39 -0
- data/lib/rubocop/cop/style/string_concatenation.rb +169 -0
- data/lib/rubocop/cop/style/string_hash_keys.rb +8 -7
- data/lib/rubocop/cop/style/string_literals.rb +19 -15
- data/lib/rubocop/cop/style/string_literals_in_interpolation.rb +5 -3
- data/lib/rubocop/cop/style/string_methods.rb +7 -17
- data/lib/rubocop/cop/style/strip.rb +10 -14
- data/lib/rubocop/cop/style/struct_inheritance.rb +33 -4
- data/lib/rubocop/cop/style/swap_values.rb +108 -0
- data/lib/rubocop/cop/style/symbol_array.rb +11 -22
- data/lib/rubocop/cop/style/symbol_literal.rb +4 -8
- data/lib/rubocop/cop/style/symbol_proc.rb +50 -32
- data/lib/rubocop/cop/style/ternary_parentheses.rb +29 -33
- data/lib/rubocop/cop/style/top_level_method_definition.rb +83 -0
- data/lib/rubocop/cop/style/trailing_body_on_class.rb +3 -6
- data/lib/rubocop/cop/style/trailing_body_on_method_definition.rb +10 -9
- data/lib/rubocop/cop/style/trailing_body_on_module.rb +3 -6
- data/lib/rubocop/cop/style/trailing_comma_in_arguments.rb +5 -8
- data/lib/rubocop/cop/style/trailing_comma_in_array_literal.rb +5 -8
- data/lib/rubocop/cop/style/trailing_comma_in_block_args.rb +22 -24
- data/lib/rubocop/cop/style/trailing_comma_in_hash_literal.rb +5 -8
- data/lib/rubocop/cop/style/trailing_method_end_statement.rb +12 -38
- data/lib/rubocop/cop/style/trailing_underscore_variable.rb +16 -31
- data/lib/rubocop/cop/style/trivial_accessors.rb +101 -40
- data/lib/rubocop/cop/style/unless_else.rb +7 -11
- data/lib/rubocop/cop/style/unless_logical_operators.rb +105 -0
- data/lib/rubocop/cop/style/unpack_first.rb +7 -9
- data/lib/rubocop/cop/style/variable_interpolation.rb +8 -11
- data/lib/rubocop/cop/style/when_then.rb +7 -7
- data/lib/rubocop/cop/style/while_until_do.rb +6 -16
- data/lib/rubocop/cop/style/while_until_modifier.rb +16 -24
- data/lib/rubocop/cop/style/word_array.rb +6 -25
- data/lib/rubocop/cop/style/yoda_condition.rb +17 -18
- data/lib/rubocop/cop/style/zero_length_predicate.rb +25 -23
- data/lib/rubocop/cop/team.rb +147 -84
- data/lib/rubocop/cop/util.rb +43 -27
- data/lib/rubocop/cop/utils/format_string.rb +22 -9
- data/lib/rubocop/cop/variable_force.rb +11 -26
- data/lib/rubocop/cop/variable_force/assignment.rb +2 -2
- data/lib/rubocop/cop/variable_force/branch.rb +18 -9
- data/lib/rubocop/cop/variable_force/reference.rb +1 -3
- data/lib/rubocop/cop/variable_force/scope.rb +6 -9
- data/lib/rubocop/cop/variable_force/variable.rb +9 -12
- data/lib/rubocop/cop/variable_force/variable_table.rb +1 -1
- data/lib/rubocop/cops_documentation_generator.rb +270 -0
- data/lib/rubocop/core_ext/string.rb +2 -2
- data/lib/rubocop/directive_comment.rb +144 -0
- data/lib/rubocop/error.rb +1 -0
- data/lib/rubocop/ext/processed_source.rb +18 -0
- data/lib/rubocop/ext/regexp_node.rb +87 -0
- data/lib/rubocop/ext/regexp_parser.rb +92 -0
- data/lib/rubocop/file_finder.rb +12 -13
- data/lib/rubocop/formatter/auto_gen_config_formatter.rb +2 -1
- data/lib/rubocop/formatter/base_formatter.rb +0 -4
- data/lib/rubocop/formatter/clang_style_formatter.rb +4 -2
- data/lib/rubocop/formatter/disabled_config_formatter.rb +39 -30
- data/lib/rubocop/formatter/emacs_style_formatter.rb +2 -0
- data/lib/rubocop/formatter/formatter_set.rb +5 -5
- data/lib/rubocop/formatter/git_hub_actions_formatter.rb +44 -0
- data/lib/rubocop/formatter/html_formatter.rb +6 -10
- data/lib/rubocop/formatter/json_formatter.rb +1 -5
- data/lib/rubocop/formatter/junit_formatter.rb +34 -15
- data/lib/rubocop/formatter/offense_count_formatter.rb +2 -2
- data/lib/rubocop/formatter/progress_formatter.rb +3 -4
- data/lib/rubocop/formatter/quiet_formatter.rb +1 -1
- data/lib/rubocop/formatter/simple_text_formatter.rb +40 -7
- data/lib/rubocop/formatter/tap_formatter.rb +6 -2
- data/lib/rubocop/formatter/worst_offenders_formatter.rb +2 -2
- data/lib/rubocop/lockfile.rb +40 -0
- data/lib/rubocop/magic_comment.rb +33 -4
- data/lib/rubocop/name_similarity.rb +18 -10
- data/lib/rubocop/options.rb +126 -91
- data/lib/rubocop/path_util.rb +20 -22
- data/lib/rubocop/platform.rb +1 -1
- data/lib/rubocop/rake_task.rb +12 -11
- data/lib/rubocop/remote_config.rb +15 -11
- data/lib/rubocop/result_cache.rb +50 -31
- data/lib/rubocop/rspec/cop_helper.rb +11 -35
- data/lib/rubocop/rspec/expect_offense.rb +128 -39
- data/lib/rubocop/rspec/shared_contexts.rb +78 -32
- data/lib/rubocop/runner.rb +111 -74
- data/lib/rubocop/string_interpreter.rb +3 -0
- data/lib/rubocop/target_finder.rb +58 -48
- data/lib/rubocop/target_ruby.rb +126 -13
- data/lib/rubocop/util.rb +16 -0
- data/lib/rubocop/version.rb +71 -7
- data/lib/rubocop/yaml_duplication_checker.rb +1 -0
- metadata +189 -91
- data/bin/console +0 -10
- data/bin/setup +0 -7
- data/lib/rubocop/ast/builder.rb +0 -85
- data/lib/rubocop/ast/node.rb +0 -637
- data/lib/rubocop/ast/node/alias_node.rb +0 -24
- data/lib/rubocop/ast/node/and_node.rb +0 -29
- data/lib/rubocop/ast/node/args_node.rb +0 -29
- data/lib/rubocop/ast/node/array_node.rb +0 -70
- data/lib/rubocop/ast/node/block_node.rb +0 -121
- data/lib/rubocop/ast/node/break_node.rb +0 -17
- data/lib/rubocop/ast/node/case_match_node.rb +0 -56
- data/lib/rubocop/ast/node/case_node.rb +0 -56
- data/lib/rubocop/ast/node/class_node.rb +0 -31
- data/lib/rubocop/ast/node/def_node.rb +0 -82
- data/lib/rubocop/ast/node/defined_node.rb +0 -17
- data/lib/rubocop/ast/node/ensure_node.rb +0 -17
- data/lib/rubocop/ast/node/float_node.rb +0 -12
- data/lib/rubocop/ast/node/for_node.rb +0 -53
- data/lib/rubocop/ast/node/forward_args_node.rb +0 -18
- data/lib/rubocop/ast/node/hash_node.rb +0 -109
- data/lib/rubocop/ast/node/if_node.rb +0 -175
- data/lib/rubocop/ast/node/int_node.rb +0 -12
- data/lib/rubocop/ast/node/keyword_splat_node.rb +0 -45
- data/lib/rubocop/ast/node/mixin/basic_literal_node.rb +0 -16
- data/lib/rubocop/ast/node/mixin/binary_operator_node.rb +0 -43
- data/lib/rubocop/ast/node/mixin/collection_node.rb +0 -15
- data/lib/rubocop/ast/node/mixin/conditional_node.rb +0 -45
- data/lib/rubocop/ast/node/mixin/hash_element_node.rb +0 -125
- data/lib/rubocop/ast/node/mixin/method_dispatch_node.rb +0 -269
- data/lib/rubocop/ast/node/mixin/method_identifier_predicates.rb +0 -114
- data/lib/rubocop/ast/node/mixin/modifier_node.rb +0 -17
- data/lib/rubocop/ast/node/mixin/numeric_node.rb +0 -21
- data/lib/rubocop/ast/node/mixin/parameterized_node.rb +0 -61
- data/lib/rubocop/ast/node/mixin/predicate_operator_node.rb +0 -35
- data/lib/rubocop/ast/node/module_node.rb +0 -24
- data/lib/rubocop/ast/node/or_node.rb +0 -29
- data/lib/rubocop/ast/node/pair_node.rb +0 -63
- data/lib/rubocop/ast/node/range_node.rb +0 -18
- data/lib/rubocop/ast/node/regexp_node.rb +0 -33
- data/lib/rubocop/ast/node/resbody_node.rb +0 -24
- data/lib/rubocop/ast/node/retry_node.rb +0 -17
- data/lib/rubocop/ast/node/return_node.rb +0 -24
- data/lib/rubocop/ast/node/self_class_node.rb +0 -24
- data/lib/rubocop/ast/node/send_node.rb +0 -13
- data/lib/rubocop/ast/node/str_node.rb +0 -16
- data/lib/rubocop/ast/node/super_node.rb +0 -21
- data/lib/rubocop/ast/node/symbol_node.rb +0 -12
- data/lib/rubocop/ast/node/until_node.rb +0 -35
- data/lib/rubocop/ast/node/when_node.rb +0 -53
- data/lib/rubocop/ast/node/while_node.rb +0 -35
- data/lib/rubocop/ast/node/yield_node.rb +0 -21
- data/lib/rubocop/ast/sexp.rb +0 -16
- data/lib/rubocop/ast/traversal.rb +0 -202
- data/lib/rubocop/cop/lint/useless_comparison.rb +0 -28
- data/lib/rubocop/cop/mixin/classish_length.rb +0 -37
- data/lib/rubocop/cop/mixin/parser_diagnostic.rb +0 -37
- data/lib/rubocop/cop/mixin/too_many_lines.rb +0 -35
- data/lib/rubocop/cop/style/method_missing_super.rb +0 -34
- data/lib/rubocop/node_pattern.rb +0 -887
- data/lib/rubocop/processed_source.rb +0 -213
- data/lib/rubocop/string_util.rb +0 -14
- data/lib/rubocop/token.rb +0 -114
@@ -6,7 +6,13 @@ module RuboCop
|
|
6
6
|
# This cop checks that comment annotation keywords are written according
|
7
7
|
# to guidelines.
|
8
8
|
#
|
9
|
-
#
|
9
|
+
# NOTE: With a multiline comment block (where each line is only a
|
10
|
+
# comment), only the first line will be able to register an offense, even
|
11
|
+
# if an annotation keyword starts another line. This is done to prevent
|
12
|
+
# incorrect registering of keywords (eg. `review`) inside a paragraph as an
|
13
|
+
# annotation.
|
14
|
+
#
|
15
|
+
# @example RequireColon: true (default)
|
10
16
|
# # bad
|
11
17
|
# # TODO make better
|
12
18
|
#
|
@@ -30,48 +36,69 @@ module RuboCop
|
|
30
36
|
#
|
31
37
|
# # good
|
32
38
|
# # OPTIMIZE: does not work
|
33
|
-
|
39
|
+
#
|
40
|
+
# @example RequireColon: false
|
41
|
+
# # bad
|
42
|
+
# # TODO: make better
|
43
|
+
#
|
44
|
+
# # good
|
45
|
+
# # TODO make better
|
46
|
+
#
|
47
|
+
# # bad
|
48
|
+
# # fixme does not work
|
49
|
+
#
|
50
|
+
# # good
|
51
|
+
# # FIXME does not work
|
52
|
+
#
|
53
|
+
# # bad
|
54
|
+
# # Optimize does not work
|
55
|
+
#
|
56
|
+
# # good
|
57
|
+
# # OPTIMIZE does not work
|
58
|
+
class CommentAnnotation < Base
|
34
59
|
include AnnotationComment
|
35
60
|
include RangeHelp
|
61
|
+
extend AutoCorrector
|
36
62
|
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
63
|
+
MSG_COLON_STYLE = 'Annotation keywords like `%<keyword>s` should be all ' \
|
64
|
+
'upper case, followed by a colon, and a space, ' \
|
65
|
+
'then a note describing the problem.'
|
66
|
+
MSG_SPACE_STYLE = 'Annotation keywords like `%<keyword>s` should be all ' \
|
67
|
+
'upper case, followed by a space, ' \
|
68
|
+
'then a note describing the problem.'
|
69
|
+
MISSING_NOTE = 'Annotation comment, with keyword `%<keyword>s`, is missing a note.'
|
42
70
|
|
43
|
-
def
|
71
|
+
def on_new_investigation
|
44
72
|
processed_source.comments.each_with_index do |comment, index|
|
45
73
|
next unless first_comment_line?(processed_source.comments, index) ||
|
46
74
|
inline_comment?(comment)
|
47
75
|
|
48
76
|
margin, first_word, colon, space, note = split_comment(comment)
|
49
|
-
next unless annotation?(comment) &&
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
location: annotation_range(comment, margin,
|
55
|
-
first_word, colon, space),
|
56
|
-
message: format(note ? MSG : MISSING_NOTE, keyword: first_word)
|
57
|
-
)
|
77
|
+
next unless annotation?(comment) && !correct_annotation?(first_word, colon, space, note)
|
78
|
+
|
79
|
+
range = annotation_range(comment, margin, first_word, colon, space)
|
80
|
+
|
81
|
+
register_offense(range, note, first_word)
|
58
82
|
end
|
59
83
|
end
|
60
84
|
|
61
|
-
|
62
|
-
margin, first_word, colon, space, note = split_comment(comment)
|
63
|
-
return if note.nil?
|
85
|
+
private
|
64
86
|
|
65
|
-
|
87
|
+
def register_offense(range, note, first_word)
|
88
|
+
message = requires_colon? ? MSG_COLON_STYLE : MSG_SPACE_STYLE
|
66
89
|
|
67
|
-
|
68
|
-
|
90
|
+
add_offense(
|
91
|
+
range,
|
92
|
+
message: format(note ? message : MISSING_NOTE, keyword: first_word)
|
93
|
+
) do |corrector|
|
94
|
+
next if note.nil?
|
69
95
|
|
70
|
-
|
96
|
+
correct_offense(corrector, range, first_word)
|
97
|
+
end
|
98
|
+
end
|
71
99
|
|
72
100
|
def first_comment_line?(comments, index)
|
73
|
-
index.zero? ||
|
74
|
-
comments[index - 1].loc.line < comments[index].loc.line - 1
|
101
|
+
index.zero? || comments[index - 1].loc.line < comments[index].loc.line - 1
|
75
102
|
end
|
76
103
|
|
77
104
|
def inline_comment?(comment)
|
@@ -89,8 +116,28 @@ module RuboCop
|
|
89
116
|
end
|
90
117
|
|
91
118
|
def correct_annotation?(first_word, colon, space, note)
|
119
|
+
return correct_colon_annotation?(first_word, colon, space, note) if requires_colon?
|
120
|
+
|
121
|
+
correct_space_annotation?(first_word, colon, space, note)
|
122
|
+
end
|
123
|
+
|
124
|
+
def correct_colon_annotation?(first_word, colon, space, note)
|
92
125
|
keyword?(first_word) && (colon && space && note || !colon && !note)
|
93
126
|
end
|
127
|
+
|
128
|
+
def correct_space_annotation?(first_word, colon, space, note)
|
129
|
+
keyword?(first_word) && (!colon && space && note || !colon && !note)
|
130
|
+
end
|
131
|
+
|
132
|
+
def correct_offense(corrector, range, first_word)
|
133
|
+
return corrector.replace(range, "#{first_word.upcase}: ") if requires_colon?
|
134
|
+
|
135
|
+
corrector.replace(range, "#{first_word.upcase} ")
|
136
|
+
end
|
137
|
+
|
138
|
+
def requires_colon?
|
139
|
+
cop_config['RequireColon']
|
140
|
+
end
|
94
141
|
end
|
95
142
|
end
|
96
143
|
end
|
@@ -4,12 +4,15 @@ module RuboCop
|
|
4
4
|
module Cop
|
5
5
|
module Style
|
6
6
|
# This cop checks for comments put on the same line as some keywords.
|
7
|
-
# These keywords are: `
|
7
|
+
# These keywords are: `class`, `module`, `def`, `begin`, `end`.
|
8
8
|
#
|
9
9
|
# Note that some comments
|
10
10
|
# (`:nodoc:`, `:yields:`, `rubocop:disable` and `rubocop:todo`)
|
11
11
|
# are allowed.
|
12
12
|
#
|
13
|
+
# Auto-correction removes comments from `end` keyword and keeps comments
|
14
|
+
# for `class`, `module`, `def` and `begin` above the keyword.
|
15
|
+
#
|
13
16
|
# @example
|
14
17
|
# # bad
|
15
18
|
# if condition
|
@@ -33,35 +36,45 @@ module RuboCop
|
|
33
36
|
# class X # :nodoc:
|
34
37
|
# y
|
35
38
|
# end
|
36
|
-
class CommentedKeyword <
|
37
|
-
|
38
|
-
|
39
|
+
class CommentedKeyword < Base
|
40
|
+
include RangeHelp
|
41
|
+
extend AutoCorrector
|
42
|
+
|
43
|
+
MSG = 'Do not place comments on the same line as the `%<keyword>s` keyword.'
|
44
|
+
|
45
|
+
KEYWORDS = %w[begin class def end module].freeze
|
46
|
+
KEYWORD_REGEXES = KEYWORDS.map { |w| /^\s*#{w}\s/ }.freeze
|
47
|
+
|
48
|
+
ALLOWED_COMMENTS = %w[:nodoc: :yields: rubocop:disable rubocop:todo].freeze
|
49
|
+
ALLOWED_COMMENT_REGEXES = ALLOWED_COMMENTS.map { |c| /#\s*#{c}/ }.freeze
|
50
|
+
|
51
|
+
def on_new_investigation
|
52
|
+
processed_source.comments.each do |comment|
|
53
|
+
next unless (match = line(comment).match(/(?<keyword>\S+).*#/)) && offensive?(comment)
|
39
54
|
|
40
|
-
|
41
|
-
processed_source.each_comment do |comment|
|
42
|
-
add_offense(comment) if offensive?(comment)
|
55
|
+
register_offense(comment, match[:keyword])
|
43
56
|
end
|
44
57
|
end
|
45
58
|
|
46
59
|
private
|
47
60
|
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
rubocop:disable
|
53
|
-
rubocop:todo
|
54
|
-
].freeze
|
61
|
+
def register_offense(comment, matched_keyword)
|
62
|
+
add_offense(comment, message: format(MSG, keyword: matched_keyword)) do |corrector|
|
63
|
+
range = range_with_surrounding_space(range: comment.loc.expression, newlines: false)
|
64
|
+
corrector.remove(range)
|
55
65
|
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
66
|
+
unless matched_keyword == 'end'
|
67
|
+
corrector.insert_before(
|
68
|
+
range.source_buffer.line_range(comment.loc.line), "#{comment.text}\n"
|
69
|
+
)
|
70
|
+
end
|
71
|
+
end
|
60
72
|
end
|
61
73
|
|
62
|
-
def
|
63
|
-
|
64
|
-
|
74
|
+
def offensive?(comment)
|
75
|
+
line = line(comment)
|
76
|
+
KEYWORD_REGEXES.any? { |r| r.match?(line) } &&
|
77
|
+
ALLOWED_COMMENT_REGEXES.none? { |r| r.match?(line) }
|
65
78
|
end
|
66
79
|
|
67
80
|
def line(comment)
|
@@ -30,7 +30,7 @@ module RuboCop
|
|
30
30
|
end
|
31
31
|
|
32
32
|
def tail(branch)
|
33
|
-
branch.begin_type? ?
|
33
|
+
branch.begin_type? ? Array(branch).last : branch
|
34
34
|
end
|
35
35
|
|
36
36
|
# rubocop:disable Metrics/AbcSize
|
@@ -43,7 +43,7 @@ module RuboCop
|
|
43
43
|
when :and_asgn, :or_asgn
|
44
44
|
"#{node.children[0].source} #{node.loc.operator.source} "
|
45
45
|
when :casgn
|
46
|
-
|
46
|
+
lhs_for_casgn(node)
|
47
47
|
when *ConditionalAssignment::VARIABLE_ASSIGNMENT_TYPES
|
48
48
|
"#{node.children[0]} = "
|
49
49
|
else
|
@@ -93,9 +93,17 @@ module RuboCop
|
|
93
93
|
end
|
94
94
|
end
|
95
95
|
|
96
|
+
def lhs_for_casgn(node)
|
97
|
+
namespace = node.children[0]
|
98
|
+
if namespace.nil? || namespace.cbase_type?
|
99
|
+
"#{namespace&.source}#{node.children[1]} = "
|
100
|
+
else
|
101
|
+
"#{namespace.source}::#{node.children[1]} = "
|
102
|
+
end
|
103
|
+
end
|
104
|
+
|
96
105
|
def setter_method?(method_name)
|
97
|
-
method_name.to_s.end_with?(EQUAL) &&
|
98
|
-
!%i[!= == === >= <=].include?(method_name)
|
106
|
+
method_name.to_s.end_with?(EQUAL) && !%i[!= == === >= <=].include?(method_name)
|
99
107
|
end
|
100
108
|
|
101
109
|
def assignment_rhs_exist?(node)
|
@@ -199,19 +207,16 @@ module RuboCop
|
|
199
207
|
# some_other_method
|
200
208
|
# bar = 2
|
201
209
|
# end
|
202
|
-
class ConditionalAssignment <
|
210
|
+
class ConditionalAssignment < Base
|
203
211
|
include ConditionalAssignmentHelper
|
204
212
|
include ConfigurableEnforcedStyle
|
205
213
|
include IgnoredNode
|
214
|
+
extend AutoCorrector
|
206
215
|
|
207
|
-
MSG = 'Use the return of the conditional for variable assignment '
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
VARIABLE_ASSIGNMENT_TYPES =
|
212
|
-
%i[casgn cvasgn gvasgn ivasgn lvasgn].freeze
|
213
|
-
ASSIGNMENT_TYPES = VARIABLE_ASSIGNMENT_TYPES +
|
214
|
-
%i[and_asgn or_asgn op_asgn masgn].freeze
|
216
|
+
MSG = 'Use the return of the conditional for variable assignment and comparison.'
|
217
|
+
ASSIGN_TO_CONDITION_MSG = 'Assign variables inside of conditionals'
|
218
|
+
VARIABLE_ASSIGNMENT_TYPES = %i[casgn cvasgn gvasgn ivasgn lvasgn].freeze
|
219
|
+
ASSIGNMENT_TYPES = VARIABLE_ASSIGNMENT_TYPES + %i[and_asgn or_asgn op_asgn masgn].freeze
|
215
220
|
LINE_LENGTH = 'Layout/LineLength'
|
216
221
|
INDENTATION_WIDTH = 'Layout/IndentationWidth'
|
217
222
|
ENABLED = 'Enabled'
|
@@ -221,10 +226,11 @@ module RuboCop
|
|
221
226
|
|
222
227
|
# The shovel operator `<<` does not have its own type. It is a `send`
|
223
228
|
# type.
|
229
|
+
# @!method assignment_type?(node)
|
224
230
|
def_node_matcher :assignment_type?, <<~PATTERN
|
225
231
|
{
|
226
232
|
#{ASSIGNMENT_TYPES.join(' ')}
|
227
|
-
(send _recv {:[]= :<< :=~ :!~ :<=> #end_with_eq?} ...)
|
233
|
+
(send _recv {:[]= :<< :=~ :!~ :<=> #end_with_eq? :< :>} ...)
|
228
234
|
}
|
229
235
|
PATTERN
|
230
236
|
|
@@ -266,14 +272,6 @@ module RuboCop
|
|
266
272
|
check_node(node, branches)
|
267
273
|
end
|
268
274
|
|
269
|
-
def autocorrect(node)
|
270
|
-
if assignment_type?(node)
|
271
|
-
move_assignment_inside_condition(node)
|
272
|
-
else
|
273
|
-
move_assignment_outside_condition(node)
|
274
|
-
end
|
275
|
-
end
|
276
|
-
|
277
275
|
private
|
278
276
|
|
279
277
|
def check_assignment_to_condition(node)
|
@@ -289,13 +287,16 @@ module RuboCop
|
|
289
287
|
return unless else_branch
|
290
288
|
return if allowed_single_line?([*branches, else_branch])
|
291
289
|
|
292
|
-
add_offense(node, message: ASSIGN_TO_CONDITION_MSG)
|
290
|
+
add_offense(node, message: ASSIGN_TO_CONDITION_MSG) do |corrector|
|
291
|
+
autocorrect(corrector, node)
|
292
|
+
end
|
293
293
|
end
|
294
294
|
|
295
295
|
def candidate_node?(node)
|
296
296
|
style == :assign_inside_condition && assignment_rhs_exist?(node)
|
297
297
|
end
|
298
298
|
|
299
|
+
# @!method candidate_condition?(node)
|
299
300
|
def_node_matcher :candidate_condition?, '[{if case} !#allowed_ternary?]'
|
300
301
|
|
301
302
|
def allowed_ternary?(assignment)
|
@@ -312,32 +313,30 @@ module RuboCop
|
|
312
313
|
# ignore pseudo-assignments without rhs in for nodes
|
313
314
|
return if node.parent&.for_type?
|
314
315
|
|
315
|
-
if assignment.begin_type? && assignment.children.one?
|
316
|
-
assignment, = *assignment
|
317
|
-
end
|
316
|
+
assignment, = *assignment if assignment.begin_type? && assignment.children.one?
|
318
317
|
|
319
318
|
assignment
|
320
319
|
end
|
321
320
|
|
322
|
-
def move_assignment_outside_condition(node)
|
321
|
+
def move_assignment_outside_condition(corrector, node)
|
323
322
|
if node.case_type?
|
324
|
-
CaseCorrector.correct(self, node)
|
323
|
+
CaseCorrector.correct(corrector, self, node)
|
325
324
|
elsif node.ternary?
|
326
|
-
TernaryCorrector.correct(node)
|
325
|
+
TernaryCorrector.correct(corrector, node)
|
327
326
|
elsif node.if? || node.unless?
|
328
|
-
IfCorrector.correct(self, node)
|
327
|
+
IfCorrector.correct(corrector, self, node)
|
329
328
|
end
|
330
329
|
end
|
331
330
|
|
332
|
-
def move_assignment_inside_condition(node)
|
331
|
+
def move_assignment_inside_condition(corrector, node)
|
333
332
|
*_assignment, condition = *node
|
334
333
|
|
335
334
|
if ternary_condition?(condition)
|
336
|
-
TernaryCorrector.move_assignment_inside_condition(node)
|
335
|
+
TernaryCorrector.move_assignment_inside_condition(corrector, node)
|
337
336
|
elsif condition.case_type?
|
338
|
-
CaseCorrector.move_assignment_inside_condition(node)
|
337
|
+
CaseCorrector.move_assignment_inside_condition(corrector, node)
|
339
338
|
elsif condition.if_type?
|
340
|
-
IfCorrector.move_assignment_inside_condition(node)
|
339
|
+
IfCorrector.move_assignment_inside_condition(corrector, node)
|
341
340
|
end
|
342
341
|
end
|
343
342
|
|
@@ -364,7 +363,15 @@ module RuboCop
|
|
364
363
|
return if allowed_single_line?(branches)
|
365
364
|
return if correction_exceeds_line_limit?(node, branches)
|
366
365
|
|
367
|
-
add_offense(node)
|
366
|
+
add_offense(node) { |corrector| autocorrect(corrector, node) }
|
367
|
+
end
|
368
|
+
|
369
|
+
def autocorrect(corrector, node)
|
370
|
+
if assignment_type?(node)
|
371
|
+
move_assignment_inside_condition(corrector, node)
|
372
|
+
else
|
373
|
+
move_assignment_outside_condition(corrector, node)
|
374
|
+
end
|
368
375
|
end
|
369
376
|
|
370
377
|
def allowed_statements?(branches)
|
@@ -397,9 +404,7 @@ module RuboCop
|
|
397
404
|
|
398
405
|
def longest_line(node, assignment)
|
399
406
|
assignment_regex = /\s*#{Regexp.escape(assignment).gsub('\ ', '\s*')}/
|
400
|
-
lines = node.source.lines.map
|
401
|
-
line.chomp.sub(assignment_regex, '')
|
402
|
-
end
|
407
|
+
lines = node.source.lines.map { |line| line.chomp.sub(assignment_regex, '') }
|
403
408
|
longest_line = lines.max_by(&:length)
|
404
409
|
assignment + longest_line
|
405
410
|
end
|
@@ -443,9 +448,7 @@ module RuboCop
|
|
443
448
|
expression = node.loc.expression
|
444
449
|
begin_pos = expression.begin_pos - (expression.column - column - 2)
|
445
450
|
|
446
|
-
Parser::Source::Range.new(expression.source_buffer,
|
447
|
-
begin_pos,
|
448
|
-
expression.begin_pos)
|
451
|
+
Parser::Source::Range.new(expression.source_buffer, begin_pos, expression.begin_pos)
|
449
452
|
end
|
450
453
|
|
451
454
|
def assignment(node)
|
@@ -492,24 +495,20 @@ module RuboCop
|
|
492
495
|
include ConditionalAssignmentHelper
|
493
496
|
include ConditionalCorrectorHelper
|
494
497
|
|
495
|
-
def correct(node)
|
496
|
-
|
497
|
-
corrector.replace(node, correction(node))
|
498
|
-
end
|
498
|
+
def correct(corrector, node)
|
499
|
+
corrector.replace(node, correction(node))
|
499
500
|
end
|
500
501
|
|
501
|
-
def move_assignment_inside_condition(node)
|
502
|
+
def move_assignment_inside_condition(corrector, node)
|
502
503
|
*_var, rhs = *node
|
503
504
|
if_branch, else_branch = extract_branches(node)
|
504
505
|
assignment = assignment(node)
|
505
506
|
|
506
|
-
|
507
|
-
|
508
|
-
corrector.remove(assignment)
|
507
|
+
remove_parentheses(corrector, rhs) if Util.parentheses?(rhs)
|
508
|
+
corrector.remove(assignment)
|
509
509
|
|
510
|
-
|
511
|
-
|
512
|
-
end
|
510
|
+
move_branch_inside_condition(corrector, if_branch, assignment)
|
511
|
+
move_branch_inside_condition(corrector, else_branch, assignment)
|
513
512
|
end
|
514
513
|
|
515
514
|
private
|
@@ -522,9 +521,7 @@ module RuboCop
|
|
522
521
|
_variable, *_operator, if_rhs = *node.if_branch
|
523
522
|
_else_variable, *_operator, else_rhs = *node.else_branch
|
524
523
|
|
525
|
-
expr = "#{node.condition.source} ? "
|
526
|
-
"#{if_rhs.source} : " \
|
527
|
-
"#{else_rhs.source}"
|
524
|
+
expr = "#{node.condition.source} ? #{if_rhs.source} : #{else_rhs.source}"
|
528
525
|
|
529
526
|
element_assignment?(node.if_branch) ? "(#{expr})" : expr
|
530
527
|
end
|
@@ -558,22 +555,19 @@ module RuboCop
|
|
558
555
|
include ConditionalAssignmentHelper
|
559
556
|
include ConditionalCorrectorHelper
|
560
557
|
|
561
|
-
def correct(cop, node)
|
562
|
-
|
558
|
+
def correct(corrector, cop, node)
|
559
|
+
correct_if_branches(corrector, cop, node)
|
563
560
|
end
|
564
561
|
|
565
|
-
def move_assignment_inside_condition(node)
|
562
|
+
def move_assignment_inside_condition(corrector, node)
|
566
563
|
column = node.loc.expression.column
|
567
564
|
*_var, condition = *node
|
568
565
|
assignment = assignment(node)
|
569
566
|
|
570
|
-
|
571
|
-
corrector.remove(assignment)
|
567
|
+
corrector.remove(assignment)
|
572
568
|
|
573
|
-
|
574
|
-
|
575
|
-
assignment, column)
|
576
|
-
end
|
569
|
+
condition.branches.flatten.each do |branch|
|
570
|
+
move_branch_inside_condition(corrector, branch, condition, assignment, column)
|
577
571
|
end
|
578
572
|
end
|
579
573
|
|
@@ -589,8 +583,7 @@ module RuboCop
|
|
589
583
|
def move_branch_inside_condition(corrector, branch, condition,
|
590
584
|
assignment, column)
|
591
585
|
branch_assignment = tail(branch)
|
592
|
-
corrector.insert_before(branch_assignment,
|
593
|
-
assignment.source)
|
586
|
+
corrector.insert_before(branch_assignment, assignment.source)
|
594
587
|
|
595
588
|
remove_whitespace_in_branches(corrector, branch, condition, column)
|
596
589
|
|
@@ -607,31 +600,25 @@ module RuboCop
|
|
607
600
|
include ConditionalAssignmentHelper
|
608
601
|
include ConditionalCorrectorHelper
|
609
602
|
|
610
|
-
def correct(cop, node)
|
603
|
+
def correct(corrector, cop, node)
|
611
604
|
when_branches, else_branch = extract_tail_branches(node)
|
612
605
|
|
613
|
-
|
614
|
-
|
615
|
-
|
616
|
-
replace_branch_assignment(corrector, else_branch)
|
606
|
+
corrector.insert_before(node, lhs(else_branch))
|
607
|
+
correct_branches(corrector, when_branches)
|
608
|
+
replace_branch_assignment(corrector, else_branch)
|
617
609
|
|
618
|
-
|
619
|
-
indent(cop, lhs(else_branch)))
|
620
|
-
end
|
610
|
+
corrector.insert_before(node.loc.end, indent(cop, lhs(else_branch)))
|
621
611
|
end
|
622
612
|
|
623
|
-
def move_assignment_inside_condition(node)
|
613
|
+
def move_assignment_inside_condition(corrector, node)
|
624
614
|
column = node.loc.expression.column
|
625
615
|
*_var, condition = *node
|
626
616
|
assignment = assignment(node)
|
627
617
|
|
628
|
-
|
629
|
-
corrector.remove(assignment)
|
618
|
+
corrector.remove(assignment)
|
630
619
|
|
631
|
-
|
632
|
-
|
633
|
-
assignment, column)
|
634
|
-
end
|
620
|
+
extract_branches(condition).flatten.each do |branch|
|
621
|
+
move_branch_inside_condition(corrector, branch, condition, assignment, column)
|
635
622
|
end
|
636
623
|
end
|
637
624
|
|
@@ -649,17 +636,14 @@ module RuboCop
|
|
649
636
|
[when_branches, case_node.else_branch]
|
650
637
|
end
|
651
638
|
|
652
|
-
def move_branch_inside_condition(corrector, branch, condition,
|
653
|
-
assignment, column)
|
639
|
+
def move_branch_inside_condition(corrector, branch, condition, assignment, column)
|
654
640
|
branch_assignment = tail(branch)
|
655
|
-
corrector.insert_before(branch_assignment,
|
656
|
-
assignment.source)
|
641
|
+
corrector.insert_before(branch_assignment, assignment.source)
|
657
642
|
|
658
643
|
remove_whitespace_in_branches(corrector, branch, condition, column)
|
659
644
|
|
660
645
|
parent_keyword = branch.parent.loc.keyword
|
661
|
-
corrector.remove_preceding(parent_keyword,
|
662
|
-
parent_keyword.column - column)
|
646
|
+
corrector.remove_preceding(parent_keyword, parent_keyword.column - column)
|
663
647
|
end
|
664
648
|
end
|
665
649
|
end
|