rubocop 0.87.1 → 0.91.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +2 -2
- data/bin/rubocop-profile +32 -0
- data/config/default.yml +267 -33
- data/lib/rubocop.rb +45 -5
- data/lib/rubocop/cached_data.rb +1 -0
- data/lib/rubocop/cli.rb +2 -2
- data/lib/rubocop/cli/command.rb +1 -0
- data/lib/rubocop/cli/command/auto_genenerate_config.rb +4 -3
- data/lib/rubocop/cli/command/base.rb +2 -0
- data/lib/rubocop/cli/command/execute_runner.rb +10 -1
- data/lib/rubocop/cli/command/init_dotfile.rb +1 -0
- data/lib/rubocop/cli/command/show_cops.rb +3 -2
- data/lib/rubocop/cli/command/version.rb +3 -2
- data/lib/rubocop/cli/environment.rb +1 -0
- data/lib/rubocop/comment_config.rb +10 -7
- data/lib/rubocop/config.rb +20 -3
- data/lib/rubocop/config_loader.rb +42 -18
- data/lib/rubocop/config_loader_resolver.rb +4 -3
- data/lib/rubocop/config_obsoletion.rb +7 -1
- data/lib/rubocop/config_store.rb +7 -3
- data/lib/rubocop/config_validator.rb +5 -4
- data/lib/rubocop/cop/autocorrect_logic.rb +1 -1
- data/lib/rubocop/cop/badge.rb +1 -1
- data/lib/rubocop/cop/base.rb +37 -6
- 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 -8
- data/lib/rubocop/cop/cop.rb +1 -1
- 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 +6 -6
- data/lib/rubocop/cop/correctors/multiline_literal_brace_corrector.rb +34 -3
- data/lib/rubocop/cop/correctors/parentheses_corrector.rb +5 -8
- data/lib/rubocop/cop/correctors/percent_literal_corrector.rb +6 -11
- data/lib/rubocop/cop/correctors/punctuation_corrector.rb +8 -10
- data/lib/rubocop/cop/correctors/unused_arg_corrector.rb +15 -18
- data/lib/rubocop/cop/documentation.rb +22 -0
- data/lib/rubocop/cop/force.rb +1 -0
- data/lib/rubocop/cop/gemspec/required_ruby_version.rb +38 -12
- data/lib/rubocop/cop/generator.rb +2 -1
- data/lib/rubocop/cop/generator/configuration_injector.rb +2 -2
- data/lib/rubocop/cop/internal_affairs/method_name_equal.rb +5 -12
- data/lib/rubocop/cop/internal_affairs/node_destructuring.rb +1 -1
- data/lib/rubocop/cop/internal_affairs/node_type_predicate.rb +1 -0
- data/lib/rubocop/cop/internal_affairs/offense_location_keyword.rb +9 -8
- data/lib/rubocop/cop/internal_affairs/redundant_location_argument.rb +11 -7
- data/lib/rubocop/cop/internal_affairs/redundant_message_argument.rb +8 -8
- data/lib/rubocop/cop/internal_affairs/useless_message_assertion.rb +2 -2
- data/lib/rubocop/cop/layout/begin_end_alignment.rb +77 -0
- data/lib/rubocop/cop/layout/block_alignment.rb +24 -20
- data/lib/rubocop/cop/layout/class_structure.rb +13 -16
- 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 +19 -16
- data/lib/rubocop/cop/layout/empty_line_after_magic_comment.rb +13 -13
- data/lib/rubocop/cop/layout/empty_line_after_multiline_condition.rb +145 -0
- data/lib/rubocop/cop/layout/empty_line_between_defs.rb +21 -23
- data/lib/rubocop/cop/layout/empty_lines.rb +6 -9
- data/lib/rubocop/cop/layout/empty_lines_around_access_modifier.rb +5 -6
- data/lib/rubocop/cop/layout/empty_lines_around_arguments.rb +7 -8
- data/lib/rubocop/cop/layout/empty_lines_around_attribute_accessor.rb +3 -6
- 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 +2 -5
- 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 +14 -19
- data/lib/rubocop/cop/layout/extra_spacing.rb +22 -36
- 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 +5 -9
- 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 +16 -13
- data/lib/rubocop/cop/layout/indentation_style.rb +0 -2
- 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 +37 -24
- 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 +32 -24
- 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_block_parameters.rb +3 -2
- data/lib/rubocop/cop/layout/space_around_equals_in_parameter_default.rb +20 -15
- data/lib/rubocop/cop/layout/space_around_keyword.rb +17 -18
- data/lib/rubocop/cop/layout/space_around_method_call_operator.rb +33 -66
- 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 +16 -18
- 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 +15 -19
- 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 +14 -22
- data/lib/rubocop/cop/layout/space_inside_string_interpolation.rb +10 -11
- 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_block_association.rb +7 -4
- data/lib/rubocop/cop/lint/ambiguous_operator.rb +17 -10
- data/lib/rubocop/cop/lint/ambiguous_regexp_literal.rb +11 -13
- data/lib/rubocop/cop/lint/assignment_in_condition.rb +2 -2
- data/lib/rubocop/cop/lint/big_decimal_new.rb +9 -10
- data/lib/rubocop/cop/lint/binary_operator_with_identical_operands.rb +50 -0
- data/lib/rubocop/cop/lint/boolean_symbol.rb +16 -11
- data/lib/rubocop/cop/lint/circular_argument_reference.rb +1 -1
- data/lib/rubocop/cop/lint/constant_definition_in_block.rb +54 -0
- data/lib/rubocop/cop/lint/constant_resolution.rb +2 -2
- data/lib/rubocop/cop/lint/debugger.rb +6 -1
- data/lib/rubocop/cop/lint/deprecated_class_methods.rb +7 -10
- data/lib/rubocop/cop/lint/deprecated_open_ssl_constant.rb +17 -13
- data/lib/rubocop/cop/lint/disjunctive_assignment_in_constructor.rb +8 -2
- data/lib/rubocop/cop/lint/duplicate_case_condition.rb +1 -1
- data/lib/rubocop/cop/lint/duplicate_elsif_condition.rb +39 -0
- data/lib/rubocop/cop/lint/duplicate_hash_key.rb +1 -1
- data/lib/rubocop/cop/lint/duplicate_methods.rb +7 -6
- data/lib/rubocop/cop/lint/duplicate_require.rb +46 -0
- data/lib/rubocop/cop/lint/duplicate_rescue_exception.rb +49 -0
- data/lib/rubocop/cop/lint/each_with_object_argument.rb +2 -1
- data/lib/rubocop/cop/lint/else_layout.rb +1 -1
- data/lib/rubocop/cop/lint/empty_conditional_body.rb +67 -0
- data/lib/rubocop/cop/lint/empty_ensure.rb +5 -5
- data/lib/rubocop/cop/lint/empty_expression.rb +2 -2
- data/lib/rubocop/cop/lint/empty_file.rb +50 -0
- data/lib/rubocop/cop/lint/empty_interpolation.rb +5 -6
- data/lib/rubocop/cop/lint/empty_when.rb +2 -2
- data/lib/rubocop/cop/lint/ensure_return.rb +27 -29
- data/lib/rubocop/cop/lint/erb_new_arguments.rb +13 -10
- data/lib/rubocop/cop/lint/flip_flop.rb +1 -1
- data/lib/rubocop/cop/lint/float_comparison.rb +93 -0
- data/lib/rubocop/cop/lint/float_out_of_range.rb +1 -1
- data/lib/rubocop/cop/lint/format_parameter_mismatch.rb +4 -3
- data/lib/rubocop/cop/lint/heredoc_method_call_position.rb +13 -14
- data/lib/rubocop/cop/lint/identity_comparison.rb +49 -0
- data/lib/rubocop/cop/lint/implicit_string_concatenation.rb +5 -4
- data/lib/rubocop/cop/lint/ineffective_access_modifier.rb +8 -8
- data/lib/rubocop/cop/lint/inherit_exception.rb +12 -7
- data/lib/rubocop/cop/lint/interpolation_check.rb +18 -15
- data/lib/rubocop/cop/lint/literal_as_condition.rb +14 -2
- data/lib/rubocop/cop/lint/literal_in_interpolation.rb +7 -7
- data/lib/rubocop/cop/lint/loop.rb +23 -2
- data/lib/rubocop/cop/lint/missing_cop_enable_directive.rb +6 -5
- data/lib/rubocop/cop/lint/missing_super.rb +99 -0
- data/lib/rubocop/cop/lint/mixed_regexp_capture_types.rb +3 -36
- data/lib/rubocop/cop/lint/multiple_comparison.rb +9 -10
- data/lib/rubocop/cop/lint/nested_method_definition.rb +14 -20
- data/lib/rubocop/cop/lint/nested_percent_literal.rb +1 -1
- data/lib/rubocop/cop/lint/next_without_accumulator.rb +1 -1
- data/lib/rubocop/cop/lint/non_deterministic_require_order.rb +82 -11
- data/lib/rubocop/cop/lint/non_local_exit_from_iterator.rb +2 -2
- data/lib/rubocop/cop/lint/number_conversion.rb +7 -9
- data/lib/rubocop/cop/lint/ordered_magic_comments.rb +11 -13
- data/lib/rubocop/cop/lint/out_of_range_regexp_ref.rb +79 -0
- data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb +4 -10
- data/lib/rubocop/cop/lint/percent_string_array.rb +3 -6
- data/lib/rubocop/cop/lint/percent_symbol_array.rb +13 -12
- data/lib/rubocop/cop/lint/raise_exception.rb +13 -10
- data/lib/rubocop/cop/lint/rand_one.rb +2 -1
- data/lib/rubocop/cop/lint/redundant_cop_disable_directive.rb +16 -19
- data/lib/rubocop/cop/lint/redundant_cop_enable_directive.rb +7 -11
- data/lib/rubocop/cop/lint/redundant_require_statement.rb +5 -7
- data/lib/rubocop/cop/lint/redundant_splat_expansion.rb +13 -9
- data/lib/rubocop/cop/lint/redundant_string_coercion.rb +6 -13
- data/lib/rubocop/cop/lint/redundant_with_index.rb +11 -14
- data/lib/rubocop/cop/lint/redundant_with_object.rb +11 -14
- data/lib/rubocop/cop/lint/regexp_as_condition.rb +4 -6
- data/lib/rubocop/cop/lint/require_parentheses.rb +2 -2
- data/lib/rubocop/cop/lint/rescue_exception.rb +1 -1
- data/lib/rubocop/cop/lint/rescue_type.rb +8 -8
- data/lib/rubocop/cop/lint/return_in_void_context.rb +2 -4
- data/lib/rubocop/cop/lint/safe_navigation_chain.rb +3 -6
- data/lib/rubocop/cop/lint/safe_navigation_consistency.rb +14 -10
- data/lib/rubocop/cop/lint/safe_navigation_with_empty.rb +7 -7
- data/lib/rubocop/cop/lint/script_permission.rb +10 -7
- data/lib/rubocop/cop/lint/self_assignment.rb +78 -0
- data/lib/rubocop/cop/lint/send_with_mixin_argument.rb +8 -12
- data/lib/rubocop/cop/lint/shadowed_argument.rb +3 -3
- data/lib/rubocop/cop/lint/shadowed_exception.rb +2 -2
- data/lib/rubocop/cop/lint/shadowing_outer_local_variable.rb +7 -7
- data/lib/rubocop/cop/lint/struct_new_override.rb +2 -1
- data/lib/rubocop/cop/lint/suppressed_exception.rb +4 -7
- data/lib/rubocop/cop/lint/to_json.rb +20 -11
- 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 +4 -4
- data/lib/rubocop/cop/lint/unified_integer.rb +4 -6
- data/lib/rubocop/cop/lint/unreachable_code.rb +1 -1
- data/lib/rubocop/cop/lint/unreachable_loop.rb +175 -0
- data/lib/rubocop/cop/lint/unused_block_argument.rb +8 -3
- data/lib/rubocop/cop/lint/unused_method_argument.rb +8 -3
- data/lib/rubocop/cop/lint/uri_escape_unescape.rb +4 -2
- data/lib/rubocop/cop/lint/uri_regexp.rb +12 -47
- data/lib/rubocop/cop/lint/useless_access_modifier.rb +25 -15
- data/lib/rubocop/cop/lint/useless_assignment.rb +4 -4
- data/lib/rubocop/cop/lint/useless_else_without_rescue.rb +6 -15
- data/lib/rubocop/cop/lint/useless_method_definition.rb +70 -0
- data/lib/rubocop/cop/lint/useless_setter_call.rb +4 -6
- data/lib/rubocop/cop/lint/useless_times.rb +97 -0
- data/lib/rubocop/cop/lint/void.rb +3 -7
- data/lib/rubocop/cop/metrics/abc_size.rb +1 -1
- data/lib/rubocop/cop/metrics/block_length.rb +2 -2
- data/lib/rubocop/cop/metrics/block_nesting.rb +2 -2
- data/lib/rubocop/cop/metrics/class_length.rb +2 -2
- data/lib/rubocop/cop/metrics/cyclomatic_complexity.rb +2 -1
- data/lib/rubocop/cop/metrics/method_length.rb +2 -2
- data/lib/rubocop/cop/metrics/module_length.rb +2 -2
- data/lib/rubocop/cop/metrics/parameter_lists.rb +2 -6
- data/lib/rubocop/cop/metrics/perceived_complexity.rb +7 -8
- data/lib/rubocop/cop/metrics/utils/abc_size_calculator.rb +50 -5
- data/lib/rubocop/cop/metrics/utils/code_length_calculator.rb +53 -24
- data/lib/rubocop/cop/metrics/utils/repeated_csend_discount.rb +37 -0
- data/lib/rubocop/cop/migration/department_name.rb +14 -16
- 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/array_min_size.rb +1 -1
- data/lib/rubocop/cop/mixin/check_line_breakable.rb +17 -8
- data/lib/rubocop/cop/mixin/code_length.rb +22 -5
- 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/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/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/method_complexity.rb +10 -2
- 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 +10 -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 +39 -10
- data/lib/rubocop/cop/mixin/surrounding_space.rb +8 -29
- data/lib/rubocop/cop/mixin/trailing_comma.rb +9 -11
- data/lib/rubocop/cop/mixin/uncommunicative_name.rb +6 -13
- data/lib/rubocop/cop/mixin/unused_argument.rb +4 -6
- data/lib/rubocop/cop/naming/accessor_method_name.rb +4 -2
- data/lib/rubocop/cop/naming/ascii_identifiers.rb +3 -3
- data/lib/rubocop/cop/naming/binary_operator_parameter_name.rb +2 -2
- data/lib/rubocop/cop/naming/block_parameter_name.rb +1 -1
- data/lib/rubocop/cop/naming/class_and_module_camel_case.rb +2 -2
- data/lib/rubocop/cop/naming/constant_name.rb +2 -2
- data/lib/rubocop/cop/naming/file_name.rb +4 -4
- data/lib/rubocop/cop/naming/heredoc_delimiter_case.rb +2 -2
- data/lib/rubocop/cop/naming/heredoc_delimiter_naming.rb +2 -2
- data/lib/rubocop/cop/naming/memoized_instance_variable_name.rb +2 -2
- data/lib/rubocop/cop/naming/method_parameter_name.rb +1 -1
- data/lib/rubocop/cop/naming/predicate_name.rb +3 -5
- data/lib/rubocop/cop/naming/rescued_exceptions_variable_name.rb +12 -11
- data/lib/rubocop/cop/offense.rb +1 -0
- data/lib/rubocop/cop/registry.rb +3 -3
- data/lib/rubocop/cop/security/eval.rb +3 -2
- data/lib/rubocop/cop/security/json_load.rb +7 -8
- data/lib/rubocop/cop/security/marshal_load.rb +3 -4
- data/lib/rubocop/cop/security/open.rb +3 -2
- data/lib/rubocop/cop/security/yaml_load.rb +7 -6
- data/lib/rubocop/cop/severity.rb +0 -8
- data/lib/rubocop/cop/style/access_modifier_declarations.rb +7 -8
- data/lib/rubocop/cop/style/accessor_grouping.rb +29 -20
- data/lib/rubocop/cop/style/alias.rb +43 -36
- data/lib/rubocop/cop/style/and_or.rb +9 -11
- data/lib/rubocop/cop/style/array_coercion.rb +63 -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 +7 -7
- 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 +14 -18
- 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 +32 -5
- data/lib/rubocop/cop/style/case_like_if.rb +236 -0
- 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 +8 -9
- data/lib/rubocop/cop/style/colon_method_definition.rb +6 -6
- data/lib/rubocop/cop/style/combinable_loops.rb +89 -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 +6 -3
- data/lib/rubocop/cop/style/conditional_assignment.rb +62 -64
- 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 +1 -1
- 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 +6 -8
- 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 -19
- 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 +10 -13
- 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 +7 -7
- data/lib/rubocop/cop/style/even_odd.rb +8 -11
- data/lib/rubocop/cop/style/expand_path_arguments.rb +22 -21
- data/lib/rubocop/cop/style/explicit_block_argument.rb +102 -0
- data/lib/rubocop/cop/style/exponential_notation.rb +7 -9
- data/lib/rubocop/cop/style/float_division.rb +10 -11
- data/lib/rubocop/cop/style/for.rb +11 -15
- data/lib/rubocop/cop/style/format_string.rb +18 -19
- data/lib/rubocop/cop/style/format_string_token.rb +10 -12
- data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +19 -41
- data/lib/rubocop/cop/style/global_std_stream.rb +65 -0
- data/lib/rubocop/cop/style/global_vars.rb +2 -2
- data/lib/rubocop/cop/style/guard_clause.rb +6 -6
- data/lib/rubocop/cop/style/hash_as_last_array_item.rb +79 -0
- data/lib/rubocop/cop/style/hash_each_methods.rb +5 -8
- data/lib/rubocop/cop/style/hash_like_case.rb +76 -0
- data/lib/rubocop/cop/style/hash_syntax.rb +10 -8
- 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 +2 -2
- data/lib/rubocop/cop/style/if_inside_else.rb +3 -3
- data/lib/rubocop/cop/style/if_unless_modifier.rb +19 -41
- 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 +24 -24
- data/lib/rubocop/cop/style/inline_comment.rb +3 -3
- data/lib/rubocop/cop/style/inverse_methods.rb +22 -32
- data/lib/rubocop/cop/style/keyword_parameters_order.rb +58 -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 +16 -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 +8 -7
- 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 +11 -21
- data/lib/rubocop/cop/style/missing_respond_to_missing.rb +10 -3
- data/lib/rubocop/cop/style/mixin_grouping.rb +24 -27
- data/lib/rubocop/cop/style/mixin_usage.rb +2 -1
- data/lib/rubocop/cop/style/module_function.rb +10 -13
- 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 +14 -12
- data/lib/rubocop/cop/style/multiline_method_signature.rb +2 -2
- data/lib/rubocop/cop/style/multiline_ternary_operator.rb +17 -6
- data/lib/rubocop/cop/style/multiline_when_then.rb +9 -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 +9 -15
- data/lib/rubocop/cop/style/one_line_conditional.rb +71 -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 +42 -0
- data/lib/rubocop/cop/style/or_assignment.rb +13 -10
- data/lib/rubocop/cop/style/parallel_assignment.rb +18 -18
- data/lib/rubocop/cop/style/parentheses_around_condition.rb +6 -6
- data/lib/rubocop/cop/style/percent_literal_delimiters.rb +14 -20
- 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 +17 -16
- data/lib/rubocop/cop/style/redundant_assignment.rb +8 -10
- 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 +20 -9
- data/lib/rubocop/cop/style/redundant_exception.rb +2 -0
- data/lib/rubocop/cop/style/redundant_fetch_block.rb +3 -12
- data/lib/rubocop/cop/style/redundant_file_extension_in_require.rb +51 -0
- 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 +19 -12
- data/lib/rubocop/cop/style/redundant_regexp_character_class.rb +6 -13
- data/lib/rubocop/cop/style/redundant_regexp_escape.rb +14 -23
- data/lib/rubocop/cop/style/redundant_self.rb +2 -2
- data/lib/rubocop/cop/style/redundant_self_assignment.rb +116 -0
- data/lib/rubocop/cop/style/redundant_sort.rb +21 -13
- 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/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 +25 -19
- data/lib/rubocop/cop/style/single_argument_dig.rb +55 -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 -20
- data/lib/rubocop/cop/style/stderr_puts.rb +5 -6
- data/lib/rubocop/cop/style/string_concatenation.rb +106 -0
- 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 +4 -7
- data/lib/rubocop/cop/style/symbol_array.rb +6 -17
- data/lib/rubocop/cop/style/symbol_literal.rb +4 -6
- data/lib/rubocop/cop/style/symbol_proc.rb +15 -19
- data/lib/rubocop/cop/style/ternary_parentheses.rb +21 -20
- 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 +7 -6
- data/lib/rubocop/cop/style/trailing_comma_in_hash_literal.rb +2 -5
- data/lib/rubocop/cop/style/trailing_method_end_statement.rb +9 -32
- 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 +17 -19
- data/lib/rubocop/cop/team.rb +2 -1
- data/lib/rubocop/cop/tokens_util.rb +84 -0
- data/lib/rubocop/cop/util.rb +3 -13
- data/lib/rubocop/cop/utils/format_string.rb +3 -5
- data/lib/rubocop/cop/variable_force.rb +2 -2
- data/lib/rubocop/cop/variable_force/branch.rb +1 -0
- data/lib/rubocop/cop/variable_force/variable.rb +7 -5
- data/lib/rubocop/cops_documentation_generator.rb +284 -0
- data/lib/rubocop/core_ext/string.rb +2 -2
- data/lib/rubocop/error.rb +1 -0
- data/lib/rubocop/ext/regexp_node.rb +46 -0
- data/lib/rubocop/file_finder.rb +13 -12
- data/lib/rubocop/formatter/auto_gen_config_formatter.rb +2 -1
- data/lib/rubocop/formatter/disabled_config_formatter.rb +1 -1
- data/lib/rubocop/formatter/formatter_set.rb +1 -0
- 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 +25 -4
- data/lib/rubocop/path_util.rb +17 -17
- data/lib/rubocop/rake_task.rb +1 -0
- data/lib/rubocop/remote_config.rb +1 -0
- data/lib/rubocop/result_cache.rb +37 -15
- data/lib/rubocop/rspec/cop_helper.rb +4 -1
- data/lib/rubocop/rspec/expect_offense.rb +37 -6
- data/lib/rubocop/rspec/shared_contexts.rb +25 -14
- data/lib/rubocop/runner.rb +36 -21
- data/lib/rubocop/string_interpreter.rb +3 -0
- data/lib/rubocop/target_finder.rb +14 -10
- data/lib/rubocop/target_ruby.rb +6 -0
- data/lib/rubocop/version.rb +3 -2
- data/lib/rubocop/yaml_duplication_checker.rb +1 -0
- metadata +45 -8
- data/lib/rubocop/cop/lint/useless_comparison.rb +0 -28
- data/lib/rubocop/cop/mixin/parser_diagnostic.rb +0 -37
- data/lib/rubocop/cop/mixin/too_many_lines.rb +0 -25
- data/lib/rubocop/cop/style/method_missing_super.rb +0 -34
@@ -17,8 +17,9 @@ module RuboCop
|
|
17
17
|
# :a,
|
18
18
|
# :b]
|
19
19
|
#
|
20
|
-
class FirstArrayElementLineBreak <
|
20
|
+
class FirstArrayElementLineBreak < Base
|
21
21
|
include FirstElementLineBreak
|
22
|
+
extend AutoCorrector
|
22
23
|
|
23
24
|
MSG = 'Add a line break before the first element of a ' \
|
24
25
|
'multi-line array.'
|
@@ -29,10 +30,6 @@ module RuboCop
|
|
29
30
|
check_children_line_break(node, node.children)
|
30
31
|
end
|
31
32
|
|
32
|
-
def autocorrect(node)
|
33
|
-
EmptyLineCorrector.insert_before(node)
|
34
|
-
end
|
35
|
-
|
36
33
|
private
|
37
34
|
|
38
35
|
def assignment_on_same_line?(node)
|
@@ -16,8 +16,9 @@ module RuboCop
|
|
16
16
|
# {
|
17
17
|
# a: 1,
|
18
18
|
# b: 2 }
|
19
|
-
class FirstHashElementLineBreak <
|
19
|
+
class FirstHashElementLineBreak < Base
|
20
20
|
include FirstElementLineBreak
|
21
|
+
extend AutoCorrector
|
21
22
|
|
22
23
|
MSG = 'Add a line break before the first element of a ' \
|
23
24
|
'multi-line hash.'
|
@@ -27,10 +28,6 @@ module RuboCop
|
|
27
28
|
# If it doesn't, Style/FirstMethodArgumentLineBreak will handle it
|
28
29
|
check_children_line_break(node, node.children) if node.loc.begin
|
29
30
|
end
|
30
|
-
|
31
|
-
def autocorrect(node)
|
32
|
-
EmptyLineCorrector.insert_before(node)
|
33
|
-
end
|
34
31
|
end
|
35
32
|
end
|
36
33
|
end
|
@@ -20,14 +20,15 @@ module RuboCop
|
|
20
20
|
# # ignored
|
21
21
|
# method foo, bar,
|
22
22
|
# baz
|
23
|
-
class FirstMethodArgumentLineBreak <
|
23
|
+
class FirstMethodArgumentLineBreak < Base
|
24
24
|
include FirstElementLineBreak
|
25
|
+
extend AutoCorrector
|
25
26
|
|
26
27
|
MSG = 'Add a line break before the first argument of a ' \
|
27
28
|
'multi-line method argument list.'
|
28
29
|
|
29
30
|
def on_send(node)
|
30
|
-
args = node.arguments
|
31
|
+
args = node.arguments.dup
|
31
32
|
|
32
33
|
# If there is a trailing hash arg without explicit braces, like this:
|
33
34
|
#
|
@@ -35,18 +36,13 @@ module RuboCop
|
|
35
36
|
#
|
36
37
|
# ...then each key/value pair is treated as a method 'argument'
|
37
38
|
# when determining where line breaks should appear.
|
38
|
-
|
39
|
-
|
40
|
-
end
|
39
|
+
last_arg = args.last
|
40
|
+
args.concat(args.pop.children) if last_arg&.hash_type? && !last_arg&.braces?
|
41
41
|
|
42
42
|
check_method_line_break(node, args)
|
43
43
|
end
|
44
44
|
alias on_csend on_send
|
45
45
|
alias on_super on_send
|
46
|
-
|
47
|
-
def autocorrect(node)
|
48
|
-
EmptyLineCorrector.insert_before(node)
|
49
|
-
end
|
50
46
|
end
|
51
47
|
end
|
52
48
|
end
|
@@ -26,8 +26,9 @@ module RuboCop
|
|
26
26
|
# bar
|
27
27
|
# do_something
|
28
28
|
# end
|
29
|
-
class FirstMethodParameterLineBreak <
|
29
|
+
class FirstMethodParameterLineBreak < Base
|
30
30
|
include FirstElementLineBreak
|
31
|
+
extend AutoCorrector
|
31
32
|
|
32
33
|
MSG = 'Add a line break before the first parameter of a ' \
|
33
34
|
'multi-line method parameter list.'
|
@@ -36,10 +37,6 @@ module RuboCop
|
|
36
37
|
check_method_line_break(node, node.arguments)
|
37
38
|
end
|
38
39
|
alias on_defs on_def
|
39
|
-
|
40
|
-
def autocorrect(node)
|
41
|
-
EmptyLineCorrector.insert_before(node)
|
42
|
-
end
|
43
40
|
end
|
44
41
|
end
|
45
42
|
end
|
@@ -175,9 +175,10 @@ module RuboCop
|
|
175
175
|
# do_something({foo: 1,
|
176
176
|
# bar: 2})
|
177
177
|
#
|
178
|
-
class HashAlignment <
|
178
|
+
class HashAlignment < Base
|
179
179
|
include HashAlignmentStyles
|
180
180
|
include RangeHelp
|
181
|
+
extend AutoCorrector
|
181
182
|
|
182
183
|
MESSAGES = { KeyAlignment => 'Align the keys of a hash literal if ' \
|
183
184
|
'they span more than one line.',
|
@@ -212,13 +213,6 @@ module RuboCop
|
|
212
213
|
check_pairs(node)
|
213
214
|
end
|
214
215
|
|
215
|
-
def autocorrect(node)
|
216
|
-
delta = column_deltas[alignment_for(node).first.class][node]
|
217
|
-
return if delta.nil?
|
218
|
-
|
219
|
-
correct_node(node, delta)
|
220
|
-
end
|
221
|
-
|
222
216
|
attr_accessor :offences_by, :column_deltas
|
223
217
|
|
224
218
|
private
|
@@ -254,7 +248,11 @@ module RuboCop
|
|
254
248
|
def add_offences
|
255
249
|
format, offences = offences_by.min_by { |_, v| v.length }
|
256
250
|
(offences || []).each do |offence|
|
257
|
-
add_offense(offence, message: MESSAGES[format])
|
251
|
+
add_offense(offence, message: MESSAGES[format]) do |corrector|
|
252
|
+
delta = column_deltas[alignment_for(offence).first.class][offence]
|
253
|
+
|
254
|
+
correct_node(corrector, offence, delta) unless delta.nil?
|
255
|
+
end
|
258
256
|
end
|
259
257
|
end
|
260
258
|
|
@@ -293,25 +291,26 @@ module RuboCop
|
|
293
291
|
new_alignment('EnforcedColonStyle')
|
294
292
|
end
|
295
293
|
|
296
|
-
def correct_node(node, delta)
|
294
|
+
def correct_node(corrector, node, delta)
|
297
295
|
# We can't use the instance variable inside the lambda. That would
|
298
296
|
# just give each lambda the same reference and they would all get the
|
299
297
|
# last value of each. A local variable fixes the problem.
|
300
298
|
|
301
299
|
if !node.value
|
302
|
-
|
300
|
+
delta_value = delta[:key] || 0
|
301
|
+
correct_no_value(corrector, delta_value, node.source_range)
|
303
302
|
else
|
304
|
-
correct_key_value(delta, node.key.source_range,
|
303
|
+
correct_key_value(corrector, delta, node.key.source_range,
|
305
304
|
node.value.source_range,
|
306
305
|
node.loc.operator)
|
307
306
|
end
|
308
307
|
end
|
309
308
|
|
310
|
-
def correct_no_value(key_delta, key)
|
311
|
-
|
309
|
+
def correct_no_value(corrector, key_delta, key)
|
310
|
+
adjust(corrector, key_delta, key)
|
312
311
|
end
|
313
312
|
|
314
|
-
def correct_key_value(delta, key, value, separator)
|
313
|
+
def correct_key_value(corrector, delta, key, value, separator)
|
315
314
|
# We can't use the instance variable inside the lambda. That would
|
316
315
|
# just give each lambda the same reference and they would all get the
|
317
316
|
# last value of each. Some local variables fix the problem.
|
@@ -322,11 +321,9 @@ module RuboCop
|
|
322
321
|
key_column = key.column
|
323
322
|
key_delta = -key_column if key_delta < -key_column
|
324
323
|
|
325
|
-
|
326
|
-
|
327
|
-
|
328
|
-
adjust(corrector, value_delta, value)
|
329
|
-
end
|
324
|
+
adjust(corrector, key_delta, key)
|
325
|
+
adjust(corrector, separator_delta, separator)
|
326
|
+
adjust(corrector, value_delta, value)
|
330
327
|
end
|
331
328
|
|
332
329
|
def new_alignment(key)
|
@@ -50,12 +50,17 @@ module RuboCop
|
|
50
50
|
# 123,
|
51
51
|
# )
|
52
52
|
#
|
53
|
-
class HeredocArgumentClosingParenthesis <
|
53
|
+
class HeredocArgumentClosingParenthesis < Base
|
54
54
|
include RangeHelp
|
55
|
+
extend AutoCorrector
|
55
56
|
|
56
57
|
MSG = 'Put the closing parenthesis for a method call with a ' \
|
57
58
|
'HEREDOC parameter on the same line as the HEREDOC opening.'
|
58
59
|
|
60
|
+
def self.autocorrect_incompatible_with
|
61
|
+
[Style::TrailingCommaInArguments]
|
62
|
+
end
|
63
|
+
|
59
64
|
def on_send(node)
|
60
65
|
heredoc_arg = extract_heredoc_argument(node)
|
61
66
|
return unless heredoc_arg
|
@@ -65,9 +70,13 @@ module RuboCop
|
|
65
70
|
return unless outermost_send.loc.end
|
66
71
|
return unless heredoc_arg.first_line != outermost_send.loc.end.line
|
67
72
|
|
68
|
-
add_offense(outermost_send
|
73
|
+
add_offense(outermost_send.loc.end) do |corrector|
|
74
|
+
autocorrect(corrector, outermost_send)
|
75
|
+
end
|
69
76
|
end
|
70
77
|
|
78
|
+
private
|
79
|
+
|
71
80
|
# Autocorrection note:
|
72
81
|
#
|
73
82
|
# Commas are a bit tricky to handle when the method call is
|
@@ -94,22 +103,14 @@ module RuboCop
|
|
94
103
|
# SQL
|
95
104
|
# third_array_value,
|
96
105
|
# ]
|
97
|
-
def autocorrect(node)
|
98
|
-
|
99
|
-
fix_closing_parenthesis(node, corrector)
|
106
|
+
def autocorrect(corrector, node)
|
107
|
+
fix_closing_parenthesis(node, corrector)
|
100
108
|
|
101
|
-
|
109
|
+
remove_internal_trailing_comma(node, corrector) if internal_trailing_comma?(node)
|
102
110
|
|
103
|
-
|
104
|
-
end
|
111
|
+
fix_external_trailing_comma(node, corrector) if external_trailing_comma?(node)
|
105
112
|
end
|
106
113
|
|
107
|
-
def self.autocorrect_incompatible_with
|
108
|
-
[Style::TrailingCommaInArguments]
|
109
|
-
end
|
110
|
-
|
111
|
-
private
|
112
|
-
|
113
114
|
def outermost_send_on_same_line(heredoc)
|
114
115
|
previous = heredoc
|
115
116
|
current = previous.parent
|
@@ -21,9 +21,9 @@ module RuboCop
|
|
21
21
|
# something
|
22
22
|
# RUBY
|
23
23
|
#
|
24
|
-
|
25
|
-
class HeredocIndentation < Cop
|
24
|
+
class HeredocIndentation < Base
|
26
25
|
include Heredoc
|
26
|
+
extend AutoCorrector
|
27
27
|
|
28
28
|
TYPE_MSG = 'Use %<indentation_width>d spaces for indentation in a ' \
|
29
29
|
'heredoc by using `<<~` instead of `%<current_indent_type>s`.'
|
@@ -34,8 +34,9 @@ module RuboCop
|
|
34
34
|
return if body.strip.empty?
|
35
35
|
|
36
36
|
body_indent_level = indent_level(body)
|
37
|
+
heredoc_indent_type = heredoc_indent_type(node)
|
37
38
|
|
38
|
-
if heredoc_indent_type
|
39
|
+
if heredoc_indent_type == '~'
|
39
40
|
expected_indent_level = base_indent_level(node) + indentation_width
|
40
41
|
return if expected_indent_level == body_indent_level
|
41
42
|
else
|
@@ -44,12 +45,16 @@ module RuboCop
|
|
44
45
|
|
45
46
|
return if line_too_long?(node)
|
46
47
|
|
47
|
-
|
48
|
+
register_offense(node, heredoc_indent_type)
|
48
49
|
end
|
49
50
|
|
50
|
-
|
51
|
-
|
52
|
-
|
51
|
+
private
|
52
|
+
|
53
|
+
def register_offense(node, heredoc_indent_type)
|
54
|
+
message = message(heredoc_indent_type)
|
55
|
+
|
56
|
+
add_offense(node.loc.heredoc_body, message: message) do |corrector|
|
57
|
+
if heredoc_indent_type == '~'
|
53
58
|
adjust_squiggly(corrector, node)
|
54
59
|
else
|
55
60
|
adjust_minus(corrector, node)
|
@@ -57,10 +62,8 @@ module RuboCop
|
|
57
62
|
end
|
58
63
|
end
|
59
64
|
|
60
|
-
|
61
|
-
|
62
|
-
def message(node)
|
63
|
-
current_indent_type = "<<#{heredoc_indent_type(node)}"
|
65
|
+
def message(heredoc_indent_type)
|
66
|
+
current_indent_type = "<<#{heredoc_indent_type}"
|
64
67
|
|
65
68
|
if current_indent_type == '<<~'
|
66
69
|
width_message(indentation_width)
|
@@ -161,11 +164,11 @@ module RuboCop
|
|
161
164
|
end
|
162
165
|
|
163
166
|
def heredoc_body(node)
|
164
|
-
node.loc.heredoc_body.source
|
167
|
+
node.loc.heredoc_body.source
|
165
168
|
end
|
166
169
|
|
167
170
|
def heredoc_end(node)
|
168
|
-
node.loc.heredoc_end.source
|
171
|
+
node.loc.heredoc_end.source
|
169
172
|
end
|
170
173
|
end
|
171
174
|
end
|
@@ -17,21 +17,20 @@ module RuboCop
|
|
17
17
|
# def foo; end
|
18
18
|
# end
|
19
19
|
#
|
20
|
-
class InitialIndentation <
|
20
|
+
class InitialIndentation < Base
|
21
21
|
include RangeHelp
|
22
|
+
extend AutoCorrector
|
22
23
|
|
23
24
|
MSG = 'Indentation of first line in file detected.'
|
24
25
|
|
25
|
-
def
|
26
|
+
def on_new_investigation
|
26
27
|
space_before(first_token) do |space|
|
27
|
-
add_offense(
|
28
|
+
add_offense(first_token.pos) do |corrector|
|
29
|
+
corrector.remove(space)
|
30
|
+
end
|
28
31
|
end
|
29
32
|
end
|
30
33
|
|
31
|
-
def autocorrect(range)
|
32
|
-
->(corrector) { corrector.remove(range) }
|
33
|
-
end
|
34
|
-
|
35
34
|
private
|
36
35
|
|
37
36
|
def first_token
|
@@ -49,31 +49,33 @@ module RuboCop
|
|
49
49
|
# #ruby=2.7.0
|
50
50
|
# #ruby-gemset=myproject
|
51
51
|
#
|
52
|
-
class LeadingCommentSpace <
|
52
|
+
class LeadingCommentSpace < Base
|
53
53
|
include RangeHelp
|
54
|
+
extend AutoCorrector
|
54
55
|
|
55
56
|
MSG = 'Missing space after `#`.'
|
56
57
|
|
57
|
-
def
|
58
|
-
processed_source.
|
58
|
+
def on_new_investigation
|
59
|
+
processed_source.comments.each do |comment|
|
59
60
|
next unless /\A#+[^#\s=:+-]/.match?(comment.text)
|
60
61
|
next if comment.loc.line == 1 && allowed_on_first_line?(comment)
|
61
62
|
next if doxygen_comment_style?(comment)
|
62
63
|
next if gemfile_ruby_comment?(comment)
|
63
64
|
|
64
|
-
add_offense(comment)
|
65
|
+
add_offense(comment) do |corrector|
|
66
|
+
expr = comment.loc.expression
|
67
|
+
|
68
|
+
corrector.insert_after(hash_mark(expr), ' ')
|
69
|
+
end
|
65
70
|
end
|
66
71
|
end
|
67
72
|
|
68
|
-
|
69
|
-
expr = comment.loc.expression
|
70
|
-
hash_mark = range_between(expr.begin_pos, expr.begin_pos + 1)
|
73
|
+
private
|
71
74
|
|
72
|
-
|
75
|
+
def hash_mark(expr)
|
76
|
+
range_between(expr.begin_pos, expr.begin_pos + 1)
|
73
77
|
end
|
74
78
|
|
75
|
-
private
|
76
|
-
|
77
79
|
def allowed_on_first_line?(comment)
|
78
80
|
shebang?(comment) || rackup_config_file? && rackup_options?(comment)
|
79
81
|
end
|
@@ -27,23 +27,18 @@ module RuboCop
|
|
27
27
|
# # good
|
28
28
|
# # (start of file)
|
29
29
|
# # a comment
|
30
|
-
class LeadingEmptyLines <
|
30
|
+
class LeadingEmptyLines < Base
|
31
|
+
extend AutoCorrector
|
32
|
+
|
31
33
|
MSG = 'Unnecessary blank line at the beginning of the source.'
|
32
34
|
|
33
|
-
def
|
35
|
+
def on_new_investigation
|
34
36
|
token = processed_source.tokens[0]
|
35
37
|
return unless token && token.line > 1
|
36
38
|
|
37
|
-
add_offense(
|
38
|
-
|
39
|
-
end
|
40
|
-
|
41
|
-
def autocorrect(node)
|
42
|
-
range = Parser::Source::Range.new(processed_source.buffer,
|
43
|
-
0,
|
44
|
-
node.begin_pos)
|
39
|
+
add_offense(token.pos) do |corrector|
|
40
|
+
range = Parser::Source::Range.new(processed_source.buffer, 0, token.begin_pos)
|
45
41
|
|
46
|
-
lambda do |corrector|
|
47
42
|
corrector.remove(range)
|
48
43
|
end
|
49
44
|
end
|
@@ -88,8 +88,9 @@ module RuboCop
|
|
88
88
|
# # good
|
89
89
|
# [ :a,
|
90
90
|
# :b ]
|
91
|
-
class MultilineArrayBraceLayout <
|
91
|
+
class MultilineArrayBraceLayout < Base
|
92
92
|
include MultilineLiteralBraceLayout
|
93
|
+
extend AutoCorrector
|
93
94
|
|
94
95
|
SAME_LINE_MESSAGE = 'The closing array brace must be on the same ' \
|
95
96
|
'line as the last array element when the opening brace is on the ' \
|
@@ -108,10 +109,6 @@ module RuboCop
|
|
108
109
|
def on_array(node)
|
109
110
|
check_brace_layout(node)
|
110
111
|
end
|
111
|
-
|
112
|
-
def autocorrect(node)
|
113
|
-
MultilineLiteralBraceCorrector.new(node, processed_source)
|
114
|
-
end
|
115
112
|
end
|
116
113
|
end
|
117
114
|
end
|