rubocop 0.52.1 → 0.93.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/LICENSE.txt +1 -1
- data/README.md +49 -38
- data/assets/output.html.erb +1 -1
- data/bin/console +10 -0
- data/bin/rubocop-profile +32 -0
- data/bin/setup +7 -0
- data/config/default.yml +3332 -538
- data/{bin → exe}/rubocop +0 -0
- data/lib/rubocop.rb +206 -158
- data/lib/rubocop/ast_aliases.rb +8 -0
- data/lib/rubocop/cached_data.rb +4 -2
- data/lib/rubocop/cli.rb +50 -187
- data/lib/rubocop/cli/command.rb +22 -0
- data/lib/rubocop/cli/command/auto_genenerate_config.rb +141 -0
- data/lib/rubocop/cli/command/base.rb +35 -0
- data/lib/rubocop/cli/command/execute_runner.rb +85 -0
- data/lib/rubocop/cli/command/init_dotfile.rb +46 -0
- data/lib/rubocop/cli/command/show_cops.rb +77 -0
- data/lib/rubocop/cli/command/version.rb +18 -0
- data/lib/rubocop/cli/environment.rb +22 -0
- data/lib/rubocop/comment_config.rb +73 -12
- data/lib/rubocop/config.rb +117 -385
- data/lib/rubocop/config_loader.rb +145 -92
- data/lib/rubocop/config_loader_resolver.rb +124 -30
- data/lib/rubocop/config_obsoletion.rb +283 -0
- data/lib/rubocop/config_regeneration.rb +33 -0
- data/lib/rubocop/config_store.rb +19 -5
- data/lib/rubocop/config_validator.rb +224 -0
- data/lib/rubocop/cop/autocorrect_logic.rb +73 -4
- data/lib/rubocop/cop/badge.rb +7 -7
- data/lib/rubocop/cop/base.rb +430 -0
- data/lib/rubocop/cop/bundler/duplicated_gem.rb +9 -3
- data/lib/rubocop/cop/bundler/gem_comment.rb +138 -0
- data/lib/rubocop/cop/bundler/insecure_protocol_source.rb +19 -25
- data/lib/rubocop/cop/bundler/ordered_gems.rb +6 -4
- data/lib/rubocop/cop/commissioner.rb +102 -62
- data/lib/rubocop/cop/cop.rb +104 -181
- data/lib/rubocop/cop/corrector.rb +82 -98
- data/lib/rubocop/cop/correctors/alignment_corrector.rb +50 -29
- data/lib/rubocop/cop/correctors/condition_corrector.rb +3 -6
- data/lib/rubocop/cop/correctors/each_to_for_corrector.rb +53 -0
- data/lib/rubocop/cop/correctors/empty_line_corrector.rb +9 -10
- data/lib/rubocop/cop/correctors/for_to_each_corrector.rb +73 -0
- data/lib/rubocop/cop/correctors/lambda_literal_to_method_corrector.rb +136 -0
- data/lib/rubocop/cop/correctors/line_break_corrector.rb +61 -0
- data/lib/rubocop/cop/correctors/multiline_literal_brace_corrector.rb +82 -45
- data/lib/rubocop/cop/correctors/parentheses_corrector.rb +6 -9
- data/lib/rubocop/cop/correctors/percent_literal_corrector.rb +112 -0
- data/lib/rubocop/cop/correctors/punctuation_corrector.rb +8 -10
- data/lib/rubocop/cop/correctors/space_corrector.rb +15 -3
- data/lib/rubocop/cop/correctors/string_literal_corrector.rb +2 -2
- data/lib/rubocop/cop/correctors/unused_arg_corrector.rb +18 -9
- data/lib/rubocop/cop/documentation.rb +22 -0
- data/lib/rubocop/cop/force.rb +2 -0
- data/lib/rubocop/cop/gemspec/duplicated_assignment.rb +7 -5
- data/lib/rubocop/cop/gemspec/ordered_dependencies.rb +5 -7
- data/lib/rubocop/cop/gemspec/required_ruby_version.rb +49 -25
- data/lib/rubocop/cop/gemspec/ruby_version_globals_usage.rb +55 -0
- data/lib/rubocop/cop/generator.rb +70 -37
- data/lib/rubocop/cop/generator/configuration_injector.rb +66 -0
- data/lib/rubocop/cop/generator/require_file_injector.rb +2 -2
- data/lib/rubocop/cop/ignored_node.rb +1 -3
- data/lib/rubocop/cop/internal_affairs.rb +1 -0
- data/lib/rubocop/cop/internal_affairs/method_name_equal.rb +52 -0
- data/lib/rubocop/cop/internal_affairs/node_destructuring.rb +13 -15
- data/lib/rubocop/cop/internal_affairs/node_type_predicate.rb +14 -16
- data/lib/rubocop/cop/internal_affairs/offense_location_keyword.rb +12 -11
- data/lib/rubocop/cop/internal_affairs/redundant_location_argument.rb +15 -22
- data/lib/rubocop/cop/internal_affairs/redundant_message_argument.rb +13 -11
- data/lib/rubocop/cop/internal_affairs/useless_message_assertion.rb +5 -5
- data/lib/rubocop/cop/layout/access_modifier_indentation.rb +15 -27
- data/lib/rubocop/cop/layout/{align_parameters.rb → argument_alignment.rb} +21 -17
- data/lib/rubocop/cop/layout/array_alignment.rb +83 -0
- data/lib/rubocop/cop/layout/{indent_assignment.rb → assignment_indentation.rb} +12 -3
- data/lib/rubocop/cop/layout/begin_end_alignment.rb +77 -0
- data/lib/rubocop/cop/{lint → layout}/block_alignment.rb +36 -29
- data/lib/rubocop/cop/layout/block_end_newline.rb +9 -20
- data/lib/rubocop/cop/layout/case_indentation.rb +23 -26
- data/lib/rubocop/cop/layout/class_structure.rb +97 -98
- data/lib/rubocop/cop/layout/closing_heredoc_indentation.rb +124 -0
- data/lib/rubocop/cop/layout/closing_parenthesis_indentation.rb +140 -30
- data/lib/rubocop/cop/layout/comment_indentation.rb +34 -7
- data/lib/rubocop/cop/{lint → layout}/condition_position.rb +18 -10
- data/lib/rubocop/cop/{lint → layout}/def_end_alignment.rb +11 -7
- data/lib/rubocop/cop/layout/dot_position.rb +31 -27
- data/lib/rubocop/cop/layout/else_alignment.rb +28 -15
- data/lib/rubocop/cop/layout/empty_comment.rb +158 -0
- data/lib/rubocop/cop/layout/empty_line_after_guard_clause.rb +160 -0
- data/lib/rubocop/cop/layout/empty_line_after_magic_comment.rb +17 -16
- data/lib/rubocop/cop/layout/empty_line_after_multiline_condition.rb +136 -0
- data/lib/rubocop/cop/layout/empty_line_between_defs.rb +32 -29
- data/lib/rubocop/cop/layout/empty_lines.rb +11 -12
- data/lib/rubocop/cop/layout/empty_lines_around_access_modifier.rb +147 -39
- data/lib/rubocop/cop/layout/empty_lines_around_arguments.rb +29 -18
- data/lib/rubocop/cop/layout/empty_lines_around_attribute_accessor.rb +118 -0
- data/lib/rubocop/cop/layout/empty_lines_around_begin_body.rb +4 -8
- data/lib/rubocop/cop/layout/empty_lines_around_block_body.rb +6 -7
- data/lib/rubocop/cop/layout/empty_lines_around_class_body.rb +28 -11
- data/lib/rubocop/cop/layout/empty_lines_around_exception_handling_keywords.rb +6 -9
- data/lib/rubocop/cop/layout/empty_lines_around_method_body.rb +4 -7
- data/lib/rubocop/cop/layout/empty_lines_around_module_body.rb +5 -9
- data/lib/rubocop/cop/{lint → layout}/end_alignment.rb +49 -23
- data/lib/rubocop/cop/layout/end_of_line.rb +48 -8
- data/lib/rubocop/cop/layout/extra_spacing.rb +71 -118
- data/lib/rubocop/cop/layout/first_argument_indentation.rb +251 -0
- data/lib/rubocop/cop/layout/{indent_array.rb → first_array_element_indentation.rb} +22 -16
- data/lib/rubocop/cop/layout/first_array_element_line_break.rb +4 -7
- data/lib/rubocop/cop/layout/{indent_hash.rb → first_hash_element_indentation.rb} +10 -9
- data/lib/rubocop/cop/layout/first_hash_element_line_break.rb +3 -6
- data/lib/rubocop/cop/layout/first_method_argument_line_break.rb +8 -12
- data/lib/rubocop/cop/layout/first_method_parameter_line_break.rb +3 -6
- data/lib/rubocop/cop/layout/first_parameter_indentation.rb +57 -76
- data/lib/rubocop/cop/layout/hash_alignment.rb +362 -0
- data/lib/rubocop/cop/layout/heredoc_argument_closing_parenthesis.rb +286 -0
- data/lib/rubocop/cop/layout/heredoc_indentation.rb +176 -0
- data/lib/rubocop/cop/layout/indentation_consistency.rb +155 -7
- data/lib/rubocop/cop/layout/indentation_style.rb +115 -0
- data/lib/rubocop/cop/layout/indentation_width.rb +72 -28
- data/lib/rubocop/cop/layout/initial_indentation.rb +24 -11
- data/lib/rubocop/cop/layout/leading_comment_space.rb +75 -12
- data/lib/rubocop/cop/layout/leading_empty_lines.rb +48 -0
- data/lib/rubocop/cop/layout/line_length.rb +280 -0
- data/lib/rubocop/cop/layout/multiline_array_brace_layout.rb +13 -16
- data/lib/rubocop/cop/layout/multiline_array_line_breaks.rb +36 -0
- data/lib/rubocop/cop/layout/multiline_assignment_layout.rb +18 -16
- data/lib/rubocop/cop/layout/multiline_block_layout.rb +74 -29
- data/lib/rubocop/cop/layout/multiline_hash_brace_layout.rb +6 -13
- data/lib/rubocop/cop/layout/multiline_hash_key_line_breaks.rb +47 -0
- data/lib/rubocop/cop/layout/multiline_method_argument_line_breaks.rb +48 -0
- data/lib/rubocop/cop/layout/multiline_method_call_brace_layout.rb +68 -38
- data/lib/rubocop/cop/layout/multiline_method_call_indentation.rb +7 -8
- data/lib/rubocop/cop/layout/multiline_method_definition_brace_layout.rb +80 -42
- data/lib/rubocop/cop/layout/multiline_operation_indentation.rb +29 -5
- data/lib/rubocop/cop/layout/parameter_alignment.rb +118 -0
- data/lib/rubocop/cop/layout/rescue_ensure_alignment.rb +142 -30
- data/lib/rubocop/cop/layout/space_after_colon.rb +13 -9
- data/lib/rubocop/cop/layout/space_after_comma.rb +2 -5
- data/lib/rubocop/cop/layout/space_after_method_name.rb +11 -9
- data/lib/rubocop/cop/layout/space_after_not.rb +13 -13
- data/lib/rubocop/cop/layout/space_after_semicolon.rb +2 -5
- data/lib/rubocop/cop/layout/space_around_block_parameters.rb +76 -47
- data/lib/rubocop/cop/layout/space_around_equals_in_parameter_default.rb +33 -24
- data/lib/rubocop/cop/layout/space_around_keyword.rb +42 -29
- data/lib/rubocop/cop/layout/space_around_method_call_operator.rb +98 -0
- data/lib/rubocop/cop/layout/space_around_operators.rb +132 -48
- data/lib/rubocop/cop/layout/space_before_block_braces.rb +69 -25
- data/lib/rubocop/cop/layout/space_before_comma.rb +3 -5
- data/lib/rubocop/cop/layout/space_before_comment.rb +15 -11
- data/lib/rubocop/cop/layout/space_before_first_arg.rb +18 -8
- data/lib/rubocop/cop/layout/space_before_semicolon.rb +2 -5
- data/lib/rubocop/cop/layout/space_in_lambda_literal.rb +29 -40
- data/lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb +68 -77
- data/lib/rubocop/cop/layout/space_inside_array_percent_literal.rb +5 -10
- data/lib/rubocop/cop/layout/space_inside_block_braces.rb +41 -24
- data/lib/rubocop/cop/layout/space_inside_hash_literal_braces.rb +68 -62
- data/lib/rubocop/cop/layout/space_inside_parens.rb +72 -17
- data/lib/rubocop/cop/layout/space_inside_percent_literal_delimiters.rb +8 -13
- data/lib/rubocop/cop/layout/space_inside_range_literal.rb +10 -19
- data/lib/rubocop/cop/layout/space_inside_reference_brackets.rb +76 -26
- data/lib/rubocop/cop/layout/space_inside_string_interpolation.rb +26 -42
- data/lib/rubocop/cop/layout/trailing_empty_lines.rb +108 -0
- data/lib/rubocop/cop/layout/trailing_whitespace.rb +58 -9
- data/lib/rubocop/cop/legacy/corrections_proxy.rb +49 -0
- data/lib/rubocop/cop/legacy/corrector.rb +29 -0
- data/lib/rubocop/cop/lint/ambiguous_block_association.rb +15 -7
- data/lib/rubocop/cop/lint/ambiguous_operator.rb +54 -6
- data/lib/rubocop/cop/lint/ambiguous_regexp_literal.rb +36 -7
- data/lib/rubocop/cop/lint/assignment_in_condition.rb +30 -27
- data/lib/rubocop/cop/lint/big_decimal_new.rb +43 -0
- data/lib/rubocop/cop/lint/binary_operator_with_identical_operands.rb +50 -0
- data/lib/rubocop/cop/lint/boolean_symbol.rb +23 -3
- data/lib/rubocop/cop/lint/circular_argument_reference.rb +3 -3
- data/lib/rubocop/cop/lint/constant_definition_in_block.rb +74 -0
- data/lib/rubocop/cop/lint/constant_resolution.rb +89 -0
- data/lib/rubocop/cop/lint/debugger.rb +14 -11
- data/lib/rubocop/cop/lint/deprecated_class_methods.rb +41 -23
- data/lib/rubocop/cop/lint/deprecated_open_ssl_constant.rb +141 -0
- data/lib/rubocop/cop/lint/disjunctive_assignment_in_constructor.rb +87 -0
- data/lib/rubocop/cop/lint/duplicate_case_condition.rb +2 -2
- data/lib/rubocop/cop/lint/duplicate_elsif_condition.rb +39 -0
- data/lib/rubocop/cop/lint/{duplicated_key.rb → duplicate_hash_key.rb} +2 -2
- data/lib/rubocop/cop/lint/duplicate_methods.rb +44 -30
- data/lib/rubocop/cop/lint/duplicate_require.rb +46 -0
- data/lib/rubocop/cop/lint/duplicate_rescue_exception.rb +47 -0
- data/lib/rubocop/cop/lint/each_with_object_argument.rb +7 -3
- data/lib/rubocop/cop/lint/else_layout.rb +3 -2
- data/lib/rubocop/cop/lint/empty_conditional_body.rb +67 -0
- data/lib/rubocop/cop/lint/empty_ensure.rb +6 -6
- data/lib/rubocop/cop/lint/empty_expression.rb +3 -3
- data/lib/rubocop/cop/lint/empty_file.rb +50 -0
- data/lib/rubocop/cop/lint/empty_interpolation.rb +9 -10
- data/lib/rubocop/cop/lint/empty_when.rb +32 -9
- data/lib/rubocop/cop/lint/ensure_return.rb +31 -13
- data/lib/rubocop/cop/lint/erb_new_arguments.rb +165 -0
- data/lib/rubocop/cop/{style → lint}/flip_flop.rb +5 -4
- data/lib/rubocop/cop/lint/float_comparison.rb +93 -0
- data/lib/rubocop/cop/lint/float_out_of_range.rb +3 -3
- data/lib/rubocop/cop/lint/format_parameter_mismatch.rb +65 -46
- data/lib/rubocop/cop/lint/hash_compare_by_identity.rb +37 -0
- data/lib/rubocop/cop/lint/heredoc_method_call_position.rb +155 -0
- data/lib/rubocop/cop/lint/identity_comparison.rb +51 -0
- data/lib/rubocop/cop/lint/implicit_string_concatenation.rb +26 -19
- data/lib/rubocop/cop/lint/ineffective_access_modifier.rb +43 -67
- data/lib/rubocop/cop/lint/inherit_exception.rb +34 -9
- data/lib/rubocop/cop/lint/interpolation_check.rb +24 -5
- data/lib/rubocop/cop/lint/literal_as_condition.rb +30 -24
- data/lib/rubocop/cop/lint/literal_in_interpolation.rb +38 -16
- data/lib/rubocop/cop/lint/loop.rb +31 -8
- data/lib/rubocop/cop/lint/missing_cop_enable_directive.rb +15 -11
- data/lib/rubocop/cop/lint/missing_super.rb +99 -0
- data/lib/rubocop/cop/lint/mixed_regexp_capture_types.rb +37 -0
- data/lib/rubocop/cop/lint/{multiple_compare.rb → multiple_comparison.rb} +12 -13
- data/lib/rubocop/cop/lint/nested_method_definition.rb +21 -26
- data/lib/rubocop/cop/lint/nested_percent_literal.rb +7 -14
- data/lib/rubocop/cop/lint/next_without_accumulator.rb +3 -3
- data/lib/rubocop/cop/lint/non_deterministic_require_order.rb +160 -0
- data/lib/rubocop/cop/lint/non_local_exit_from_iterator.rb +14 -16
- data/lib/rubocop/cop/lint/number_conversion.rb +79 -0
- data/lib/rubocop/cop/lint/ordered_magic_comments.rb +84 -0
- data/lib/rubocop/cop/lint/out_of_range_regexp_ref.rb +79 -0
- data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb +39 -15
- data/lib/rubocop/cop/lint/percent_string_array.rb +10 -17
- data/lib/rubocop/cop/lint/percent_symbol_array.rb +21 -17
- data/lib/rubocop/cop/lint/raise_exception.rb +86 -0
- data/lib/rubocop/cop/lint/rand_one.rb +7 -6
- data/lib/rubocop/cop/lint/{unneeded_disable.rb → redundant_cop_disable_directive.rb} +91 -76
- data/lib/rubocop/cop/lint/redundant_cop_enable_directive.rb +125 -0
- data/lib/rubocop/cop/lint/{unneeded_require_statement.rb → redundant_require_statement.rb} +12 -15
- data/lib/rubocop/cop/lint/redundant_safe_navigation.rb +78 -0
- data/lib/rubocop/cop/lint/{unneeded_splat_expansion.rb → redundant_splat_expansion.rb} +32 -23
- data/lib/rubocop/cop/lint/{string_conversion_in_interpolation.rb → redundant_string_coercion.rb} +15 -21
- data/lib/rubocop/cop/lint/redundant_with_index.rb +17 -18
- data/lib/rubocop/cop/lint/redundant_with_object.rb +18 -19
- data/lib/rubocop/cop/lint/regexp_as_condition.rb +7 -3
- data/lib/rubocop/cop/lint/require_parentheses.rb +6 -3
- data/lib/rubocop/cop/lint/rescue_exception.rb +4 -3
- data/lib/rubocop/cop/lint/rescue_type.rb +15 -12
- data/lib/rubocop/cop/lint/return_in_void_context.rb +4 -6
- data/lib/rubocop/cop/lint/safe_navigation_chain.rb +21 -29
- data/lib/rubocop/cop/lint/safe_navigation_consistency.rb +98 -0
- data/lib/rubocop/cop/lint/safe_navigation_with_empty.rb +46 -0
- data/lib/rubocop/cop/lint/script_permission.rb +40 -16
- data/lib/rubocop/cop/lint/self_assignment.rb +78 -0
- data/lib/rubocop/cop/lint/send_with_mixin_argument.rb +87 -0
- data/lib/rubocop/cop/lint/shadowed_argument.rb +51 -15
- data/lib/rubocop/cop/lint/shadowed_exception.rb +47 -28
- data/lib/rubocop/cop/lint/shadowing_outer_local_variable.rb +9 -9
- data/lib/rubocop/cop/lint/struct_new_override.rb +59 -0
- data/lib/rubocop/cop/lint/suppressed_exception.rb +89 -0
- data/lib/rubocop/cop/lint/syntax.rb +12 -28
- data/lib/rubocop/cop/lint/to_json.rb +50 -0
- data/lib/rubocop/cop/lint/top_level_return_with_argument.rb +34 -0
- data/lib/rubocop/cop/lint/trailing_comma_in_attribute_declaration.rb +57 -0
- data/lib/rubocop/cop/lint/underscore_prefixed_variable_name.rb +30 -10
- data/lib/rubocop/cop/lint/unified_integer.rb +6 -8
- data/lib/rubocop/cop/lint/unreachable_code.rb +10 -8
- data/lib/rubocop/cop/lint/unreachable_loop.rb +171 -0
- data/lib/rubocop/cop/lint/unused_block_argument.rb +30 -9
- data/lib/rubocop/cop/lint/unused_method_argument.rb +64 -15
- data/lib/rubocop/cop/lint/uri_escape_unescape.rb +19 -16
- data/lib/rubocop/cop/lint/uri_regexp.rb +12 -47
- data/lib/rubocop/cop/lint/useless_access_modifier.rb +110 -47
- data/lib/rubocop/cop/lint/useless_assignment.rb +12 -14
- data/lib/rubocop/cop/lint/useless_else_without_rescue.rb +10 -11
- data/lib/rubocop/cop/lint/useless_method_definition.rb +70 -0
- data/lib/rubocop/cop/lint/useless_setter_call.rb +17 -16
- data/lib/rubocop/cop/lint/useless_times.rb +106 -0
- data/lib/rubocop/cop/lint/void.rb +63 -35
- data/lib/rubocop/cop/message_annotator.rb +22 -11
- data/lib/rubocop/cop/metrics/abc_size.rb +4 -19
- data/lib/rubocop/cop/metrics/block_length.rb +46 -4
- data/lib/rubocop/cop/metrics/block_nesting.rb +4 -3
- data/lib/rubocop/cop/metrics/class_length.rb +43 -2
- data/lib/rubocop/cop/metrics/cyclomatic_complexity.rb +38 -5
- data/lib/rubocop/cop/metrics/method_length.rb +31 -4
- data/lib/rubocop/cop/metrics/module_length.rb +35 -2
- data/lib/rubocop/cop/metrics/parameter_lists.rb +4 -8
- data/lib/rubocop/cop/metrics/perceived_complexity.rb +9 -11
- data/lib/rubocop/cop/metrics/utils/abc_size_calculator.rb +138 -0
- data/lib/rubocop/cop/metrics/utils/code_length_calculator.rb +158 -0
- data/lib/rubocop/cop/metrics/utils/iterating_block.rb +61 -0
- data/lib/rubocop/cop/metrics/utils/repeated_csend_discount.rb +37 -0
- data/lib/rubocop/cop/migration/department_name.rb +83 -0
- data/lib/rubocop/cop/mixin/alignment.rb +12 -6
- data/lib/rubocop/cop/mixin/allowed_methods.rb +21 -0
- data/lib/rubocop/cop/mixin/annotation_comment.rb +6 -0
- data/lib/rubocop/cop/mixin/array_min_size.rb +2 -4
- data/lib/rubocop/cop/mixin/array_syntax.rb +1 -1
- data/lib/rubocop/cop/mixin/auto_corrector.rb +12 -0
- data/lib/rubocop/cop/mixin/check_assignment.rb +13 -9
- data/lib/rubocop/cop/mixin/check_line_breakable.rb +193 -0
- data/lib/rubocop/cop/mixin/code_length.rb +28 -3
- data/lib/rubocop/cop/mixin/comments_help.rb +48 -0
- data/lib/rubocop/cop/mixin/configurable_enforced_style.rb +8 -5
- data/lib/rubocop/cop/mixin/configurable_formatting.rb +4 -7
- data/lib/rubocop/cop/mixin/configurable_max.rb +4 -2
- data/lib/rubocop/cop/mixin/configurable_naming.rb +2 -2
- data/lib/rubocop/cop/mixin/configurable_numbering.rb +3 -3
- data/lib/rubocop/cop/mixin/def_node.rb +5 -1
- data/lib/rubocop/cop/mixin/documentation_comment.rb +13 -7
- data/lib/rubocop/cop/mixin/empty_lines_around_body.rb +35 -18
- data/lib/rubocop/cop/mixin/empty_parameter.rb +5 -2
- data/lib/rubocop/cop/mixin/end_keyword_alignment.rb +24 -6
- data/lib/rubocop/cop/mixin/enforce_superclass.rb +6 -4
- data/lib/rubocop/cop/mixin/first_element_line_break.rb +4 -2
- data/lib/rubocop/cop/mixin/frozen_string_literal.rb +31 -6
- data/lib/rubocop/cop/mixin/{hash_alignment.rb → hash_alignment_styles.rb} +38 -7
- data/lib/rubocop/cop/mixin/hash_transform_method.rb +197 -0
- data/lib/rubocop/cop/mixin/heredoc.rb +6 -2
- data/lib/rubocop/cop/mixin/ignored_methods.rb +19 -0
- data/lib/rubocop/cop/mixin/ignored_pattern.rb +1 -1
- data/lib/rubocop/cop/mixin/integer_node.rb +1 -1
- data/lib/rubocop/cop/mixin/interpolation.rb +27 -0
- data/lib/rubocop/cop/mixin/line_length_help.rb +87 -0
- data/lib/rubocop/cop/mixin/match_range.rb +2 -0
- data/lib/rubocop/cop/mixin/method_complexity.rb +18 -4
- data/lib/rubocop/cop/mixin/method_preference.rb +2 -1
- data/lib/rubocop/cop/mixin/min_body_length.rb +1 -1
- data/lib/rubocop/cop/mixin/{array_hash_indentation.rb → multiline_element_indentation.rb} +3 -2
- data/lib/rubocop/cop/mixin/multiline_element_line_breaks.rb +35 -0
- data/lib/rubocop/cop/mixin/multiline_expression_indentation.rb +42 -13
- data/lib/rubocop/cop/mixin/multiline_literal_brace_layout.rb +17 -14
- data/lib/rubocop/cop/mixin/negative_conditional.rb +3 -3
- data/lib/rubocop/cop/mixin/nil_methods.rb +23 -0
- data/lib/rubocop/cop/mixin/ordered_gem_node.rb +15 -2
- data/lib/rubocop/cop/mixin/parentheses.rb +1 -2
- data/lib/rubocop/cop/mixin/percent_array.rb +18 -11
- data/lib/rubocop/cop/mixin/percent_literal.rb +3 -65
- data/lib/rubocop/cop/mixin/preceding_following_alignment.rb +96 -6
- data/lib/rubocop/cop/mixin/preferred_delimiters.rb +53 -0
- data/lib/rubocop/cop/mixin/range_help.rb +131 -0
- data/lib/rubocop/cop/mixin/rational_literal.rb +18 -0
- data/lib/rubocop/cop/mixin/rescue_node.rb +13 -4
- data/lib/rubocop/cop/mixin/safe_assignment.rb +2 -1
- data/lib/rubocop/cop/mixin/space_after_punctuation.rb +13 -11
- data/lib/rubocop/cop/mixin/space_before_punctuation.rb +16 -13
- data/lib/rubocop/cop/mixin/statement_modifier.rb +48 -18
- data/lib/rubocop/cop/mixin/string_literals_help.rb +2 -1
- data/lib/rubocop/cop/mixin/surrounding_space.rb +62 -42
- data/lib/rubocop/cop/mixin/target_ruby_version.rb +5 -1
- data/lib/rubocop/cop/mixin/trailing_body.rb +26 -0
- data/lib/rubocop/cop/mixin/trailing_comma.rb +96 -46
- data/lib/rubocop/cop/mixin/uncommunicative_name.rb +106 -0
- data/lib/rubocop/cop/mixin/unused_argument.rb +4 -6
- data/lib/rubocop/cop/mixin/visibility_help.rb +38 -0
- data/lib/rubocop/cop/naming/accessor_method_name.rb +6 -4
- data/lib/rubocop/cop/naming/ascii_identifiers.rb +33 -7
- data/lib/rubocop/cop/naming/binary_operator_parameter_name.rb +7 -6
- data/lib/rubocop/cop/naming/block_parameter_name.rb +49 -0
- data/lib/rubocop/cop/naming/class_and_module_camel_case.rb +15 -5
- data/lib/rubocop/cop/naming/constant_name.rb +35 -11
- data/lib/rubocop/cop/naming/file_name.rb +58 -33
- data/lib/rubocop/cop/naming/heredoc_delimiter_case.rb +3 -3
- data/lib/rubocop/cop/naming/heredoc_delimiter_naming.rb +10 -14
- data/lib/rubocop/cop/naming/memoized_instance_variable_name.rb +171 -0
- data/lib/rubocop/cop/naming/method_name.rb +41 -2
- data/lib/rubocop/cop/naming/method_parameter_name.rb +58 -0
- data/lib/rubocop/cop/naming/predicate_name.rb +18 -15
- data/lib/rubocop/cop/naming/rescued_exceptions_variable_name.rb +113 -0
- data/lib/rubocop/cop/naming/variable_name.rb +4 -2
- data/lib/rubocop/cop/naming/variable_number.rb +3 -3
- data/lib/rubocop/cop/offense.rb +64 -13
- data/lib/rubocop/cop/registry.rb +118 -14
- data/lib/rubocop/cop/security/eval.rb +6 -4
- data/lib/rubocop/cop/security/json_load.rb +11 -12
- data/lib/rubocop/cop/security/marshal_load.rb +5 -6
- data/lib/rubocop/cop/security/open.rb +72 -0
- data/lib/rubocop/cop/security/yaml_load.rb +9 -8
- data/lib/rubocop/cop/severity.rb +2 -11
- data/lib/rubocop/cop/style/access_modifier_declarations.rb +135 -0
- data/lib/rubocop/cop/style/accessor_grouping.rb +152 -0
- data/lib/rubocop/cop/style/alias.rb +51 -38
- data/lib/rubocop/cop/style/and_or.rb +23 -25
- data/lib/rubocop/cop/style/array_coercion.rb +67 -0
- data/lib/rubocop/cop/style/array_join.rb +10 -11
- data/lib/rubocop/cop/style/ascii_comments.rb +7 -4
- data/lib/rubocop/cop/style/attr.rb +25 -14
- data/lib/rubocop/cop/style/auto_resource_cleanup.rb +8 -8
- data/lib/rubocop/cop/style/bare_percent_literals.rb +14 -16
- data/lib/rubocop/cop/style/begin_block.rb +9 -3
- data/lib/rubocop/cop/style/bisected_attr_accessor.rb +141 -0
- data/lib/rubocop/cop/style/block_comments.rb +25 -19
- data/lib/rubocop/cop/style/block_delimiters.rb +131 -37
- data/lib/rubocop/cop/style/case_equality.rb +55 -5
- data/lib/rubocop/cop/style/case_like_if.rb +252 -0
- data/lib/rubocop/cop/style/character_literal.rb +3 -3
- data/lib/rubocop/cop/style/class_and_module_children.rb +43 -36
- data/lib/rubocop/cop/style/class_check.rb +7 -12
- data/lib/rubocop/cop/style/class_equality_comparison.rb +64 -0
- data/lib/rubocop/cop/style/class_methods.rb +19 -31
- data/lib/rubocop/cop/style/class_methods_definitions.rb +157 -0
- data/lib/rubocop/cop/style/class_vars.rb +47 -7
- data/lib/rubocop/cop/style/collection_methods.rb +40 -18
- data/lib/rubocop/cop/style/colon_method_call.rb +11 -13
- data/lib/rubocop/cop/style/colon_method_definition.rb +7 -6
- data/lib/rubocop/cop/style/combinable_loops.rb +91 -0
- data/lib/rubocop/cop/style/command_literal.rb +41 -34
- data/lib/rubocop/cop/style/comment_annotation.rb +35 -22
- data/lib/rubocop/cop/style/commented_keyword.rb +24 -33
- data/lib/rubocop/cop/style/conditional_assignment.rb +108 -138
- data/lib/rubocop/cop/style/constant_visibility.rb +78 -0
- data/lib/rubocop/cop/style/copyright.rb +39 -28
- data/lib/rubocop/cop/style/date_time.rb +55 -11
- data/lib/rubocop/cop/style/def_with_parentheses.rb +9 -11
- data/lib/rubocop/cop/style/dir.rb +11 -13
- data/lib/rubocop/cop/style/disable_cops_within_source_code_directive.rb +47 -0
- data/lib/rubocop/cop/style/documentation.rb +62 -23
- data/lib/rubocop/cop/style/documentation_method.rb +52 -3
- data/lib/rubocop/cop/style/double_cop_disable_directive.rb +52 -0
- data/lib/rubocop/cop/style/double_negation.rb +46 -8
- data/lib/rubocop/cop/style/each_for_simple_loop.rb +7 -10
- data/lib/rubocop/cop/style/each_with_object.rb +30 -19
- data/lib/rubocop/cop/style/empty_block_parameter.rb +12 -12
- data/lib/rubocop/cop/style/empty_case_condition.rb +36 -12
- data/lib/rubocop/cop/style/empty_else.rb +28 -24
- data/lib/rubocop/cop/style/empty_lambda_parameter.rb +13 -12
- data/lib/rubocop/cop/style/empty_literal.rb +34 -31
- data/lib/rubocop/cop/style/empty_method.rb +14 -18
- data/lib/rubocop/cop/style/encoding.rb +17 -14
- data/lib/rubocop/cop/style/end_block.rb +15 -3
- data/lib/rubocop/cop/style/eval_with_location.rb +15 -13
- data/lib/rubocop/cop/style/even_odd.rb +13 -16
- data/lib/rubocop/cop/style/expand_path_arguments.rb +195 -0
- data/lib/rubocop/cop/style/explicit_block_argument.rb +106 -0
- data/lib/rubocop/cop/style/exponential_notation.rb +117 -0
- data/lib/rubocop/cop/style/float_division.rb +93 -0
- data/lib/rubocop/cop/style/for.rb +48 -21
- data/lib/rubocop/cop/style/format_string.rb +52 -49
- data/lib/rubocop/cop/style/format_string_token.rb +32 -77
- data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +131 -62
- data/lib/rubocop/cop/style/global_std_stream.rb +65 -0
- data/lib/rubocop/cop/style/global_vars.rb +5 -5
- data/lib/rubocop/cop/style/guard_clause.rb +69 -16
- data/lib/rubocop/cop/style/hash_as_last_array_item.rb +88 -0
- data/lib/rubocop/cop/style/hash_each_methods.rb +86 -0
- data/lib/rubocop/cop/style/hash_like_case.rb +76 -0
- data/lib/rubocop/cop/style/hash_syntax.rb +39 -31
- data/lib/rubocop/cop/style/hash_transform_keys.rb +91 -0
- data/lib/rubocop/cop/style/hash_transform_values.rb +88 -0
- data/lib/rubocop/cop/style/identical_conditional_branches.rb +11 -15
- data/lib/rubocop/cop/style/if_inside_else.rb +46 -4
- data/lib/rubocop/cop/style/if_unless_modifier.rb +114 -46
- data/lib/rubocop/cop/style/if_unless_modifier_of_if_unless.rb +12 -4
- data/lib/rubocop/cop/style/if_with_semicolon.rb +18 -4
- data/lib/rubocop/cop/style/implicit_runtime_error.rb +3 -2
- data/lib/rubocop/cop/style/infinite_loop.rb +64 -27
- data/lib/rubocop/cop/style/inline_comment.rb +6 -4
- data/lib/rubocop/cop/style/inverse_methods.rb +78 -40
- data/lib/rubocop/cop/style/ip_addresses.rb +76 -0
- data/lib/rubocop/cop/style/keyword_parameters_order.rb +53 -0
- data/lib/rubocop/cop/style/lambda.rb +15 -99
- data/lib/rubocop/cop/style/lambda_call.rb +17 -34
- data/lib/rubocop/cop/style/line_end_concatenation.rb +37 -28
- data/lib/rubocop/cop/style/method_call_with_args_parentheses.rb +136 -35
- data/lib/rubocop/cop/style/method_call_with_args_parentheses/omit_parentheses.rb +174 -0
- data/lib/rubocop/cop/style/method_call_with_args_parentheses/require_parentheses.rb +48 -0
- data/lib/rubocop/cop/style/method_call_without_args_parentheses.rb +17 -18
- data/lib/rubocop/cop/style/method_called_on_do_end_block.rb +17 -5
- data/lib/rubocop/cop/style/method_def_parentheses.rb +27 -27
- data/lib/rubocop/cop/style/min_max.rb +10 -14
- data/lib/rubocop/cop/style/missing_else.rb +87 -31
- data/lib/rubocop/cop/style/missing_respond_to_missing.rb +53 -0
- data/lib/rubocop/cop/style/mixin_grouping.rb +42 -42
- data/lib/rubocop/cop/style/mixin_usage.rb +16 -27
- data/lib/rubocop/cop/style/module_function.rb +85 -18
- data/lib/rubocop/cop/style/multiline_block_chain.rb +16 -5
- data/lib/rubocop/cop/style/multiline_if_modifier.rb +5 -12
- data/lib/rubocop/cop/style/multiline_if_then.rb +8 -13
- data/lib/rubocop/cop/style/multiline_memoization.rb +17 -14
- data/lib/rubocop/cop/style/multiline_method_signature.rb +61 -0
- data/lib/rubocop/cop/style/multiline_ternary_operator.rb +32 -10
- data/lib/rubocop/cop/style/multiline_when_then.rb +73 -0
- data/lib/rubocop/cop/style/multiple_comparison.rb +20 -5
- data/lib/rubocop/cop/style/mutable_constant.rb +130 -19
- data/lib/rubocop/cop/style/negated_if.rb +10 -10
- data/lib/rubocop/cop/style/negated_unless.rb +89 -0
- data/lib/rubocop/cop/style/negated_while.rb +25 -15
- data/lib/rubocop/cop/style/nested_modifier.rb +37 -20
- data/lib/rubocop/cop/style/nested_parenthesized_calls.rb +26 -24
- data/lib/rubocop/cop/style/nested_ternary_operator.rb +41 -3
- data/lib/rubocop/cop/style/next.rb +40 -43
- data/lib/rubocop/cop/style/nil_comparison.rb +51 -9
- data/lib/rubocop/cop/style/non_nil_check.rb +55 -35
- data/lib/rubocop/cop/style/not.rb +26 -29
- data/lib/rubocop/cop/style/numeric_literal_prefix.rb +43 -25
- data/lib/rubocop/cop/style/numeric_literals.rb +28 -15
- data/lib/rubocop/cop/style/numeric_predicate.rb +19 -27
- data/lib/rubocop/cop/style/one_line_conditional.rb +95 -27
- data/lib/rubocop/cop/style/option_hash.rb +14 -3
- 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 +27 -16
- data/lib/rubocop/cop/style/parallel_assignment.rb +20 -20
- data/lib/rubocop/cop/style/parentheses_around_condition.rb +50 -10
- data/lib/rubocop/cop/style/percent_literal_delimiters.rb +26 -26
- data/lib/rubocop/cop/style/percent_q_literals.rb +10 -12
- data/lib/rubocop/cop/style/perl_backrefs.rb +9 -11
- data/lib/rubocop/cop/style/preferred_hash_methods.rb +12 -14
- data/lib/rubocop/cop/style/proc.rb +9 -9
- data/lib/rubocop/cop/style/raise_args.rb +30 -30
- data/lib/rubocop/cop/style/random_with_offset.rb +65 -72
- data/lib/rubocop/cop/style/redundant_assignment.rb +107 -0
- data/lib/rubocop/cop/style/redundant_begin.rb +69 -10
- data/lib/rubocop/cop/style/{unneeded_capital_w.rb → redundant_capital_w.rb} +7 -10
- data/lib/rubocop/cop/style/redundant_condition.rb +139 -0
- data/lib/rubocop/cop/style/redundant_conditional.rb +13 -12
- data/lib/rubocop/cop/style/redundant_exception.rb +28 -17
- data/lib/rubocop/cop/style/redundant_fetch_block.rb +113 -0
- data/lib/rubocop/cop/style/redundant_file_extension_in_require.rb +51 -0
- data/lib/rubocop/cop/style/redundant_freeze.rb +29 -9
- data/lib/rubocop/cop/style/{unneeded_interpolation.rb → redundant_interpolation.rb} +34 -28
- data/lib/rubocop/cop/style/redundant_parentheses.rb +73 -39
- data/lib/rubocop/cop/style/{unneeded_percent_q.rb → redundant_percent_q.rb} +36 -23
- data/lib/rubocop/cop/style/redundant_regexp_character_class.rb +98 -0
- data/lib/rubocop/cop/style/redundant_regexp_escape.rb +105 -0
- data/lib/rubocop/cop/style/redundant_return.rb +90 -55
- data/lib/rubocop/cop/style/redundant_self.rb +39 -25
- data/lib/rubocop/cop/style/redundant_self_assignment.rb +116 -0
- data/lib/rubocop/cop/style/redundant_sort.rb +162 -0
- data/lib/rubocop/cop/{performance → style}/redundant_sort_by.rb +10 -12
- data/lib/rubocop/cop/style/regexp_literal.rb +76 -34
- data/lib/rubocop/cop/style/rescue_modifier.rb +55 -10
- data/lib/rubocop/cop/style/rescue_standard_error.rb +27 -21
- data/lib/rubocop/cop/style/return_nil.rb +9 -9
- data/lib/rubocop/cop/style/safe_navigation.rb +130 -50
- data/lib/rubocop/cop/{performance → style}/sample.rb +28 -26
- data/lib/rubocop/cop/style/self_assignment.rb +27 -23
- data/lib/rubocop/cop/style/semicolon.rb +32 -14
- data/lib/rubocop/cop/style/send.rb +6 -6
- data/lib/rubocop/cop/style/signal_exception.rb +29 -22
- data/lib/rubocop/cop/style/single_argument_dig.rb +55 -0
- data/lib/rubocop/cop/style/single_line_block_params.rb +25 -3
- data/lib/rubocop/cop/style/single_line_methods.rb +31 -32
- data/lib/rubocop/cop/style/slicing_with_range.rb +37 -0
- data/lib/rubocop/cop/style/sole_nested_conditional.rb +66 -0
- data/lib/rubocop/cop/style/special_global_vars.rb +74 -33
- data/lib/rubocop/cop/style/stabby_lambda_parentheses.rb +21 -27
- data/lib/rubocop/cop/style/stderr_puts.rb +17 -11
- data/lib/rubocop/cop/style/string_concatenation.rb +106 -0
- data/lib/rubocop/cop/style/string_hash_keys.rb +22 -9
- data/lib/rubocop/cop/style/string_literals.rb +3 -3
- data/lib/rubocop/cop/style/string_literals_in_interpolation.rb +1 -1
- data/lib/rubocop/cop/style/string_methods.rb +8 -17
- data/lib/rubocop/cop/style/strip.rb +41 -0
- data/lib/rubocop/cop/style/struct_inheritance.rb +34 -9
- data/lib/rubocop/cop/style/symbol_array.rb +47 -20
- data/lib/rubocop/cop/style/symbol_literal.rb +7 -9
- data/lib/rubocop/cop/style/symbol_proc.rb +32 -59
- data/lib/rubocop/cop/style/ternary_parentheses.rb +60 -35
- data/lib/rubocop/cop/style/trailing_body_on_class.rb +40 -0
- data/lib/rubocop/cop/style/trailing_body_on_method_definition.rb +12 -62
- data/lib/rubocop/cop/style/trailing_body_on_module.rb +40 -0
- data/lib/rubocop/cop/style/trailing_comma_in_arguments.rb +49 -25
- data/lib/rubocop/cop/style/trailing_comma_in_array_literal.rb +96 -0
- data/lib/rubocop/cop/style/trailing_comma_in_block_args.rb +90 -0
- data/lib/rubocop/cop/style/trailing_comma_in_hash_literal.rb +97 -0
- data/lib/rubocop/cop/style/trailing_method_end_statement.rb +12 -39
- data/lib/rubocop/cop/style/trailing_underscore_variable.rb +20 -23
- data/lib/rubocop/cop/style/trivial_accessors.rb +42 -37
- data/lib/rubocop/cop/style/unless_else.rb +10 -12
- data/lib/rubocop/cop/style/unpack_first.rb +58 -0
- data/lib/rubocop/cop/style/variable_interpolation.rb +12 -25
- data/lib/rubocop/cop/style/when_then.rb +6 -8
- data/lib/rubocop/cop/style/while_until_do.rb +7 -17
- data/lib/rubocop/cop/style/while_until_modifier.rb +9 -23
- data/lib/rubocop/cop/style/word_array.rb +18 -28
- data/lib/rubocop/cop/style/yoda_condition.rb +84 -29
- data/lib/rubocop/cop/style/zero_length_predicate.rb +34 -24
- data/lib/rubocop/cop/team.rb +160 -91
- data/lib/rubocop/cop/util.rb +38 -216
- data/lib/rubocop/cop/utils/format_string.rb +135 -0
- data/lib/rubocop/cop/variable_force.rb +40 -35
- data/lib/rubocop/cop/variable_force/assignment.rb +5 -0
- data/lib/rubocop/cop/variable_force/branch.rb +6 -7
- data/lib/rubocop/cop/variable_force/branchable.rb +2 -0
- data/lib/rubocop/cop/variable_force/scope.rb +7 -0
- data/lib/rubocop/cop/variable_force/variable.rb +23 -10
- data/lib/rubocop/cop/variable_force/variable_table.rb +4 -3
- data/lib/rubocop/cops_documentation_generator.rb +284 -0
- data/lib/rubocop/core_ext/string.rb +23 -0
- data/lib/rubocop/directive_comment.rb +32 -0
- data/lib/rubocop/error.rb +24 -0
- data/lib/rubocop/ext/processed_source.rb +18 -0
- data/lib/rubocop/ext/regexp_node.rb +62 -0
- data/lib/rubocop/file_finder.rb +43 -0
- data/lib/rubocop/formatter/auto_gen_config_formatter.rb +17 -0
- data/lib/rubocop/formatter/base_formatter.rb +3 -7
- data/lib/rubocop/formatter/clang_style_formatter.rb +9 -6
- data/lib/rubocop/formatter/disabled_config_formatter.rb +69 -35
- data/lib/rubocop/formatter/emacs_style_formatter.rb +22 -9
- data/lib/rubocop/formatter/file_list_formatter.rb +2 -1
- data/lib/rubocop/formatter/formatter_set.rb +18 -17
- data/lib/rubocop/formatter/fuubar_style_formatter.rb +2 -2
- data/lib/rubocop/formatter/html_formatter.rb +15 -6
- data/lib/rubocop/formatter/json_formatter.rb +14 -13
- data/lib/rubocop/formatter/junit_formatter.rb +84 -0
- data/lib/rubocop/formatter/offense_count_formatter.rb +17 -0
- data/lib/rubocop/formatter/pacman_formatter.rb +80 -0
- data/lib/rubocop/formatter/progress_formatter.rb +3 -2
- data/lib/rubocop/formatter/quiet_formatter.rb +1 -1
- data/lib/rubocop/formatter/simple_text_formatter.rb +54 -11
- data/lib/rubocop/formatter/tap_formatter.rb +17 -6
- data/lib/rubocop/magic_comment.rb +15 -11
- data/lib/rubocop/name_similarity.rb +18 -10
- data/lib/rubocop/options.rb +267 -139
- data/lib/rubocop/path_util.rb +36 -17
- data/lib/rubocop/platform.rb +1 -1
- data/lib/rubocop/rake_task.rb +8 -9
- data/lib/rubocop/remote_config.rb +24 -9
- data/lib/rubocop/result_cache.rb +86 -31
- data/lib/rubocop/rspec/cop_helper.rb +14 -38
- data/lib/rubocop/rspec/expect_offense.rb +168 -14
- data/lib/rubocop/rspec/host_environment_simulation_helper.rb +1 -5
- data/lib/rubocop/rspec/shared_contexts.rb +93 -47
- data/lib/rubocop/rspec/support.rb +5 -1
- data/lib/rubocop/runner.rb +146 -77
- data/lib/rubocop/string_interpreter.rb +11 -8
- data/lib/rubocop/target_finder.rb +94 -95
- data/lib/rubocop/target_ruby.rb +160 -0
- data/lib/rubocop/version.rb +15 -5
- data/lib/rubocop/yaml_duplication_checker.rb +40 -0
- metadata +265 -192
- data/config/disabled.yml +0 -128
- data/config/enabled.yml +0 -1989
- data/lib/rubocop/ast/builder.rb +0 -72
- data/lib/rubocop/ast/node.rb +0 -634
- data/lib/rubocop/ast/node/and_node.rb +0 -37
- 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 -116
- data/lib/rubocop/ast/node/case_node.rb +0 -64
- data/lib/rubocop/ast/node/def_node.rb +0 -71
- data/lib/rubocop/ast/node/ensure_node.rb +0 -25
- data/lib/rubocop/ast/node/for_node.rb +0 -61
- data/lib/rubocop/ast/node/hash_node.rb +0 -109
- data/lib/rubocop/ast/node/if_node.rb +0 -146
- 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 -23
- 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 -174
- data/lib/rubocop/ast/node/mixin/method_identifier_predicates.rb +0 -89
- data/lib/rubocop/ast/node/mixin/modifier_node.rb +0 -17
- 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/or_node.rb +0 -37
- data/lib/rubocop/ast/node/pair_node.rb +0 -64
- data/lib/rubocop/ast/node/regexp_node.rb +0 -35
- data/lib/rubocop/ast/node/resbody_node.rb +0 -25
- data/lib/rubocop/ast/node/send_node.rb +0 -45
- data/lib/rubocop/ast/node/str_node.rb +0 -14
- data/lib/rubocop/ast/node/super_node.rb +0 -21
- data/lib/rubocop/ast/node/symbol_node.rb +0 -20
- data/lib/rubocop/ast/node/until_node.rb +0 -43
- data/lib/rubocop/ast/node/when_node.rb +0 -61
- data/lib/rubocop/ast/node/while_node.rb +0 -43
- 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 -171
- data/lib/rubocop/cop/layout/align_array.rb +0 -39
- data/lib/rubocop/cop/layout/align_hash.rb +0 -235
- data/lib/rubocop/cop/layout/indent_heredoc.rb +0 -208
- data/lib/rubocop/cop/layout/tab.rb +0 -60
- data/lib/rubocop/cop/layout/trailing_blank_lines.rb +0 -80
- data/lib/rubocop/cop/lint/end_in_method.rb +0 -40
- data/lib/rubocop/cop/lint/handle_exceptions.rb +0 -56
- data/lib/rubocop/cop/lint/useless_comparison.rb +0 -28
- data/lib/rubocop/cop/metrics/line_length.rb +0 -171
- data/lib/rubocop/cop/mixin/classish_length.rb +0 -36
- data/lib/rubocop/cop/mixin/parser_diagnostic.rb +0 -37
- data/lib/rubocop/cop/mixin/safe_mode.rb +0 -22
- data/lib/rubocop/cop/mixin/target_rails_version.rb +0 -16
- data/lib/rubocop/cop/mixin/too_many_lines.rb +0 -39
- data/lib/rubocop/cop/performance/caller.rb +0 -69
- data/lib/rubocop/cop/performance/case_when_splat.rb +0 -172
- data/lib/rubocop/cop/performance/casecmp.rb +0 -108
- data/lib/rubocop/cop/performance/compare_with_block.rb +0 -117
- data/lib/rubocop/cop/performance/count.rb +0 -101
- data/lib/rubocop/cop/performance/detect.rb +0 -110
- data/lib/rubocop/cop/performance/double_start_end_with.rb +0 -94
- data/lib/rubocop/cop/performance/end_with.rb +0 -55
- data/lib/rubocop/cop/performance/fixed_size.rb +0 -56
- data/lib/rubocop/cop/performance/flat_map.rb +0 -76
- data/lib/rubocop/cop/performance/hash_each_methods.rb +0 -129
- data/lib/rubocop/cop/performance/lstrip_rstrip.rb +0 -44
- data/lib/rubocop/cop/performance/range_include.rb +0 -41
- data/lib/rubocop/cop/performance/redundant_block_call.rb +0 -93
- data/lib/rubocop/cop/performance/redundant_match.rb +0 -56
- data/lib/rubocop/cop/performance/redundant_merge.rb +0 -169
- data/lib/rubocop/cop/performance/regexp_match.rb +0 -224
- data/lib/rubocop/cop/performance/reverse_each.rb +0 -40
- data/lib/rubocop/cop/performance/size.rb +0 -71
- data/lib/rubocop/cop/performance/start_with.rb +0 -58
- data/lib/rubocop/cop/performance/string_replacement.rb +0 -170
- data/lib/rubocop/cop/performance/times_map.rb +0 -71
- data/lib/rubocop/cop/performance/unfreeze_string.rb +0 -50
- data/lib/rubocop/cop/performance/uri_default_parser.rb +0 -47
- data/lib/rubocop/cop/rails/action_filter.rb +0 -117
- data/lib/rubocop/cop/rails/active_support_aliases.rb +0 -68
- data/lib/rubocop/cop/rails/application_job.rb +0 -40
- data/lib/rubocop/cop/rails/application_record.rb +0 -40
- data/lib/rubocop/cop/rails/blank.rb +0 -142
- data/lib/rubocop/cop/rails/create_table_with_timestamps.rb +0 -82
- data/lib/rubocop/cop/rails/date.rb +0 -136
- data/lib/rubocop/cop/rails/delegate.rb +0 -130
- data/lib/rubocop/cop/rails/delegate_allow_blank.rb +0 -51
- data/lib/rubocop/cop/rails/dynamic_find_by.rb +0 -82
- data/lib/rubocop/cop/rails/enum_uniqueness.rb +0 -45
- data/lib/rubocop/cop/rails/environment_comparison.rb +0 -66
- data/lib/rubocop/cop/rails/exit.rb +0 -68
- data/lib/rubocop/cop/rails/file_path.rb +0 -72
- data/lib/rubocop/cop/rails/find_by.rb +0 -52
- data/lib/rubocop/cop/rails/find_each.rb +0 -47
- data/lib/rubocop/cop/rails/has_and_belongs_to_many.rb +0 -25
- data/lib/rubocop/cop/rails/has_many_or_has_one_dependent.rb +0 -84
- data/lib/rubocop/cop/rails/http_positional_arguments.rb +0 -102
- data/lib/rubocop/cop/rails/inverse_of.rb +0 -218
- data/lib/rubocop/cop/rails/lexically_scoped_action_filter.rb +0 -112
- data/lib/rubocop/cop/rails/not_null_column.rb +0 -67
- data/lib/rubocop/cop/rails/output.rb +0 -32
- data/lib/rubocop/cop/rails/output_safety.rb +0 -93
- data/lib/rubocop/cop/rails/pluralization_grammar.rb +0 -107
- data/lib/rubocop/cop/rails/presence.rb +0 -118
- data/lib/rubocop/cop/rails/present.rb +0 -143
- data/lib/rubocop/cop/rails/read_write_attribute.rb +0 -65
- data/lib/rubocop/cop/rails/redundant_receiver_in_with_options.rb +0 -133
- data/lib/rubocop/cop/rails/relative_date_constant.rb +0 -88
- data/lib/rubocop/cop/rails/request_referer.rb +0 -55
- data/lib/rubocop/cop/rails/reversible_migration.rb +0 -281
- data/lib/rubocop/cop/rails/safe_navigation.rb +0 -90
- data/lib/rubocop/cop/rails/save_bang.rb +0 -162
- data/lib/rubocop/cop/rails/scope_args.rb +0 -29
- data/lib/rubocop/cop/rails/skips_model_validations.rb +0 -70
- data/lib/rubocop/cop/rails/time_zone.rb +0 -198
- data/lib/rubocop/cop/rails/uniq_before_pluck.rb +0 -95
- data/lib/rubocop/cop/rails/unknown_env.rb +0 -63
- data/lib/rubocop/cop/rails/validation.rb +0 -64
- data/lib/rubocop/cop/style/braces_around_hash_parameters.rb +0 -202
- data/lib/rubocop/cop/style/method_missing.rb +0 -68
- data/lib/rubocop/cop/style/trailing_comma_in_literal.rb +0 -75
- data/lib/rubocop/formatter/disabled_lines_formatter.rb +0 -57
- data/lib/rubocop/node_pattern.rb +0 -560
- data/lib/rubocop/processed_source.rb +0 -150
- data/lib/rubocop/rspec/shared_examples.rb +0 -92
- data/lib/rubocop/string_util.rb +0 -158
- data/lib/rubocop/token.rb +0 -103
@@ -8,10 +8,10 @@ module RuboCop
|
|
8
8
|
module ConditionalAssignmentHelper
|
9
9
|
extend NodePattern::Macros
|
10
10
|
|
11
|
-
EQUAL = '='
|
12
|
-
END_ALIGNMENT = '
|
13
|
-
ALIGN_WITH = 'EnforcedStyleAlignWith'
|
14
|
-
KEYWORD = 'keyword'
|
11
|
+
EQUAL = '='
|
12
|
+
END_ALIGNMENT = 'Layout/EndAlignment'
|
13
|
+
ALIGN_WITH = 'EnforcedStyleAlignWith'
|
14
|
+
KEYWORD = 'keyword'
|
15
15
|
|
16
16
|
# `elsif` branches show up in the `node` as an `else`. We need
|
17
17
|
# to recursively iterate over all `else` branches and consider all
|
@@ -30,7 +30,7 @@ module RuboCop
|
|
30
30
|
end
|
31
31
|
|
32
32
|
def tail(branch)
|
33
|
-
branch.begin_type? ?
|
33
|
+
branch.begin_type? ? Array(branch).last : branch
|
34
34
|
end
|
35
35
|
|
36
36
|
# rubocop:disable Metrics/AbcSize
|
@@ -43,7 +43,7 @@ module RuboCop
|
|
43
43
|
when :and_asgn, :or_asgn
|
44
44
|
"#{node.children[0].source} #{node.loc.operator.source} "
|
45
45
|
when :casgn
|
46
|
-
|
46
|
+
lhs_for_casgn(node)
|
47
47
|
when *ConditionalAssignment::VARIABLE_ASSIGNMENT_TYPES
|
48
48
|
"#{node.children[0]} = "
|
49
49
|
else
|
@@ -68,15 +68,16 @@ module RuboCop
|
|
68
68
|
private
|
69
69
|
|
70
70
|
def expand_elsif(node, elsif_branches = [])
|
71
|
-
return [] if node.nil? || !node.if_type?
|
72
|
-
|
73
|
-
elsif_branches <<
|
74
|
-
|
71
|
+
return [] if node.nil? || !node.if_type? || !node.elsif?
|
72
|
+
|
73
|
+
elsif_branches << node.if_branch
|
74
|
+
|
75
|
+
else_branch = node.else_branch
|
76
|
+
if else_branch&.if_type? && else_branch&.elsif?
|
75
77
|
expand_elsif(else_branch, elsif_branches)
|
76
78
|
else
|
77
79
|
elsif_branches << else_branch
|
78
80
|
end
|
79
|
-
elsif_branches
|
80
81
|
end
|
81
82
|
|
82
83
|
def lhs_for_send(node)
|
@@ -92,6 +93,15 @@ module RuboCop
|
|
92
93
|
end
|
93
94
|
end
|
94
95
|
|
96
|
+
def lhs_for_casgn(node)
|
97
|
+
namespace = node.children[0]
|
98
|
+
if namespace.nil? || namespace.cbase_type?
|
99
|
+
"#{namespace&.source}#{node.children[1]} = "
|
100
|
+
else
|
101
|
+
"#{namespace.source}::#{node.children[1]} = "
|
102
|
+
end
|
103
|
+
end
|
104
|
+
|
95
105
|
def setter_method?(method_name)
|
96
106
|
method_name.to_s.end_with?(EQUAL) &&
|
97
107
|
!%i[!= == === >= <=].include?(method_name)
|
@@ -100,6 +110,7 @@ module RuboCop
|
|
100
110
|
def assignment_rhs_exist?(node)
|
101
111
|
parent = node.parent
|
102
112
|
return true unless parent
|
113
|
+
|
103
114
|
!(parent.mlhs_type? || parent.resbody_type?)
|
104
115
|
end
|
105
116
|
end
|
@@ -197,34 +208,33 @@ module RuboCop
|
|
197
208
|
# some_other_method
|
198
209
|
# bar = 2
|
199
210
|
# end
|
200
|
-
class ConditionalAssignment <
|
211
|
+
class ConditionalAssignment < Base
|
201
212
|
include ConditionalAssignmentHelper
|
202
213
|
include ConfigurableEnforcedStyle
|
203
214
|
include IgnoredNode
|
215
|
+
extend AutoCorrector
|
204
216
|
|
205
217
|
MSG = 'Use the return of the conditional for variable assignment ' \
|
206
|
-
'and comparison.'
|
218
|
+
'and comparison.'
|
207
219
|
ASSIGN_TO_CONDITION_MSG =
|
208
|
-
'Assign variables inside of conditionals'
|
220
|
+
'Assign variables inside of conditionals'
|
209
221
|
VARIABLE_ASSIGNMENT_TYPES =
|
210
222
|
%i[casgn cvasgn gvasgn ivasgn lvasgn].freeze
|
211
223
|
ASSIGNMENT_TYPES = VARIABLE_ASSIGNMENT_TYPES +
|
212
224
|
%i[and_asgn or_asgn op_asgn masgn].freeze
|
213
|
-
LINE_LENGTH = '
|
214
|
-
INDENTATION_WIDTH = 'Layout/IndentationWidth'
|
215
|
-
ENABLED = 'Enabled'
|
216
|
-
MAX = 'Max'
|
217
|
-
SINGLE_LINE_CONDITIONS_ONLY = 'SingleLineConditionsOnly'
|
218
|
-
WIDTH = 'Width'
|
219
|
-
|
220
|
-
def_node_matcher :condition?, '{if case}'
|
225
|
+
LINE_LENGTH = 'Layout/LineLength'
|
226
|
+
INDENTATION_WIDTH = 'Layout/IndentationWidth'
|
227
|
+
ENABLED = 'Enabled'
|
228
|
+
MAX = 'Max'
|
229
|
+
SINGLE_LINE_CONDITIONS_ONLY = 'SingleLineConditionsOnly'
|
230
|
+
WIDTH = 'Width'
|
221
231
|
|
222
232
|
# The shovel operator `<<` does not have its own type. It is a `send`
|
223
233
|
# type.
|
224
|
-
def_node_matcher :assignment_type?,
|
234
|
+
def_node_matcher :assignment_type?, <<~PATTERN
|
225
235
|
{
|
226
236
|
#{ASSIGNMENT_TYPES.join(' ')}
|
227
|
-
(send _recv {:[]= :<< :=~ :!~ :<=> #end_with_eq?} ...)
|
237
|
+
(send _recv {:[]= :<< :=~ :!~ :<=> #end_with_eq? :< :>} ...)
|
228
238
|
}
|
229
239
|
PATTERN
|
230
240
|
|
@@ -266,14 +276,6 @@ module RuboCop
|
|
266
276
|
check_node(node, branches)
|
267
277
|
end
|
268
278
|
|
269
|
-
def autocorrect(node)
|
270
|
-
if assignment_type?(node)
|
271
|
-
move_assignment_inside_condition(node)
|
272
|
-
else
|
273
|
-
move_assignment_outside_condition(node)
|
274
|
-
end
|
275
|
-
end
|
276
|
-
|
277
279
|
private
|
278
280
|
|
279
281
|
def check_assignment_to_condition(node)
|
@@ -289,7 +291,9 @@ module RuboCop
|
|
289
291
|
return unless else_branch
|
290
292
|
return if allowed_single_line?([*branches, else_branch])
|
291
293
|
|
292
|
-
add_offense(node, message: ASSIGN_TO_CONDITION_MSG)
|
294
|
+
add_offense(node, message: ASSIGN_TO_CONDITION_MSG) do |corrector|
|
295
|
+
autocorrect(corrector, node)
|
296
|
+
end
|
293
297
|
end
|
294
298
|
|
295
299
|
def candidate_node?(node)
|
@@ -310,36 +314,32 @@ module RuboCop
|
|
310
314
|
*_variable, assignment = *node
|
311
315
|
|
312
316
|
# ignore pseudo-assignments without rhs in for nodes
|
313
|
-
return if node.parent
|
317
|
+
return if node.parent&.for_type?
|
314
318
|
|
315
|
-
if assignment.begin_type? && assignment.children.one?
|
316
|
-
assignment, = *assignment
|
317
|
-
end
|
319
|
+
assignment, = *assignment if assignment.begin_type? && assignment.children.one?
|
318
320
|
|
319
321
|
assignment
|
320
322
|
end
|
321
323
|
|
322
|
-
def move_assignment_outside_condition(node)
|
324
|
+
def move_assignment_outside_condition(corrector, node)
|
323
325
|
if node.case_type?
|
324
|
-
CaseCorrector.correct(self, node)
|
326
|
+
CaseCorrector.correct(corrector, self, node)
|
325
327
|
elsif node.ternary?
|
326
|
-
TernaryCorrector.correct(node)
|
327
|
-
elsif node.if?
|
328
|
-
IfCorrector.correct(self, node)
|
329
|
-
elsif node.unless?
|
330
|
-
UnlessCorrector.correct(self, node)
|
328
|
+
TernaryCorrector.correct(corrector, node)
|
329
|
+
elsif node.if? || node.unless?
|
330
|
+
IfCorrector.correct(corrector, self, node)
|
331
331
|
end
|
332
332
|
end
|
333
333
|
|
334
|
-
def move_assignment_inside_condition(node)
|
334
|
+
def move_assignment_inside_condition(corrector, node)
|
335
335
|
*_assignment, condition = *node
|
336
336
|
|
337
337
|
if ternary_condition?(condition)
|
338
|
-
TernaryCorrector.move_assignment_inside_condition(node)
|
338
|
+
TernaryCorrector.move_assignment_inside_condition(corrector, node)
|
339
339
|
elsif condition.case_type?
|
340
|
-
CaseCorrector.move_assignment_inside_condition(node)
|
340
|
+
CaseCorrector.move_assignment_inside_condition(corrector, node)
|
341
341
|
elsif condition.if_type?
|
342
|
-
IfCorrector.move_assignment_inside_condition(node)
|
342
|
+
IfCorrector.move_assignment_inside_condition(corrector, node)
|
343
343
|
end
|
344
344
|
end
|
345
345
|
|
@@ -348,6 +348,8 @@ module RuboCop
|
|
348
348
|
end
|
349
349
|
|
350
350
|
def lhs_all_match?(branches)
|
351
|
+
return true if branches.empty?
|
352
|
+
|
351
353
|
first_lhs = lhs(branches.first)
|
352
354
|
branches.all? { |branch| lhs(branch) == first_lhs }
|
353
355
|
end
|
@@ -364,19 +366,29 @@ module RuboCop
|
|
364
366
|
return if allowed_single_line?(branches)
|
365
367
|
return if correction_exceeds_line_limit?(node, branches)
|
366
368
|
|
367
|
-
add_offense(node)
|
369
|
+
add_offense(node) do |corrector|
|
370
|
+
autocorrect(corrector, node)
|
371
|
+
end
|
372
|
+
end
|
373
|
+
|
374
|
+
def autocorrect(corrector, node)
|
375
|
+
if assignment_type?(node)
|
376
|
+
move_assignment_inside_condition(corrector, node)
|
377
|
+
else
|
378
|
+
move_assignment_outside_condition(corrector, node)
|
379
|
+
end
|
368
380
|
end
|
369
381
|
|
370
382
|
def allowed_statements?(branches)
|
371
383
|
return false unless branches.all?
|
372
384
|
|
373
|
-
statements = branches.map { |branch| tail(branch) }
|
385
|
+
statements = branches.map { |branch| tail(branch) }.compact
|
374
386
|
|
375
387
|
lhs_all_match?(statements) && statements.none?(&:masgn_type?) &&
|
376
388
|
assignment_types_match?(*statements)
|
377
389
|
end
|
378
390
|
|
379
|
-
# If `
|
391
|
+
# If `Layout/LineLength` is enabled, we do not want to introduce an
|
380
392
|
# offense by auto-correcting this cop. Find the max configured line
|
381
393
|
# length. Find the longest line of condition. Remove the assignment
|
382
394
|
# from lines that contain the offending assignment because after
|
@@ -458,7 +470,7 @@ module RuboCop
|
|
458
470
|
def correct_if_branches(corrector, cop, node)
|
459
471
|
if_branch, elsif_branches, else_branch = extract_tail_branches(node)
|
460
472
|
|
461
|
-
corrector.insert_before(node
|
473
|
+
corrector.insert_before(node, lhs(if_branch))
|
462
474
|
replace_branch_assignment(corrector, if_branch)
|
463
475
|
correct_branches(corrector, elsif_branches)
|
464
476
|
replace_branch_assignment(corrector, else_branch)
|
@@ -475,13 +487,13 @@ module RuboCop
|
|
475
487
|
source
|
476
488
|
end
|
477
489
|
|
478
|
-
corrector.replace(branch
|
490
|
+
corrector.replace(branch, replacement)
|
479
491
|
end
|
480
492
|
|
481
493
|
def correct_branches(corrector, branches)
|
482
494
|
branches.each do |branch|
|
483
495
|
*_, assignment = *branch
|
484
|
-
corrector.replace(branch
|
496
|
+
corrector.replace(branch, assignment.source)
|
485
497
|
end
|
486
498
|
end
|
487
499
|
end
|
@@ -492,41 +504,37 @@ module RuboCop
|
|
492
504
|
include ConditionalAssignmentHelper
|
493
505
|
include ConditionalCorrectorHelper
|
494
506
|
|
495
|
-
def correct(node)
|
496
|
-
|
497
|
-
corrector.replace(node.source_range, correction(node))
|
498
|
-
end
|
507
|
+
def correct(corrector, node)
|
508
|
+
corrector.replace(node, correction(node))
|
499
509
|
end
|
500
510
|
|
501
|
-
def move_assignment_inside_condition(node)
|
511
|
+
def move_assignment_inside_condition(corrector, node)
|
502
512
|
*_var, rhs = *node
|
503
513
|
if_branch, else_branch = extract_branches(node)
|
504
514
|
assignment = assignment(node)
|
505
515
|
|
506
|
-
|
507
|
-
|
508
|
-
corrector.remove(assignment)
|
516
|
+
remove_parentheses(corrector, rhs) if Util.parentheses?(rhs)
|
517
|
+
corrector.remove(assignment)
|
509
518
|
|
510
|
-
|
511
|
-
|
512
|
-
end
|
519
|
+
move_branch_inside_condition(corrector, if_branch, assignment)
|
520
|
+
move_branch_inside_condition(corrector, else_branch, assignment)
|
513
521
|
end
|
514
522
|
|
515
523
|
private
|
516
524
|
|
517
525
|
def correction(node)
|
518
|
-
|
519
|
-
|
520
|
-
"#{lhs(if_branch)}#{ternary(condition, if_branch, else_branch)}"
|
526
|
+
"#{lhs(node.if_branch)}#{ternary(node)}"
|
521
527
|
end
|
522
528
|
|
523
|
-
def ternary(
|
524
|
-
_variable, *_operator, if_rhs = *if_branch
|
525
|
-
_else_variable, *_operator, else_rhs = *else_branch
|
529
|
+
def ternary(node)
|
530
|
+
_variable, *_operator, if_rhs = *node.if_branch
|
531
|
+
_else_variable, *_operator, else_rhs = *node.else_branch
|
526
532
|
|
527
|
-
expr = "#{condition.source} ?
|
533
|
+
expr = "#{node.condition.source} ? " \
|
534
|
+
"#{if_rhs.source} : " \
|
535
|
+
"#{else_rhs.source}"
|
528
536
|
|
529
|
-
element_assignment?(if_branch) ? "(#{expr})" : expr
|
537
|
+
element_assignment?(node.if_branch) ? "(#{expr})" : expr
|
530
538
|
end
|
531
539
|
|
532
540
|
def element_assignment?(node)
|
@@ -547,7 +555,7 @@ module RuboCop
|
|
547
555
|
end
|
548
556
|
|
549
557
|
def move_branch_inside_condition(corrector, branch, assignment)
|
550
|
-
corrector.insert_before(branch
|
558
|
+
corrector.insert_before(branch, assignment.source)
|
551
559
|
end
|
552
560
|
end
|
553
561
|
end
|
@@ -558,50 +566,41 @@ module RuboCop
|
|
558
566
|
include ConditionalAssignmentHelper
|
559
567
|
include ConditionalCorrectorHelper
|
560
568
|
|
561
|
-
def correct(cop, node)
|
562
|
-
|
569
|
+
def correct(corrector, cop, node)
|
570
|
+
correct_if_branches(corrector, cop, node)
|
563
571
|
end
|
564
572
|
|
565
|
-
def move_assignment_inside_condition(node)
|
573
|
+
def move_assignment_inside_condition(corrector, node)
|
566
574
|
column = node.loc.expression.column
|
567
575
|
*_var, condition = *node
|
568
576
|
assignment = assignment(node)
|
569
577
|
|
570
|
-
|
571
|
-
corrector.remove(assignment)
|
578
|
+
corrector.remove(assignment)
|
572
579
|
|
573
|
-
|
574
|
-
|
575
|
-
assignment, column)
|
576
|
-
end
|
580
|
+
condition.branches.flatten.each do |branch|
|
581
|
+
move_branch_inside_condition(corrector, branch, condition, assignment, column)
|
577
582
|
end
|
578
583
|
end
|
579
584
|
|
580
585
|
private
|
581
586
|
|
582
587
|
def extract_tail_branches(node)
|
583
|
-
if_branch, elsif_branches, else_branch =
|
588
|
+
if_branch, *elsif_branches, else_branch = *node.branches
|
584
589
|
elsif_branches.map! { |branch| tail(branch) }
|
585
590
|
|
586
591
|
[tail(if_branch), elsif_branches, tail(else_branch)]
|
587
592
|
end
|
588
593
|
|
589
|
-
def extract_branches(node)
|
590
|
-
_condition, if_branch, else_branch = *node
|
591
|
-
elsif_branches, else_branch = expand_elses(else_branch)
|
592
|
-
|
593
|
-
[if_branch, elsif_branches, else_branch]
|
594
|
-
end
|
595
|
-
|
596
594
|
def move_branch_inside_condition(corrector, branch, condition,
|
597
595
|
assignment, column)
|
598
596
|
branch_assignment = tail(branch)
|
599
|
-
corrector.insert_before(branch_assignment
|
597
|
+
corrector.insert_before(branch_assignment,
|
600
598
|
assignment.source)
|
601
599
|
|
602
600
|
remove_whitespace_in_branches(corrector, branch, condition, column)
|
603
601
|
|
604
|
-
branch_else = branch.parent.loc.else
|
602
|
+
return unless (branch_else = branch.parent.loc.else)
|
603
|
+
|
605
604
|
corrector.remove_preceding(branch_else, branch_else.column - column)
|
606
605
|
end
|
607
606
|
end
|
@@ -613,31 +612,25 @@ module RuboCop
|
|
613
612
|
include ConditionalAssignmentHelper
|
614
613
|
include ConditionalCorrectorHelper
|
615
614
|
|
616
|
-
def correct(cop, node)
|
615
|
+
def correct(corrector, cop, node)
|
617
616
|
when_branches, else_branch = extract_tail_branches(node)
|
618
617
|
|
619
|
-
|
620
|
-
|
621
|
-
|
622
|
-
replace_branch_assignment(corrector, else_branch)
|
618
|
+
corrector.insert_before(node, lhs(else_branch))
|
619
|
+
correct_branches(corrector, when_branches)
|
620
|
+
replace_branch_assignment(corrector, else_branch)
|
623
621
|
|
624
|
-
|
625
|
-
indent(cop, lhs(else_branch)))
|
626
|
-
end
|
622
|
+
corrector.insert_before(node.loc.end, indent(cop, lhs(else_branch)))
|
627
623
|
end
|
628
624
|
|
629
|
-
def move_assignment_inside_condition(node)
|
625
|
+
def move_assignment_inside_condition(corrector, node)
|
630
626
|
column = node.loc.expression.column
|
631
627
|
*_var, condition = *node
|
632
628
|
assignment = assignment(node)
|
633
629
|
|
634
|
-
|
635
|
-
corrector.remove(assignment)
|
630
|
+
corrector.remove(assignment)
|
636
631
|
|
637
|
-
|
638
|
-
|
639
|
-
assignment, column)
|
640
|
-
end
|
632
|
+
extract_branches(condition).flatten.each do |branch|
|
633
|
+
move_branch_inside_condition(corrector, branch, condition, assignment, column)
|
641
634
|
end
|
642
635
|
end
|
643
636
|
|
@@ -649,43 +642,20 @@ module RuboCop
|
|
649
642
|
[when_branches, tail(else_branch)]
|
650
643
|
end
|
651
644
|
|
652
|
-
def extract_branches(
|
653
|
-
|
654
|
-
|
655
|
-
[when_branches, else_branch]
|
645
|
+
def extract_branches(case_node)
|
646
|
+
when_branches = expand_when_branches(case_node.when_branches)
|
647
|
+
|
648
|
+
[when_branches, case_node.else_branch]
|
656
649
|
end
|
657
650
|
|
658
|
-
def move_branch_inside_condition(corrector, branch, condition,
|
659
|
-
assignment, column)
|
651
|
+
def move_branch_inside_condition(corrector, branch, condition, assignment, column)
|
660
652
|
branch_assignment = tail(branch)
|
661
|
-
corrector.insert_before(branch_assignment.
|
662
|
-
assignment.source)
|
653
|
+
corrector.insert_before(branch_assignment, assignment.source)
|
663
654
|
|
664
655
|
remove_whitespace_in_branches(corrector, branch, condition, column)
|
665
656
|
|
666
657
|
parent_keyword = branch.parent.loc.keyword
|
667
|
-
corrector.remove_preceding(parent_keyword,
|
668
|
-
parent_keyword.column - column)
|
669
|
-
end
|
670
|
-
end
|
671
|
-
end
|
672
|
-
|
673
|
-
# Corrector to correct conditional assignment in `unless` statements.
|
674
|
-
class UnlessCorrector
|
675
|
-
class << self
|
676
|
-
include ConditionalAssignmentHelper
|
677
|
-
include ConditionalCorrectorHelper
|
678
|
-
|
679
|
-
def correct(cop, node)
|
680
|
-
->(corrector) { correct_if_branches(corrector, cop, node) }
|
681
|
-
end
|
682
|
-
|
683
|
-
private
|
684
|
-
|
685
|
-
def extract_tail_branches(node)
|
686
|
-
_condition, else_branch, if_branch = *node
|
687
|
-
|
688
|
-
[tail(if_branch), [], tail(else_branch)]
|
658
|
+
corrector.remove_preceding(parent_keyword, parent_keyword.column - column)
|
689
659
|
end
|
690
660
|
end
|
691
661
|
end
|