rubocop 0.80.0 → 1.42.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 +71 -38
- data/assets/output.html.erb +1 -1
- data/config/default.yml +1682 -202
- data/config/obsoletion.yml +233 -0
- data/exe/rubocop +15 -9
- data/lib/rubocop/arguments_env.rb +17 -0
- data/lib/rubocop/arguments_file.rb +17 -0
- data/lib/rubocop/ast_aliases.rb +8 -0
- data/lib/rubocop/cache_config.rb +29 -0
- data/lib/rubocop/cached_data.rb +4 -4
- data/lib/rubocop/cli/command/auto_generate_config.rb +147 -0
- data/lib/rubocop/cli/command/base.rb +2 -0
- data/lib/rubocop/cli/command/execute_runner.rb +38 -14
- data/lib/rubocop/cli/command/init_dotfile.rb +4 -5
- data/lib/rubocop/cli/command/show_cops.rb +6 -12
- data/lib/rubocop/cli/command/show_docs_url.rb +48 -0
- data/lib/rubocop/cli/command/suggest_extensions.rb +126 -0
- data/lib/rubocop/cli/command/version.rb +3 -2
- data/lib/rubocop/cli/command.rb +1 -0
- data/lib/rubocop/cli/environment.rb +1 -0
- data/lib/rubocop/cli.rb +41 -14
- data/lib/rubocop/comment_config.rb +90 -99
- data/lib/rubocop/config.rb +117 -42
- data/lib/rubocop/config_finder.rb +68 -0
- data/lib/rubocop/config_loader.rb +122 -133
- data/lib/rubocop/config_loader_resolver.rb +125 -39
- data/lib/rubocop/config_obsoletion/changed_enforced_styles.rb +33 -0
- data/lib/rubocop/config_obsoletion/changed_parameter.rb +26 -0
- data/lib/rubocop/config_obsoletion/cop_rule.rb +33 -0
- data/lib/rubocop/config_obsoletion/extracted_cop.rb +46 -0
- data/lib/rubocop/config_obsoletion/parameter_rule.rb +48 -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_obsoletion.rb +72 -240
- data/lib/rubocop/config_regeneration.rb +33 -0
- data/lib/rubocop/config_store.rb +31 -7
- data/lib/rubocop/config_validator.rb +95 -29
- data/lib/rubocop/cop/autocorrect_logic.rb +45 -40
- data/lib/rubocop/cop/badge.rb +27 -32
- data/lib/rubocop/cop/base.rb +464 -0
- data/lib/rubocop/cop/bundler/duplicated_gem.rb +34 -14
- data/lib/rubocop/cop/bundler/gem_comment.rb +117 -10
- data/lib/rubocop/cop/bundler/gem_filename.rb +103 -0
- data/lib/rubocop/cop/bundler/gem_version.rb +133 -0
- data/lib/rubocop/cop/bundler/insecure_protocol_source.rb +45 -28
- data/lib/rubocop/cop/bundler/ordered_gems.rb +7 -18
- data/lib/rubocop/cop/commissioner.rb +105 -74
- data/lib/rubocop/cop/cop.rb +84 -234
- data/lib/rubocop/cop/corrector.rb +77 -119
- data/lib/rubocop/cop/correctors/alignment_corrector.rb +14 -24
- data/lib/rubocop/cop/correctors/condition_corrector.rb +4 -7
- data/lib/rubocop/cop/correctors/each_to_for_corrector.rb +4 -6
- data/lib/rubocop/cop/correctors/empty_line_corrector.rb +10 -11
- data/lib/rubocop/cop/correctors/for_to_each_corrector.rb +5 -4
- data/lib/rubocop/cop/correctors/if_then_corrector.rb +55 -0
- data/lib/rubocop/cop/correctors/lambda_literal_to_method_corrector.rb +7 -7
- data/lib/rubocop/cop/correctors/line_break_corrector.rb +15 -12
- data/lib/rubocop/cop/correctors/multiline_literal_brace_corrector.rb +56 -11
- data/lib/rubocop/cop/correctors/ordered_gem_corrector.rb +12 -13
- data/lib/rubocop/cop/correctors/parentheses_corrector.rb +64 -9
- data/lib/rubocop/cop/correctors/percent_literal_corrector.rb +11 -22
- data/lib/rubocop/cop/correctors/punctuation_corrector.rb +9 -11
- data/lib/rubocop/cop/correctors/require_library_corrector.rb +23 -0
- data/lib/rubocop/cop/correctors/space_corrector.rb +2 -4
- data/lib/rubocop/cop/correctors/string_literal_corrector.rb +7 -9
- data/lib/rubocop/cop/correctors/unused_arg_corrector.rb +16 -19
- data/lib/rubocop/cop/documentation.rb +39 -0
- data/lib/rubocop/cop/exclude_limit.rb +26 -0
- data/lib/rubocop/cop/force.rb +2 -1
- data/lib/rubocop/cop/gemspec/dependency_version.rb +154 -0
- data/lib/rubocop/cop/gemspec/deprecated_attribute_assignment.rb +92 -0
- data/lib/rubocop/cop/gemspec/duplicated_assignment.rb +11 -26
- data/lib/rubocop/cop/gemspec/ordered_dependencies.rb +7 -20
- data/lib/rubocop/cop/gemspec/require_mfa.rb +145 -0
- data/lib/rubocop/cop/gemspec/required_ruby_version.rb +69 -27
- data/lib/rubocop/cop/gemspec/ruby_version_globals_usage.rb +7 -12
- data/lib/rubocop/cop/generator/configuration_injector.rb +4 -5
- data/lib/rubocop/cop/generator/require_file_injector.rb +4 -7
- data/lib/rubocop/cop/generator.rb +36 -41
- data/lib/rubocop/cop/ignored_node.rb +1 -3
- data/lib/rubocop/cop/internal_affairs/cop_description.rb +98 -0
- data/lib/rubocop/cop/internal_affairs/create_empty_file.rb +37 -0
- 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/example_heredoc_delimiter.rb +111 -0
- data/lib/rubocop/cop/internal_affairs/inherit_deprecated_cop_class.rb +34 -0
- data/lib/rubocop/cop/internal_affairs/lambda_or_proc.rb +46 -0
- data/lib/rubocop/cop/internal_affairs/location_line_equality_comparison.rb +60 -0
- data/lib/rubocop/cop/internal_affairs/method_name_end_with.rb +80 -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 +147 -0
- data/lib/rubocop/cop/internal_affairs/node_type_predicate.rb +11 -14
- data/lib/rubocop/cop/internal_affairs/numblock_handler.rb +69 -0
- data/lib/rubocop/cop/internal_affairs/offense_location_keyword.rb +12 -10
- data/lib/rubocop/cop/internal_affairs/redundant_context_config_parameter.rb +46 -0
- 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 +13 -8
- data/lib/rubocop/cop/internal_affairs/redundant_message_argument.rb +12 -9
- data/lib/rubocop/cop/internal_affairs/redundant_method_dispatch_node.rb +47 -0
- data/lib/rubocop/cop/internal_affairs/single_line_comparison.rb +62 -0
- data/lib/rubocop/cop/internal_affairs/style_detected_api_use.rb +148 -0
- data/lib/rubocop/cop/internal_affairs/undefined_config.rb +73 -0
- data/lib/rubocop/cop/internal_affairs/useless_message_assertion.rb +6 -6
- data/lib/rubocop/cop/internal_affairs/useless_restrict_on_send.rb +60 -0
- data/lib/rubocop/cop/internal_affairs.rb +20 -1
- data/lib/rubocop/cop/layout/access_modifier_indentation.rb +12 -10
- data/lib/rubocop/cop/layout/argument_alignment.rb +84 -19
- data/lib/rubocop/cop/layout/array_alignment.rb +58 -13
- data/lib/rubocop/cop/layout/assignment_indentation.rb +10 -9
- data/lib/rubocop/cop/layout/begin_end_alignment.rb +74 -0
- data/lib/rubocop/cop/layout/block_alignment.rb +56 -60
- data/lib/rubocop/cop/layout/block_end_newline.rb +41 -13
- data/lib/rubocop/cop/layout/case_indentation.rb +88 -30
- data/lib/rubocop/cop/layout/class_structure.rb +90 -80
- data/lib/rubocop/cop/layout/closing_heredoc_indentation.rb +4 -6
- data/lib/rubocop/cop/layout/closing_parenthesis_indentation.rb +25 -31
- data/lib/rubocop/cop/layout/comment_indentation.rb +56 -29
- data/lib/rubocop/cop/layout/condition_position.rb +17 -9
- data/lib/rubocop/cop/layout/def_end_alignment.rb +10 -11
- data/lib/rubocop/cop/layout/dot_position.rb +65 -27
- data/lib/rubocop/cop/layout/else_alignment.rb +29 -7
- data/lib/rubocop/cop/layout/empty_comment.rb +30 -30
- data/lib/rubocop/cop/layout/empty_line_after_guard_clause.rb +61 -37
- 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 +161 -40
- data/lib/rubocop/cop/layout/empty_lines.rb +10 -13
- data/lib/rubocop/cop/layout/empty_lines_around_access_modifier.rb +32 -38
- data/lib/rubocop/cop/layout/empty_lines_around_arguments.rb +14 -10
- data/lib/rubocop/cop/layout/empty_lines_around_attribute_accessor.rb +139 -0
- data/lib/rubocop/cop/layout/empty_lines_around_begin_body.rb +3 -6
- data/lib/rubocop/cop/layout/empty_lines_around_block_body.rb +8 -9
- data/lib/rubocop/cop/layout/empty_lines_around_class_body.rb +12 -15
- data/lib/rubocop/cop/layout/empty_lines_around_exception_handling_keywords.rb +16 -19
- data/lib/rubocop/cop/layout/empty_lines_around_method_body.rb +3 -6
- data/lib/rubocop/cop/layout/empty_lines_around_module_body.rb +12 -15
- data/lib/rubocop/cop/layout/end_alignment.rb +26 -25
- data/lib/rubocop/cop/layout/end_of_line.rb +13 -13
- data/lib/rubocop/cop/layout/extra_spacing.rb +32 -47
- data/lib/rubocop/cop/layout/first_argument_indentation.rb +74 -41
- data/lib/rubocop/cop/layout/first_array_element_indentation.rb +38 -25
- data/lib/rubocop/cop/layout/first_array_element_line_break.rb +43 -11
- data/lib/rubocop/cop/layout/first_hash_element_indentation.rb +84 -29
- data/lib/rubocop/cop/layout/first_hash_element_line_break.rb +51 -8
- data/lib/rubocop/cop/layout/first_method_argument_line_break.rb +66 -14
- data/lib/rubocop/cop/layout/first_method_parameter_line_break.rb +54 -8
- data/lib/rubocop/cop/layout/first_parameter_indentation.rb +11 -10
- data/lib/rubocop/cop/layout/hash_alignment.rb +85 -55
- data/lib/rubocop/cop/layout/heredoc_argument_closing_parenthesis.rb +48 -32
- data/lib/rubocop/cop/layout/heredoc_indentation.rb +33 -124
- data/lib/rubocop/cop/layout/indentation_consistency.rb +10 -7
- data/lib/rubocop/cop/layout/indentation_style.rb +115 -0
- data/lib/rubocop/cop/layout/indentation_width.rb +51 -26
- data/lib/rubocop/cop/layout/initial_indentation.rb +8 -12
- data/lib/rubocop/cop/layout/leading_comment_space.rb +15 -13
- data/lib/rubocop/cop/layout/leading_empty_lines.rb +7 -12
- data/lib/rubocop/cop/layout/line_continuation_leading_space.rb +138 -0
- data/lib/rubocop/cop/layout/line_continuation_spacing.rb +136 -0
- data/lib/rubocop/cop/layout/line_end_string_concatenation_indentation.rb +141 -0
- data/lib/rubocop/cop/layout/line_length.rb +62 -63
- data/lib/rubocop/cop/layout/multiline_array_brace_layout.rb +9 -12
- data/lib/rubocop/cop/layout/multiline_array_line_breaks.rb +53 -8
- data/lib/rubocop/cop/layout/multiline_assignment_layout.rb +41 -19
- data/lib/rubocop/cop/layout/multiline_block_layout.rb +45 -39
- data/lib/rubocop/cop/layout/multiline_hash_brace_layout.rb +9 -12
- data/lib/rubocop/cop/layout/multiline_hash_key_line_breaks.rb +53 -10
- data/lib/rubocop/cop/layout/multiline_method_argument_line_breaks.rb +64 -14
- data/lib/rubocop/cop/layout/multiline_method_call_brace_layout.rb +9 -12
- data/lib/rubocop/cop/layout/multiline_method_call_indentation.rb +52 -24
- data/lib/rubocop/cop/layout/multiline_method_definition_brace_layout.rb +9 -12
- data/lib/rubocop/cop/layout/multiline_method_parameter_line_breaks.rb +101 -0
- data/lib/rubocop/cop/layout/multiline_operation_indentation.rb +28 -15
- 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 +60 -40
- data/lib/rubocop/cop/layout/single_line_block_chain.rb +64 -0
- data/lib/rubocop/cop/layout/space_after_colon.rb +11 -9
- 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 +11 -12
- data/lib/rubocop/cop/layout/space_after_semicolon.rb +2 -5
- data/lib/rubocop/cop/layout/space_around_block_parameters.rb +47 -54
- data/lib/rubocop/cop/layout/space_around_equals_in_parameter_default.rb +20 -23
- data/lib/rubocop/cop/layout/space_around_keyword.rb +54 -30
- data/lib/rubocop/cop/layout/space_around_method_call_operator.rb +98 -0
- data/lib/rubocop/cop/layout/space_around_operators.rb +61 -28
- data/lib/rubocop/cop/layout/space_before_block_braces.rb +43 -25
- data/lib/rubocop/cop/layout/space_before_brackets.rb +73 -0
- data/lib/rubocop/cop/layout/space_before_comma.rb +3 -5
- data/lib/rubocop/cop/layout/space_before_comment.rb +11 -12
- data/lib/rubocop/cop/layout/space_before_first_arg.rb +13 -15
- data/lib/rubocop/cop/layout/space_before_semicolon.rb +2 -5
- data/lib/rubocop/cop/layout/space_in_lambda_literal.rb +17 -21
- data/lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb +50 -55
- data/lib/rubocop/cop/layout/space_inside_array_percent_literal.rb +8 -15
- data/lib/rubocop/cop/layout/space_inside_block_braces.rb +63 -50
- data/lib/rubocop/cop/layout/space_inside_hash_literal_braces.rb +52 -44
- data/lib/rubocop/cop/layout/space_inside_parens.rb +92 -29
- data/lib/rubocop/cop/layout/space_inside_percent_literal_delimiters.rb +38 -9
- data/lib/rubocop/cop/layout/space_inside_range_literal.rb +9 -18
- data/lib/rubocop/cop/layout/space_inside_reference_brackets.rb +25 -32
- data/lib/rubocop/cop/layout/space_inside_string_interpolation.rb +13 -14
- data/lib/rubocop/cop/layout/trailing_empty_lines.rb +20 -25
- data/lib/rubocop/cop/layout/trailing_whitespace.rb +73 -19
- 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 +44 -11
- data/lib/rubocop/cop/lint/ambiguous_operator.rb +60 -12
- data/lib/rubocop/cop/lint/ambiguous_operator_precedence.rb +111 -0
- data/lib/rubocop/cop/lint/ambiguous_range.rb +105 -0
- data/lib/rubocop/cop/lint/ambiguous_regexp_literal.rb +44 -7
- data/lib/rubocop/cop/lint/assignment_in_condition.rb +20 -8
- data/lib/rubocop/cop/lint/big_decimal_new.rb +10 -10
- data/lib/rubocop/cop/lint/binary_operator_with_identical_operands.rb +68 -0
- data/lib/rubocop/cop/lint/boolean_symbol.rb +30 -5
- data/lib/rubocop/cop/lint/circular_argument_reference.rb +2 -2
- data/lib/rubocop/cop/lint/constant_definition_in_block.rb +100 -0
- data/lib/rubocop/cop/lint/constant_overwritten_in_rescue.rb +51 -0
- data/lib/rubocop/cop/lint/constant_resolution.rb +93 -0
- data/lib/rubocop/cop/lint/debugger.rb +76 -26
- data/lib/rubocop/cop/lint/deprecated_class_methods.rb +109 -52
- data/lib/rubocop/cop/lint/deprecated_constants.rb +88 -0
- data/lib/rubocop/cop/lint/deprecated_open_ssl_constant.rb +154 -0
- data/lib/rubocop/cop/lint/disjunctive_assignment_in_constructor.rb +32 -3
- data/lib/rubocop/cop/lint/duplicate_branch.rb +153 -0
- data/lib/rubocop/cop/lint/duplicate_case_condition.rb +4 -14
- data/lib/rubocop/cop/lint/duplicate_elsif_condition.rb +39 -0
- data/lib/rubocop/cop/lint/duplicate_hash_key.rb +3 -5
- data/lib/rubocop/cop/lint/duplicate_magic_comment.rb +73 -0
- data/lib/rubocop/cop/lint/duplicate_methods.rb +63 -34
- data/lib/rubocop/cop/lint/duplicate_regexp_character_class_element.rb +96 -0
- data/lib/rubocop/cop/lint/duplicate_require.rb +56 -0
- data/lib/rubocop/cop/lint/duplicate_rescue_exception.rb +47 -0
- data/lib/rubocop/cop/lint/each_with_object_argument.rb +5 -3
- data/lib/rubocop/cop/lint/else_layout.rb +37 -9
- data/lib/rubocop/cop/lint/empty_block.rb +94 -0
- data/lib/rubocop/cop/lint/empty_class.rb +95 -0
- data/lib/rubocop/cop/lint/empty_conditional_body.rb +175 -0
- data/lib/rubocop/cop/lint/empty_ensure.rb +6 -8
- data/lib/rubocop/cop/lint/empty_expression.rb +3 -3
- data/lib/rubocop/cop/lint/empty_file.rb +48 -0
- data/lib/rubocop/cop/lint/empty_in_pattern.rb +64 -0
- data/lib/rubocop/cop/lint/empty_interpolation.rb +5 -8
- data/lib/rubocop/cop/lint/empty_when.rb +34 -9
- data/lib/rubocop/cop/lint/ensure_return.rb +29 -16
- data/lib/rubocop/cop/lint/erb_new_arguments.rb +28 -30
- 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 +3 -4
- data/lib/rubocop/cop/lint/format_parameter_mismatch.rb +45 -10
- data/lib/rubocop/cop/lint/hash_compare_by_identity.rb +47 -0
- data/lib/rubocop/cop/lint/heredoc_method_call_position.rb +15 -17
- data/lib/rubocop/cop/lint/identity_comparison.rb +51 -0
- data/lib/rubocop/cop/lint/implicit_string_concatenation.rb +8 -8
- data/lib/rubocop/cop/lint/incompatible_io_select_with_fiber_scheduler.rb +79 -0
- data/lib/rubocop/cop/lint/ineffective_access_modifier.rb +15 -21
- data/lib/rubocop/cop/lint/inherit_exception.rb +32 -36
- data/lib/rubocop/cop/lint/interpolation_check.rb +28 -9
- data/lib/rubocop/cop/lint/lambda_without_literal_block.rb +51 -0
- data/lib/rubocop/cop/lint/literal_as_condition.rb +43 -17
- data/lib/rubocop/cop/lint/literal_in_interpolation.rb +49 -16
- data/lib/rubocop/cop/lint/loop.rb +32 -9
- data/lib/rubocop/cop/lint/missing_cop_enable_directive.rb +51 -24
- 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 +71 -26
- data/lib/rubocop/cop/lint/nested_percent_literal.rb +19 -7
- data/lib/rubocop/cop/lint/next_without_accumulator.rb +26 -6
- data/lib/rubocop/cop/lint/no_return_in_begin_end_blocks.rb +58 -0
- data/lib/rubocop/cop/lint/non_atomic_file_operation.rb +162 -0
- data/lib/rubocop/cop/lint/non_deterministic_require_order.rb +112 -16
- data/lib/rubocop/cop/lint/non_local_exit_from_iterator.rb +13 -10
- data/lib/rubocop/cop/lint/number_conversion.rb +137 -27
- data/lib/rubocop/cop/lint/numbered_parameter_assignment.rb +47 -0
- data/lib/rubocop/cop/lint/or_assignment_to_constant.rb +40 -0
- data/lib/rubocop/cop/lint/ordered_magic_comments.rb +16 -20
- data/lib/rubocop/cop/lint/out_of_range_regexp_ref.rb +132 -0
- data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb +42 -14
- data/lib/rubocop/cop/lint/percent_string_array.rb +18 -13
- data/lib/rubocop/cop/lint/percent_symbol_array.rb +14 -15
- data/lib/rubocop/cop/lint/raise_exception.rb +91 -0
- data/lib/rubocop/cop/lint/rand_one.rb +6 -5
- data/lib/rubocop/cop/lint/redundant_cop_disable_directive.rb +180 -119
- data/lib/rubocop/cop/lint/redundant_cop_enable_directive.rb +46 -32
- data/lib/rubocop/cop/lint/redundant_dir_glob_sort.rb +62 -0
- data/lib/rubocop/cop/lint/redundant_require_statement.rb +45 -15
- data/lib/rubocop/cop/lint/redundant_safe_navigation.rb +91 -0
- data/lib/rubocop/cop/lint/redundant_splat_expansion.rb +73 -36
- data/lib/rubocop/cop/lint/redundant_string_coercion.rb +9 -16
- data/lib/rubocop/cop/lint/redundant_with_index.rb +26 -28
- data/lib/rubocop/cop/lint/redundant_with_object.rb +25 -29
- data/lib/rubocop/cop/lint/refinement_import_methods.rb +51 -0
- data/lib/rubocop/cop/lint/regexp_as_condition.rb +13 -5
- data/lib/rubocop/cop/lint/require_parentheses.rb +8 -8
- data/lib/rubocop/cop/lint/require_range_parentheses.rb +57 -0
- data/lib/rubocop/cop/lint/require_relative_self_path.rb +50 -0
- 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 +7 -22
- data/lib/rubocop/cop/lint/safe_navigation_chain.rb +48 -15
- data/lib/rubocop/cop/lint/safe_navigation_consistency.rb +16 -18
- data/lib/rubocop/cop/lint/safe_navigation_with_empty.rb +13 -5
- data/lib/rubocop/cop/lint/script_permission.rb +11 -8
- data/lib/rubocop/cop/lint/self_assignment.rb +78 -0
- data/lib/rubocop/cop/lint/send_with_mixin_argument.rb +14 -21
- data/lib/rubocop/cop/lint/shadowed_argument.rb +10 -16
- data/lib/rubocop/cop/lint/shadowed_exception.rb +34 -41
- data/lib/rubocop/cop/lint/shadowing_outer_local_variable.rb +56 -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 +179 -0
- data/lib/rubocop/cop/lint/syntax.rb +10 -30
- data/lib/rubocop/cop/lint/to_enum_arguments.rb +89 -0
- data/lib/rubocop/cop/lint/to_json.rb +22 -14
- 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 +6 -8
- data/lib/rubocop/cop/lint/unexpected_block_arity.rb +90 -0
- data/lib/rubocop/cop/lint/unified_integer.rb +7 -8
- data/lib/rubocop/cop/lint/unmodified_reduce_accumulator.rb +204 -0
- data/lib/rubocop/cop/lint/unreachable_code.rb +6 -8
- data/lib/rubocop/cop/lint/unreachable_loop.rb +202 -0
- data/lib/rubocop/cop/lint/unused_block_argument.rb +19 -12
- data/lib/rubocop/cop/lint/unused_method_argument.rb +48 -13
- data/lib/rubocop/cop/lint/uri_escape_unescape.rb +6 -3
- data/lib/rubocop/cop/lint/uri_regexp.rb +13 -48
- data/lib/rubocop/cop/lint/useless_access_modifier.rb +45 -27
- data/lib/rubocop/cop/lint/useless_assignment.rb +11 -15
- data/lib/rubocop/cop/lint/useless_else_without_rescue.rb +8 -13
- data/lib/rubocop/cop/lint/useless_method_definition.rb +69 -0
- data/lib/rubocop/cop/lint/useless_ruby2_keywords.rb +119 -0
- data/lib/rubocop/cop/lint/useless_setter_call.rb +18 -13
- data/lib/rubocop/cop/lint/useless_times.rb +114 -0
- data/lib/rubocop/cop/lint/void.rb +16 -25
- data/lib/rubocop/cop/message_annotator.rb +5 -4
- data/lib/rubocop/cop/metrics/abc_size.rb +35 -3
- data/lib/rubocop/cop/metrics/block_length.rb +47 -11
- data/lib/rubocop/cop/metrics/block_nesting.rb +6 -11
- data/lib/rubocop/cop/metrics/class_length.rb +46 -12
- data/lib/rubocop/cop/metrics/cyclomatic_complexity.rb +30 -7
- data/lib/rubocop/cop/metrics/method_length.rb +41 -6
- data/lib/rubocop/cop/metrics/module_length.rb +35 -10
- data/lib/rubocop/cop/metrics/parameter_lists.rb +79 -13
- data/lib/rubocop/cop/metrics/perceived_complexity.rb +8 -10
- data/lib/rubocop/cop/metrics/utils/abc_size_calculator.rb +76 -16
- data/lib/rubocop/cop/metrics/utils/code_length_calculator.rb +182 -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 +39 -30
- 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 +40 -0
- data/lib/rubocop/cop/mixin/allowed_pattern.rb +56 -0
- data/lib/rubocop/cop/mixin/annotation_comment.rb +58 -23
- 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 +56 -19
- data/lib/rubocop/cop/mixin/code_length.rb +30 -9
- data/lib/rubocop/cop/mixin/comments_help.rb +80 -0
- data/lib/rubocop/cop/mixin/configurable_enforced_style.rb +24 -14
- 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 +4 -11
- data/lib/rubocop/cop/mixin/documentation_comment.rb +9 -9
- data/lib/rubocop/cop/mixin/duplication.rb +1 -1
- 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 +17 -4
- data/lib/rubocop/cop/mixin/enforce_superclass.rb +22 -8
- data/lib/rubocop/cop/mixin/first_element_line_break.rb +14 -10
- data/lib/rubocop/cop/mixin/frozen_string_literal.rb +41 -6
- data/lib/rubocop/cop/mixin/gem_declaration.rb +13 -0
- data/lib/rubocop/cop/mixin/gemspec_help.rb +30 -0
- data/lib/rubocop/cop/mixin/hash_alignment_styles.rb +20 -11
- data/lib/rubocop/cop/mixin/hash_shorthand_syntax.rb +187 -0
- data/lib/rubocop/cop/mixin/hash_transform_method.rb +58 -38
- data/lib/rubocop/cop/mixin/heredoc.rb +5 -0
- data/lib/rubocop/cop/mixin/interpolation.rb +1 -3
- data/lib/rubocop/cop/mixin/line_length_help.rb +35 -15
- data/lib/rubocop/cop/mixin/match_range.rb +2 -5
- data/lib/rubocop/cop/mixin/method_complexity.rb +27 -10
- data/lib/rubocop/cop/mixin/method_preference.rb +1 -2
- data/lib/rubocop/cop/mixin/multiline_element_indentation.rb +39 -16
- data/lib/rubocop/cop/mixin/multiline_element_line_breaks.rb +6 -4
- data/lib/rubocop/cop/mixin/multiline_expression_indentation.rb +18 -46
- data/lib/rubocop/cop/mixin/multiline_literal_brace_layout.rb +15 -15
- 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 +16 -6
- data/lib/rubocop/cop/mixin/parentheses.rb +1 -2
- data/lib/rubocop/cop/mixin/percent_array.rb +85 -12
- data/lib/rubocop/cop/mixin/percent_literal.rb +0 -6
- data/lib/rubocop/cop/mixin/preceding_following_alignment.rb +16 -14
- data/lib/rubocop/cop/mixin/preferred_delimiters.rb +6 -9
- data/lib/rubocop/cop/mixin/range_help.rb +55 -18
- data/lib/rubocop/cop/mixin/rational_literal.rb +1 -0
- data/lib/rubocop/cop/mixin/require_library.rb +61 -0
- data/lib/rubocop/cop/mixin/rescue_node.rb +15 -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 +7 -7
- data/lib/rubocop/cop/mixin/statement_modifier.rb +59 -22
- data/lib/rubocop/cop/mixin/string_help.rb +5 -2
- data/lib/rubocop/cop/mixin/string_literals_help.rb +3 -5
- data/lib/rubocop/cop/mixin/surrounding_space.rb +28 -40
- 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 +2 -3
- data/lib/rubocop/cop/mixin/trailing_comma.rb +14 -19
- 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 +72 -0
- data/lib/rubocop/cop/naming/accessor_method_name.rb +22 -4
- data/lib/rubocop/cop/naming/ascii_identifiers.rb +29 -11
- data/lib/rubocop/cop/naming/binary_operator_parameter_name.rb +18 -8
- data/lib/rubocop/cop/naming/block_forwarding.rb +121 -0
- data/lib/rubocop/cop/naming/block_parameter_name.rb +4 -4
- data/lib/rubocop/cop/naming/class_and_module_camel_case.rb +16 -4
- data/lib/rubocop/cop/naming/constant_name.rb +9 -6
- data/lib/rubocop/cop/naming/file_name.rb +74 -39
- data/lib/rubocop/cop/naming/heredoc_delimiter_case.rb +13 -7
- data/lib/rubocop/cop/naming/heredoc_delimiter_naming.rb +5 -5
- data/lib/rubocop/cop/naming/inclusive_language.rb +270 -0
- data/lib/rubocop/cop/naming/memoized_instance_variable_name.rb +136 -27
- data/lib/rubocop/cop/naming/method_name.rb +35 -7
- data/lib/rubocop/cop/naming/method_parameter_name.rb +4 -4
- data/lib/rubocop/cop/naming/predicate_name.rb +42 -16
- data/lib/rubocop/cop/naming/rescued_exceptions_variable_name.rb +67 -16
- data/lib/rubocop/cop/naming/variable_name.rb +13 -2
- data/lib/rubocop/cop/naming/variable_number.rb +107 -12
- data/lib/rubocop/cop/offense.rb +35 -12
- data/lib/rubocop/cop/registry.rb +128 -36
- data/lib/rubocop/cop/security/compound_hash.rb +106 -0
- data/lib/rubocop/cop/security/eval.rb +5 -3
- data/lib/rubocop/cop/security/io_methods.rb +49 -0
- data/lib/rubocop/cop/security/json_load.rb +17 -16
- data/lib/rubocop/cop/security/marshal_load.rb +5 -5
- data/lib/rubocop/cop/security/open.rb +29 -11
- data/lib/rubocop/cop/security/yaml_load.rb +22 -10
- data/lib/rubocop/cop/severity.rb +4 -14
- data/lib/rubocop/cop/style/access_modifier_declarations.rb +110 -12
- data/lib/rubocop/cop/style/accessor_grouping.rb +154 -0
- data/lib/rubocop/cop/style/alias.rb +55 -46
- data/lib/rubocop/cop/style/and_or.rb +42 -30
- data/lib/rubocop/cop/style/arguments_forwarding.rb +154 -0
- data/lib/rubocop/cop/style/array_coercion.rb +87 -0
- data/lib/rubocop/cop/style/array_intersect.rb +111 -0
- data/lib/rubocop/cop/style/array_join.rb +9 -9
- data/lib/rubocop/cop/style/ascii_comments.rb +7 -11
- data/lib/rubocop/cop/style/attr.rb +16 -16
- data/lib/rubocop/cop/style/auto_resource_cleanup.rb +10 -13
- data/lib/rubocop/cop/style/bare_percent_literals.rb +13 -15
- data/lib/rubocop/cop/style/begin_block.rb +2 -2
- data/lib/rubocop/cop/style/bisected_attr_accessor/macro.rb +60 -0
- data/lib/rubocop/cop/style/bisected_attr_accessor.rb +125 -0
- data/lib/rubocop/cop/style/block_comments.rb +15 -19
- data/lib/rubocop/cop/style/block_delimiters.rb +105 -39
- data/lib/rubocop/cop/style/case_equality.rb +84 -6
- data/lib/rubocop/cop/style/case_like_if.rb +263 -0
- data/lib/rubocop/cop/style/character_literal.rb +20 -16
- data/lib/rubocop/cop/style/class_and_module_children.rb +71 -29
- data/lib/rubocop/cop/style/class_check.rb +7 -12
- data/lib/rubocop/cop/style/class_equality_comparison.rb +116 -0
- data/lib/rubocop/cop/style/class_methods.rb +9 -15
- data/lib/rubocop/cop/style/class_methods_definitions.rb +158 -0
- data/lib/rubocop/cop/style/class_vars.rb +24 -8
- data/lib/rubocop/cop/style/collection_compact.rb +120 -0
- data/lib/rubocop/cop/style/collection_methods.rb +34 -21
- data/lib/rubocop/cop/style/colon_method_call.rb +8 -10
- data/lib/rubocop/cop/style/colon_method_definition.rb +7 -7
- data/lib/rubocop/cop/style/combinable_loops.rb +95 -0
- data/lib/rubocop/cop/style/command_literal.rb +23 -29
- data/lib/rubocop/cop/style/comment_annotation.rb +69 -36
- data/lib/rubocop/cop/style/commented_keyword.rb +42 -23
- data/lib/rubocop/cop/style/concat_array_literals.rb +86 -0
- data/lib/rubocop/cop/style/conditional_assignment.rb +94 -95
- data/lib/rubocop/cop/style/constant_visibility.rb +32 -3
- data/lib/rubocop/cop/style/copyright.rb +21 -24
- data/lib/rubocop/cop/style/date_time.rb +22 -6
- data/lib/rubocop/cop/style/def_with_parentheses.rb +22 -20
- data/lib/rubocop/cop/style/dir.rb +15 -13
- 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 +117 -22
- data/lib/rubocop/cop/style/documentation_method.rb +3 -2
- data/lib/rubocop/cop/style/double_cop_disable_directive.rb +7 -16
- data/lib/rubocop/cop/style/double_negation.rb +134 -10
- data/lib/rubocop/cop/style/each_for_simple_loop.rb +48 -16
- data/lib/rubocop/cop/style/each_with_object.rb +53 -24
- data/lib/rubocop/cop/style/empty_block_parameter.rb +11 -12
- data/lib/rubocop/cop/style/empty_case_condition.rb +32 -27
- data/lib/rubocop/cop/style/empty_else.rb +54 -25
- data/lib/rubocop/cop/style/empty_heredoc.rb +73 -0
- data/lib/rubocop/cop/style/empty_lambda_parameter.rb +11 -12
- data/lib/rubocop/cop/style/empty_literal.rb +48 -33
- data/lib/rubocop/cop/style/empty_method.rb +29 -25
- data/lib/rubocop/cop/style/encoding.rb +30 -23
- data/lib/rubocop/cop/style/end_block.rb +8 -5
- data/lib/rubocop/cop/style/endless_method.rb +101 -0
- data/lib/rubocop/cop/style/env_home.rb +56 -0
- data/lib/rubocop/cop/style/eval_with_location.rb +143 -54
- data/lib/rubocop/cop/style/even_odd.rb +10 -12
- data/lib/rubocop/cop/style/expand_path_arguments.rb +28 -26
- data/lib/rubocop/cop/style/explicit_block_argument.rb +153 -0
- data/lib/rubocop/cop/style/exponential_notation.rb +116 -0
- data/lib/rubocop/cop/style/fetch_env_var.rb +132 -0
- data/lib/rubocop/cop/style/file_read.rb +112 -0
- data/lib/rubocop/cop/style/file_write.rb +136 -0
- data/lib/rubocop/cop/style/float_division.rb +69 -12
- data/lib/rubocop/cop/style/for.rb +13 -13
- data/lib/rubocop/cop/style/format_string.rb +31 -25
- data/lib/rubocop/cop/style/format_string_token.rb +138 -31
- data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +35 -54
- data/lib/rubocop/cop/style/global_std_stream.rb +70 -0
- data/lib/rubocop/cop/style/global_vars.rb +3 -3
- data/lib/rubocop/cop/style/guard_clause.rb +186 -33
- data/lib/rubocop/cop/style/hash_as_last_array_item.rb +100 -0
- data/lib/rubocop/cop/style/hash_conversion.rb +134 -0
- data/lib/rubocop/cop/style/hash_each_methods.rb +61 -16
- data/lib/rubocop/cop/style/hash_except.rb +177 -0
- data/lib/rubocop/cop/style/hash_like_case.rb +77 -0
- data/lib/rubocop/cop/style/hash_syntax.rb +106 -45
- data/lib/rubocop/cop/style/hash_transform_keys.rb +31 -15
- data/lib/rubocop/cop/style/hash_transform_values.rb +29 -15
- data/lib/rubocop/cop/style/identical_conditional_branches.rb +106 -11
- data/lib/rubocop/cop/style/if_inside_else.rb +65 -2
- data/lib/rubocop/cop/style/if_unless_modifier.rb +81 -51
- 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 +161 -0
- data/lib/rubocop/cop/style/if_with_semicolon.rb +51 -3
- data/lib/rubocop/cop/style/implicit_runtime_error.rb +6 -4
- data/lib/rubocop/cop/style/in_pattern_then.rb +56 -0
- data/lib/rubocop/cop/style/infinite_loop.rb +28 -26
- data/lib/rubocop/cop/style/inline_comment.rb +5 -5
- data/lib/rubocop/cop/style/inverse_methods.rb +55 -52
- data/lib/rubocop/cop/style/ip_addresses.rb +4 -5
- data/lib/rubocop/cop/style/keyword_parameters_order.rb +75 -0
- data/lib/rubocop/cop/style/lambda.rb +12 -18
- data/lib/rubocop/cop/style/lambda_call.rb +20 -45
- data/lib/rubocop/cop/style/line_end_concatenation.rb +40 -28
- data/lib/rubocop/cop/style/magic_comment_format.rb +307 -0
- data/lib/rubocop/cop/style/map_compact_with_conditional_block.rb +136 -0
- data/lib/rubocop/cop/style/map_to_hash.rb +68 -0
- data/lib/rubocop/cop/style/map_to_set.rb +61 -0
- data/lib/rubocop/cop/style/method_call_with_args_parentheses/omit_parentheses.rb +91 -39
- data/lib/rubocop/cop/style/method_call_with_args_parentheses/require_parentheses.rb +12 -18
- data/lib/rubocop/cop/style/method_call_with_args_parentheses.rb +76 -25
- data/lib/rubocop/cop/style/method_call_without_args_parentheses.rb +39 -15
- data/lib/rubocop/cop/style/method_called_on_do_end_block.rb +17 -7
- data/lib/rubocop/cop/style/method_def_parentheses.rb +43 -29
- data/lib/rubocop/cop/style/min_max.rb +11 -15
- data/lib/rubocop/cop/style/min_max_comparison.rb +73 -0
- data/lib/rubocop/cop/style/missing_else.rb +44 -49
- data/lib/rubocop/cop/style/missing_respond_to_missing.rb +12 -6
- data/lib/rubocop/cop/style/mixin_grouping.rb +29 -42
- data/lib/rubocop/cop/style/mixin_usage.rb +13 -31
- data/lib/rubocop/cop/style/module_function.rb +99 -33
- data/lib/rubocop/cop/style/multiline_block_chain.rb +17 -7
- data/lib/rubocop/cop/style/multiline_if_modifier.rb +6 -13
- data/lib/rubocop/cop/style/multiline_if_then.rb +5 -11
- data/lib/rubocop/cop/style/multiline_in_pattern_then.rb +60 -0
- data/lib/rubocop/cop/style/multiline_memoization.rb +16 -14
- data/lib/rubocop/cop/style/multiline_method_signature.rb +34 -4
- data/lib/rubocop/cop/style/multiline_ternary_operator.rb +59 -12
- data/lib/rubocop/cop/style/multiline_when_then.rb +24 -19
- data/lib/rubocop/cop/style/multiple_comparison.rb +78 -13
- data/lib/rubocop/cop/style/mutable_constant.rb +117 -44
- data/lib/rubocop/cop/style/negated_if.rb +10 -11
- data/lib/rubocop/cop/style/negated_if_else_condition.rb +134 -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_file_dirname.rb +66 -0
- data/lib/rubocop/cop/style/nested_modifier.rb +11 -18
- data/lib/rubocop/cop/style/nested_parenthesized_calls.rb +33 -21
- data/lib/rubocop/cop/style/nested_ternary_operator.rb +43 -5
- data/lib/rubocop/cop/style/next.rb +20 -31
- data/lib/rubocop/cop/style/nil_comparison.rb +20 -12
- data/lib/rubocop/cop/style/nil_lambda.rb +70 -0
- data/lib/rubocop/cop/style/non_nil_check.rb +57 -35
- data/lib/rubocop/cop/style/not.rb +23 -29
- data/lib/rubocop/cop/style/numbered_parameters.rb +46 -0
- data/lib/rubocop/cop/style/numbered_parameters_limit.rb +50 -0
- data/lib/rubocop/cop/style/numeric_literal_prefix.rb +7 -12
- data/lib/rubocop/cop/style/numeric_literals.rb +44 -29
- data/lib/rubocop/cop/style/numeric_predicate.rb +72 -33
- data/lib/rubocop/cop/style/object_then.rb +74 -0
- data/lib/rubocop/cop/style/one_line_conditional.rb +56 -31
- data/lib/rubocop/cop/style/open_struct_use.rb +69 -0
- data/lib/rubocop/cop/style/operator_method_call.rb +53 -0
- data/lib/rubocop/cop/style/option_hash.rb +4 -5
- data/lib/rubocop/cop/style/optional_arguments.rb +9 -8
- data/lib/rubocop/cop/style/optional_boolean_parameter.rb +64 -0
- data/lib/rubocop/cop/style/or_assignment.rb +12 -11
- data/lib/rubocop/cop/style/parallel_assignment.rb +28 -25
- data/lib/rubocop/cop/style/parentheses_around_condition.rb +20 -9
- data/lib/rubocop/cop/style/percent_literal_delimiters.rb +17 -25
- data/lib/rubocop/cop/style/percent_q_literals.rb +12 -15
- data/lib/rubocop/cop/style/perl_backrefs.rb +106 -17
- data/lib/rubocop/cop/style/preferred_hash_methods.rb +21 -22
- data/lib/rubocop/cop/style/proc.rb +10 -7
- data/lib/rubocop/cop/style/quoted_symbols.rb +124 -0
- data/lib/rubocop/cop/style/raise_args.rb +49 -39
- data/lib/rubocop/cop/style/random_with_offset.rb +31 -36
- data/lib/rubocop/cop/style/redundant_argument.rb +98 -0
- data/lib/rubocop/cop/style/redundant_assignment.rb +106 -0
- data/lib/rubocop/cop/style/redundant_begin.rb +113 -12
- data/lib/rubocop/cop/style/redundant_capital_w.rb +9 -14
- data/lib/rubocop/cop/style/redundant_condition.rb +169 -26
- data/lib/rubocop/cop/style/redundant_conditional.rb +15 -16
- data/lib/rubocop/cop/style/redundant_constant_base.rb +85 -0
- data/lib/rubocop/cop/style/redundant_double_splat_hash_braces.rb +39 -0
- data/lib/rubocop/cop/style/redundant_each.rb +116 -0
- data/lib/rubocop/cop/style/redundant_exception.rb +23 -18
- data/lib/rubocop/cop/style/redundant_fetch_block.rb +119 -0
- data/lib/rubocop/cop/style/redundant_file_extension_in_require.rb +61 -0
- data/lib/rubocop/cop/style/redundant_freeze.rb +16 -14
- data/lib/rubocop/cop/style/redundant_initialize.rb +156 -0
- data/lib/rubocop/cop/style/redundant_interpolation.rb +70 -30
- data/lib/rubocop/cop/style/redundant_parentheses.rb +68 -57
- data/lib/rubocop/cop/style/redundant_percent_q.rb +17 -21
- data/lib/rubocop/cop/style/redundant_regexp_character_class.rb +120 -0
- data/lib/rubocop/cop/style/redundant_regexp_escape.rb +127 -0
- data/lib/rubocop/cop/style/redundant_return.rb +37 -30
- data/lib/rubocop/cop/style/redundant_self.rb +60 -28
- data/lib/rubocop/cop/style/redundant_self_assignment.rb +118 -0
- data/lib/rubocop/cop/style/redundant_self_assignment_branch.rb +83 -0
- data/lib/rubocop/cop/style/redundant_sort.rb +84 -41
- data/lib/rubocop/cop/style/redundant_sort_by.rb +27 -14
- data/lib/rubocop/cop/style/redundant_string_escape.rb +184 -0
- data/lib/rubocop/cop/style/regexp_literal.rb +26 -32
- data/lib/rubocop/cop/style/require_order.rb +142 -0
- data/lib/rubocop/cop/style/rescue_modifier.rb +41 -14
- data/lib/rubocop/cop/style/rescue_standard_error.rb +36 -34
- data/lib/rubocop/cop/style/return_nil.rb +15 -9
- data/lib/rubocop/cop/style/safe_navigation.rb +107 -56
- data/lib/rubocop/cop/style/sample.rb +18 -17
- data/lib/rubocop/cop/style/select_by_regexp.rb +152 -0
- data/lib/rubocop/cop/style/self_assignment.rb +27 -23
- data/lib/rubocop/cop/style/semicolon.rb +65 -32
- data/lib/rubocop/cop/style/send.rb +6 -8
- data/lib/rubocop/cop/style/signal_exception.rb +39 -32
- data/lib/rubocop/cop/style/single_argument_dig.rb +65 -0
- data/lib/rubocop/cop/style/single_line_block_params.rb +39 -15
- data/lib/rubocop/cop/style/single_line_methods.rb +82 -20
- data/lib/rubocop/cop/style/slicing_with_range.rb +51 -0
- data/lib/rubocop/cop/style/sole_nested_conditional.rb +248 -0
- data/lib/rubocop/cop/style/special_global_vars.rb +107 -57
- data/lib/rubocop/cop/style/stabby_lambda_parentheses.rb +18 -25
- data/lib/rubocop/cop/style/static_class.rb +128 -0
- data/lib/rubocop/cop/style/stderr_puts.rb +10 -14
- data/lib/rubocop/cop/style/string_chars.rb +41 -0
- data/lib/rubocop/cop/style/string_concatenation.rb +178 -0
- data/lib/rubocop/cop/style/string_hash_keys.rb +13 -8
- data/lib/rubocop/cop/style/string_literals.rb +20 -20
- data/lib/rubocop/cop/style/string_literals_in_interpolation.rb +6 -4
- data/lib/rubocop/cop/style/string_methods.rb +8 -18
- data/lib/rubocop/cop/style/strip.rb +11 -15
- data/lib/rubocop/cop/style/struct_inheritance.rb +38 -5
- data/lib/rubocop/cop/style/swap_values.rb +112 -0
- data/lib/rubocop/cop/style/symbol_array.rb +20 -26
- data/lib/rubocop/cop/style/symbol_literal.rb +6 -10
- data/lib/rubocop/cop/style/symbol_proc.rb +135 -35
- data/lib/rubocop/cop/style/ternary_parentheses.rb +47 -51
- data/lib/rubocop/cop/style/top_level_method_definition.rb +85 -0
- data/lib/rubocop/cop/style/trailing_body_on_class.rb +4 -7
- data/lib/rubocop/cop/style/trailing_body_on_method_definition.rb +11 -10
- data/lib/rubocop/cop/style/trailing_body_on_module.rb +4 -7
- data/lib/rubocop/cop/style/trailing_comma_in_arguments.rb +42 -10
- data/lib/rubocop/cop/style/trailing_comma_in_array_literal.rb +44 -6
- data/lib/rubocop/cop/style/trailing_comma_in_block_args.rb +105 -0
- data/lib/rubocop/cop/style/trailing_comma_in_hash_literal.rb +47 -6
- data/lib/rubocop/cop/style/trailing_method_end_statement.rb +10 -39
- data/lib/rubocop/cop/style/trailing_underscore_variable.rb +17 -32
- data/lib/rubocop/cop/style/trivial_accessors.rb +111 -48
- data/lib/rubocop/cop/style/unless_else.rb +10 -10
- data/lib/rubocop/cop/style/unless_logical_operators.rb +105 -0
- data/lib/rubocop/cop/style/unpack_first.rb +8 -11
- data/lib/rubocop/cop/style/variable_interpolation.rb +9 -12
- 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 +67 -26
- data/lib/rubocop/cop/style/yoda_condition.rb +41 -25
- data/lib/rubocop/cop/style/yoda_expression.rb +74 -0
- data/lib/rubocop/cop/style/zero_length_predicate.rb +56 -31
- data/lib/rubocop/cop/team.rb +147 -85
- data/lib/rubocop/cop/util.rb +97 -30
- data/lib/rubocop/cop/utils/format_string.rb +22 -9
- data/lib/rubocop/cop/variable_force/assignment.rb +3 -3
- data/lib/rubocop/cop/variable_force/branch.rb +19 -10
- 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 +2 -2
- data/lib/rubocop/cop/variable_force.rb +28 -59
- data/lib/rubocop/cops_documentation_generator.rb +322 -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 +20 -0
- data/lib/rubocop/ext/range.rb +15 -0
- data/lib/rubocop/ext/regexp_node.rb +87 -0
- data/lib/rubocop/ext/regexp_parser.rb +92 -0
- data/lib/rubocop/feature_loader.rb +94 -0
- data/lib/rubocop/file_finder.rb +12 -13
- data/lib/rubocop/file_patterns.rb +43 -0
- 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 +6 -4
- data/lib/rubocop/formatter/disabled_config_formatter.rb +82 -39
- data/lib/rubocop/formatter/emacs_style_formatter.rb +2 -0
- data/lib/rubocop/formatter/formatter_set.rb +24 -23
- data/lib/rubocop/formatter/git_hub_actions_formatter.rb +57 -0
- data/lib/rubocop/formatter/html_formatter.rb +17 -26
- data/lib/rubocop/formatter/json_formatter.rb +5 -6
- data/lib/rubocop/formatter/junit_formatter.rb +45 -15
- data/lib/rubocop/formatter/markdown_formatter.rb +78 -0
- data/lib/rubocop/formatter/offense_count_formatter.rb +17 -8
- 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 +42 -8
- data/lib/rubocop/formatter/tap_formatter.rb +8 -4
- data/lib/rubocop/formatter/worst_offenders_formatter.rb +8 -6
- data/lib/rubocop/formatter.rb +35 -0
- data/lib/rubocop/lockfile.rb +40 -0
- data/lib/rubocop/magic_comment.rb +101 -17
- data/lib/rubocop/name_similarity.rb +18 -10
- data/lib/rubocop/options.rb +335 -188
- data/lib/rubocop/path_util.rb +58 -37
- data/lib/rubocop/platform.rb +1 -1
- data/lib/rubocop/rake_task.rb +43 -17
- data/lib/rubocop/remote_config.rb +17 -15
- data/lib/rubocop/result_cache.rb +74 -44
- data/lib/rubocop/rspec/cop_helper.rb +36 -37
- data/lib/rubocop/rspec/expect_offense.rb +134 -41
- data/lib/rubocop/rspec/parallel_formatter.rb +90 -0
- data/lib/rubocop/rspec/shared_contexts.rb +115 -36
- data/lib/rubocop/rspec/support.rb +16 -1
- data/lib/rubocop/runner.rb +172 -91
- data/lib/rubocop/server/cache.rb +148 -0
- data/lib/rubocop/server/cli.rb +128 -0
- data/lib/rubocop/server/client_command/base.rb +44 -0
- data/lib/rubocop/server/client_command/exec.rb +64 -0
- data/lib/rubocop/server/client_command/restart.rb +25 -0
- data/lib/rubocop/server/client_command/start.rb +43 -0
- data/lib/rubocop/server/client_command/status.rb +28 -0
- data/lib/rubocop/server/client_command/stop.rb +31 -0
- data/lib/rubocop/server/client_command.rb +26 -0
- data/lib/rubocop/server/core.rb +96 -0
- data/lib/rubocop/server/errors.rb +23 -0
- data/lib/rubocop/server/helper.rb +34 -0
- data/lib/rubocop/server/server_command/base.rb +50 -0
- data/lib/rubocop/server/server_command/exec.rb +34 -0
- data/lib/rubocop/server/server_command/stop.rb +24 -0
- data/lib/rubocop/server/server_command.rb +21 -0
- data/lib/rubocop/server/socket_reader.rb +69 -0
- data/lib/rubocop/server.rb +53 -0
- data/lib/rubocop/string_interpreter.rb +7 -4
- data/lib/rubocop/target_finder.rb +58 -48
- data/lib/rubocop/target_ruby.rb +135 -15
- data/lib/rubocop/util.rb +16 -0
- data/lib/rubocop/version.rb +84 -7
- data/lib/rubocop/yaml_duplication_checker.rb +2 -1
- data/lib/rubocop.rb +213 -103
- metadata +307 -91
- data/bin/console +0 -10
- data/bin/setup +0 -7
- data/lib/rubocop/ast/builder.rb +0 -83
- 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 -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 -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 -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/node.rb +0 -632
- data/lib/rubocop/ast/sexp.rb +0 -16
- data/lib/rubocop/ast/traversal.rb +0 -200
- data/lib/rubocop/cli/command/auto_genenerate_config.rb +0 -105
- 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/ignored_methods.rb +0 -19
- data/lib/rubocop/cop/mixin/ignored_pattern.rb +0 -29
- 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/formatter/disabled_lines_formatter.rb +0 -57
- data/lib/rubocop/node_pattern.rb +0 -887
- data/lib/rubocop/processed_source.rb +0 -216
- data/lib/rubocop/string_util.rb +0 -14
- data/lib/rubocop/token.rb +0 -114
@@ -3,7 +3,7 @@
|
|
3
3
|
module RuboCop
|
4
4
|
module Cop
|
5
5
|
module Layout
|
6
|
-
#
|
6
|
+
# Checks whether the end statement of a do..end block
|
7
7
|
# is on its own line.
|
8
8
|
#
|
9
9
|
# @example
|
@@ -24,8 +24,9 @@ module RuboCop
|
|
24
24
|
# blah { |i|
|
25
25
|
# foo(i)
|
26
26
|
# }
|
27
|
-
class BlockEndNewline <
|
27
|
+
class BlockEndNewline < Base
|
28
28
|
include Alignment
|
29
|
+
extend AutoCorrector
|
29
30
|
|
30
31
|
MSG = 'Expression at %<line>d, %<column>d should be on its own line.'
|
31
32
|
|
@@ -35,26 +36,53 @@ module RuboCop
|
|
35
36
|
# If the end is on its own line, there is no offense
|
36
37
|
return if begins_its_line?(node.loc.end)
|
37
38
|
|
38
|
-
|
39
|
+
register_offense(node)
|
39
40
|
end
|
40
41
|
|
41
|
-
|
42
|
-
lambda do |corrector|
|
43
|
-
corrector.replace(delimiter_range(node),
|
44
|
-
"\n#{node.loc.end.source}#{offset(node)}")
|
45
|
-
end
|
46
|
-
end
|
42
|
+
alias on_numblock on_block
|
47
43
|
|
48
44
|
private
|
49
45
|
|
46
|
+
def register_offense(node)
|
47
|
+
add_offense(node.loc.end, message: message(node)) do |corrector|
|
48
|
+
offense_range = offense_range(node)
|
49
|
+
replacement = "\n#{offense_range.source.strip}"
|
50
|
+
|
51
|
+
if (heredoc = last_heredoc_argument(node.body))
|
52
|
+
corrector.remove(offense_range)
|
53
|
+
corrector.insert_after(heredoc.loc.heredoc_end, replacement)
|
54
|
+
else
|
55
|
+
corrector.replace(offense_range, replacement)
|
56
|
+
end
|
57
|
+
end
|
58
|
+
end
|
59
|
+
|
50
60
|
def message(node)
|
51
61
|
format(MSG, line: node.loc.end.line, column: node.loc.end.column + 1)
|
52
62
|
end
|
53
63
|
|
54
|
-
def
|
55
|
-
|
56
|
-
|
57
|
-
|
64
|
+
def last_heredoc_argument(node)
|
65
|
+
return unless node&.call_type?
|
66
|
+
return unless (arguments = node&.arguments)
|
67
|
+
|
68
|
+
heredoc = arguments.reverse.detect { |arg| arg.str_type? && arg.heredoc? }
|
69
|
+
return heredoc if heredoc
|
70
|
+
|
71
|
+
last_heredoc_argument(node.children.first)
|
72
|
+
end
|
73
|
+
|
74
|
+
def offense_range(node)
|
75
|
+
Parser::Source::Range.new(
|
76
|
+
node.loc.expression.source_buffer,
|
77
|
+
node.children.compact.last.loc.expression.end_pos,
|
78
|
+
end_of_method_chain(node).loc.expression.end_pos
|
79
|
+
)
|
80
|
+
end
|
81
|
+
|
82
|
+
def end_of_method_chain(node)
|
83
|
+
return node unless node.parent&.call_type?
|
84
|
+
|
85
|
+
end_of_method_chain(node.parent)
|
58
86
|
end
|
59
87
|
end
|
60
88
|
end
|
@@ -3,10 +3,10 @@
|
|
3
3
|
module RuboCop
|
4
4
|
module Cop
|
5
5
|
module Layout
|
6
|
-
#
|
7
|
-
# are indented in relation to its
|
6
|
+
# Checks how the `when` and ``in``s of a `case` expression
|
7
|
+
# are indented in relation to its `case` or `end` keyword.
|
8
8
|
#
|
9
|
-
# It will register a separate offense for each misaligned
|
9
|
+
# It will register a separate offense for each misaligned `when` and `in`.
|
10
10
|
#
|
11
11
|
# @example
|
12
12
|
# # If Layout/EndAlignment is set to keyword style (default)
|
@@ -22,6 +22,13 @@ module RuboCop
|
|
22
22
|
# y / 3
|
23
23
|
# end
|
24
24
|
#
|
25
|
+
# case n
|
26
|
+
# in pattern
|
27
|
+
# x * 2
|
28
|
+
# else
|
29
|
+
# y / 3
|
30
|
+
# end
|
31
|
+
#
|
25
32
|
# # good for all styles
|
26
33
|
# case n
|
27
34
|
# when 0
|
@@ -30,6 +37,13 @@ module RuboCop
|
|
30
37
|
# y / 3
|
31
38
|
# end
|
32
39
|
#
|
40
|
+
# case n
|
41
|
+
# in pattern
|
42
|
+
# x * 2
|
43
|
+
# else
|
44
|
+
# y / 3
|
45
|
+
# end
|
46
|
+
#
|
33
47
|
# @example EnforcedStyle: case (default)
|
34
48
|
# # if EndAlignment is set to other style such as
|
35
49
|
# # start_of_line (as shown below), then *when* alignment
|
@@ -43,6 +57,13 @@ module RuboCop
|
|
43
57
|
# y / 3
|
44
58
|
# end
|
45
59
|
#
|
60
|
+
# a = case n
|
61
|
+
# in pattern
|
62
|
+
# x * 2
|
63
|
+
# else
|
64
|
+
# y / 3
|
65
|
+
# end
|
66
|
+
#
|
46
67
|
# # good
|
47
68
|
# a = case n
|
48
69
|
# when 0
|
@@ -51,6 +72,13 @@ module RuboCop
|
|
51
72
|
# y / 3
|
52
73
|
# end
|
53
74
|
#
|
75
|
+
# a = case n
|
76
|
+
# in pattern
|
77
|
+
# x * 2
|
78
|
+
# else
|
79
|
+
# y / 3
|
80
|
+
# end
|
81
|
+
#
|
54
82
|
# @example EnforcedStyle: end
|
55
83
|
# # bad
|
56
84
|
# a = case n
|
@@ -60,6 +88,13 @@ module RuboCop
|
|
60
88
|
# y / 3
|
61
89
|
# end
|
62
90
|
#
|
91
|
+
# a = case n
|
92
|
+
# in pattern
|
93
|
+
# x * 2
|
94
|
+
# else
|
95
|
+
# y / 3
|
96
|
+
# end
|
97
|
+
#
|
63
98
|
# # good
|
64
99
|
# a = case n
|
65
100
|
# when 0
|
@@ -67,41 +102,59 @@ module RuboCop
|
|
67
102
|
# else
|
68
103
|
# y / 3
|
69
104
|
# end
|
70
|
-
|
105
|
+
#
|
106
|
+
# a = case n
|
107
|
+
# in pattern
|
108
|
+
# x * 2
|
109
|
+
# else
|
110
|
+
# y / 3
|
111
|
+
# end
|
112
|
+
class CaseIndentation < Base
|
71
113
|
include Alignment
|
72
114
|
include ConfigurableEnforcedStyle
|
73
115
|
include RangeHelp
|
116
|
+
extend AutoCorrector
|
74
117
|
|
75
|
-
MSG = 'Indent `
|
118
|
+
MSG = 'Indent `%<branch_type>s` %<depth>s `%<base>s`.'
|
76
119
|
|
77
120
|
def on_case(case_node)
|
78
121
|
return if case_node.single_line?
|
122
|
+
return if enforced_style_end? && end_and_last_conditional_same_line?(case_node)
|
79
123
|
|
80
|
-
case_node.each_when
|
81
|
-
check_when(when_node)
|
82
|
-
end
|
124
|
+
case_node.each_when { |when_node| check_when(when_node, 'when') }
|
83
125
|
end
|
84
126
|
|
85
|
-
def
|
86
|
-
|
127
|
+
def on_case_match(case_match_node)
|
128
|
+
return if case_match_node.single_line?
|
129
|
+
return if enforced_style_end? && end_and_last_conditional_same_line?(case_match_node)
|
87
130
|
|
88
|
-
|
89
|
-
|
90
|
-
lambda do |corrector|
|
91
|
-
corrector.replace(whitespace, replacement(node))
|
92
|
-
end
|
131
|
+
case_match_node.each_in_pattern { |in_pattern_node| check_when(in_pattern_node, 'in') }
|
93
132
|
end
|
94
133
|
|
95
134
|
private
|
96
135
|
|
97
|
-
def
|
136
|
+
def end_and_last_conditional_same_line?(node)
|
137
|
+
end_line = node.loc.end&.line
|
138
|
+
last_conditional_line = if node.loc.else
|
139
|
+
node.loc.else.line
|
140
|
+
else
|
141
|
+
node.child_nodes.last.loc.begin&.line
|
142
|
+
end
|
143
|
+
end_line && last_conditional_line && end_line == last_conditional_line
|
144
|
+
end
|
145
|
+
|
146
|
+
def enforced_style_end?
|
147
|
+
cop_config[style_parameter_name] == 'end'
|
148
|
+
end
|
149
|
+
|
150
|
+
def check_when(when_node, branch_type)
|
98
151
|
when_column = when_node.loc.keyword.column
|
99
152
|
base_column = base_column(when_node.parent, style)
|
100
153
|
|
101
154
|
if when_column == base_column + indentation_width
|
102
155
|
correct_style_detected
|
103
156
|
else
|
104
|
-
incorrect_style(when_node)
|
157
|
+
incorrect_style(when_node, branch_type)
|
105
158
|
end
|
106
159
|
end
|
107
160
|
|
@@ -113,23 +166,28 @@ module RuboCop
|
|
113
166
|
indent_one_step? ? configured_indentation_width : 0
|
114
167
|
end
|
115
168
|
|
116
|
-
def incorrect_style(when_node)
|
117
|
-
|
118
|
-
|
169
|
+
def incorrect_style(when_node, branch_type)
|
170
|
+
depth = indent_one_step? ? 'one step more than' : 'as deep as'
|
171
|
+
message = format(MSG, branch_type: branch_type, depth: depth, base: style)
|
172
|
+
|
173
|
+
add_offense(when_node.loc.keyword, message: message) do |corrector|
|
174
|
+
detect_incorrect_style(when_node)
|
119
175
|
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
else
|
124
|
-
unrecognized_style_detected
|
125
|
-
end
|
176
|
+
whitespace = whitespace_range(when_node)
|
177
|
+
|
178
|
+
corrector.replace(whitespace, replacement(when_node)) if whitespace.source.strip.empty?
|
126
179
|
end
|
127
180
|
end
|
128
181
|
|
129
|
-
def
|
130
|
-
|
182
|
+
def detect_incorrect_style(when_node)
|
183
|
+
when_column = when_node.loc.keyword.column
|
184
|
+
base_column = base_column(when_node.parent, alternative_style)
|
131
185
|
|
132
|
-
|
186
|
+
if when_column == base_column
|
187
|
+
opposite_style_detected
|
188
|
+
else
|
189
|
+
unrecognized_style_detected
|
190
|
+
end
|
133
191
|
end
|
134
192
|
|
135
193
|
def base_column(case_node, base)
|
@@ -147,7 +205,7 @@ module RuboCop
|
|
147
205
|
end
|
148
206
|
|
149
207
|
def replacement(node)
|
150
|
-
case_node = node.each_ancestor(:case).first
|
208
|
+
case_node = node.each_ancestor(:case, :case_match).first
|
151
209
|
base_type = cop_config[style_parameter_name] == 'end' ? :end : :case
|
152
210
|
|
153
211
|
column = base_column(case_node, base_type)
|
@@ -8,22 +8,24 @@ module RuboCop
|
|
8
8
|
# `Categories` allows us to map macro names into a category.
|
9
9
|
#
|
10
10
|
# Consider an example of code style that covers the following order:
|
11
|
-
#
|
12
|
-
#
|
13
|
-
#
|
14
|
-
#
|
15
|
-
#
|
16
|
-
#
|
17
|
-
#
|
18
|
-
#
|
19
|
-
#
|
20
|
-
#
|
21
|
-
#
|
22
|
-
#
|
11
|
+
#
|
12
|
+
# * Module inclusion (include, prepend, extend)
|
13
|
+
# * Constants
|
14
|
+
# * Associations (has_one, has_many)
|
15
|
+
# * Public attribute macros (attr_accessor, attr_writer, attr_reader)
|
16
|
+
# * Other macros (validates, validate)
|
17
|
+
# * Public class methods
|
18
|
+
# * Initializer
|
19
|
+
# * Public instance methods
|
20
|
+
# * Protected attribute macros (attr_accessor, attr_writer, attr_reader)
|
21
|
+
# * Protected instance methods
|
22
|
+
# * Private attribute macros (attr_accessor, attr_writer, attr_reader)
|
23
|
+
# * Private instance methods
|
23
24
|
#
|
24
25
|
# You can configure the following order:
|
25
26
|
#
|
26
|
-
#
|
27
|
+
# [source,yaml]
|
28
|
+
# ----
|
27
29
|
# Layout/ClassStructure:
|
28
30
|
# ExpectedOrder:
|
29
31
|
# - module_inclusion
|
@@ -40,13 +42,14 @@ module RuboCop
|
|
40
42
|
# - private_attribute_macros
|
41
43
|
# - private_delegate
|
42
44
|
# - private_methods
|
43
|
-
#
|
45
|
+
# ----
|
44
46
|
#
|
45
47
|
# Instead of putting all literals in the expected order, is also
|
46
48
|
# possible to group categories of macros. Visibility levels are handled
|
47
49
|
# automatically.
|
48
50
|
#
|
49
|
-
#
|
51
|
+
# [source,yaml]
|
52
|
+
# ----
|
50
53
|
# Layout/ClassStructure:
|
51
54
|
# Categories:
|
52
55
|
# association:
|
@@ -63,7 +66,7 @@ module RuboCop
|
|
63
66
|
# - include
|
64
67
|
# - prepend
|
65
68
|
# - extend
|
66
|
-
#
|
69
|
+
# ----
|
67
70
|
#
|
68
71
|
# @example
|
69
72
|
# # bad
|
@@ -129,22 +132,18 @@ module RuboCop
|
|
129
132
|
# end
|
130
133
|
# end
|
131
134
|
#
|
132
|
-
|
133
|
-
|
135
|
+
class ClassStructure < Base
|
136
|
+
include VisibilityHelp
|
137
|
+
extend AutoCorrector
|
138
|
+
|
134
139
|
HUMANIZED_NODE_TYPE = {
|
135
140
|
casgn: :constants,
|
136
|
-
defs: :
|
141
|
+
defs: :public_class_methods,
|
137
142
|
def: :public_methods,
|
138
143
|
sclass: :class_singleton
|
139
144
|
}.freeze
|
140
145
|
|
141
|
-
|
142
|
-
MSG = '`%<category>s` is supposed to appear before ' \
|
143
|
-
'`%<previous>s`.'
|
144
|
-
|
145
|
-
def_node_matcher :visibility_block?, <<~PATTERN
|
146
|
-
(send nil? { :private :protected :public })
|
147
|
-
PATTERN
|
146
|
+
MSG = '`%<category>s` is supposed to appear before `%<previous>s`.'
|
148
147
|
|
149
148
|
# Validates code style on class declaration.
|
150
149
|
# Add offense when find a node out of expected order.
|
@@ -153,33 +152,29 @@ module RuboCop
|
|
153
152
|
walk_over_nested_class_definition(class_node) do |node, category|
|
154
153
|
index = expected_order.index(category)
|
155
154
|
if index < previous
|
156
|
-
message = format(MSG, category: category,
|
157
|
-
|
158
|
-
add_offense(node, message: message)
|
155
|
+
message = format(MSG, category: category, previous: expected_order[previous])
|
156
|
+
add_offense(node, message: message) { |corrector| autocorrect(corrector, node) }
|
159
157
|
end
|
160
158
|
previous = index
|
161
159
|
end
|
162
160
|
end
|
163
161
|
|
162
|
+
private
|
163
|
+
|
164
164
|
# Autocorrect by swapping between two nodes autocorrecting them
|
165
|
-
def autocorrect(node)
|
166
|
-
|
167
|
-
|
168
|
-
classification = classify(sibling)
|
169
|
-
!ignore?(classification) && node_classification != classification
|
165
|
+
def autocorrect(corrector, node)
|
166
|
+
previous = node.left_siblings.find do |sibling|
|
167
|
+
!ignore_for_autocorrect?(node, sibling)
|
170
168
|
end
|
169
|
+
return unless previous
|
171
170
|
|
172
171
|
current_range = source_range_with_comment(node)
|
173
172
|
previous_range = source_range_with_comment(previous)
|
174
173
|
|
175
|
-
|
176
|
-
|
177
|
-
corrector.remove(current_range)
|
178
|
-
end
|
174
|
+
corrector.insert_before(previous_range, current_range.source)
|
175
|
+
corrector.remove(current_range)
|
179
176
|
end
|
180
177
|
|
181
|
-
private
|
182
|
-
|
183
178
|
# Classifies a node to match with something in the {expected_order}
|
184
179
|
# @param node to be analysed
|
185
180
|
# @return String when the node type is a `:block` then
|
@@ -209,14 +204,19 @@ module RuboCop
|
|
209
204
|
name = node.method_name.to_s
|
210
205
|
category, = categories.find { |_, names| names.include?(name) }
|
211
206
|
key = category || name
|
212
|
-
visibility_key =
|
207
|
+
visibility_key =
|
208
|
+
if node.def_modifier?
|
209
|
+
"#{name}_methods"
|
210
|
+
else
|
211
|
+
"#{node_visibility(node)}_#{key}"
|
212
|
+
end
|
213
213
|
expected_order.include?(visibility_key) ? visibility_key : key
|
214
214
|
end
|
215
215
|
|
216
216
|
def walk_over_nested_class_definition(class_node)
|
217
217
|
class_elements(class_node).each do |node|
|
218
218
|
classification = classify(node)
|
219
|
-
next if ignore?(classification)
|
219
|
+
next if ignore?(node, classification)
|
220
220
|
|
221
221
|
yield node, classification
|
222
222
|
end
|
@@ -234,56 +234,59 @@ module RuboCop
|
|
234
234
|
end
|
235
235
|
end
|
236
236
|
|
237
|
-
def ignore?(classification)
|
237
|
+
def ignore?(node, classification)
|
238
238
|
classification.nil? ||
|
239
239
|
classification.to_s.end_with?('=') ||
|
240
|
-
expected_order.index(classification).nil?
|
240
|
+
expected_order.index(classification).nil? ||
|
241
|
+
private_constant?(node)
|
241
242
|
end
|
242
243
|
|
243
|
-
def
|
244
|
-
|
245
|
-
|
246
|
-
end
|
244
|
+
def ignore_for_autocorrect?(node, sibling)
|
245
|
+
classification = classify(node)
|
246
|
+
sibling_class = classify(sibling)
|
247
247
|
|
248
|
-
|
249
|
-
|
250
|
-
|
251
|
-
.find(&method(:visibility_block?))
|
248
|
+
ignore?(sibling, sibling_class) ||
|
249
|
+
classification == sibling_class ||
|
250
|
+
dynamic_constant?(node)
|
252
251
|
end
|
253
252
|
|
254
|
-
|
255
|
-
|
256
|
-
|
257
|
-
right = right_siblings_of(node)
|
258
|
-
right.find do |child_node|
|
259
|
-
possible_visibilities.include?(node_visibility(child_node))
|
260
|
-
end || right.last
|
261
|
-
end
|
253
|
+
def humanize_node(node)
|
254
|
+
if node.def_type?
|
255
|
+
return :initializer if node.method?(:initialize)
|
262
256
|
|
263
|
-
|
264
|
-
|
257
|
+
return "#{node_visibility(node)}_methods"
|
258
|
+
end
|
259
|
+
HUMANIZED_NODE_TYPE[node.type] || node.type
|
265
260
|
end
|
266
261
|
|
267
|
-
def
|
268
|
-
|
269
|
-
end
|
262
|
+
def dynamic_constant?(node)
|
263
|
+
return false unless node.casgn_type? && node.namespace.nil?
|
270
264
|
|
271
|
-
|
272
|
-
|
265
|
+
expression = node.expression
|
266
|
+
expression.send_type? &&
|
267
|
+
!(expression.method?(:freeze) && expression.receiver&.recursive_basic_literal?)
|
273
268
|
end
|
274
269
|
|
275
|
-
def
|
276
|
-
|
277
|
-
|
270
|
+
def private_constant?(node)
|
271
|
+
return false unless node.casgn_type? && node.namespace.nil?
|
272
|
+
return false unless (parent = node.parent)
|
278
273
|
|
279
|
-
|
274
|
+
parent.each_child_node(:send) do |child_node|
|
275
|
+
return true if marked_as_private_constant?(child_node, node.name)
|
280
276
|
end
|
281
|
-
|
277
|
+
false
|
278
|
+
end
|
279
|
+
|
280
|
+
def marked_as_private_constant?(node, name)
|
281
|
+
return false unless node.method?(:private_constant)
|
282
|
+
|
283
|
+
node.arguments.any? { |arg| (arg.sym_type? || arg.str_type?) && arg.value == name }
|
282
284
|
end
|
283
285
|
|
284
286
|
def source_range_with_comment(node)
|
285
287
|
begin_pos, end_pos =
|
286
|
-
if node.def_type?
|
288
|
+
if (node.def_type? && !node.method?(:initialize)) ||
|
289
|
+
(node.send_type? && node.def_modifier?)
|
287
290
|
start_node = find_visibility_start(node) || node
|
288
291
|
end_node = find_visibility_end(node) || node
|
289
292
|
[begin_pos_with_comment(start_node),
|
@@ -296,29 +299,36 @@ module RuboCop
|
|
296
299
|
end
|
297
300
|
|
298
301
|
def end_position_for(node)
|
302
|
+
heredoc = find_heredoc(node)
|
303
|
+
return heredoc.location.heredoc_end.end_pos + 1 if heredoc
|
304
|
+
|
299
305
|
end_line = buffer.line_for_position(node.loc.expression.end_pos)
|
300
306
|
buffer.line_range(end_line).end_pos
|
301
307
|
end
|
302
308
|
|
303
309
|
def begin_pos_with_comment(node)
|
304
|
-
annotation_line = node.first_line - 1
|
305
310
|
first_comment = nil
|
311
|
+
(node.first_line - 1).downto(1) do |annotation_line|
|
312
|
+
break unless (comment = processed_source.comment_at_line(annotation_line))
|
306
313
|
|
307
|
-
|
308
|
-
.reverse_each do |comment|
|
309
|
-
if comment.location.line == annotation_line
|
310
|
-
first_comment = comment
|
311
|
-
annotation_line -= 1
|
312
|
-
end
|
314
|
+
first_comment = comment if whole_line_comment_at_line?(annotation_line)
|
313
315
|
end
|
314
316
|
|
315
317
|
start_line_position(first_comment || node)
|
316
318
|
end
|
317
319
|
|
320
|
+
def whole_line_comment_at_line?(line)
|
321
|
+
/\A\s*#/.match?(processed_source.lines[line - 1])
|
322
|
+
end
|
323
|
+
|
318
324
|
def start_line_position(node)
|
319
325
|
buffer.line_range(node.loc.line).begin_pos - 1
|
320
326
|
end
|
321
327
|
|
328
|
+
def find_heredoc(node)
|
329
|
+
node.each_node(:str, :dstr, :xstr).find(&:heredoc?)
|
330
|
+
end
|
331
|
+
|
322
332
|
def buffer
|
323
333
|
processed_source.buffer
|
324
334
|
end
|
@@ -46,8 +46,9 @@ module RuboCop
|
|
46
46
|
# Hi
|
47
47
|
# EOS
|
48
48
|
#
|
49
|
-
class ClosingHeredocIndentation <
|
49
|
+
class ClosingHeredocIndentation < Base
|
50
50
|
include Heredoc
|
51
|
+
extend AutoCorrector
|
51
52
|
|
52
53
|
SIMPLE_HEREDOC = '<<'
|
53
54
|
MSG = '`%<closing>s` is not aligned with `%<opening>s`.'
|
@@ -59,11 +60,8 @@ module RuboCop
|
|
59
60
|
opening_indentation(node) == closing_indentation(node) ||
|
60
61
|
argument_indentation_correct?(node)
|
61
62
|
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
def autocorrect(node)
|
66
|
-
lambda do |corrector|
|
63
|
+
message = message(node)
|
64
|
+
add_offense(node.loc.heredoc_end, message: message) do |corrector|
|
67
65
|
corrector.replace(node.loc.heredoc_end, indented_end(node))
|
68
66
|
end
|
69
67
|
end
|