rubocop 0.89.0 → 0.92.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +2 -2
- data/config/default.yml +128 -14
- data/lib/rubocop.rb +30 -4
- data/lib/rubocop/cached_data.rb +1 -0
- data/lib/rubocop/cli/command.rb +1 -0
- data/lib/rubocop/cli/command/auto_genenerate_config.rb +1 -0
- data/lib/rubocop/cli/command/base.rb +1 -0
- data/lib/rubocop/cli/command/execute_runner.rb +9 -0
- data/lib/rubocop/cli/command/init_dotfile.rb +1 -0
- data/lib/rubocop/cli/command/show_cops.rb +2 -1
- data/lib/rubocop/cli/command/version.rb +1 -0
- data/lib/rubocop/cli/environment.rb +1 -0
- data/lib/rubocop/comment_config.rb +17 -10
- data/lib/rubocop/config.rb +1 -1
- data/lib/rubocop/config_loader.rb +21 -10
- data/lib/rubocop/config_loader_resolver.rb +1 -0
- data/lib/rubocop/config_obsoletion.rb +1 -0
- data/lib/rubocop/config_regeneration.rb +33 -0
- data/lib/rubocop/config_store.rb +3 -3
- data/lib/rubocop/config_validator.rb +4 -1
- data/lib/rubocop/cop/base.rb +23 -0
- data/lib/rubocop/cop/bundler/duplicated_gem.rb +5 -1
- data/lib/rubocop/cop/bundler/gem_comment.rb +8 -3
- data/lib/rubocop/cop/bundler/insecure_protocol_source.rb +2 -0
- data/lib/rubocop/cop/commissioner.rb +47 -7
- data/lib/rubocop/cop/correctors/alignment_corrector.rb +4 -4
- data/lib/rubocop/cop/correctors/condition_corrector.rb +3 -5
- data/lib/rubocop/cop/correctors/empty_line_corrector.rb +9 -10
- data/lib/rubocop/cop/correctors/line_break_corrector.rb +4 -4
- data/lib/rubocop/cop/correctors/multiline_literal_brace_corrector.rb +8 -3
- data/lib/rubocop/cop/correctors/parentheses_corrector.rb +5 -8
- data/lib/rubocop/cop/correctors/percent_literal_corrector.rb +5 -10
- data/lib/rubocop/cop/correctors/punctuation_corrector.rb +8 -10
- data/lib/rubocop/cop/documentation.rb +22 -0
- data/lib/rubocop/cop/generator.rb +2 -1
- data/lib/rubocop/cop/internal_affairs/method_name_equal.rb +1 -0
- data/lib/rubocop/cop/internal_affairs/node_type_predicate.rb +1 -0
- data/lib/rubocop/cop/internal_affairs/offense_location_keyword.rb +1 -0
- data/lib/rubocop/cop/internal_affairs/redundant_location_argument.rb +1 -0
- data/lib/rubocop/cop/internal_affairs/redundant_message_argument.rb +1 -0
- data/lib/rubocop/cop/layout/array_alignment.rb +1 -0
- data/lib/rubocop/cop/layout/begin_end_alignment.rb +77 -0
- data/lib/rubocop/cop/layout/block_alignment.rb +23 -19
- data/lib/rubocop/cop/layout/case_indentation.rb +4 -7
- data/lib/rubocop/cop/layout/class_structure.rb +14 -17
- data/lib/rubocop/cop/layout/closing_heredoc_indentation.rb +4 -6
- data/lib/rubocop/cop/layout/comment_indentation.rb +1 -1
- data/lib/rubocop/cop/layout/condition_position.rb +13 -15
- data/lib/rubocop/cop/layout/def_end_alignment.rb +8 -5
- data/lib/rubocop/cop/layout/dot_position.rb +21 -17
- data/lib/rubocop/cop/layout/empty_comment.rb +30 -23
- data/lib/rubocop/cop/layout/empty_line_after_guard_clause.rb +21 -18
- 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 +21 -23
- data/lib/rubocop/cop/layout/empty_lines.rb +6 -7
- data/lib/rubocop/cop/layout/empty_lines_around_access_modifier.rb +18 -14
- data/lib/rubocop/cop/layout/empty_lines_around_arguments.rb +7 -8
- data/lib/rubocop/cop/layout/empty_lines_around_attribute_accessor.rb +4 -7
- data/lib/rubocop/cop/layout/empty_lines_around_begin_body.rb +2 -5
- data/lib/rubocop/cop/layout/empty_lines_around_block_body.rb +2 -5
- data/lib/rubocop/cop/layout/empty_lines_around_class_body.rb +2 -5
- data/lib/rubocop/cop/layout/empty_lines_around_exception_handling_keywords.rb +3 -7
- data/lib/rubocop/cop/layout/empty_lines_around_method_body.rb +2 -5
- data/lib/rubocop/cop/layout/empty_lines_around_module_body.rb +2 -5
- data/lib/rubocop/cop/layout/end_alignment.rb +11 -17
- data/lib/rubocop/cop/layout/extra_spacing.rb +14 -21
- data/lib/rubocop/cop/layout/first_array_element_line_break.rb +2 -5
- data/lib/rubocop/cop/layout/first_hash_element_line_break.rb +2 -5
- data/lib/rubocop/cop/layout/first_method_argument_line_break.rb +4 -8
- data/lib/rubocop/cop/layout/first_method_parameter_line_break.rb +2 -5
- data/lib/rubocop/cop/layout/hash_alignment.rb +17 -20
- data/lib/rubocop/cop/layout/heredoc_argument_closing_parenthesis.rb +15 -14
- data/lib/rubocop/cop/layout/heredoc_indentation.rb +14 -11
- data/lib/rubocop/cop/layout/initial_indentation.rb +6 -7
- data/lib/rubocop/cop/layout/leading_comment_space.rb +12 -10
- data/lib/rubocop/cop/layout/leading_empty_lines.rb +6 -11
- data/lib/rubocop/cop/layout/multiline_array_brace_layout.rb +2 -5
- data/lib/rubocop/cop/layout/multiline_array_line_breaks.rb +2 -5
- data/lib/rubocop/cop/layout/multiline_assignment_layout.rb +10 -14
- data/lib/rubocop/cop/layout/multiline_block_layout.rb +21 -19
- data/lib/rubocop/cop/layout/multiline_hash_brace_layout.rb +2 -5
- data/lib/rubocop/cop/layout/multiline_hash_key_line_breaks.rb +2 -5
- data/lib/rubocop/cop/layout/multiline_method_argument_line_breaks.rb +5 -9
- data/lib/rubocop/cop/layout/multiline_method_call_brace_layout.rb +2 -5
- data/lib/rubocop/cop/layout/multiline_method_definition_brace_layout.rb +2 -5
- data/lib/rubocop/cop/layout/rescue_ensure_alignment.rb +41 -22
- data/lib/rubocop/cop/layout/space_after_colon.rb +11 -7
- data/lib/rubocop/cop/layout/space_after_comma.rb +2 -5
- data/lib/rubocop/cop/layout/space_after_method_name.rb +5 -6
- data/lib/rubocop/cop/layout/space_after_not.rb +9 -11
- data/lib/rubocop/cop/layout/space_after_semicolon.rb +2 -5
- data/lib/rubocop/cop/layout/space_around_equals_in_parameter_default.rb +22 -17
- data/lib/rubocop/cop/layout/space_around_keyword.rb +17 -18
- data/lib/rubocop/cop/layout/space_around_operators.rb +17 -16
- data/lib/rubocop/cop/layout/space_before_block_braces.rb +23 -22
- data/lib/rubocop/cop/layout/space_before_comma.rb +3 -5
- data/lib/rubocop/cop/layout/space_before_comment.rb +10 -7
- data/lib/rubocop/cop/layout/space_before_first_arg.rb +7 -7
- data/lib/rubocop/cop/layout/space_before_semicolon.rb +2 -5
- data/lib/rubocop/cop/layout/space_in_lambda_literal.rb +9 -17
- data/lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb +20 -23
- data/lib/rubocop/cop/layout/space_inside_array_percent_literal.rb +3 -8
- data/lib/rubocop/cop/layout/space_inside_block_braces.rb +17 -16
- data/lib/rubocop/cop/layout/space_inside_hash_literal_braces.rb +19 -37
- data/lib/rubocop/cop/layout/space_inside_parens.rb +9 -14
- data/lib/rubocop/cop/layout/space_inside_percent_literal_delimiters.rb +5 -10
- data/lib/rubocop/cop/layout/space_inside_range_literal.rb +8 -17
- data/lib/rubocop/cop/layout/space_inside_reference_brackets.rb +16 -24
- data/lib/rubocop/cop/layout/space_inside_string_interpolation.rb +12 -13
- data/lib/rubocop/cop/layout/trailing_empty_lines.rb +10 -15
- data/lib/rubocop/cop/layout/trailing_whitespace.rb +11 -11
- data/lib/rubocop/cop/lint/ambiguous_operator.rb +2 -0
- data/lib/rubocop/cop/lint/big_decimal_new.rb +1 -2
- data/lib/rubocop/cop/lint/binary_operator_with_identical_operands.rb +2 -1
- data/lib/rubocop/cop/lint/constant_definition_in_block.rb +74 -0
- data/lib/rubocop/cop/lint/constant_resolution.rb +1 -1
- data/lib/rubocop/cop/lint/debugger.rb +2 -3
- data/lib/rubocop/cop/lint/deprecated_class_methods.rb +1 -3
- data/lib/rubocop/cop/lint/duplicate_methods.rb +2 -4
- data/lib/rubocop/cop/lint/duplicate_require.rb +46 -0
- data/lib/rubocop/cop/lint/duplicate_rescue_exception.rb +2 -15
- data/lib/rubocop/cop/lint/each_with_object_argument.rb +1 -0
- data/lib/rubocop/cop/lint/empty_file.rb +50 -0
- data/lib/rubocop/cop/lint/erb_new_arguments.rb +2 -0
- data/lib/rubocop/cop/lint/float_comparison.rb +2 -2
- data/lib/rubocop/cop/lint/format_parameter_mismatch.rb +2 -2
- data/lib/rubocop/cop/lint/identity_comparison.rb +51 -0
- data/lib/rubocop/cop/lint/ineffective_access_modifier.rb +2 -5
- data/lib/rubocop/cop/lint/inherit_exception.rb +2 -2
- data/lib/rubocop/cop/lint/missing_super.rb +11 -11
- data/lib/rubocop/cop/lint/mixed_regexp_capture_types.rb +2 -35
- data/lib/rubocop/cop/lint/multiple_comparison.rb +3 -1
- data/lib/rubocop/cop/lint/number_conversion.rb +1 -0
- data/lib/rubocop/cop/lint/out_of_range_regexp_ref.rb +33 -15
- data/lib/rubocop/cop/lint/percent_string_array.rb +8 -12
- data/lib/rubocop/cop/lint/raise_exception.rb +1 -0
- data/lib/rubocop/cop/lint/rand_one.rb +2 -1
- data/lib/rubocop/cop/lint/redundant_cop_disable_directive.rb +36 -29
- data/lib/rubocop/cop/lint/redundant_cop_enable_directive.rb +14 -4
- data/lib/rubocop/cop/lint/redundant_require_statement.rb +1 -0
- data/lib/rubocop/cop/lint/rescue_type.rb +0 -1
- data/lib/rubocop/cop/lint/send_with_mixin_argument.rb +3 -1
- data/lib/rubocop/cop/lint/shadowed_exception.rb +6 -6
- data/lib/rubocop/cop/lint/shadowing_outer_local_variable.rb +4 -4
- data/lib/rubocop/cop/lint/struct_new_override.rb +1 -0
- data/lib/rubocop/cop/lint/to_json.rb +16 -5
- data/lib/rubocop/cop/lint/top_level_return_with_argument.rb +1 -1
- data/lib/rubocop/cop/lint/trailing_comma_in_attribute_declaration.rb +57 -0
- data/lib/rubocop/cop/lint/unreachable_loop.rb +3 -6
- data/lib/rubocop/cop/lint/uri_escape_unescape.rb +3 -1
- data/lib/rubocop/cop/lint/uri_regexp.rb +10 -25
- data/lib/rubocop/cop/lint/useless_access_modifier.rb +3 -9
- data/lib/rubocop/cop/lint/useless_method_definition.rb +70 -0
- data/lib/rubocop/cop/lint/useless_times.rb +106 -0
- data/lib/rubocop/cop/metrics/utils/abc_size_calculator.rb +27 -16
- data/lib/rubocop/cop/metrics/utils/code_length_calculator.rb +1 -0
- data/lib/rubocop/cop/migration/department_name.rb +2 -2
- data/lib/rubocop/cop/mixin/alignment.rb +5 -1
- data/lib/rubocop/cop/mixin/allowed_methods.rb +2 -0
- data/lib/rubocop/cop/mixin/annotation_comment.rb +5 -0
- data/lib/rubocop/cop/mixin/check_line_breakable.rb +17 -8
- data/lib/rubocop/cop/mixin/comments_help.rb +48 -0
- 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/empty_lines_around_body.rb +8 -7
- data/lib/rubocop/cop/mixin/empty_parameter.rb +3 -1
- data/lib/rubocop/cop/mixin/end_keyword_alignment.rb +12 -1
- data/lib/rubocop/cop/mixin/enforce_superclass.rb +0 -2
- data/lib/rubocop/cop/mixin/first_element_line_break.rb +3 -1
- data/lib/rubocop/cop/mixin/hash_transform_method.rb +31 -12
- data/lib/rubocop/cop/mixin/line_length_help.rb +1 -3
- data/lib/rubocop/cop/mixin/multiline_element_line_breaks.rb +3 -1
- data/lib/rubocop/cop/mixin/multiline_literal_brace_layout.rb +13 -12
- data/lib/rubocop/cop/mixin/negative_conditional.rb +2 -2
- data/lib/rubocop/cop/mixin/percent_array.rb +16 -9
- data/lib/rubocop/cop/mixin/range_help.rb +18 -4
- data/lib/rubocop/cop/mixin/regexp_literal_help.rb +1 -1
- data/lib/rubocop/cop/mixin/rescue_node.rb +11 -1
- data/lib/rubocop/cop/mixin/space_after_punctuation.rb +4 -3
- data/lib/rubocop/cop/mixin/space_before_punctuation.rb +4 -3
- data/lib/rubocop/cop/mixin/statement_modifier.rb +12 -6
- data/lib/rubocop/cop/mixin/surrounding_space.rb +8 -4
- data/lib/rubocop/cop/mixin/trailing_comma.rb +9 -11
- data/lib/rubocop/cop/mixin/visibility_help.rb +4 -16
- data/lib/rubocop/cop/naming/binary_operator_parameter_name.rb +1 -1
- data/lib/rubocop/cop/naming/file_name.rb +1 -1
- data/lib/rubocop/cop/offense.rb +1 -0
- data/lib/rubocop/cop/security/eval.rb +1 -0
- data/lib/rubocop/cop/security/json_load.rb +1 -0
- data/lib/rubocop/cop/security/marshal_load.rb +1 -0
- data/lib/rubocop/cop/security/open.rb +1 -0
- data/lib/rubocop/cop/security/yaml_load.rb +1 -0
- data/lib/rubocop/cop/severity.rb +0 -8
- data/lib/rubocop/cop/style/access_modifier_declarations.rb +8 -19
- data/lib/rubocop/cop/style/accessor_grouping.rb +20 -20
- data/lib/rubocop/cop/style/alias.rb +36 -33
- data/lib/rubocop/cop/style/and_or.rb +9 -11
- data/lib/rubocop/cop/style/array_coercion.rb +4 -0
- data/lib/rubocop/cop/style/array_join.rb +7 -8
- data/lib/rubocop/cop/style/ascii_comments.rb +4 -4
- data/lib/rubocop/cop/style/attr.rb +12 -9
- data/lib/rubocop/cop/style/auto_resource_cleanup.rb +4 -5
- data/lib/rubocop/cop/style/bare_percent_literals.rb +10 -12
- data/lib/rubocop/cop/style/begin_block.rb +2 -2
- data/lib/rubocop/cop/style/bisected_attr_accessor.rb +9 -12
- data/lib/rubocop/cop/style/block_comments.rb +14 -18
- data/lib/rubocop/cop/style/block_delimiters.rb +23 -23
- data/lib/rubocop/cop/style/case_equality.rb +11 -3
- data/lib/rubocop/cop/style/case_like_if.rb +37 -18
- data/lib/rubocop/cop/style/class_and_module_children.rb +16 -11
- data/lib/rubocop/cop/style/class_check.rb +6 -11
- data/lib/rubocop/cop/style/class_methods.rb +7 -11
- data/lib/rubocop/cop/style/class_methods_definitions.rb +157 -0
- data/lib/rubocop/cop/style/class_vars.rb +7 -12
- data/lib/rubocop/cop/style/collection_methods.rb +11 -17
- data/lib/rubocop/cop/style/colon_method_call.rb +6 -7
- data/lib/rubocop/cop/style/colon_method_definition.rb +6 -6
- data/lib/rubocop/cop/style/combinable_loops.rb +84 -0
- data/lib/rubocop/cop/style/command_literal.rb +23 -24
- data/lib/rubocop/cop/style/comment_annotation.rb +15 -15
- data/lib/rubocop/cop/style/commented_keyword.rb +8 -9
- data/lib/rubocop/cop/style/conditional_assignment.rb +50 -61
- data/lib/rubocop/cop/style/constant_visibility.rb +3 -2
- data/lib/rubocop/cop/style/copyright.rb +12 -12
- data/lib/rubocop/cop/style/date_time.rb +13 -2
- data/lib/rubocop/cop/style/def_with_parentheses.rb +8 -10
- data/lib/rubocop/cop/style/dir.rb +8 -10
- data/lib/rubocop/cop/style/disable_cops_within_source_code_directive.rb +7 -9
- data/lib/rubocop/cop/style/documentation.rb +2 -4
- data/lib/rubocop/cop/style/documentation_method.rb +1 -1
- data/lib/rubocop/cop/style/double_cop_disable_directive.rb +12 -15
- data/lib/rubocop/cop/style/double_negation.rb +3 -2
- data/lib/rubocop/cop/style/each_for_simple_loop.rb +5 -8
- data/lib/rubocop/cop/style/each_with_object.rb +16 -17
- data/lib/rubocop/cop/style/empty_block_parameter.rb +9 -10
- data/lib/rubocop/cop/style/empty_case_condition.rb +19 -20
- data/lib/rubocop/cop/style/empty_else.rb +17 -19
- data/lib/rubocop/cop/style/empty_lambda_parameter.rb +9 -10
- data/lib/rubocop/cop/style/empty_literal.rb +18 -17
- data/lib/rubocop/cop/style/empty_method.rb +5 -8
- data/lib/rubocop/cop/style/encoding.rb +5 -9
- data/lib/rubocop/cop/style/end_block.rb +4 -6
- data/lib/rubocop/cop/style/eval_with_location.rb +6 -10
- data/lib/rubocop/cop/style/even_odd.rb +8 -11
- data/lib/rubocop/cop/style/expand_path_arguments.rb +23 -26
- data/lib/rubocop/cop/style/explicit_block_argument.rb +1 -1
- data/lib/rubocop/cop/style/exponential_notation.rb +1 -1
- data/lib/rubocop/cop/style/float_division.rb +3 -1
- data/lib/rubocop/cop/style/for.rb +11 -15
- data/lib/rubocop/cop/style/format_string.rb +18 -23
- data/lib/rubocop/cop/style/format_string_token.rb +4 -7
- data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +19 -41
- data/lib/rubocop/cop/style/global_vars.rb +2 -2
- data/lib/rubocop/cop/style/guard_clause.rb +4 -4
- data/lib/rubocop/cop/style/hash_as_last_array_item.rb +24 -5
- data/lib/rubocop/cop/style/hash_each_methods.rb +5 -8
- data/lib/rubocop/cop/style/hash_syntax.rb +6 -7
- data/lib/rubocop/cop/style/hash_transform_keys.rb +19 -11
- data/lib/rubocop/cop/style/hash_transform_values.rb +18 -10
- data/lib/rubocop/cop/style/identical_conditional_branches.rb +1 -1
- data/lib/rubocop/cop/style/if_inside_else.rb +2 -2
- data/lib/rubocop/cop/style/if_unless_modifier.rb +11 -17
- data/lib/rubocop/cop/style/if_unless_modifier_of_if_unless.rb +3 -7
- data/lib/rubocop/cop/style/if_with_semicolon.rb +3 -6
- data/lib/rubocop/cop/style/implicit_runtime_error.rb +2 -1
- data/lib/rubocop/cop/style/infinite_loop.rb +23 -23
- data/lib/rubocop/cop/style/inline_comment.rb +3 -3
- data/lib/rubocop/cop/style/inverse_methods.rb +20 -29
- data/lib/rubocop/cop/style/keyword_parameters_order.rb +53 -0
- data/lib/rubocop/cop/style/lambda.rb +7 -12
- data/lib/rubocop/cop/style/lambda_call.rb +17 -14
- data/lib/rubocop/cop/style/line_end_concatenation.rb +19 -16
- data/lib/rubocop/cop/style/method_call_with_args_parentheses.rb +2 -1
- data/lib/rubocop/cop/style/method_call_with_args_parentheses/omit_parentheses.rb +11 -11
- data/lib/rubocop/cop/style/method_call_with_args_parentheses/require_parentheses.rb +4 -8
- data/lib/rubocop/cop/style/method_call_without_args_parentheses.rb +7 -6
- data/lib/rubocop/cop/style/method_called_on_do_end_block.rb +12 -3
- data/lib/rubocop/cop/style/method_def_parentheses.rb +11 -16
- data/lib/rubocop/cop/style/min_max.rb +8 -12
- data/lib/rubocop/cop/style/missing_else.rb +13 -13
- data/lib/rubocop/cop/style/missing_respond_to_missing.rb +1 -1
- data/lib/rubocop/cop/style/mixin_grouping.rb +24 -27
- data/lib/rubocop/cop/style/mixin_usage.rb +9 -28
- data/lib/rubocop/cop/style/module_function.rb +10 -13
- data/lib/rubocop/cop/style/multiline_block_chain.rb +2 -2
- data/lib/rubocop/cop/style/multiline_if_modifier.rb +3 -10
- data/lib/rubocop/cop/style/multiline_if_then.rb +4 -10
- data/lib/rubocop/cop/style/multiline_memoization.rb +12 -10
- data/lib/rubocop/cop/style/multiline_method_signature.rb +1 -1
- data/lib/rubocop/cop/style/multiline_ternary_operator.rb +17 -6
- data/lib/rubocop/cop/style/multiline_when_then.rb +10 -11
- data/lib/rubocop/cop/style/multiple_comparison.rb +1 -1
- data/lib/rubocop/cop/style/mutable_constant.rb +23 -20
- data/lib/rubocop/cop/style/negated_if.rb +6 -6
- data/lib/rubocop/cop/style/negated_unless.rb +6 -6
- data/lib/rubocop/cop/style/negated_while.rb +7 -15
- data/lib/rubocop/cop/style/nested_modifier.rb +10 -13
- data/lib/rubocop/cop/style/nested_parenthesized_calls.rb +14 -12
- data/lib/rubocop/cop/style/nested_ternary_operator.rb +14 -16
- data/lib/rubocop/cop/style/next.rb +10 -14
- data/lib/rubocop/cop/style/nil_comparison.rb +13 -11
- data/lib/rubocop/cop/style/non_nil_check.rb +34 -26
- data/lib/rubocop/cop/style/not.rb +20 -26
- data/lib/rubocop/cop/style/numeric_literal_prefix.rb +4 -9
- data/lib/rubocop/cop/style/numeric_predicate.rb +5 -14
- data/lib/rubocop/cop/style/one_line_conditional.rb +73 -23
- data/lib/rubocop/cop/style/option_hash.rb +1 -1
- data/lib/rubocop/cop/style/optional_arguments.rb +1 -1
- data/lib/rubocop/cop/style/optional_boolean_parameter.rb +12 -1
- data/lib/rubocop/cop/style/or_assignment.rb +13 -10
- data/lib/rubocop/cop/style/parallel_assignment.rb +14 -14
- data/lib/rubocop/cop/style/parentheses_around_condition.rb +6 -6
- data/lib/rubocop/cop/style/percent_literal_delimiters.rb +13 -19
- data/lib/rubocop/cop/style/percent_q_literals.rb +8 -10
- data/lib/rubocop/cop/style/perl_backrefs.rb +8 -10
- data/lib/rubocop/cop/style/preferred_hash_methods.rb +11 -14
- data/lib/rubocop/cop/style/proc.rb +6 -6
- data/lib/rubocop/cop/style/raise_args.rb +15 -24
- data/lib/rubocop/cop/style/random_with_offset.rb +19 -19
- data/lib/rubocop/cop/style/redundant_assignment.rb +8 -18
- data/lib/rubocop/cop/style/redundant_begin.rb +7 -9
- data/lib/rubocop/cop/style/redundant_capital_w.rb +6 -9
- data/lib/rubocop/cop/style/redundant_condition.rb +5 -6
- data/lib/rubocop/cop/style/redundant_conditional.rb +4 -5
- data/lib/rubocop/cop/style/redundant_exception.rb +1 -3
- data/lib/rubocop/cop/style/redundant_fetch_block.rb +3 -12
- data/lib/rubocop/cop/style/redundant_file_extension_in_require.rb +9 -8
- data/lib/rubocop/cop/style/redundant_freeze.rb +5 -7
- data/lib/rubocop/cop/style/redundant_interpolation.rb +25 -24
- data/lib/rubocop/cop/style/redundant_parentheses.rb +21 -15
- data/lib/rubocop/cop/style/redundant_percent_q.rb +9 -11
- data/lib/rubocop/cop/style/redundant_regexp_character_class.rb +6 -13
- data/lib/rubocop/cop/style/redundant_regexp_escape.rb +5 -14
- data/lib/rubocop/cop/style/redundant_return.rb +17 -17
- data/lib/rubocop/cop/style/redundant_self.rb +9 -11
- data/lib/rubocop/cop/style/redundant_self_assignment.rb +116 -0
- data/lib/rubocop/cop/style/redundant_sort.rb +12 -31
- data/lib/rubocop/cop/style/redundant_sort_by.rb +5 -9
- data/lib/rubocop/cop/style/regexp_literal.rb +10 -21
- data/lib/rubocop/cop/style/rescue_modifier.rb +29 -9
- data/lib/rubocop/cop/style/rescue_standard_error.rb +20 -16
- data/lib/rubocop/cop/style/return_nil.rb +5 -5
- data/lib/rubocop/cop/style/safe_navigation.rb +22 -16
- data/lib/rubocop/cop/style/sample.rb +12 -14
- data/lib/rubocop/cop/style/self_assignment.rb +26 -22
- data/lib/rubocop/cop/style/semicolon.rb +6 -9
- data/lib/rubocop/cop/style/send.rb +4 -5
- data/lib/rubocop/cop/style/signal_exception.rb +23 -19
- data/lib/rubocop/cop/style/single_argument_dig.rb +1 -0
- data/lib/rubocop/cop/style/single_line_block_params.rb +4 -2
- data/lib/rubocop/cop/style/single_line_methods.rb +18 -17
- data/lib/rubocop/cop/style/slicing_with_range.rb +6 -8
- data/lib/rubocop/cop/style/sole_nested_conditional.rb +66 -0
- data/lib/rubocop/cop/style/special_global_vars.rb +10 -15
- data/lib/rubocop/cop/style/stabby_lambda_parentheses.rb +17 -21
- data/lib/rubocop/cop/style/stderr_puts.rb +5 -6
- data/lib/rubocop/cop/style/string_concatenation.rb +16 -2
- data/lib/rubocop/cop/style/string_hash_keys.rb +6 -7
- data/lib/rubocop/cop/style/string_methods.rb +7 -17
- data/lib/rubocop/cop/style/strip.rb +9 -14
- data/lib/rubocop/cop/style/struct_inheritance.rb +3 -6
- data/lib/rubocop/cop/style/symbol_array.rb +5 -16
- data/lib/rubocop/cop/style/symbol_literal.rb +4 -6
- data/lib/rubocop/cop/style/symbol_proc.rb +14 -18
- data/lib/rubocop/cop/style/ternary_parentheses.rb +22 -22
- data/lib/rubocop/cop/style/trailing_body_on_class.rb +3 -6
- data/lib/rubocop/cop/style/trailing_body_on_method_definition.rb +4 -7
- data/lib/rubocop/cop/style/trailing_body_on_module.rb +3 -6
- data/lib/rubocop/cop/style/trailing_comma_in_arguments.rb +2 -5
- data/lib/rubocop/cop/style/trailing_comma_in_array_literal.rb +2 -5
- data/lib/rubocop/cop/style/trailing_comma_in_block_args.rb +11 -9
- data/lib/rubocop/cop/style/trailing_comma_in_hash_literal.rb +2 -5
- data/lib/rubocop/cop/style/trailing_underscore_variable.rb +8 -17
- data/lib/rubocop/cop/style/trivial_accessors.rb +26 -30
- data/lib/rubocop/cop/style/unless_else.rb +5 -8
- data/lib/rubocop/cop/style/unpack_first.rb +5 -8
- data/lib/rubocop/cop/style/variable_interpolation.rb +7 -10
- data/lib/rubocop/cop/style/when_then.rb +4 -6
- data/lib/rubocop/cop/style/while_until_do.rb +6 -16
- data/lib/rubocop/cop/style/while_until_modifier.rb +6 -20
- data/lib/rubocop/cop/style/word_array.rb +5 -23
- data/lib/rubocop/cop/style/yoda_condition.rb +4 -15
- data/lib/rubocop/cop/style/zero_length_predicate.rb +12 -18
- data/lib/rubocop/cop/team.rb +1 -0
- data/lib/rubocop/cop/util.rb +2 -1
- data/lib/rubocop/cop/utils/format_string.rb +3 -5
- data/lib/rubocop/cop/variable_force.rb +2 -0
- data/lib/rubocop/cops_documentation_generator.rb +5 -3
- data/lib/rubocop/core_ext/string.rb +2 -2
- data/lib/rubocop/directive_comment.rb +32 -0
- data/lib/rubocop/ext/regexp_node.rb +46 -0
- data/lib/rubocop/file_finder.rb +1 -0
- data/lib/rubocop/formatter/auto_gen_config_formatter.rb +2 -1
- data/lib/rubocop/formatter/disabled_config_formatter.rb +13 -6
- data/lib/rubocop/formatter/html_formatter.rb +2 -0
- data/lib/rubocop/formatter/junit_formatter.rb +1 -1
- data/lib/rubocop/formatter/progress_formatter.rb +2 -1
- data/lib/rubocop/formatter/quiet_formatter.rb +1 -1
- data/lib/rubocop/formatter/simple_text_formatter.rb +36 -6
- data/lib/rubocop/name_similarity.rb +1 -0
- data/lib/rubocop/options.rb +43 -20
- data/lib/rubocop/remote_config.rb +1 -0
- data/lib/rubocop/result_cache.rb +31 -13
- data/lib/rubocop/rspec/cop_helper.rb +4 -1
- data/lib/rubocop/rspec/expect_offense.rb +14 -9
- data/lib/rubocop/rspec/shared_contexts.rb +13 -5
- data/lib/rubocop/runner.rb +35 -15
- data/lib/rubocop/string_interpreter.rb +3 -0
- data/lib/rubocop/target_finder.rb +5 -1
- data/lib/rubocop/target_ruby.rb +7 -1
- data/lib/rubocop/version.rb +7 -1
- data/lib/rubocop/yaml_duplication_checker.rb +1 -0
- metadata +26 -14
- data/lib/rubocop/cop/tokens_util.rb +0 -84
@@ -26,7 +26,7 @@ module RuboCop
|
|
26
26
|
# public_constant :BAZ
|
27
27
|
# end
|
28
28
|
#
|
29
|
-
class ConstantVisibility <
|
29
|
+
class ConstantVisibility < Base
|
30
30
|
MSG = 'Explicitly make `%<constant_name>s` public or private using ' \
|
31
31
|
'either `#public_constant` or `#private_constant`.'
|
32
32
|
|
@@ -34,7 +34,8 @@ module RuboCop
|
|
34
34
|
return unless class_or_module_scope?(node)
|
35
35
|
return if visibility_declaration?(node)
|
36
36
|
|
37
|
-
|
37
|
+
message = message(node)
|
38
|
+
add_offense(node, message: message)
|
38
39
|
end
|
39
40
|
|
40
41
|
private
|
@@ -15,28 +15,24 @@ module RuboCop
|
|
15
15
|
# that RuboCop scans, a comment that matches this regex must be found or
|
16
16
|
# an offense is reported.
|
17
17
|
#
|
18
|
-
class Copyright <
|
18
|
+
class Copyright < Base
|
19
19
|
include RangeHelp
|
20
|
+
extend AutoCorrector
|
20
21
|
|
21
22
|
MSG = 'Include a copyright notice matching /%<notice>s/ before ' \
|
22
23
|
'any code.'
|
23
24
|
AUTOCORRECT_EMPTY_WARNING = 'An AutocorrectNotice must be defined in ' \
|
24
25
|
'your RuboCop config'
|
25
26
|
|
26
|
-
def
|
27
|
-
return if notice.empty?
|
28
|
-
return if notice_found?(processed_source)
|
27
|
+
def on_new_investigation
|
28
|
+
return if notice.empty? || notice_found?(processed_source)
|
29
29
|
|
30
|
-
|
31
|
-
|
32
|
-
location: range, message: format(MSG, notice: notice))
|
33
|
-
end
|
34
|
-
|
35
|
-
def autocorrect(token)
|
36
|
-
verify_autocorrect_notice!
|
30
|
+
add_offense(offense_range, message: format(MSG, notice: notice)) do |corrector|
|
31
|
+
verify_autocorrect_notice!
|
37
32
|
|
38
|
-
|
33
|
+
token = insert_notice_before(processed_source)
|
39
34
|
range = token.nil? ? range_between(0, 0) : token.pos
|
35
|
+
|
40
36
|
corrector.insert_before(range, "#{autocorrect_notice}\n")
|
41
37
|
end
|
42
38
|
end
|
@@ -51,6 +47,10 @@ module RuboCop
|
|
51
47
|
cop_config['AutocorrectNotice']
|
52
48
|
end
|
53
49
|
|
50
|
+
def offense_range
|
51
|
+
source_range(processed_source.buffer, 1, 0)
|
52
|
+
end
|
53
|
+
|
54
54
|
def verify_autocorrect_notice!
|
55
55
|
raise Warning, AUTOCORRECT_EMPTY_WARNING if autocorrect_notice.empty?
|
56
56
|
|
@@ -41,7 +41,9 @@ module RuboCop
|
|
41
41
|
#
|
42
42
|
# # good
|
43
43
|
# something.to_time
|
44
|
-
class DateTime <
|
44
|
+
class DateTime < Base
|
45
|
+
extend AutoCorrector
|
46
|
+
|
45
47
|
CLASS_MSG = 'Prefer Time over DateTime.'
|
46
48
|
COERCION_MSG = 'Do not use #to_datetime.'
|
47
49
|
|
@@ -63,7 +65,10 @@ module RuboCop
|
|
63
65
|
return if historic_date?(node)
|
64
66
|
|
65
67
|
message = to_datetime?(node) ? COERCION_MSG : CLASS_MSG
|
66
|
-
|
68
|
+
|
69
|
+
add_offense(node, message: message) do |corrector|
|
70
|
+
autocorrect(corrector, node)
|
71
|
+
end
|
67
72
|
end
|
68
73
|
|
69
74
|
private
|
@@ -71,6 +76,12 @@ module RuboCop
|
|
71
76
|
def disallow_coercion?
|
72
77
|
!cop_config['AllowCoercion']
|
73
78
|
end
|
79
|
+
|
80
|
+
def autocorrect(corrector, node)
|
81
|
+
return if to_datetime?(node)
|
82
|
+
|
83
|
+
corrector.replace(node.receiver.loc.name, 'Time')
|
84
|
+
end
|
74
85
|
end
|
75
86
|
end
|
76
87
|
end
|
@@ -33,24 +33,22 @@ module RuboCop
|
|
33
33
|
# def Baz.foo
|
34
34
|
# # does a thing
|
35
35
|
# end
|
36
|
-
class DefWithParentheses <
|
36
|
+
class DefWithParentheses < Base
|
37
|
+
extend AutoCorrector
|
38
|
+
|
37
39
|
MSG = "Omit the parentheses in defs when the method doesn't accept " \
|
38
40
|
'any arguments.'
|
39
41
|
|
40
42
|
def on_def(node)
|
41
43
|
return if node.single_line?
|
42
|
-
return unless !node.arguments? && node.arguments.loc.begin
|
44
|
+
return unless !node.arguments? && (node_arguments_loc_begin = node.arguments.loc.begin)
|
43
45
|
|
44
|
-
add_offense(
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
def autocorrect(node)
|
49
|
-
lambda do |corrector|
|
50
|
-
corrector.remove(node.loc.begin)
|
51
|
-
corrector.remove(node.loc.end)
|
46
|
+
add_offense(node_arguments_loc_begin) do |corrector|
|
47
|
+
corrector.remove(node_arguments_loc_begin)
|
48
|
+
corrector.remove(node.arguments.loc.end)
|
52
49
|
end
|
53
50
|
end
|
51
|
+
alias on_defs on_def
|
54
52
|
end
|
55
53
|
end
|
56
54
|
end
|
@@ -16,9 +16,11 @@ module RuboCop
|
|
16
16
|
#
|
17
17
|
# # good
|
18
18
|
# path = __dir__
|
19
|
-
class Dir <
|
20
|
-
|
21
|
-
|
19
|
+
class Dir < Base
|
20
|
+
extend AutoCorrector
|
21
|
+
|
22
|
+
MSG = "Use `__dir__` to get an absolute path to the current file's directory."
|
23
|
+
RESTRICT_ON_SEND = %i[expand_path dirname].freeze
|
22
24
|
|
23
25
|
def_node_matcher :dir_replacement?, <<~PATTERN
|
24
26
|
{(send (const {nil? cbase} :File) :expand_path (send (const {nil? cbase} :File) :dirname #file_keyword?))
|
@@ -27,13 +29,9 @@ module RuboCop
|
|
27
29
|
|
28
30
|
def on_send(node)
|
29
31
|
dir_replacement?(node) do
|
30
|
-
add_offense(node)
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
def autocorrect(node)
|
35
|
-
lambda do |corrector|
|
36
|
-
corrector.replace(node, '__dir__')
|
32
|
+
add_offense(node) do |corrector|
|
33
|
+
corrector.replace(node, '__dir__')
|
34
|
+
end
|
37
35
|
end
|
38
36
|
end
|
39
37
|
|
@@ -20,21 +20,19 @@ module RuboCop
|
|
20
20
|
# def fixed_method_name_and_no_rubocop_comments
|
21
21
|
# end
|
22
22
|
#
|
23
|
-
class DisableCopsWithinSourceCodeDirective <
|
23
|
+
class DisableCopsWithinSourceCodeDirective < Base
|
24
|
+
extend AutoCorrector
|
25
|
+
|
24
26
|
# rubocop:enable Lint/RedundantCopDisableDirective
|
25
27
|
MSG = 'Comment to disable/enable RuboCop.'
|
26
28
|
|
27
|
-
def
|
29
|
+
def on_new_investigation
|
28
30
|
processed_source.comments.each do |comment|
|
29
31
|
next unless rubocop_directive_comment?(comment)
|
30
32
|
|
31
|
-
add_offense(comment)
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
def autocorrect(comment)
|
36
|
-
lambda do |corrector|
|
37
|
-
corrector.replace(comment, '')
|
33
|
+
add_offense(comment) do |corrector|
|
34
|
+
corrector.replace(comment, '')
|
35
|
+
end
|
38
36
|
end
|
39
37
|
end
|
40
38
|
|
@@ -55,7 +55,7 @@ module RuboCop
|
|
55
55
|
# Public = Class.new
|
56
56
|
# end
|
57
57
|
#
|
58
|
-
class Documentation <
|
58
|
+
class Documentation < Base
|
59
59
|
include DocumentationComment
|
60
60
|
|
61
61
|
MSG = 'Missing top-level %<type>s documentation comment.'
|
@@ -84,9 +84,7 @@ module RuboCop
|
|
84
84
|
return if compact_namespace?(node) &&
|
85
85
|
nodoc_comment?(outer_module(node).first)
|
86
86
|
|
87
|
-
add_offense(node,
|
88
|
-
location: :keyword,
|
89
|
-
message: format(MSG, type: type))
|
87
|
+
add_offense(node.loc.keyword, message: format(MSG, type: type))
|
90
88
|
end
|
91
89
|
|
92
90
|
def namespace?(node)
|
@@ -24,29 +24,26 @@ module RuboCop
|
|
24
24
|
# def f # rubocop:disable Style/For, Metrics/AbcSize
|
25
25
|
# end
|
26
26
|
#
|
27
|
-
class DoubleCopDisableDirective <
|
27
|
+
class DoubleCopDisableDirective < Base
|
28
|
+
extend AutoCorrector
|
29
|
+
|
28
30
|
# rubocop:enable Style/For, Style/DoubleCopDisableDirective
|
29
31
|
# rubocop:enable Lint/RedundantCopDisableDirective, Metrics/AbcSize
|
30
32
|
MSG = 'More than one disable comment on one line.'
|
31
33
|
|
32
|
-
def
|
34
|
+
def on_new_investigation
|
33
35
|
processed_source.comments.each do |comment|
|
34
36
|
next unless comment.text.scan(/# rubocop:(?:disable|todo)/).size > 1
|
35
37
|
|
36
|
-
add_offense(comment)
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
'# rubocop:disable'
|
43
|
-
else
|
44
|
-
'# rubocop:todo'
|
45
|
-
end
|
38
|
+
add_offense(comment) do |corrector|
|
39
|
+
prefix = if comment.text.start_with?('# rubocop:disable')
|
40
|
+
'# rubocop:disable'
|
41
|
+
else
|
42
|
+
'# rubocop:todo'
|
43
|
+
end
|
46
44
|
|
47
|
-
|
48
|
-
|
49
|
-
comment.text[/#{prefix} \S+/])
|
45
|
+
corrector.replace(comment, comment.text[/#{prefix} \S+/])
|
46
|
+
end
|
50
47
|
end
|
51
48
|
end
|
52
49
|
end
|
@@ -32,10 +32,11 @@ module RuboCop
|
|
32
32
|
# !!something and !something.nil? are not the same thing.
|
33
33
|
# As you're unlikely to write code that can accept values of any type
|
34
34
|
# this is rarely a problem in practice.
|
35
|
-
class DoubleNegation <
|
35
|
+
class DoubleNegation < Base
|
36
36
|
include ConfigurableEnforcedStyle
|
37
37
|
|
38
38
|
MSG = 'Avoid the use of double negation (`!!`).'
|
39
|
+
RESTRICT_ON_SEND = %i[!].freeze
|
39
40
|
|
40
41
|
def_node_matcher :double_negative?, '(send (send _ :!) :!)'
|
41
42
|
|
@@ -43,7 +44,7 @@ module RuboCop
|
|
43
44
|
return unless double_negative?(node) && node.prefix_bang?
|
44
45
|
return if style == :allowed_in_returns && allowed_in_returns?(node)
|
45
46
|
|
46
|
-
add_offense(node
|
47
|
+
add_offense(node.loc.selector)
|
47
48
|
end
|
48
49
|
|
49
50
|
private
|
@@ -22,7 +22,9 @@ module RuboCop
|
|
22
22
|
#
|
23
23
|
# # good
|
24
24
|
# 10.times {}
|
25
|
-
class EachForSimpleLoop <
|
25
|
+
class EachForSimpleLoop < Base
|
26
|
+
extend AutoCorrector
|
27
|
+
|
26
28
|
MSG = 'Use `Integer#times` for a simple loop which iterates a fixed ' \
|
27
29
|
'number of times.'
|
28
30
|
|
@@ -33,17 +35,12 @@ module RuboCop
|
|
33
35
|
|
34
36
|
range = send_node.receiver.source_range.join(send_node.loc.selector)
|
35
37
|
|
36
|
-
add_offense(
|
37
|
-
end
|
38
|
-
|
39
|
-
def autocorrect(node)
|
40
|
-
lambda do |corrector|
|
38
|
+
add_offense(range) do |corrector|
|
41
39
|
range_type, min, max = offending_each_range(node)
|
42
40
|
|
43
41
|
max += 1 if range_type == :irange
|
44
42
|
|
45
|
-
corrector.replace(node.send_node,
|
46
|
-
"#{max - min}.times")
|
43
|
+
corrector.replace(node.send_node, "#{max - min}.times")
|
47
44
|
end
|
48
45
|
end
|
49
46
|
|
@@ -16,7 +16,8 @@ module RuboCop
|
|
16
16
|
#
|
17
17
|
# # good
|
18
18
|
# [1, 2].each_with_object({}) { |e, a| a[e] = e }
|
19
|
-
class EachWithObject <
|
19
|
+
class EachWithObject < Base
|
20
|
+
extend AutoCorrector
|
20
21
|
include RangeHelp
|
21
22
|
|
22
23
|
MSG = 'Use `each_with_object` instead of `%<method>s`.'
|
@@ -36,32 +37,30 @@ module RuboCop
|
|
36
37
|
return unless first_argument_returned?(args, return_value)
|
37
38
|
return if accumulator_param_assigned_to?(body, args)
|
38
39
|
|
39
|
-
|
40
|
-
|
40
|
+
message = format(MSG, method: method_name)
|
41
|
+
add_offense(method.loc.selector, message: message) do |corrector|
|
42
|
+
autocorrect(corrector, node, return_value)
|
43
|
+
end
|
41
44
|
end
|
42
45
|
end
|
43
46
|
|
44
|
-
|
45
|
-
lambda do |corrector|
|
46
|
-
corrector.replace(node.send_node.loc.selector, 'each_with_object')
|
47
|
+
private
|
47
48
|
|
48
|
-
|
49
|
+
def autocorrect(corrector, node, return_value)
|
50
|
+
corrector.replace(node.send_node.loc.selector, 'each_with_object')
|
49
51
|
|
50
|
-
|
51
|
-
corrector.replace(second_arg, first_arg.source)
|
52
|
+
first_arg, second_arg = *node.arguments
|
52
53
|
|
53
|
-
|
54
|
+
corrector.replace(first_arg, second_arg.source)
|
55
|
+
corrector.replace(second_arg, first_arg.source)
|
54
56
|
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
end
|
57
|
+
if return_value_occupies_whole_line?(return_value)
|
58
|
+
corrector.remove(whole_line_expression(return_value))
|
59
|
+
else
|
60
|
+
corrector.remove(return_value)
|
60
61
|
end
|
61
62
|
end
|
62
63
|
|
63
|
-
private
|
64
|
-
|
65
64
|
def simple_method_arg?(method_arg)
|
66
65
|
method_arg&.basic_literal?
|
67
66
|
end
|
@@ -21,9 +21,10 @@ module RuboCop
|
|
21
21
|
#
|
22
22
|
# # good
|
23
23
|
# a { do_something }
|
24
|
-
class EmptyBlockParameter <
|
24
|
+
class EmptyBlockParameter < Base
|
25
25
|
include EmptyParameter
|
26
26
|
include RangeHelp
|
27
|
+
extend AutoCorrector
|
27
28
|
|
28
29
|
MSG = 'Omit pipes for the empty block parameters.'
|
29
30
|
|
@@ -32,15 +33,13 @@ module RuboCop
|
|
32
33
|
check(node) unless send_node.send_type? && send_node.lambda_literal?
|
33
34
|
end
|
34
35
|
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
corrector.remove(range)
|
43
|
-
end
|
36
|
+
private
|
37
|
+
|
38
|
+
def autocorrect(corrector, node)
|
39
|
+
block = node.parent
|
40
|
+
range = range_between(block.loc.begin.end_pos, node.loc.expression.end_pos)
|
41
|
+
|
42
|
+
corrector.remove(range)
|
44
43
|
end
|
45
44
|
end
|
46
45
|
end
|
@@ -35,11 +35,11 @@ module RuboCop
|
|
35
35
|
# else
|
36
36
|
# puts 'more'
|
37
37
|
# end
|
38
|
-
class EmptyCaseCondition <
|
38
|
+
class EmptyCaseCondition < Base
|
39
39
|
include RangeHelp
|
40
|
+
extend AutoCorrector
|
40
41
|
|
41
|
-
MSG = 'Do not use empty `case` condition, instead use an `if` '
|
42
|
-
'expression.'
|
42
|
+
MSG = 'Do not use empty `case` condition, instead use an `if` expression.'
|
43
43
|
|
44
44
|
def on_case(case_node)
|
45
45
|
return if case_node.condition
|
@@ -54,26 +54,26 @@ module RuboCop
|
|
54
54
|
body.each_descendant.any?(&:return_type?)
|
55
55
|
end
|
56
56
|
|
57
|
-
add_offense(case_node
|
57
|
+
add_offense(case_node.loc.keyword) do |corrector|
|
58
|
+
autocorrect(corrector, case_node)
|
59
|
+
end
|
58
60
|
end
|
59
61
|
|
60
|
-
|
62
|
+
private
|
63
|
+
|
64
|
+
def autocorrect(corrector, case_node)
|
61
65
|
when_branches = case_node.when_branches
|
62
66
|
|
63
|
-
|
64
|
-
|
65
|
-
correct_when_conditions(corrector, when_branches)
|
66
|
-
end
|
67
|
+
correct_case_when(corrector, case_node, when_branches)
|
68
|
+
correct_when_conditions(corrector, when_branches)
|
67
69
|
end
|
68
70
|
|
69
|
-
private
|
70
|
-
|
71
71
|
def correct_case_when(corrector, case_node, when_nodes)
|
72
72
|
case_range = case_node.loc.keyword.join(when_nodes.first.loc.keyword)
|
73
73
|
|
74
74
|
corrector.replace(case_range, 'if')
|
75
75
|
|
76
|
-
keep_first_when_comment(
|
76
|
+
keep_first_when_comment(case_range, corrector)
|
77
77
|
|
78
78
|
when_nodes[1..-1].each do |when_node|
|
79
79
|
corrector.replace(when_node.loc.keyword, 'elsif')
|
@@ -93,15 +93,14 @@ module RuboCop
|
|
93
93
|
end
|
94
94
|
end
|
95
95
|
|
96
|
-
def keep_first_when_comment(
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
line = range_by_whole_lines(case_node.source_range)
|
96
|
+
def keep_first_when_comment(case_range, corrector)
|
97
|
+
indent = ' ' * case_range.column
|
98
|
+
comments = processed_source.each_comment_in_lines(
|
99
|
+
case_range.first_line...case_range.last_line
|
100
|
+
).map { |comment| "#{indent}#{comment.text}\n" }.join
|
102
101
|
|
103
|
-
|
104
|
-
|
102
|
+
line_beginning = case_range.adjust(begin_pos: -case_range.column)
|
103
|
+
corrector.insert_before(line_beginning, comments)
|
105
104
|
end
|
106
105
|
end
|
107
106
|
end
|