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
@@ -34,6 +34,8 @@ module RuboCop
|
|
34
34
|
"Please change your source to 'https://rubygems.org' " \
|
35
35
|
"if possible, or 'http://rubygems.org' if not."
|
36
36
|
|
37
|
+
RESTRICT_ON_SEND = %i[source].freeze
|
38
|
+
|
37
39
|
def_node_matcher :insecure_protocol_source?, <<~PATTERN
|
38
40
|
(send nil? :source
|
39
41
|
$(sym ${:gemcutter :rubygems :rubyforge}))
|
@@ -7,6 +7,9 @@ module RuboCop
|
|
7
7
|
class Commissioner
|
8
8
|
include RuboCop::AST::Traversal
|
9
9
|
|
10
|
+
RESTRICTED_CALLBACKS = %i[on_send on_csend].freeze
|
11
|
+
private_constant :RESTRICTED_CALLBACKS
|
12
|
+
|
10
13
|
# How a Commissioner returns the results of the investigation
|
11
14
|
# as a list of Cop::InvestigationReport and any errors caught
|
12
15
|
# during the investigation.
|
@@ -42,7 +45,8 @@ module RuboCop
|
|
42
45
|
@cops = cops
|
43
46
|
@forces = forces
|
44
47
|
@options = options
|
45
|
-
@callbacks = {}
|
48
|
+
@callbacks = Hash.new { |h, k| h[k] = cops_callbacks_for(k) }
|
49
|
+
@restricted_map = {}
|
46
50
|
|
47
51
|
reset
|
48
52
|
end
|
@@ -57,10 +61,17 @@ module RuboCop
|
|
57
61
|
method_name = :"on_#{node_type}"
|
58
62
|
next unless method_defined?(method_name)
|
59
63
|
|
60
|
-
|
61
|
-
|
62
|
-
super(node) unless NO_CHILD_NODES.include?(node_type)
|
64
|
+
if RESTRICTED_CALLBACKS.include?(method_name)
|
65
|
+
trigger_restricted = "trigger_restricted_cops(:on_#{node_type}, node)"
|
63
66
|
end
|
67
|
+
|
68
|
+
class_eval(<<~RUBY, __FILE__, __LINE__ + 1)
|
69
|
+
def on_#{node_type}(node)
|
70
|
+
trigger_responding_cops(:on_#{node_type}, node)
|
71
|
+
#{trigger_restricted}
|
72
|
+
#{'super(node)' unless NO_CHILD_NODES.include?(node_type)}
|
73
|
+
end
|
74
|
+
RUBY
|
64
75
|
end
|
65
76
|
|
66
77
|
# @return [InvestigationReport]
|
@@ -83,9 +94,6 @@ module RuboCop
|
|
83
94
|
private
|
84
95
|
|
85
96
|
def trigger_responding_cops(callback, node)
|
86
|
-
@callbacks[callback] ||= @cops.select do |cop|
|
87
|
-
cop.respond_to?(callback)
|
88
|
-
end
|
89
97
|
@callbacks[callback].each do |cop|
|
90
98
|
with_cop_error_handling(cop, node) do
|
91
99
|
cop.send(callback, node)
|
@@ -97,6 +105,38 @@ module RuboCop
|
|
97
105
|
@errors = []
|
98
106
|
end
|
99
107
|
|
108
|
+
def cops_callbacks_for(callback)
|
109
|
+
callbacks = @cops.select do |cop|
|
110
|
+
cop.respond_to?(callback)
|
111
|
+
end
|
112
|
+
if RESTRICTED_CALLBACKS.include?(callback)
|
113
|
+
@restricted_map[callback] = restricted_map(callbacks)
|
114
|
+
end
|
115
|
+
callbacks
|
116
|
+
end
|
117
|
+
|
118
|
+
def trigger_restricted_cops(event, node)
|
119
|
+
name = node.method_name
|
120
|
+
@restricted_map.fetch(event)[name]&.each do |cop|
|
121
|
+
with_cop_error_handling(cop, node) do
|
122
|
+
cop.send(event, node)
|
123
|
+
end
|
124
|
+
end
|
125
|
+
end
|
126
|
+
|
127
|
+
# Note: mutates `callbacks` in place
|
128
|
+
def restricted_map(callbacks)
|
129
|
+
map = {}
|
130
|
+
callbacks.select! do |cop|
|
131
|
+
restrictions = cop.class.send :restrict_on_send
|
132
|
+
restrictions.each do |name|
|
133
|
+
(map[name] ||= []) << cop
|
134
|
+
end
|
135
|
+
restrictions.empty?
|
136
|
+
end
|
137
|
+
map
|
138
|
+
end
|
139
|
+
|
100
140
|
def invoke(callback, cops, *args)
|
101
141
|
cops.each do |cop|
|
102
142
|
with_cop_error_handling(cop) do
|
@@ -29,13 +29,13 @@ module RuboCop
|
|
29
29
|
end
|
30
30
|
end
|
31
31
|
|
32
|
-
def align_end(processed_source, node, align_to)
|
32
|
+
def align_end(corrector, processed_source, node, align_to)
|
33
33
|
@processed_source = processed_source
|
34
34
|
whitespace = whitespace_range(node)
|
35
35
|
return false unless whitespace.source.strip.empty?
|
36
36
|
|
37
37
|
column = alignment_column(align_to)
|
38
|
-
|
38
|
+
corrector.replace(whitespace, ' ' * column)
|
39
39
|
end
|
40
40
|
|
41
41
|
private
|
@@ -47,8 +47,8 @@ module RuboCop
|
|
47
47
|
# string literals
|
48
48
|
return if taboo_ranges.any? { |t| within?(range, t) }
|
49
49
|
|
50
|
-
if column_delta.positive?
|
51
|
-
corrector.insert_before(range, ' ' * column_delta)
|
50
|
+
if column_delta.positive? && range.resize(1).source != "\n"
|
51
|
+
corrector.insert_before(range, ' ' * column_delta)
|
52
52
|
elsif /\A[ \t]+\z/.match?(range.source)
|
53
53
|
remove(range, corrector)
|
54
54
|
end
|
@@ -5,13 +5,11 @@ module RuboCop
|
|
5
5
|
# This class does condition auto-correction
|
6
6
|
class ConditionCorrector
|
7
7
|
class << self
|
8
|
-
def correct_negative_condition(node)
|
8
|
+
def correct_negative_condition(corrector, node)
|
9
9
|
condition = negated_condition(node)
|
10
10
|
|
11
|
-
|
12
|
-
|
13
|
-
corrector.replace(condition, condition.children.first.source)
|
14
|
-
end
|
11
|
+
corrector.replace(node.loc.keyword, node.inverse_keyword)
|
12
|
+
corrector.replace(condition, condition.children.first.source)
|
15
13
|
end
|
16
14
|
|
17
15
|
private
|
@@ -5,20 +5,19 @@ module RuboCop
|
|
5
5
|
# This class does empty line auto-correction
|
6
6
|
class EmptyLineCorrector
|
7
7
|
class << self
|
8
|
-
def correct(node)
|
8
|
+
def correct(corrector, node)
|
9
9
|
offense_style, range = node
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
end
|
10
|
+
|
11
|
+
case offense_style
|
12
|
+
when :no_empty_lines
|
13
|
+
corrector.remove(range)
|
14
|
+
when :empty_lines
|
15
|
+
corrector.insert_before(range, "\n")
|
17
16
|
end
|
18
17
|
end
|
19
18
|
|
20
|
-
def insert_before(node)
|
21
|
-
|
19
|
+
def insert_before(corrector, node)
|
20
|
+
corrector.insert_before(node, "\n")
|
22
21
|
end
|
23
22
|
end
|
24
23
|
end
|
@@ -16,7 +16,7 @@ module RuboCop
|
|
16
16
|
processed_source:)
|
17
17
|
@processed_source = processed_source
|
18
18
|
range = first_part_of(node.to_a.last)
|
19
|
-
eol_comment =
|
19
|
+
eol_comment = processed_source.comment_at_line(node.source_range.line)
|
20
20
|
|
21
21
|
break_line_before(range: range, node: node, corrector: corrector,
|
22
22
|
configured_width: configured_width)
|
@@ -25,8 +25,8 @@ module RuboCop
|
|
25
25
|
remove_semicolon(node, corrector)
|
26
26
|
end
|
27
27
|
|
28
|
-
def break_line_before(range:, node:, corrector:,
|
29
|
-
|
28
|
+
def break_line_before(range:, node:, corrector:, configured_width:,
|
29
|
+
indent_steps: 1)
|
30
30
|
corrector.insert_before(
|
31
31
|
range,
|
32
32
|
"\n#{' ' * (node.loc.keyword.column +
|
@@ -53,7 +53,7 @@ module RuboCop
|
|
53
53
|
|
54
54
|
def semicolon(node)
|
55
55
|
@semicolon ||= {}
|
56
|
-
@semicolon[node.object_id] ||=
|
56
|
+
@semicolon[node.object_id] ||= processed_source.tokens_within(node).find(&:semicolon?)
|
57
57
|
end
|
58
58
|
end
|
59
59
|
end
|
@@ -8,12 +8,17 @@ module RuboCop
|
|
8
8
|
include MultilineLiteralBraceLayout
|
9
9
|
include RangeHelp
|
10
10
|
|
11
|
-
def
|
11
|
+
def self.correct(corrector, node, processed_source)
|
12
|
+
new(corrector, node, processed_source).call
|
13
|
+
end
|
14
|
+
|
15
|
+
def initialize(corrector, node, processed_source)
|
16
|
+
@corrector = corrector
|
12
17
|
@node = node
|
13
18
|
@processed_source = processed_source
|
14
19
|
end
|
15
20
|
|
16
|
-
def call
|
21
|
+
def call
|
17
22
|
if closing_brace_on_same_line?(node)
|
18
23
|
correct_same_line_brace(corrector)
|
19
24
|
else
|
@@ -29,7 +34,7 @@ module RuboCop
|
|
29
34
|
|
30
35
|
private
|
31
36
|
|
32
|
-
attr_reader :node, :processed_source
|
37
|
+
attr_reader :corrector, :node, :processed_source
|
33
38
|
|
34
39
|
def correct_same_line_brace(corrector)
|
35
40
|
corrector.insert_before(node.loc.end, "\n")
|
@@ -5,15 +5,12 @@ module RuboCop
|
|
5
5
|
# This auto-corrects parentheses
|
6
6
|
class ParenthesesCorrector
|
7
7
|
class << self
|
8
|
-
def correct(node)
|
9
|
-
|
10
|
-
|
11
|
-
|
8
|
+
def correct(corrector, node)
|
9
|
+
corrector.remove(node.loc.begin)
|
10
|
+
corrector.remove(node.loc.end)
|
11
|
+
return unless ternary_condition?(node) && next_char_is_question_mark?(node)
|
12
12
|
|
13
|
-
|
14
|
-
corrector.insert_after(node.loc.end, ' ')
|
15
|
-
end
|
16
|
-
end
|
13
|
+
corrector.insert_after(node.loc.end, ' ')
|
17
14
|
end
|
18
15
|
|
19
16
|
private
|
@@ -13,23 +13,18 @@ module RuboCop
|
|
13
13
|
@preferred_delimiters = preferred_delimiters
|
14
14
|
end
|
15
15
|
|
16
|
-
def correct(node, char)
|
16
|
+
def correct(corrector, node, char)
|
17
17
|
escape = escape_words?(node)
|
18
18
|
char = char.upcase if escape
|
19
19
|
delimiters = delimiters_for("%#{char}")
|
20
20
|
contents = new_contents(node, escape, delimiters)
|
21
|
-
wrap_contents(node, contents, char, delimiters)
|
21
|
+
wrap_contents(corrector, node, contents, char, delimiters)
|
22
22
|
end
|
23
23
|
|
24
24
|
private
|
25
25
|
|
26
|
-
def wrap_contents(node, contents, char, delimiters)
|
27
|
-
|
28
|
-
corrector.replace(
|
29
|
-
node,
|
30
|
-
"%#{char}#{delimiters[0]}#{contents}#{delimiters[1]}"
|
31
|
-
)
|
32
|
-
end
|
26
|
+
def wrap_contents(corrector, node, contents, char, delimiters)
|
27
|
+
corrector.replace(node, "%#{char}#{delimiters[0]}#{contents}#{delimiters[1]}")
|
33
28
|
end
|
34
29
|
|
35
30
|
def escape_words?(node)
|
@@ -71,7 +66,7 @@ module RuboCop
|
|
71
66
|
prev_line_num,
|
72
67
|
base_line_num,
|
73
68
|
index)
|
74
|
-
prev_line_num = word_node.
|
69
|
+
prev_line_num = word_node.last_line
|
75
70
|
content = fix_escaped_content(word_node, escape, delimiters)
|
76
71
|
line_breaks + content
|
77
72
|
end
|
@@ -5,22 +5,20 @@ module RuboCop
|
|
5
5
|
# This auto-corrects punctuation
|
6
6
|
class PunctuationCorrector
|
7
7
|
class << self
|
8
|
-
def remove_space(space_before)
|
9
|
-
|
8
|
+
def remove_space(corrector, space_before)
|
9
|
+
corrector.remove(space_before)
|
10
10
|
end
|
11
11
|
|
12
|
-
def add_space(token)
|
13
|
-
|
12
|
+
def add_space(corrector, token)
|
13
|
+
corrector.replace(token.pos, "#{token.pos.source} ")
|
14
14
|
end
|
15
15
|
|
16
|
-
def swap_comma(range)
|
16
|
+
def swap_comma(corrector, range)
|
17
17
|
return unless range
|
18
18
|
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
else corrector.insert_after(range, ',')
|
23
|
-
end
|
19
|
+
case range.source
|
20
|
+
when ',' then corrector.remove(range)
|
21
|
+
else corrector.insert_after(range, ',')
|
24
22
|
end
|
25
23
|
end
|
26
24
|
end
|
@@ -0,0 +1,22 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module RuboCop
|
4
|
+
module Cop
|
5
|
+
# Helpers for builtin documentation
|
6
|
+
module Documentation
|
7
|
+
module_function
|
8
|
+
|
9
|
+
# @api private
|
10
|
+
def department_to_basename(department)
|
11
|
+
"cops_#{department.downcase}"
|
12
|
+
end
|
13
|
+
|
14
|
+
# @api private
|
15
|
+
def url_for(cop_class)
|
16
|
+
base = department_to_basename(cop_class.department)
|
17
|
+
fragment = cop_class.cop_name.downcase.gsub(/[^a-z]/, '')
|
18
|
+
"https://docs.rubocop.org/rubocop/#{base}.html##{fragment}"
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
@@ -6,6 +6,7 @@ module RuboCop
|
|
6
6
|
#
|
7
7
|
# This generator will take a cop name and generate a source file
|
8
8
|
# and spec file when given a valid qualified cop name.
|
9
|
+
# @api private
|
9
10
|
class Generator
|
10
11
|
# Note: RDoc 5.1.0 or lower has the following issue.
|
11
12
|
# https://github.com/rubocop-hq/rubocop/issues/7043
|
@@ -58,7 +59,7 @@ module RuboCop
|
|
58
59
|
# TODO: Implement the cop in here.
|
59
60
|
#
|
60
61
|
# In many cases, you can use a node matcher for matching node pattern.
|
61
|
-
# See https://github.com/rubocop-hq/rubocop-ast/blob/master/lib/rubocop/node_pattern.rb
|
62
|
+
# See https://github.com/rubocop-hq/rubocop-ast/blob/master/lib/rubocop/ast/node_pattern.rb
|
62
63
|
#
|
63
64
|
# For example
|
64
65
|
MSG = 'Use `#good_method` instead of `#bad_method`.'
|
@@ -0,0 +1,77 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module RuboCop
|
4
|
+
module Cop
|
5
|
+
module Layout
|
6
|
+
# This cop checks whether the end keyword of `begin` is aligned properly.
|
7
|
+
#
|
8
|
+
# Two modes are supported through the `EnforcedStyleAlignWith` configuration
|
9
|
+
# parameter. If it's set to `start_of_line` (which is the default), the
|
10
|
+
# `end` shall be aligned with the start of the line where the `begin`
|
11
|
+
# keyword is. If it's set to `begin`, the `end` shall be aligned with the
|
12
|
+
# `begin` keyword.
|
13
|
+
#
|
14
|
+
# `Layout/EndAlignment` cop aligns with keywords (e.g. `if`, `while`, `case`)
|
15
|
+
# by default. On the other hand, `||= begin` that this cop targets tends to
|
16
|
+
# align with the start of the line, it defaults to `EnforcedStyleAlignWith: start_of_line`.
|
17
|
+
# These style can be configured by each cop.
|
18
|
+
#
|
19
|
+
# @example EnforcedStyleAlignWith: start_of_line (default)
|
20
|
+
# # bad
|
21
|
+
# foo ||= begin
|
22
|
+
# do_something
|
23
|
+
# end
|
24
|
+
#
|
25
|
+
# # good
|
26
|
+
# foo ||= begin
|
27
|
+
# do_something
|
28
|
+
# end
|
29
|
+
#
|
30
|
+
# @example EnforcedStyleAlignWith: begin
|
31
|
+
# # bad
|
32
|
+
# foo ||= begin
|
33
|
+
# do_something
|
34
|
+
# end
|
35
|
+
#
|
36
|
+
# # good
|
37
|
+
# foo ||= begin
|
38
|
+
# do_something
|
39
|
+
# end
|
40
|
+
#
|
41
|
+
class BeginEndAlignment < Base
|
42
|
+
include EndKeywordAlignment
|
43
|
+
include RangeHelp
|
44
|
+
extend AutoCorrector
|
45
|
+
|
46
|
+
MSG = '`end` at %d, %d is not aligned with `%s` at %d, %d.'
|
47
|
+
|
48
|
+
def on_kwbegin(node)
|
49
|
+
check_begin_alignment(node)
|
50
|
+
end
|
51
|
+
|
52
|
+
private
|
53
|
+
|
54
|
+
def check_begin_alignment(node)
|
55
|
+
align_with = {
|
56
|
+
begin: node.loc.begin,
|
57
|
+
start_of_line: start_line_range(node)
|
58
|
+
}
|
59
|
+
check_end_kw_alignment(node, align_with)
|
60
|
+
end
|
61
|
+
|
62
|
+
def autocorrect(corrector, node)
|
63
|
+
AlignmentCorrector.align_end(corrector, processed_source, node, alignment_node(node))
|
64
|
+
end
|
65
|
+
|
66
|
+
def alignment_node(node)
|
67
|
+
case style
|
68
|
+
when :begin
|
69
|
+
node
|
70
|
+
else
|
71
|
+
start_line_range(node)
|
72
|
+
end
|
73
|
+
end
|
74
|
+
end
|
75
|
+
end
|
76
|
+
end
|
77
|
+
end
|