rubocop 0.78.0 → 1.13.0
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 -39
- data/assets/output.html.erb +1 -1
- data/config/default.yml +1034 -139
- data/config/obsoletion.yml +200 -0
- data/exe/rubocop +2 -4
- data/lib/rubocop.rb +139 -66
- data/lib/rubocop/ast_aliases.rb +8 -0
- data/lib/rubocop/cached_data.rb +4 -4
- data/lib/rubocop/cli.rb +19 -13
- 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 +14 -13
- 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 -98
- data/lib/rubocop/config.rb +76 -34
- data/lib/rubocop/config_loader.rb +118 -114
- data/lib/rubocop/config_loader_resolver.rb +99 -28
- data/lib/rubocop/config_obsoletion.rb +67 -239
- 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 +89 -103
- data/lib/rubocop/cop/autocorrect_logic.rb +41 -39
- data/lib/rubocop/cop/badge.rb +16 -32
- data/lib/rubocop/cop/base.rb +450 -0
- data/lib/rubocop/cop/bundler/duplicated_gem.rb +30 -6
- data/lib/rubocop/cop/bundler/gem_comment.rb +117 -8
- 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 +63 -117
- data/lib/rubocop/cop/correctors/alignment_corrector.rb +13 -23
- data/lib/rubocop/cop/correctors/condition_corrector.rb +3 -6
- 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 +4 -4
- data/lib/rubocop/cop/correctors/line_break_corrector.rb +9 -12
- 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 +4 -8
- 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 +14 -25
- data/lib/rubocop/cop/generator/configuration_injector.rb +5 -6
- 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 +8 -9
- data/lib/rubocop/cop/layout/array_alignment.rb +58 -13
- 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 +35 -43
- data/lib/rubocop/cop/layout/block_end_newline.rb +9 -11
- data/lib/rubocop/cop/layout/case_indentation.rb +22 -28
- data/lib/rubocop/cop/layout/class_structure.rb +58 -74
- data/lib/rubocop/cop/layout/closing_heredoc_indentation.rb +4 -6
- data/lib/rubocop/cop/layout/closing_parenthesis_indentation.rb +18 -30
- data/lib/rubocop/cop/layout/comment_indentation.rb +21 -25
- 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 +20 -21
- data/lib/rubocop/cop/layout/else_alignment.rb +28 -6
- data/lib/rubocop/cop/layout/empty_comment.rb +29 -29
- data/lib/rubocop/cop/layout/empty_line_after_guard_clause.rb +39 -22
- 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 -39
- 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 +18 -24
- 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 +24 -18
- data/lib/rubocop/cop/layout/first_array_element_line_break.rb +4 -8
- data/lib/rubocop/cop/layout/first_hash_element_indentation.rb +25 -21
- 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 +8 -7
- data/lib/rubocop/cop/layout/hash_alignment.rb +37 -40
- data/lib/rubocop/cop/layout/heredoc_argument_closing_parenthesis.rb +46 -30
- data/lib/rubocop/cop/layout/heredoc_indentation.rb +33 -117
- data/lib/rubocop/cop/layout/indentation_consistency.rb +9 -6
- data/lib/rubocop/cop/layout/indentation_style.rb +110 -0
- data/lib/rubocop/cop/layout/indentation_width.rb +22 -14
- data/lib/rubocop/cop/layout/initial_indentation.rb +7 -11
- data/lib/rubocop/cop/layout/leading_comment_space.rb +46 -13
- data/lib/rubocop/cop/layout/leading_empty_lines.rb +6 -11
- data/lib/rubocop/cop/layout/line_length.rb +61 -42
- data/lib/rubocop/cop/layout/multiline_array_brace_layout.rb +2 -5
- data/lib/rubocop/cop/layout/multiline_array_line_breaks.rb +3 -7
- data/lib/rubocop/cop/layout/multiline_assignment_layout.rb +36 -14
- data/lib/rubocop/cop/layout/multiline_block_layout.rb +51 -38
- data/lib/rubocop/cop/layout/multiline_hash_brace_layout.rb +2 -9
- 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 +2 -5
- data/lib/rubocop/cop/layout/multiline_method_call_indentation.rb +30 -19
- data/lib/rubocop/cop/layout/multiline_method_definition_brace_layout.rb +2 -5
- data/lib/rubocop/cop/layout/multiline_operation_indentation.rb +23 -9
- data/lib/rubocop/cop/layout/parameter_alignment.rb +6 -5
- data/lib/rubocop/cop/layout/redundant_line_break.rb +125 -0
- data/lib/rubocop/cop/layout/rescue_ensure_alignment.rb +37 -30
- 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 +22 -26
- data/lib/rubocop/cop/layout/space_around_method_call_operator.rb +98 -0
- data/lib/rubocop/cop/layout/space_around_operators.rb +59 -25
- data/lib/rubocop/cop/layout/space_before_block_braces.rb +41 -25
- 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 +17 -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 +34 -39
- data/lib/rubocop/cop/layout/space_inside_hash_literal_braces.rb +22 -48
- 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 +9 -18
- 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 +24 -4
- 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 +9 -14
- 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 +154 -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 +82 -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_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 +19 -21
- 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 +7 -7
- 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 +24 -15
- data/lib/rubocop/cop/lint/literal_in_interpolation.rb +44 -15
- data/lib/rubocop/cop/lint/loop.rb +31 -9
- data/lib/rubocop/cop/lint/missing_cop_enable_directive.rb +9 -12
- 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 +15 -15
- data/lib/rubocop/cop/lint/nested_method_definition.rb +21 -25
- data/lib/rubocop/cop/lint/nested_percent_literal.rb +17 -5
- 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 +12 -13
- data/lib/rubocop/cop/lint/raise_exception.rb +87 -0
- data/lib/rubocop/cop/lint/rand_one.rb +5 -4
- data/lib/rubocop/cop/lint/redundant_cop_disable_directive.rb +71 -75
- data/lib/rubocop/cop/lint/redundant_cop_enable_directive.rb +51 -37
- 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 +6 -9
- 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 +59 -0
- data/lib/rubocop/cop/lint/suppressed_exception.rb +55 -18
- data/lib/rubocop/cop/lint/symbol_conversion.rb +188 -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 -8
- 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 +186 -0
- data/lib/rubocop/cop/lint/unused_block_argument.rb +12 -11
- data/lib/rubocop/cop/lint/unused_method_argument.rb +42 -11
- 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 +9 -13
- 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 +15 -9
- data/lib/rubocop/cop/lint/useless_times.rb +109 -0
- data/lib/rubocop/cop/lint/void.rb +7 -18
- 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 +51 -16
- 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 +26 -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 +7 -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 +16 -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 +12 -9
- data/lib/rubocop/cop/mixin/hash_alignment_styles.rb +3 -6
- data/lib/rubocop/cop/mixin/hash_transform_method.rb +183 -0
- 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 +26 -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 -22
- data/lib/rubocop/cop/mixin/string_help.rb +4 -1
- data/lib/rubocop/cop/mixin/string_literals_help.rb +1 -1
- data/lib/rubocop/cop/mixin/surrounding_space.rb +15 -31
- 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 +15 -27
- 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 +5 -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 +4 -4
- data/lib/rubocop/cop/naming/memoized_instance_variable_name.rb +132 -24
- data/lib/rubocop/cop/naming/method_name.rb +31 -3
- data/lib/rubocop/cop/naming/method_parameter_name.rb +1 -1
- 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 +100 -24
- 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 +37 -13
- 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 +30 -23
- 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 +77 -26
- data/lib/rubocop/cop/style/case_equality.rb +55 -4
- 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 +28 -21
- 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 +24 -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 +24 -21
- data/lib/rubocop/cop/style/commented_keyword.rb +34 -21
- data/lib/rubocop/cop/style/conditional_assignment.rb +75 -91
- data/lib/rubocop/cop/style/constant_visibility.rb +31 -2
- data/lib/rubocop/cop/style/copyright.rb +21 -24
- 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 +87 -0
- data/lib/rubocop/cop/style/document_dynamic_eval_definition.rb +169 -0
- data/lib/rubocop/cop/style/documentation.rb +92 -18
- data/lib/rubocop/cop/style/documentation_method.rb +2 -1
- data/lib/rubocop/cop/style/double_cop_disable_directive.rb +12 -15
- 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 +39 -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 +7 -4
- 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 +27 -25
- data/lib/rubocop/cop/style/explicit_block_argument.rb +114 -0
- data/lib/rubocop/cop/style/exponential_notation.rb +116 -0
- 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 +30 -24
- data/lib/rubocop/cop/style/format_string_token.rb +78 -22
- data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +83 -38
- 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 +86 -0
- 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 +50 -45
- data/lib/rubocop/cop/style/hash_transform_keys.rb +95 -0
- data/lib/rubocop/cop/style/hash_transform_values.rb +92 -0
- data/lib/rubocop/cop/style/identical_conditional_branches.rb +10 -7
- data/lib/rubocop/cop/style/if_inside_else.rb +50 -2
- data/lib/rubocop/cop/style/if_unless_modifier.rb +76 -46
- 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/infinite_loop.rb +27 -26
- data/lib/rubocop/cop/style/inline_comment.rb +4 -4
- data/lib/rubocop/cop/style/inverse_methods.rb +34 -42
- 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 +11 -17
- 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 +58 -207
- data/lib/rubocop/cop/style/method_call_with_args_parentheses/omit_parentheses.rb +189 -0
- data/lib/rubocop/cop/style/method_call_with_args_parentheses/require_parentheses.rb +44 -0
- 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 +27 -40
- data/lib/rubocop/cop/style/mixin_usage.rb +12 -30
- data/lib/rubocop/cop/style/module_function.rb +70 -25
- data/lib/rubocop/cop/style/multiline_block_chain.rb +13 -5
- data/lib/rubocop/cop/style/multiline_if_modifier.rb +4 -11
- data/lib/rubocop/cop/style/multiline_if_then.rb +5 -11
- 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 +31 -11
- data/lib/rubocop/cop/style/multiple_comparison.rb +76 -11
- data/lib/rubocop/cop/style/mutable_constant.rb +41 -33
- data/lib/rubocop/cop/style/negated_if.rb +10 -11
- data/lib/rubocop/cop/style/negated_if_else_condition.rb +120 -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 +23 -20
- data/lib/rubocop/cop/style/nested_ternary_operator.rb +30 -4
- data/lib/rubocop/cop/style/next.rb +18 -27
- data/lib/rubocop/cop/style/nil_comparison.rb +19 -11
- data/lib/rubocop/cop/style/nil_lambda.rb +53 -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 +17 -24
- data/lib/rubocop/cop/style/one_line_conditional.rb +75 -29
- 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 +14 -12
- 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 +22 -30
- 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/raise_args.rb +39 -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 +43 -18
- data/lib/rubocop/cop/style/redundant_conditional.rb +14 -15
- data/lib/rubocop/cop/style/redundant_exception.rb +22 -17
- 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 +14 -17
- 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 +29 -29
- data/lib/rubocop/cop/style/redundant_self.rb +27 -29
- data/lib/rubocop/cop/style/redundant_self_assignment.rb +118 -0
- data/lib/rubocop/cop/style/redundant_sort.rb +32 -37
- data/lib/rubocop/cop/style/redundant_sort_by.rb +6 -9
- data/lib/rubocop/cop/style/regexp_literal.rb +14 -29
- 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 +13 -8
- 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 +65 -18
- data/lib/rubocop/cop/style/slicing_with_range.rb +38 -0
- data/lib/rubocop/cop/style/sole_nested_conditional.rb +167 -0
- data/lib/rubocop/cop/style/special_global_vars.rb +18 -51
- data/lib/rubocop/cop/style/stabby_lambda_parentheses.rb +18 -25
- 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 +142 -0
- data/lib/rubocop/cop/style/string_hash_keys.rb +8 -7
- data/lib/rubocop/cop/style/string_literals.rb +16 -13
- data/lib/rubocop/cop/style/string_literals_in_interpolation.rb +4 -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 +13 -24
- data/lib/rubocop/cop/style/symbol_literal.rb +5 -9
- data/lib/rubocop/cop/style/symbol_proc.rb +50 -32
- data/lib/rubocop/cop/style/ternary_parentheses.rb +30 -35
- 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 +37 -27
- data/lib/rubocop/cop/style/trailing_comma_in_array_literal.rb +43 -5
- data/lib/rubocop/cop/style/trailing_comma_in_block_args.rb +86 -0
- data/lib/rubocop/cop/style/trailing_comma_in_hash_literal.rb +46 -5
- 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 +36 -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 +5 -11
- data/lib/rubocop/cop/style/variable_interpolation.rb +8 -11
- data/lib/rubocop/cop/style/when_then.rb +5 -9
- 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 +33 -19
- 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 +15 -27
- data/lib/rubocop/cop/variable_force/assignment.rb +2 -2
- data/lib/rubocop/cop/variable_force/branch.rb +3 -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/cops_documentation_generator.rb +270 -0
- data/lib/rubocop/core_ext/string.rb +2 -2
- data/lib/rubocop/directive_comment.rb +92 -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 +5 -3
- 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 +6 -6
- 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 +78 -0
- data/lib/rubocop/formatter/offense_count_formatter.rb +2 -2
- data/lib/rubocop/formatter/pacman_formatter.rb +1 -1
- 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 +7 -3
- 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 +124 -77
- 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 +6 -10
- data/lib/rubocop/result_cache.rb +50 -31
- data/lib/rubocop/rspec/cop_helper.rb +11 -35
- data/lib/rubocop/rspec/expect_offense.rb +129 -40
- data/lib/rubocop/rspec/shared_contexts.rb +78 -35
- data/lib/rubocop/runner.rb +112 -75
- data/lib/rubocop/string_interpreter.rb +3 -0
- data/lib/rubocop/target_finder.rb +53 -50
- data/lib/rubocop/target_ruby.rb +264 -0
- data/lib/rubocop/util.rb +16 -0
- data/lib/rubocop/version.rb +71 -7
- data/lib/rubocop/yaml_duplication_checker.rb +1 -0
- metadata +208 -94
- data/bin/console +0 -10
- data/bin/setup +0 -7
- data/lib/rubocop/ast/builder.rb +0 -82
- data/lib/rubocop/ast/node.rb +0 -644
- 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 -57
- data/lib/rubocop/ast/node/block_node.rb +0 -117
- data/lib/rubocop/ast/node/break_node.rb +0 -17
- 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 -71
- 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/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 -261
- 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 -35
- 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 -183
- data/lib/rubocop/cop/layout/tab.rb +0 -75
- data/lib/rubocop/cop/lint/end_in_method.rb +0 -40
- 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/braces_around_hash_parameters.rb +0 -209
- data/lib/rubocop/cop/style/method_missing_super.rb +0 -34
- data/lib/rubocop/formatter/disabled_lines_formatter.rb +0 -57
- data/lib/rubocop/node_pattern.rb +0 -801
- data/lib/rubocop/processed_source.rb +0 -216
- data/lib/rubocop/string_util.rb +0 -14
- data/lib/rubocop/token.rb +0 -114
@@ -17,11 +17,11 @@ module RuboCop
|
|
17
17
|
# :a,
|
18
18
|
# :b]
|
19
19
|
#
|
20
|
-
class FirstArrayElementLineBreak <
|
20
|
+
class FirstArrayElementLineBreak < Base
|
21
21
|
include FirstElementLineBreak
|
22
|
+
extend AutoCorrector
|
22
23
|
|
23
|
-
MSG = 'Add a line break before the first element of a '
|
24
|
-
'multi-line array.'
|
24
|
+
MSG = 'Add a line break before the first element of a multi-line array.'
|
25
25
|
|
26
26
|
def on_array(node)
|
27
27
|
return if !node.loc.begin && !assignment_on_same_line?(node)
|
@@ -29,15 +29,11 @@ module RuboCop
|
|
29
29
|
check_children_line_break(node, node.children)
|
30
30
|
end
|
31
31
|
|
32
|
-
def autocorrect(node)
|
33
|
-
EmptyLineCorrector.insert_before(node)
|
34
|
-
end
|
35
|
-
|
36
32
|
private
|
37
33
|
|
38
34
|
def assignment_on_same_line?(node)
|
39
35
|
source = node.source_range.source_line[0...node.loc.column]
|
40
|
-
|
36
|
+
/\s*=\s*$/.match?(source)
|
41
37
|
end
|
42
38
|
end
|
43
39
|
end
|
@@ -77,10 +77,11 @@ module RuboCop
|
|
77
77
|
# and_now_for_something = {
|
78
78
|
# completely: :different
|
79
79
|
# }
|
80
|
-
class FirstHashElementIndentation <
|
80
|
+
class FirstHashElementIndentation < Base
|
81
81
|
include Alignment
|
82
82
|
include ConfigurableEnforcedStyle
|
83
83
|
include MultilineElementIndentation
|
84
|
+
extend AutoCorrector
|
84
85
|
|
85
86
|
MSG = 'Use %<configured_indentation_width>d spaces for indentation ' \
|
86
87
|
'in a hash, relative to %<base_description>s.'
|
@@ -96,12 +97,12 @@ module RuboCop
|
|
96
97
|
end
|
97
98
|
alias on_csend on_send
|
98
99
|
|
99
|
-
def autocorrect(node)
|
100
|
-
AlignmentCorrector.correct(processed_source, node, @column_delta)
|
101
|
-
end
|
102
|
-
|
103
100
|
private
|
104
101
|
|
102
|
+
def autocorrect(corrector, node)
|
103
|
+
AlignmentCorrector.correct(corrector, processed_source, node, @column_delta)
|
104
|
+
end
|
105
|
+
|
105
106
|
def brace_alignment_style
|
106
107
|
:align_braces
|
107
108
|
end
|
@@ -116,8 +117,7 @@ module RuboCop
|
|
116
117
|
return if first_pair.first_line == left_brace.line
|
117
118
|
|
118
119
|
if separator_style?(first_pair)
|
119
|
-
check_based_on_longest_key(hash_node, left_brace,
|
120
|
-
left_parenthesis)
|
120
|
+
check_based_on_longest_key(hash_node, left_brace, left_parenthesis)
|
121
121
|
else
|
122
122
|
check_first(first_pair, left_brace, left_parenthesis, 0)
|
123
123
|
end
|
@@ -128,22 +128,16 @@ module RuboCop
|
|
128
128
|
|
129
129
|
def check_right_brace(right_brace, left_brace, left_parenthesis)
|
130
130
|
# if the right brace is on the same line as the last value, accept
|
131
|
-
return if right_brace.source_line[0...right_brace.column]
|
131
|
+
return if /\S/.match?(right_brace.source_line[0...right_brace.column])
|
132
132
|
|
133
133
|
expected_column = base_column(left_brace, left_parenthesis)
|
134
134
|
@column_delta = expected_column - right_brace.column
|
135
135
|
return if @column_delta.zero?
|
136
136
|
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
'after the preceding left parenthesis.'
|
142
|
-
else
|
143
|
-
'Indent the right brace the same as the start of the line ' \
|
144
|
-
'where the left brace is.'
|
145
|
-
end
|
146
|
-
add_offense(right_brace, location: right_brace, message: msg)
|
137
|
+
message = message_for_right_brace(left_parenthesis)
|
138
|
+
add_offense(right_brace, message: message) do |corrector|
|
139
|
+
autocorrect(corrector, right_brace)
|
140
|
+
end
|
147
141
|
end
|
148
142
|
|
149
143
|
def separator_style?(first_pair)
|
@@ -153,9 +147,7 @@ module RuboCop
|
|
153
147
|
end
|
154
148
|
|
155
149
|
def check_based_on_longest_key(hash_node, left_brace, left_parenthesis)
|
156
|
-
key_lengths = hash_node.keys.map
|
157
|
-
key.source_range.length
|
158
|
-
end
|
150
|
+
key_lengths = hash_node.keys.map { |key| key.source_range.length }
|
159
151
|
check_first(hash_node.pairs.first, left_brace, left_parenthesis,
|
160
152
|
key_lengths.max - key_lengths.first)
|
161
153
|
end
|
@@ -178,6 +170,18 @@ module RuboCop
|
|
178
170
|
base_description: base_description
|
179
171
|
)
|
180
172
|
end
|
173
|
+
|
174
|
+
def message_for_right_brace(left_parenthesis)
|
175
|
+
if style == :align_braces
|
176
|
+
'Indent the right brace the same as the left brace.'
|
177
|
+
elsif style == :special_inside_parentheses && left_parenthesis
|
178
|
+
'Indent the right brace the same as the first position ' \
|
179
|
+
'after the preceding left parenthesis.'
|
180
|
+
else
|
181
|
+
'Indent the right brace the same as the start of the line ' \
|
182
|
+
'where the left brace is.'
|
183
|
+
end
|
184
|
+
end
|
181
185
|
end
|
182
186
|
end
|
183
187
|
end
|
@@ -16,21 +16,17 @@ module RuboCop
|
|
16
16
|
# {
|
17
17
|
# a: 1,
|
18
18
|
# b: 2 }
|
19
|
-
class FirstHashElementLineBreak <
|
19
|
+
class FirstHashElementLineBreak < Base
|
20
20
|
include FirstElementLineBreak
|
21
|
+
extend AutoCorrector
|
21
22
|
|
22
|
-
MSG = 'Add a line break before the first element of a '
|
23
|
-
'multi-line hash.'
|
23
|
+
MSG = 'Add a line break before the first element of a multi-line hash.'
|
24
24
|
|
25
25
|
def on_hash(node)
|
26
26
|
# node.loc.begin tells us whether the hash opens with a {
|
27
27
|
# If it doesn't, Style/FirstMethodArgumentLineBreak will handle it
|
28
28
|
check_children_line_break(node, node.children) if node.loc.begin
|
29
29
|
end
|
30
|
-
|
31
|
-
def autocorrect(node)
|
32
|
-
EmptyLineCorrector.insert_before(node)
|
33
|
-
end
|
34
30
|
end
|
35
31
|
end
|
36
32
|
end
|
@@ -20,14 +20,14 @@ module RuboCop
|
|
20
20
|
# # ignored
|
21
21
|
# method foo, bar,
|
22
22
|
# baz
|
23
|
-
class FirstMethodArgumentLineBreak <
|
23
|
+
class FirstMethodArgumentLineBreak < Base
|
24
24
|
include FirstElementLineBreak
|
25
|
+
extend AutoCorrector
|
25
26
|
|
26
|
-
MSG = 'Add a line break before the first argument of a '
|
27
|
-
'multi-line method argument list.'
|
27
|
+
MSG = 'Add a line break before the first argument of a multi-line method argument list.'
|
28
28
|
|
29
29
|
def on_send(node)
|
30
|
-
args = node.arguments
|
30
|
+
args = node.arguments.dup
|
31
31
|
|
32
32
|
# If there is a trailing hash arg without explicit braces, like this:
|
33
33
|
#
|
@@ -35,20 +35,13 @@ module RuboCop
|
|
35
35
|
#
|
36
36
|
# ...then each key/value pair is treated as a method 'argument'
|
37
37
|
# when determining where line breaks should appear.
|
38
|
-
|
39
|
-
|
40
|
-
args = args.concat(args.pop.children)
|
41
|
-
end
|
42
|
-
end
|
38
|
+
last_arg = args.last
|
39
|
+
args.concat(args.pop.children) if last_arg&.hash_type? && !last_arg&.braces?
|
43
40
|
|
44
41
|
check_method_line_break(node, args)
|
45
42
|
end
|
46
43
|
alias on_csend on_send
|
47
44
|
alias on_super on_send
|
48
|
-
|
49
|
-
def autocorrect(node)
|
50
|
-
EmptyLineCorrector.insert_before(node)
|
51
|
-
end
|
52
45
|
end
|
53
46
|
end
|
54
47
|
end
|
@@ -26,20 +26,16 @@ module RuboCop
|
|
26
26
|
# bar
|
27
27
|
# do_something
|
28
28
|
# end
|
29
|
-
class FirstMethodParameterLineBreak <
|
29
|
+
class FirstMethodParameterLineBreak < Base
|
30
30
|
include FirstElementLineBreak
|
31
|
+
extend AutoCorrector
|
31
32
|
|
32
|
-
MSG = 'Add a line break before the first parameter of a '
|
33
|
-
'multi-line method parameter list.'
|
33
|
+
MSG = 'Add a line break before the first parameter of a multi-line method parameter list.'
|
34
34
|
|
35
35
|
def on_def(node)
|
36
36
|
check_method_line_break(node, node.arguments)
|
37
37
|
end
|
38
38
|
alias on_defs on_def
|
39
|
-
|
40
|
-
def autocorrect(node)
|
41
|
-
EmptyLineCorrector.insert_before(node)
|
42
|
-
end
|
43
39
|
end
|
44
40
|
end
|
45
41
|
end
|
@@ -7,9 +7,9 @@ module RuboCop
|
|
7
7
|
# definition. Parameters after the first one are checked by
|
8
8
|
# Layout/ParameterAlignment, not by this cop.
|
9
9
|
#
|
10
|
-
# For indenting the first argument of method
|
10
|
+
# For indenting the first argument of method _calls_, check out
|
11
11
|
# Layout/FirstArgumentIndentation, which supports options related to
|
12
|
-
# nesting that are irrelevant for method
|
12
|
+
# nesting that are irrelevant for method _definitions_.
|
13
13
|
#
|
14
14
|
# @example
|
15
15
|
#
|
@@ -41,10 +41,11 @@ module RuboCop
|
|
41
41
|
# second_param)
|
42
42
|
# 123
|
43
43
|
# end
|
44
|
-
class FirstParameterIndentation <
|
44
|
+
class FirstParameterIndentation < Base
|
45
45
|
include Alignment
|
46
46
|
include ConfigurableEnforcedStyle
|
47
47
|
include MultilineElementIndentation
|
48
|
+
extend AutoCorrector
|
48
49
|
|
49
50
|
MSG = 'Use %<configured_indentation_width>d spaces for indentation ' \
|
50
51
|
'in method args, relative to %<base_description>s.'
|
@@ -57,12 +58,12 @@ module RuboCop
|
|
57
58
|
end
|
58
59
|
alias on_defs on_def
|
59
60
|
|
60
|
-
def autocorrect(node)
|
61
|
-
AlignmentCorrector.correct(processed_source, node, @column_delta)
|
62
|
-
end
|
63
|
-
|
64
61
|
private
|
65
62
|
|
63
|
+
def autocorrect(corrector, node)
|
64
|
+
AlignmentCorrector.correct(corrector, processed_source, node, @column_delta)
|
65
|
+
end
|
66
|
+
|
66
67
|
def brace_alignment_style
|
67
68
|
:align_parentheses
|
68
69
|
end
|
@@ -7,16 +7,16 @@ module RuboCop
|
|
7
7
|
# literal are aligned according to configuration. The configuration
|
8
8
|
# options are:
|
9
9
|
#
|
10
|
-
#
|
11
|
-
#
|
12
|
-
#
|
10
|
+
# * key (left align keys, one space before hash rockets and values)
|
11
|
+
# * separator (align hash rockets and colons, right align keys)
|
12
|
+
# * table (left align keys, hash rockets, and values)
|
13
13
|
#
|
14
14
|
# The treatment of hashes passed as the last argument to a method call
|
15
15
|
# can also be configured. The options are:
|
16
16
|
#
|
17
|
-
#
|
18
|
-
#
|
19
|
-
#
|
17
|
+
# * always_inspect
|
18
|
+
# * always_ignore
|
19
|
+
# * ignore_implicit (without curly braces)
|
20
20
|
#
|
21
21
|
# Alternatively you can specify multiple allowed styles. That's done by
|
22
22
|
# passing a list of styles to EnforcedStyles.
|
@@ -175,12 +175,17 @@ module RuboCop
|
|
175
175
|
# do_something({foo: 1,
|
176
176
|
# bar: 2})
|
177
177
|
#
|
178
|
-
class HashAlignment <
|
178
|
+
class HashAlignment < Base
|
179
179
|
include HashAlignmentStyles
|
180
180
|
include RangeHelp
|
181
|
+
extend AutoCorrector
|
181
182
|
|
182
|
-
|
183
|
-
|
183
|
+
MESSAGES = { KeyAlignment => 'Align the keys of a hash literal if ' \
|
184
|
+
'they span more than one line.',
|
185
|
+
SeparatorAlignment => 'Align the separators of a hash ' \
|
186
|
+
'literal if they span more than one line.',
|
187
|
+
TableAlignment => 'Align the keys and values of a hash ' \
|
188
|
+
'literal if they span more than one line.' }.freeze
|
184
189
|
|
185
190
|
def on_send(node)
|
186
191
|
return if double_splat?(node)
|
@@ -188,15 +193,14 @@ module RuboCop
|
|
188
193
|
|
189
194
|
last_argument = node.last_argument
|
190
195
|
|
191
|
-
return unless last_argument.hash_type? &&
|
192
|
-
ignore_hash_argument?(last_argument)
|
196
|
+
return unless last_argument.hash_type? && ignore_hash_argument?(last_argument)
|
193
197
|
|
194
198
|
ignore_node(last_argument)
|
195
199
|
end
|
196
200
|
alias on_super on_send
|
197
201
|
alias on_yield on_send
|
198
202
|
|
199
|
-
def on_hash(node)
|
203
|
+
def on_hash(node) # rubocop:todo Metrics/CyclomaticComplexity
|
200
204
|
return if ignored_node?(node)
|
201
205
|
return if node.pairs.empty? || node.single_line?
|
202
206
|
|
@@ -208,15 +212,7 @@ module RuboCop
|
|
208
212
|
check_pairs(node)
|
209
213
|
end
|
210
214
|
|
211
|
-
|
212
|
-
delta = column_deltas[alignment_for(node).first.class][node]
|
213
|
-
return if delta.nil?
|
214
|
-
|
215
|
-
correct_node(node, delta)
|
216
|
-
end
|
217
|
-
|
218
|
-
attr_accessor :offences_by
|
219
|
-
attr_accessor :column_deltas
|
215
|
+
attr_accessor :offences_by, :column_deltas
|
220
216
|
|
221
217
|
private
|
222
218
|
|
@@ -249,9 +245,13 @@ module RuboCop
|
|
249
245
|
end
|
250
246
|
|
251
247
|
def add_offences
|
252
|
-
|
248
|
+
format, offences = offences_by.min_by { |_, v| v.length }
|
253
249
|
(offences || []).each do |offence|
|
254
|
-
add_offense
|
250
|
+
add_offense(offence, message: MESSAGES[format]) do |corrector|
|
251
|
+
delta = column_deltas[alignment_for(offence).first.class][offence]
|
252
|
+
|
253
|
+
correct_node(corrector, offence, delta) unless delta.nil?
|
254
|
+
end
|
255
255
|
end
|
256
256
|
end
|
257
257
|
|
@@ -281,34 +281,33 @@ module RuboCop
|
|
281
281
|
end
|
282
282
|
|
283
283
|
def alignment_for_hash_rockets
|
284
|
-
@alignment_for_hash_rockets ||=
|
285
|
-
new_alignment('EnforcedHashRocketStyle')
|
284
|
+
@alignment_for_hash_rockets ||= new_alignment('EnforcedHashRocketStyle')
|
286
285
|
end
|
287
286
|
|
288
287
|
def alignment_for_colons
|
289
|
-
@alignment_for_colons ||=
|
290
|
-
new_alignment('EnforcedColonStyle')
|
288
|
+
@alignment_for_colons ||= new_alignment('EnforcedColonStyle')
|
291
289
|
end
|
292
290
|
|
293
|
-
def correct_node(node, delta)
|
291
|
+
def correct_node(corrector, node, delta)
|
294
292
|
# We can't use the instance variable inside the lambda. That would
|
295
293
|
# just give each lambda the same reference and they would all get the
|
296
294
|
# last value of each. A local variable fixes the problem.
|
297
295
|
|
298
|
-
if
|
299
|
-
|
300
|
-
else
|
301
|
-
correct_key_value(delta, node.key.source_range,
|
296
|
+
if node.value
|
297
|
+
correct_key_value(corrector, delta, node.key.source_range,
|
302
298
|
node.value.source_range,
|
303
299
|
node.loc.operator)
|
300
|
+
else
|
301
|
+
delta_value = delta[:key] || 0
|
302
|
+
correct_no_value(corrector, delta_value, node.source_range)
|
304
303
|
end
|
305
304
|
end
|
306
305
|
|
307
|
-
def correct_no_value(key_delta, key)
|
308
|
-
|
306
|
+
def correct_no_value(corrector, key_delta, key)
|
307
|
+
adjust(corrector, key_delta, key)
|
309
308
|
end
|
310
309
|
|
311
|
-
def correct_key_value(delta, key, value, separator)
|
310
|
+
def correct_key_value(corrector, delta, key, value, separator)
|
312
311
|
# We can't use the instance variable inside the lambda. That would
|
313
312
|
# just give each lambda the same reference and they would all get the
|
314
313
|
# last value of each. Some local variables fix the problem.
|
@@ -319,11 +318,9 @@ module RuboCop
|
|
319
318
|
key_column = key.column
|
320
319
|
key_delta = -key_column if key_delta < -key_column
|
321
320
|
|
322
|
-
|
323
|
-
|
324
|
-
|
325
|
-
adjust(corrector, value_delta, value)
|
326
|
-
end
|
321
|
+
adjust(corrector, key_delta, key)
|
322
|
+
adjust(corrector, separator_delta, separator)
|
323
|
+
adjust(corrector, value_delta, value)
|
327
324
|
end
|
328
325
|
|
329
326
|
def new_alignment(key)
|
@@ -50,12 +50,17 @@ module RuboCop
|
|
50
50
|
# 123,
|
51
51
|
# )
|
52
52
|
#
|
53
|
-
class HeredocArgumentClosingParenthesis <
|
53
|
+
class HeredocArgumentClosingParenthesis < Base
|
54
54
|
include RangeHelp
|
55
|
+
extend AutoCorrector
|
55
56
|
|
56
57
|
MSG = 'Put the closing parenthesis for a method call with a ' \
|
57
58
|
'HEREDOC parameter on the same line as the HEREDOC opening.'
|
58
59
|
|
60
|
+
def self.autocorrect_incompatible_with
|
61
|
+
[Style::TrailingCommaInArguments]
|
62
|
+
end
|
63
|
+
|
59
64
|
def on_send(node)
|
60
65
|
heredoc_arg = extract_heredoc_argument(node)
|
61
66
|
return unless heredoc_arg
|
@@ -64,10 +69,16 @@ module RuboCop
|
|
64
69
|
return unless outermost_send
|
65
70
|
return unless outermost_send.loc.end
|
66
71
|
return unless heredoc_arg.first_line != outermost_send.loc.end.line
|
72
|
+
return if subsequent_closing_parentheses_in_same_line?(outermost_send)
|
73
|
+
return if exist_argument_between_heredoc_end_and_closing_parentheses?(node)
|
67
74
|
|
68
|
-
add_offense(outermost_send
|
75
|
+
add_offense(outermost_send.loc.end) do |corrector|
|
76
|
+
autocorrect(corrector, outermost_send)
|
77
|
+
end
|
69
78
|
end
|
70
79
|
|
80
|
+
private
|
81
|
+
|
71
82
|
# Autocorrection note:
|
72
83
|
#
|
73
84
|
# Commas are a bit tricky to handle when the method call is
|
@@ -94,26 +105,14 @@ module RuboCop
|
|
94
105
|
# SQL
|
95
106
|
# third_array_value,
|
96
107
|
# ]
|
97
|
-
def autocorrect(node)
|
98
|
-
|
99
|
-
fix_closing_parenthesis(node, corrector)
|
108
|
+
def autocorrect(corrector, node)
|
109
|
+
fix_closing_parenthesis(node, corrector)
|
100
110
|
|
101
|
-
|
102
|
-
remove_internal_trailing_comma(node, corrector)
|
103
|
-
end
|
111
|
+
remove_internal_trailing_comma(node, corrector) if internal_trailing_comma?(node)
|
104
112
|
|
105
|
-
|
106
|
-
fix_external_trailing_comma(node, corrector)
|
107
|
-
end
|
108
|
-
end
|
113
|
+
fix_external_trailing_comma(node, corrector) if external_trailing_comma?(node)
|
109
114
|
end
|
110
115
|
|
111
|
-
def self.autocorrect_incompatible_with
|
112
|
-
[Style::TrailingCommaInArguments]
|
113
|
-
end
|
114
|
-
|
115
|
-
private
|
116
|
-
|
117
116
|
def outermost_send_on_same_line(heredoc)
|
118
117
|
previous = heredoc
|
119
118
|
current = previous.parent
|
@@ -133,9 +132,7 @@ module RuboCop
|
|
133
132
|
end
|
134
133
|
|
135
134
|
def extract_heredoc_argument(node)
|
136
|
-
node.arguments.find
|
137
|
-
extract_heredoc(arg_node)
|
138
|
-
end
|
135
|
+
node.arguments.find { |arg_node| extract_heredoc(arg_node) }
|
139
136
|
end
|
140
137
|
|
141
138
|
def extract_heredoc(node)
|
@@ -163,13 +160,24 @@ module RuboCop
|
|
163
160
|
|
164
161
|
# Closing parenthesis helpers.
|
165
162
|
|
163
|
+
def subsequent_closing_parentheses_in_same_line?(outermost_send)
|
164
|
+
last_arg_of_outer_send = outermost_send.last_argument
|
165
|
+
return false unless last_arg_of_outer_send&.loc.respond_to?(:end) &&
|
166
|
+
(end_of_last_arg_of_outer_send = last_arg_of_outer_send.loc.end)
|
167
|
+
|
168
|
+
end_of_outer_send = outermost_send.loc.end
|
169
|
+
|
170
|
+
end_of_outer_send.line == end_of_last_arg_of_outer_send.line &&
|
171
|
+
end_of_outer_send.column == end_of_last_arg_of_outer_send.column + 1
|
172
|
+
end
|
173
|
+
|
166
174
|
def fix_closing_parenthesis(node, corrector)
|
167
175
|
remove_incorrect_closing_paren(node, corrector)
|
168
176
|
add_correct_closing_paren(node, corrector)
|
169
177
|
end
|
170
178
|
|
171
179
|
def add_correct_closing_paren(node, corrector)
|
172
|
-
corrector.insert_after(node.arguments.last
|
180
|
+
corrector.insert_after(node.arguments.last, ')')
|
173
181
|
end
|
174
182
|
|
175
183
|
def remove_incorrect_closing_paren(node, corrector)
|
@@ -194,7 +202,7 @@ module RuboCop
|
|
194
202
|
def safe_to_remove_line_containing_closing_paren?(node)
|
195
203
|
last_line = processed_source[node.loc.end.line - 1]
|
196
204
|
# Safe to remove if last line only contains `)`, `,`, and whitespace.
|
197
|
-
last_line.match(/^
|
205
|
+
last_line.match?(/^ *\) {0,20},{0,1} *$/)
|
198
206
|
end
|
199
207
|
|
200
208
|
def incorrect_parenthesis_removal_end(node)
|
@@ -206,17 +214,25 @@ module RuboCop
|
|
206
214
|
end
|
207
215
|
end
|
208
216
|
|
217
|
+
def exist_argument_between_heredoc_end_and_closing_parentheses?(node)
|
218
|
+
return false unless (heredoc_end = find_most_bottom_of_heredoc_end(node.arguments))
|
219
|
+
|
220
|
+
heredoc_end < node.loc.end.begin_pos &&
|
221
|
+
range_between(heredoc_end, node.loc.end.begin_pos).source.strip != ''
|
222
|
+
end
|
223
|
+
|
224
|
+
def find_most_bottom_of_heredoc_end(arguments)
|
225
|
+
arguments.map do |argument|
|
226
|
+
argument.loc.heredoc_end.end_pos if argument.loc.respond_to?(:heredoc_end)
|
227
|
+
end.compact.max
|
228
|
+
end
|
229
|
+
|
209
230
|
# Internal trailing comma helpers.
|
210
231
|
|
211
232
|
def remove_internal_trailing_comma(node, corrector)
|
212
233
|
offset = internal_trailing_comma_offset_from_last_arg(node)
|
213
234
|
last_arg_end_pos = node.children.last.source_range.end_pos
|
214
|
-
corrector.remove(
|
215
|
-
range_between(
|
216
|
-
last_arg_end_pos,
|
217
|
-
last_arg_end_pos + offset
|
218
|
-
)
|
219
|
-
)
|
235
|
+
corrector.remove(range_between(last_arg_end_pos, last_arg_end_pos + offset))
|
220
236
|
end
|
221
237
|
|
222
238
|
def internal_trailing_comma?(node)
|
@@ -249,7 +265,7 @@ module RuboCop
|
|
249
265
|
def add_correct_external_trailing_comma(node, corrector)
|
250
266
|
return unless external_trailing_comma?(node)
|
251
267
|
|
252
|
-
corrector.insert_after(node.arguments.last
|
268
|
+
corrector.insert_after(node.arguments.last, ',')
|
253
269
|
end
|
254
270
|
|
255
271
|
def remove_incorrect_external_trailing_comma(node, corrector)
|