rubocop 0.83.0 → 0.87.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 +26 -18
- data/config/default.yml +128 -23
- data/lib/rubocop.rb +21 -59
- data/lib/rubocop/ast_aliases.rb +8 -0
- data/lib/rubocop/cli.rb +2 -4
- data/lib/rubocop/cli/command/auto_genenerate_config.rb +42 -7
- data/lib/rubocop/cli/command/init_dotfile.rb +1 -1
- data/lib/rubocop/cli/command/show_cops.rb +2 -6
- data/lib/rubocop/comment_config.rb +1 -1
- data/lib/rubocop/config.rb +1 -1
- data/lib/rubocop/config_loader.rb +24 -70
- data/lib/rubocop/config_loader_resolver.rb +21 -9
- data/lib/rubocop/config_obsoletion.rb +0 -1
- data/lib/rubocop/config_store.rb +12 -2
- data/lib/rubocop/cop/autocorrect_logic.rb +14 -25
- data/lib/rubocop/cop/base.rb +399 -0
- data/lib/rubocop/cop/bundler/gem_comment.rb +70 -1
- data/lib/rubocop/cop/bundler/insecure_protocol_source.rb +10 -20
- data/lib/rubocop/cop/commissioner.rb +48 -71
- data/lib/rubocop/cop/cop.rb +91 -227
- data/lib/rubocop/cop/corrector.rb +38 -115
- data/lib/rubocop/cop/correctors/alignment_corrector.rb +2 -6
- data/lib/rubocop/cop/correctors/lambda_literal_to_method_corrector.rb +1 -1
- data/lib/rubocop/cop/correctors/space_corrector.rb +1 -3
- data/lib/rubocop/cop/gemspec/ordered_dependencies.rb +1 -3
- data/lib/rubocop/cop/gemspec/required_ruby_version.rb +1 -1
- data/lib/rubocop/cop/gemspec/ruby_version_globals_usage.rb +1 -1
- data/lib/rubocop/cop/generator.rb +2 -2
- data/lib/rubocop/cop/generator/configuration_injector.rb +1 -1
- data/lib/rubocop/cop/ignored_node.rb +1 -3
- data/lib/rubocop/cop/internal_affairs/node_type_predicate.rb +11 -14
- data/lib/rubocop/cop/layout/case_indentation.rb +21 -22
- data/lib/rubocop/cop/layout/class_structure.rb +19 -16
- data/lib/rubocop/cop/layout/comment_indentation.rb +3 -3
- data/lib/rubocop/cop/layout/empty_comment.rb +1 -1
- data/lib/rubocop/cop/layout/empty_lines_around_access_modifier.rb +2 -6
- data/lib/rubocop/cop/layout/empty_lines_around_attribute_accessor.rb +57 -4
- data/lib/rubocop/cop/layout/end_of_line.rb +3 -3
- data/lib/rubocop/cop/layout/first_argument_indentation.rb +6 -4
- data/lib/rubocop/cop/layout/first_array_element_indentation.rb +1 -3
- data/lib/rubocop/cop/layout/first_array_element_line_break.rb +1 -1
- data/lib/rubocop/cop/layout/first_method_argument_line_break.rb +1 -3
- data/lib/rubocop/cop/layout/first_parameter_indentation.rb +2 -2
- data/lib/rubocop/cop/layout/hash_alignment.rb +8 -9
- data/lib/rubocop/cop/layout/heredoc_argument_closing_parenthesis.rb +3 -7
- data/lib/rubocop/cop/layout/heredoc_indentation.rb +20 -103
- data/lib/rubocop/cop/layout/indentation_width.rb +1 -3
- data/lib/rubocop/cop/layout/line_length.rb +17 -17
- data/lib/rubocop/cop/layout/multiline_block_layout.rb +1 -2
- data/lib/rubocop/cop/layout/multiline_method_argument_line_breaks.rb +1 -3
- data/lib/rubocop/cop/layout/space_after_colon.rb +1 -1
- data/lib/rubocop/cop/layout/space_around_block_parameters.rb +19 -25
- data/lib/rubocop/cop/layout/space_around_keyword.rb +2 -2
- data/lib/rubocop/cop/layout/space_around_method_call_operator.rb +1 -3
- data/lib/rubocop/cop/layout/space_around_operators.rb +1 -1
- data/lib/rubocop/cop/layout/space_before_block_braces.rb +14 -0
- data/lib/rubocop/cop/layout/space_before_comment.rb +1 -3
- data/lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb +2 -4
- data/lib/rubocop/cop/layout/space_inside_block_braces.rb +1 -1
- data/lib/rubocop/cop/layout/space_inside_hash_literal_braces.rb +2 -2
- data/lib/rubocop/cop/layout/space_inside_reference_brackets.rb +1 -3
- data/lib/rubocop/cop/legacy/corrections_proxy.rb +49 -0
- data/lib/rubocop/cop/legacy/corrector.rb +29 -0
- data/lib/rubocop/cop/lint/ambiguous_operator.rb +5 -2
- data/lib/rubocop/cop/lint/constant_resolution.rb +89 -0
- data/lib/rubocop/cop/lint/deprecated_open_ssl_constant.rb +137 -0
- data/lib/rubocop/cop/lint/ensure_return.rb +1 -1
- data/lib/rubocop/cop/lint/erb_new_arguments.rb +1 -3
- data/lib/rubocop/cop/lint/float_out_of_range.rb +1 -1
- data/lib/rubocop/cop/lint/format_parameter_mismatch.rb +38 -2
- data/lib/rubocop/cop/lint/interpolation_check.rb +13 -0
- data/lib/rubocop/cop/lint/loop.rb +1 -1
- data/lib/rubocop/cop/lint/mixed_regexp_capture_types.rb +69 -0
- data/lib/rubocop/cop/lint/nested_method_definition.rb +1 -1
- data/lib/rubocop/cop/lint/nested_percent_literal.rb +1 -1
- data/lib/rubocop/cop/lint/non_deterministic_require_order.rb +2 -2
- data/lib/rubocop/cop/lint/non_local_exit_from_iterator.rb +7 -7
- data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb +20 -5
- data/lib/rubocop/cop/lint/percent_string_array.rb +2 -4
- data/lib/rubocop/cop/lint/percent_symbol_array.rb +1 -1
- data/lib/rubocop/cop/lint/raise_exception.rb +12 -4
- data/lib/rubocop/cop/lint/rand_one.rb +1 -1
- data/lib/rubocop/cop/lint/redundant_cop_disable_directive.rb +31 -25
- data/lib/rubocop/cop/lint/redundant_require_statement.rb +3 -3
- data/lib/rubocop/cop/lint/redundant_splat_expansion.rb +2 -2
- data/lib/rubocop/cop/lint/regexp_as_condition.rb +6 -0
- data/lib/rubocop/cop/lint/rescue_exception.rb +1 -1
- data/lib/rubocop/cop/lint/safe_navigation_with_empty.rb +9 -1
- data/lib/rubocop/cop/lint/suppressed_exception.rb +15 -2
- data/lib/rubocop/cop/lint/syntax.rb +11 -28
- data/lib/rubocop/cop/lint/unreachable_code.rb +1 -1
- data/lib/rubocop/cop/lint/unused_method_argument.rb +1 -1
- data/lib/rubocop/cop/lint/useless_access_modifier.rb +2 -4
- data/lib/rubocop/cop/lint/useless_else_without_rescue.rb +1 -1
- data/lib/rubocop/cop/lint/useless_setter_call.rb +1 -1
- data/lib/rubocop/cop/metrics/block_length.rb +22 -0
- data/lib/rubocop/cop/metrics/class_length.rb +25 -2
- data/lib/rubocop/cop/metrics/cyclomatic_complexity.rb +35 -3
- data/lib/rubocop/cop/metrics/method_length.rb +23 -0
- data/lib/rubocop/cop/metrics/module_length.rb +25 -2
- data/lib/rubocop/cop/metrics/utils/abc_size_calculator.rb +1 -1
- data/lib/rubocop/cop/metrics/utils/code_length_calculator.rb +129 -0
- data/lib/rubocop/cop/metrics/utils/iterating_block.rb +61 -0
- data/lib/rubocop/cop/migration/department_name.rb +7 -7
- data/lib/rubocop/cop/mixin/alignment.rb +1 -3
- data/lib/rubocop/cop/mixin/allowed_methods.rb +19 -0
- data/lib/rubocop/cop/mixin/array_min_size.rb +1 -3
- data/lib/rubocop/cop/mixin/auto_corrector.rb +12 -0
- data/lib/rubocop/cop/mixin/check_line_breakable.rb +3 -9
- data/lib/rubocop/cop/mixin/code_length.rb +4 -0
- data/lib/rubocop/cop/mixin/configurable_enforced_style.rb +1 -3
- data/lib/rubocop/cop/mixin/configurable_formatting.rb +3 -5
- data/lib/rubocop/cop/mixin/configurable_naming.rb +1 -1
- data/lib/rubocop/cop/mixin/documentation_comment.rb +2 -2
- data/lib/rubocop/cop/mixin/end_keyword_alignment.rb +1 -1
- data/lib/rubocop/cop/mixin/enforce_superclass.rb +3 -1
- data/lib/rubocop/cop/mixin/first_element_line_break.rb +1 -1
- data/lib/rubocop/cop/mixin/ignored_pattern.rb +1 -1
- data/lib/rubocop/cop/mixin/line_length_help.rb +1 -1
- data/lib/rubocop/cop/mixin/multiline_expression_indentation.rb +1 -1
- data/lib/rubocop/cop/mixin/nil_methods.rb +3 -5
- data/lib/rubocop/cop/mixin/ordered_gem_node.rb +6 -1
- data/lib/rubocop/cop/mixin/parentheses.rb +1 -2
- data/lib/rubocop/cop/mixin/preceding_following_alignment.rb +1 -1
- data/lib/rubocop/cop/mixin/range_help.rb +1 -1
- data/lib/rubocop/cop/mixin/regexp_literal_help.rb +43 -0
- data/lib/rubocop/cop/mixin/string_literals_help.rb +1 -1
- data/lib/rubocop/cop/mixin/surrounding_space.rb +10 -5
- data/lib/rubocop/cop/mixin/too_many_lines.rb +3 -13
- data/lib/rubocop/cop/mixin/trailing_comma.rb +2 -4
- data/lib/rubocop/cop/mixin/uncommunicative_name.rb +7 -5
- data/lib/rubocop/cop/naming/ascii_identifiers.rb +27 -4
- data/lib/rubocop/cop/naming/binary_operator_parameter_name.rb +3 -3
- data/lib/rubocop/cop/naming/class_and_module_camel_case.rb +11 -1
- data/lib/rubocop/cop/naming/file_name.rb +28 -17
- data/lib/rubocop/cop/naming/heredoc_delimiter_naming.rb +1 -1
- data/lib/rubocop/cop/naming/method_name.rb +1 -1
- data/lib/rubocop/cop/naming/method_parameter_name.rb +1 -1
- data/lib/rubocop/cop/naming/predicate_name.rb +4 -6
- data/lib/rubocop/cop/naming/variable_name.rb +1 -1
- data/lib/rubocop/cop/naming/variable_number.rb +1 -1
- data/lib/rubocop/cop/offense.rb +16 -2
- data/lib/rubocop/cop/registry.rb +63 -10
- data/lib/rubocop/cop/severity.rb +1 -3
- data/lib/rubocop/cop/style/accessor_grouping.rb +136 -0
- data/lib/rubocop/cop/style/and_or.rb +2 -2
- data/lib/rubocop/cop/style/array_join.rb +1 -1
- data/lib/rubocop/cop/style/attr.rb +1 -3
- data/lib/rubocop/cop/style/bare_percent_literals.rb +2 -2
- data/lib/rubocop/cop/style/bisected_attr_accessor.rb +121 -0
- data/lib/rubocop/cop/style/block_delimiters.rb +4 -12
- data/lib/rubocop/cop/style/class_and_module_children.rb +1 -1
- data/lib/rubocop/cop/style/class_vars.rb +21 -0
- data/lib/rubocop/cop/style/command_literal.rb +1 -1
- data/lib/rubocop/cop/style/commented_keyword.rb +2 -2
- data/lib/rubocop/cop/style/conditional_assignment.rb +2 -4
- data/lib/rubocop/cop/style/copyright.rb +5 -5
- data/lib/rubocop/cop/style/date_time.rb +1 -1
- data/lib/rubocop/cop/style/dir.rb +2 -2
- data/lib/rubocop/cop/style/disable_cops_within_source_code_directive.rb +1 -1
- data/lib/rubocop/cop/style/documentation.rb +2 -2
- data/lib/rubocop/cop/style/double_negation.rb +41 -4
- data/lib/rubocop/cop/style/empty_case_condition.rb +8 -6
- data/lib/rubocop/cop/style/empty_literal.rb +6 -8
- data/lib/rubocop/cop/style/empty_method.rb +1 -1
- data/lib/rubocop/cop/style/encoding.rb +1 -1
- data/lib/rubocop/cop/style/expand_path_arguments.rb +2 -2
- data/lib/rubocop/cop/style/exponential_notation.rb +5 -5
- data/lib/rubocop/cop/style/format_string_token.rb +2 -3
- data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +3 -6
- data/lib/rubocop/cop/style/hash_each_methods.rb +1 -1
- data/lib/rubocop/cop/style/hash_syntax.rb +16 -7
- data/lib/rubocop/cop/style/identical_conditional_branches.rb +1 -1
- data/lib/rubocop/cop/style/if_inside_else.rb +1 -1
- data/lib/rubocop/cop/style/if_unless_modifier_of_if_unless.rb +12 -0
- data/lib/rubocop/cop/style/inline_comment.rb +1 -1
- data/lib/rubocop/cop/style/inverse_methods.rb +1 -1
- data/lib/rubocop/cop/style/ip_addresses.rb +1 -1
- data/lib/rubocop/cop/style/method_call_with_args_parentheses/require_parentheses.rb +1 -3
- data/lib/rubocop/cop/style/method_call_without_args_parentheses.rb +1 -3
- data/lib/rubocop/cop/style/multiline_block_chain.rb +10 -1
- data/lib/rubocop/cop/style/multiline_if_then.rb +1 -1
- data/lib/rubocop/cop/style/multiline_memoization.rb +1 -1
- data/lib/rubocop/cop/style/multiline_ternary_operator.rb +17 -6
- data/lib/rubocop/cop/style/mutable_constant.rb +4 -4
- data/lib/rubocop/cop/style/negated_if.rb +3 -3
- data/lib/rubocop/cop/style/negated_unless.rb +3 -3
- data/lib/rubocop/cop/style/nested_parenthesized_calls.rb +2 -5
- data/lib/rubocop/cop/style/nested_ternary_operator.rb +27 -0
- data/lib/rubocop/cop/style/next.rb +2 -2
- data/lib/rubocop/cop/style/non_nil_check.rb +1 -1
- data/lib/rubocop/cop/style/numeric_literal_prefix.rb +2 -2
- data/lib/rubocop/cop/style/one_line_conditional.rb +2 -6
- data/lib/rubocop/cop/style/percent_literal_delimiters.rb +1 -1
- data/lib/rubocop/cop/style/proc.rb +1 -1
- data/lib/rubocop/cop/style/random_with_offset.rb +4 -10
- data/lib/rubocop/cop/style/redundant_assignment.rb +117 -0
- data/lib/rubocop/cop/style/redundant_conditional.rb +4 -3
- data/lib/rubocop/cop/style/redundant_exception.rb +14 -10
- data/lib/rubocop/cop/style/redundant_fetch_block.rb +122 -0
- data/lib/rubocop/cop/style/redundant_freeze.rb +1 -1
- data/lib/rubocop/cop/style/redundant_parentheses.rb +10 -8
- data/lib/rubocop/cop/style/redundant_percent_q.rb +3 -3
- data/lib/rubocop/cop/style/redundant_regexp_character_class.rb +90 -0
- data/lib/rubocop/cop/style/redundant_regexp_escape.rb +121 -0
- data/lib/rubocop/cop/style/redundant_self.rb +6 -9
- data/lib/rubocop/cop/style/rescue_standard_error.rb +1 -1
- data/lib/rubocop/cop/style/safe_navigation.rb +2 -6
- data/lib/rubocop/cop/style/sample.rb +1 -1
- data/lib/rubocop/cop/style/semicolon.rb +1 -1
- data/lib/rubocop/cop/style/signal_exception.rb +1 -1
- data/lib/rubocop/cop/style/slicing_with_range.rb +1 -1
- data/lib/rubocop/cop/style/special_global_vars.rb +2 -6
- data/lib/rubocop/cop/style/stderr_puts.rb +1 -1
- data/lib/rubocop/cop/style/struct_inheritance.rb +23 -2
- data/lib/rubocop/cop/style/symbol_array.rb +5 -5
- data/lib/rubocop/cop/style/symbol_proc.rb +1 -1
- data/lib/rubocop/cop/style/ternary_parentheses.rb +2 -4
- data/lib/rubocop/cop/style/trailing_comma_in_arguments.rb +3 -3
- data/lib/rubocop/cop/style/trailing_comma_in_array_literal.rb +3 -3
- data/lib/rubocop/cop/style/trailing_comma_in_block_args.rb +13 -13
- data/lib/rubocop/cop/style/trailing_comma_in_hash_literal.rb +3 -3
- data/lib/rubocop/cop/style/trailing_underscore_variable.rb +1 -3
- data/lib/rubocop/cop/style/trivial_accessors.rb +8 -7
- data/lib/rubocop/cop/style/unless_else.rb +1 -1
- data/lib/rubocop/cop/style/when_then.rb +1 -1
- data/lib/rubocop/cop/style/word_array.rb +1 -1
- data/lib/rubocop/cop/style/yoda_condition.rb +18 -1
- data/lib/rubocop/cop/style/zero_length_predicate.rb +2 -2
- data/lib/rubocop/cop/team.rb +141 -81
- data/lib/rubocop/cop/util.rb +3 -3
- data/lib/rubocop/cop/utils/format_string.rb +19 -2
- data/lib/rubocop/cop/variable_force.rb +3 -9
- data/lib/rubocop/cop/variable_force/branch.rb +1 -3
- data/lib/rubocop/cop/variable_force/variable.rb +2 -6
- data/lib/rubocop/ext/processed_source.rb +18 -0
- data/lib/rubocop/formatter/base_formatter.rb +0 -4
- data/lib/rubocop/formatter/disabled_config_formatter.rb +5 -13
- data/lib/rubocop/formatter/formatter_set.rb +2 -4
- data/lib/rubocop/formatter/junit_formatter.rb +14 -4
- data/lib/rubocop/magic_comment.rb +1 -1
- data/lib/rubocop/name_similarity.rb +7 -3
- data/lib/rubocop/options.rb +30 -15
- data/lib/rubocop/path_util.rb +2 -2
- data/lib/rubocop/platform.rb +1 -1
- data/lib/rubocop/rake_task.rb +6 -9
- data/lib/rubocop/remote_config.rb +1 -3
- data/lib/rubocop/result_cache.rb +5 -7
- data/lib/rubocop/rspec/cop_helper.rb +5 -28
- data/lib/rubocop/rspec/expect_offense.rb +60 -23
- data/lib/rubocop/rspec/shared_contexts.rb +55 -17
- data/lib/rubocop/runner.rb +42 -38
- data/lib/rubocop/target_finder.rb +2 -4
- data/lib/rubocop/target_ruby.rb +5 -2
- data/lib/rubocop/version.rb +5 -3
- metadata +60 -62
- data/lib/rubocop/ast/builder.rb +0 -85
- data/lib/rubocop/ast/node.rb +0 -637
- data/lib/rubocop/ast/node/alias_node.rb +0 -24
- data/lib/rubocop/ast/node/and_node.rb +0 -29
- data/lib/rubocop/ast/node/args_node.rb +0 -29
- data/lib/rubocop/ast/node/array_node.rb +0 -70
- data/lib/rubocop/ast/node/block_node.rb +0 -121
- data/lib/rubocop/ast/node/break_node.rb +0 -17
- data/lib/rubocop/ast/node/case_match_node.rb +0 -56
- data/lib/rubocop/ast/node/case_node.rb +0 -56
- data/lib/rubocop/ast/node/class_node.rb +0 -31
- data/lib/rubocop/ast/node/def_node.rb +0 -82
- data/lib/rubocop/ast/node/defined_node.rb +0 -17
- data/lib/rubocop/ast/node/ensure_node.rb +0 -17
- data/lib/rubocop/ast/node/float_node.rb +0 -12
- data/lib/rubocop/ast/node/for_node.rb +0 -53
- data/lib/rubocop/ast/node/forward_args_node.rb +0 -18
- data/lib/rubocop/ast/node/hash_node.rb +0 -109
- data/lib/rubocop/ast/node/if_node.rb +0 -175
- data/lib/rubocop/ast/node/int_node.rb +0 -12
- data/lib/rubocop/ast/node/keyword_splat_node.rb +0 -45
- data/lib/rubocop/ast/node/mixin/basic_literal_node.rb +0 -16
- data/lib/rubocop/ast/node/mixin/binary_operator_node.rb +0 -43
- data/lib/rubocop/ast/node/mixin/collection_node.rb +0 -15
- data/lib/rubocop/ast/node/mixin/conditional_node.rb +0 -45
- data/lib/rubocop/ast/node/mixin/hash_element_node.rb +0 -125
- data/lib/rubocop/ast/node/mixin/method_dispatch_node.rb +0 -269
- data/lib/rubocop/ast/node/mixin/method_identifier_predicates.rb +0 -114
- data/lib/rubocop/ast/node/mixin/modifier_node.rb +0 -17
- data/lib/rubocop/ast/node/mixin/numeric_node.rb +0 -21
- data/lib/rubocop/ast/node/mixin/parameterized_node.rb +0 -61
- data/lib/rubocop/ast/node/mixin/predicate_operator_node.rb +0 -35
- data/lib/rubocop/ast/node/module_node.rb +0 -24
- data/lib/rubocop/ast/node/or_node.rb +0 -29
- data/lib/rubocop/ast/node/pair_node.rb +0 -63
- data/lib/rubocop/ast/node/range_node.rb +0 -18
- data/lib/rubocop/ast/node/regexp_node.rb +0 -33
- data/lib/rubocop/ast/node/resbody_node.rb +0 -24
- data/lib/rubocop/ast/node/retry_node.rb +0 -17
- data/lib/rubocop/ast/node/return_node.rb +0 -24
- data/lib/rubocop/ast/node/self_class_node.rb +0 -24
- data/lib/rubocop/ast/node/send_node.rb +0 -17
- data/lib/rubocop/ast/node/str_node.rb +0 -16
- data/lib/rubocop/ast/node/super_node.rb +0 -21
- data/lib/rubocop/ast/node/symbol_node.rb +0 -12
- data/lib/rubocop/ast/node/until_node.rb +0 -35
- data/lib/rubocop/ast/node/when_node.rb +0 -53
- data/lib/rubocop/ast/node/while_node.rb +0 -35
- data/lib/rubocop/ast/node/yield_node.rb +0 -21
- data/lib/rubocop/ast/sexp.rb +0 -16
- data/lib/rubocop/ast/traversal.rb +0 -202
- data/lib/rubocop/cop/mixin/classish_length.rb +0 -37
- data/lib/rubocop/node_pattern.rb +0 -887
- data/lib/rubocop/processed_source.rb +0 -213
- data/lib/rubocop/token.rb +0 -114
@@ -8,117 +8,25 @@ module RuboCop
|
|
8
8
|
# Important!
|
9
9
|
# The nodes modified by the corrections should be part of the
|
10
10
|
# AST of the source_buffer.
|
11
|
-
class Corrector
|
11
|
+
class Corrector < ::Parser::Source::TreeRewriter
|
12
|
+
# @param source [Parser::Source::Buffer, or anything
|
13
|
+
# leading to one via `(processed_source.)buffer`]
|
12
14
|
#
|
13
|
-
#
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
# @example
|
19
|
-
#
|
20
|
-
# class AndOrCorrector
|
21
|
-
# def initialize(node)
|
22
|
-
# @node = node
|
23
|
-
# end
|
24
|
-
#
|
25
|
-
# def call(corrector)
|
26
|
-
# replacement = (@node.type == :and ? '&&' : '||')
|
27
|
-
# corrector.replace(@node.loc.operator, replacement)
|
28
|
-
# end
|
29
|
-
# end
|
30
|
-
#
|
31
|
-
# corrections = [AndOrCorrector.new(node)]
|
32
|
-
# corrector = Corrector.new(source_buffer, corrections)
|
33
|
-
def initialize(source_buffer, corrections = [])
|
34
|
-
@source_buffer = source_buffer
|
35
|
-
raise 'source_buffer should be a Parser::Source::Buffer' unless \
|
36
|
-
source_buffer.is_a? Parser::Source::Buffer
|
37
|
-
|
38
|
-
@corrections = corrections
|
39
|
-
@source_rewriter = Parser::Source::TreeRewriter.new(
|
40
|
-
source_buffer,
|
15
|
+
# corrector = Corrector.new(cop)
|
16
|
+
def initialize(source)
|
17
|
+
source = self.class.source_buffer(source)
|
18
|
+
super(
|
19
|
+
source,
|
41
20
|
different_replacements: :raise,
|
42
21
|
swallowed_insertions: :raise,
|
43
22
|
crossing_deletions: :accept
|
44
23
|
)
|
45
24
|
|
46
|
-
@diagnostics = []
|
47
25
|
# Don't print warnings to stderr if corrections conflict with each other
|
48
|
-
|
49
|
-
@diagnostics << diagnostic
|
50
|
-
end
|
51
|
-
end
|
52
|
-
|
53
|
-
attr_reader :corrections, :diagnostics
|
54
|
-
|
55
|
-
# Does the actual rewrite and returns string corresponding to
|
56
|
-
# the rewritten source.
|
57
|
-
#
|
58
|
-
# @return [String]
|
59
|
-
def rewrite
|
60
|
-
@corrections.each do |correction|
|
61
|
-
begin
|
62
|
-
@source_rewriter.transaction do
|
63
|
-
correction.call(self)
|
64
|
-
end
|
65
|
-
rescue ErrorWithAnalyzedFileLocation => e
|
66
|
-
raise e unless e.cause.is_a?(::Parser::ClobberingError)
|
67
|
-
end
|
68
|
-
end
|
69
|
-
|
70
|
-
@source_rewriter.process
|
71
|
-
end
|
72
|
-
|
73
|
-
# Removes the source range.
|
74
|
-
#
|
75
|
-
# @param [Parser::Source::Range, Rubocop::AST::Node] range or node
|
76
|
-
def remove(node_or_range)
|
77
|
-
range = to_range(node_or_range)
|
78
|
-
@source_rewriter.remove(range)
|
79
|
-
end
|
80
|
-
|
81
|
-
# Inserts new code before the given source range.
|
82
|
-
#
|
83
|
-
# @param [Parser::Source::Range, Rubocop::AST::Node] range or node
|
84
|
-
# @param [String] content
|
85
|
-
def insert_before(node_or_range, content)
|
86
|
-
range = to_range(node_or_range)
|
87
|
-
# TODO: Fix Cops using bad ranges instead
|
88
|
-
if range.end_pos > @source_buffer.source.size
|
89
|
-
range = range.with(end_pos: @source_buffer.source.size)
|
90
|
-
end
|
91
|
-
|
92
|
-
@source_rewriter.insert_before(range, content)
|
93
|
-
end
|
94
|
-
|
95
|
-
# Inserts new code after the given source range.
|
96
|
-
#
|
97
|
-
# @param [Parser::Source::Range, Rubocop::AST::Node] range or node
|
98
|
-
# @param [String] content
|
99
|
-
def insert_after(node_or_range, content)
|
100
|
-
range = to_range(node_or_range)
|
101
|
-
@source_rewriter.insert_after(range, content)
|
26
|
+
diagnostics.consumer = ->(diagnostic) {}
|
102
27
|
end
|
103
28
|
|
104
|
-
|
105
|
-
#
|
106
|
-
# @param [Parser::Source::Range, Rubocop::AST::Node] range or node
|
107
|
-
# @param [String] before
|
108
|
-
# @param [String] after
|
109
|
-
def wrap(node_or_range, before, after)
|
110
|
-
range = to_range(node_or_range)
|
111
|
-
@source_rewriter.wrap(range, before, after)
|
112
|
-
end
|
113
|
-
|
114
|
-
# Replaces the code of the source range `range` with `content`.
|
115
|
-
#
|
116
|
-
# @param [Parser::Source::Range, Rubocop::AST::Node] range or node
|
117
|
-
# @param [String] content
|
118
|
-
def replace(node_or_range, content)
|
119
|
-
range = to_range(node_or_range)
|
120
|
-
@source_rewriter.replace(range, content)
|
121
|
-
end
|
29
|
+
alias rewrite process # Legacy
|
122
30
|
|
123
31
|
# Removes `size` characters prior to the source range.
|
124
32
|
#
|
@@ -126,10 +34,11 @@ module RuboCop
|
|
126
34
|
# @param [Integer] size
|
127
35
|
def remove_preceding(node_or_range, size)
|
128
36
|
range = to_range(node_or_range)
|
129
|
-
to_remove =
|
130
|
-
|
131
|
-
|
132
|
-
|
37
|
+
to_remove = range.with(
|
38
|
+
begin_pos: range.begin_pos - size,
|
39
|
+
end_pos: range.begin_pos
|
40
|
+
)
|
41
|
+
remove(to_remove)
|
133
42
|
end
|
134
43
|
|
135
44
|
# Removes `size` characters from the beginning of the given range.
|
@@ -140,10 +49,8 @@ module RuboCop
|
|
140
49
|
# @param [Integer] size
|
141
50
|
def remove_leading(node_or_range, size)
|
142
51
|
range = to_range(node_or_range)
|
143
|
-
to_remove =
|
144
|
-
|
145
|
-
range.begin_pos + size)
|
146
|
-
@source_rewriter.remove(to_remove)
|
52
|
+
to_remove = range.with(end_pos: range.begin_pos + size)
|
53
|
+
remove(to_remove)
|
147
54
|
end
|
148
55
|
|
149
56
|
# Removes `size` characters from the end of the given range.
|
@@ -154,10 +61,22 @@ module RuboCop
|
|
154
61
|
# @param [Integer] size
|
155
62
|
def remove_trailing(node_or_range, size)
|
156
63
|
range = to_range(node_or_range)
|
157
|
-
to_remove =
|
158
|
-
|
159
|
-
|
160
|
-
|
64
|
+
to_remove = range.with(begin_pos: range.end_pos - size)
|
65
|
+
remove(to_remove)
|
66
|
+
end
|
67
|
+
|
68
|
+
# Duck typing for get to a ::Parser::Source::Buffer
|
69
|
+
def self.source_buffer(source)
|
70
|
+
source = source.processed_source if source.respond_to?(:processed_source)
|
71
|
+
source = source.buffer if source.respond_to?(:buffer)
|
72
|
+
source = source.source_buffer if source.respond_to?(:source_buffer)
|
73
|
+
|
74
|
+
unless source.is_a? ::Parser::Source::Buffer
|
75
|
+
raise TypeError, 'Expected argument to lead to a Parser::Source::Buffer ' \
|
76
|
+
"but got #{source.inspect}"
|
77
|
+
end
|
78
|
+
|
79
|
+
source
|
161
80
|
end
|
162
81
|
|
163
82
|
private
|
@@ -178,8 +97,12 @@ module RuboCop
|
|
178
97
|
range
|
179
98
|
end
|
180
99
|
|
100
|
+
def check_range_validity(node_or_range)
|
101
|
+
super(to_range(node_or_range))
|
102
|
+
end
|
103
|
+
|
181
104
|
def validate_buffer(buffer)
|
182
|
-
return if buffer ==
|
105
|
+
return if buffer == source_buffer
|
183
106
|
|
184
107
|
unless buffer.is_a?(::Parser::Source::Buffer)
|
185
108
|
# actually this should be enforced by parser gem
|
@@ -48,9 +48,7 @@ module RuboCop
|
|
48
48
|
return if taboo_ranges.any? { |t| within?(range, t) }
|
49
49
|
|
50
50
|
if column_delta.positive?
|
51
|
-
unless range.resize(1).source == "\n"
|
52
|
-
corrector.insert_before(range, ' ' * column_delta)
|
53
|
-
end
|
51
|
+
corrector.insert_before(range, ' ' * column_delta) unless range.resize(1).source == "\n"
|
54
52
|
elsif /\A[ \t]+\z/.match?(range.source)
|
55
53
|
remove(range, corrector)
|
56
54
|
end
|
@@ -92,9 +90,7 @@ module RuboCop
|
|
92
90
|
end
|
93
91
|
|
94
92
|
def calculate_range(expr, line_begin_pos, column_delta)
|
95
|
-
if column_delta.positive?
|
96
|
-
return range_between(line_begin_pos, line_begin_pos)
|
97
|
-
end
|
93
|
+
return range_between(line_begin_pos, line_begin_pos) if column_delta.positive?
|
98
94
|
|
99
95
|
starts_with_space =
|
100
96
|
expr.source_buffer.source[line_begin_pos].start_with?(' ')
|
@@ -35,9 +35,7 @@ module RuboCop
|
|
35
35
|
|
36
36
|
def add_space(processed_source, corrector, left_token, right_token)
|
37
37
|
@processed_source = processed_source
|
38
|
-
unless left_token.space_after?
|
39
|
-
corrector.insert_after(left_token.pos, ' ')
|
40
|
-
end
|
38
|
+
corrector.insert_after(left_token.pos, ' ') unless left_token.space_after?
|
41
39
|
return if right_token.space_before?
|
42
40
|
|
43
41
|
corrector.insert_before(right_token.pos, ' ')
|
@@ -68,9 +68,7 @@ module RuboCop
|
|
68
68
|
gem_name(current),
|
69
69
|
gem_name(previous)
|
70
70
|
)
|
71
|
-
unless get_dependency_name(previous) == get_dependency_name(current)
|
72
|
-
next
|
73
|
-
end
|
71
|
+
next unless get_dependency_name(previous) == get_dependency_name(current)
|
74
72
|
|
75
73
|
register_offense(previous, current)
|
76
74
|
end
|
@@ -28,7 +28,7 @@ module RuboCop
|
|
28
28
|
class RubyVersionGlobalsUsage < Cop
|
29
29
|
MSG = 'Do not use `RUBY_VERSION` in gemspec file.'
|
30
30
|
|
31
|
-
def_node_matcher :ruby_version?, '(const nil? :RUBY_VERSION)'
|
31
|
+
def_node_matcher :ruby_version?, '(const {cbase nil?} :RUBY_VERSION)'
|
32
32
|
|
33
33
|
def_node_search :gem_specification?, <<~PATTERN
|
34
34
|
(block
|
@@ -54,11 +54,11 @@ module RuboCop
|
|
54
54
|
# # good
|
55
55
|
# good_foo_method(args)
|
56
56
|
#
|
57
|
-
class %<cop_name>s <
|
57
|
+
class %<cop_name>s < Base
|
58
58
|
# TODO: Implement the cop in here.
|
59
59
|
#
|
60
60
|
# In many cases, you can use a node matcher for matching node pattern.
|
61
|
-
# See https://github.com/rubocop-hq/rubocop/blob/master/lib/rubocop/node_pattern.rb
|
61
|
+
# See https://github.com/rubocop-hq/rubocop-ast/blob/master/lib/rubocop/node_pattern.rb
|
62
62
|
#
|
63
63
|
# For example
|
64
64
|
MSG = 'Use `#good_method` instead of `#bad_method`.'
|
@@ -10,9 +10,7 @@ module RuboCop
|
|
10
10
|
|
11
11
|
def part_of_ignored_node?(node)
|
12
12
|
ignored_nodes.map(&:loc).any? do |ignored_loc|
|
13
|
-
if ignored_loc.expression.begin_pos > node.source_range.begin_pos
|
14
|
-
next false
|
15
|
-
end
|
13
|
+
next false if ignored_loc.expression.begin_pos > node.source_range.begin_pos
|
16
14
|
|
17
15
|
ignored_end_pos = if ignored_loc.respond_to?(:heredoc_body)
|
18
16
|
ignored_loc.heredoc_end.end_pos
|
@@ -13,7 +13,9 @@ module RuboCop
|
|
13
13
|
# # good
|
14
14
|
# node.send_type?
|
15
15
|
#
|
16
|
-
class NodeTypePredicate <
|
16
|
+
class NodeTypePredicate < Base
|
17
|
+
extend AutoCorrector
|
18
|
+
|
17
19
|
MSG = 'Use `#%<type>s_type?` to check node type.'
|
18
20
|
|
19
21
|
def_node_matcher :node_type_check, <<~PATTERN
|
@@ -21,21 +23,16 @@ module RuboCop
|
|
21
23
|
PATTERN
|
22
24
|
|
23
25
|
def on_send(node)
|
24
|
-
node_type_check(node) do |
|
26
|
+
node_type_check(node) do |receiver, node_type|
|
25
27
|
return unless Parser::Meta::NODE_TYPES.include?(node_type)
|
26
28
|
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
receiver.loc.expression.end_pos + 1,
|
35
|
-
node.loc.expression.end_pos)
|
36
|
-
|
37
|
-
lambda do |corrector|
|
38
|
-
corrector.replace(range, "#{node_type}_type?")
|
29
|
+
message = format(MSG, type: node_type)
|
30
|
+
add_offense(node, message: message) do |corrector|
|
31
|
+
range = node.loc.expression.with(
|
32
|
+
begin_pos: receiver.loc.expression.end_pos + 1
|
33
|
+
)
|
34
|
+
corrector.replace(range, "#{node_type}_type?")
|
35
|
+
end
|
39
36
|
end
|
40
37
|
end
|
41
38
|
end
|
@@ -3,10 +3,10 @@
|
|
3
3
|
module RuboCop
|
4
4
|
module Cop
|
5
5
|
module Layout
|
6
|
-
# This cop checks how the
|
7
|
-
# are indented in relation to its
|
6
|
+
# This cop checks how the ``when``s of a `case` expression
|
7
|
+
# are indented in relation to its `case` or `end` keyword.
|
8
8
|
#
|
9
|
-
# It will register a separate offense for each misaligned
|
9
|
+
# It will register a separate offense for each misaligned `when`.
|
10
10
|
#
|
11
11
|
# @example
|
12
12
|
# # If Layout/EndAlignment is set to keyword style (default)
|
@@ -67,10 +67,11 @@ module RuboCop
|
|
67
67
|
# else
|
68
68
|
# y / 3
|
69
69
|
# end
|
70
|
-
class CaseIndentation <
|
70
|
+
class CaseIndentation < Base
|
71
71
|
include Alignment
|
72
72
|
include ConfigurableEnforcedStyle
|
73
73
|
include RangeHelp
|
74
|
+
extend AutoCorrector
|
74
75
|
|
75
76
|
MSG = 'Indent `when` %<depth>s `%<base>s`.'
|
76
77
|
|
@@ -82,16 +83,6 @@ module RuboCop
|
|
82
83
|
end
|
83
84
|
end
|
84
85
|
|
85
|
-
def autocorrect(node)
|
86
|
-
whitespace = whitespace_range(node)
|
87
|
-
|
88
|
-
return false unless whitespace.source.strip.empty?
|
89
|
-
|
90
|
-
lambda do |corrector|
|
91
|
-
corrector.replace(whitespace, replacement(node))
|
92
|
-
end
|
93
|
-
end
|
94
|
-
|
95
86
|
private
|
96
87
|
|
97
88
|
def check_when(when_node)
|
@@ -114,22 +105,30 @@ module RuboCop
|
|
114
105
|
end
|
115
106
|
|
116
107
|
def incorrect_style(when_node)
|
108
|
+
add_offense(when_node.loc.keyword) do |corrector|
|
109
|
+
detect_incorrect_style(when_node)
|
110
|
+
|
111
|
+
whitespace = whitespace_range(when_node)
|
112
|
+
|
113
|
+
corrector.replace(whitespace, replacement(when_node)) if whitespace.source.strip.empty?
|
114
|
+
end
|
115
|
+
end
|
116
|
+
|
117
|
+
def detect_incorrect_style(when_node)
|
117
118
|
when_column = when_node.loc.keyword.column
|
118
119
|
base_column = base_column(when_node.parent, alternative_style)
|
119
120
|
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
unrecognized_style_detected
|
125
|
-
end
|
121
|
+
if when_column == base_column
|
122
|
+
opposite_style_detected
|
123
|
+
else
|
124
|
+
unrecognized_style_detected
|
126
125
|
end
|
127
126
|
end
|
128
127
|
|
129
|
-
def
|
128
|
+
def find_message(*)
|
130
129
|
depth = indent_one_step? ? 'one step more than' : 'as deep as'
|
131
130
|
|
132
|
-
format(MSG, depth: depth, base:
|
131
|
+
format(MSG, depth: depth, base: style)
|
133
132
|
end
|
134
133
|
|
135
134
|
def base_column(case_node, base)
|
@@ -8,22 +8,24 @@ module RuboCop
|
|
8
8
|
# `Categories` allows us to map macro names into a category.
|
9
9
|
#
|
10
10
|
# Consider an example of code style that covers the following order:
|
11
|
-
#
|
12
|
-
#
|
13
|
-
#
|
14
|
-
#
|
15
|
-
#
|
16
|
-
#
|
17
|
-
#
|
18
|
-
#
|
19
|
-
#
|
20
|
-
#
|
21
|
-
#
|
22
|
-
#
|
11
|
+
#
|
12
|
+
# * Module inclusion (include, prepend, extend)
|
13
|
+
# * Constants
|
14
|
+
# * Associations (has_one, has_many)
|
15
|
+
# * Public attribute macros (attr_accessor, attr_writer, attr_reader)
|
16
|
+
# * Other macros (validates, validate)
|
17
|
+
# * Public class methods
|
18
|
+
# * Initializer
|
19
|
+
# * Public instance methods
|
20
|
+
# * Protected attribute macros (attr_accessor, attr_writer, attr_reader)
|
21
|
+
# * Protected instance methods
|
22
|
+
# * Private attribute macros (attr_accessor, attr_writer, attr_reader)
|
23
|
+
# * Private instance methods
|
23
24
|
#
|
24
25
|
# You can configure the following order:
|
25
26
|
#
|
26
|
-
#
|
27
|
+
# [source,yaml]
|
28
|
+
# ----
|
27
29
|
# Layout/ClassStructure:
|
28
30
|
# ExpectedOrder:
|
29
31
|
# - module_inclusion
|
@@ -40,13 +42,14 @@ module RuboCop
|
|
40
42
|
# - private_attribute_macros
|
41
43
|
# - private_delegate
|
42
44
|
# - private_methods
|
43
|
-
#
|
45
|
+
# ----
|
44
46
|
#
|
45
47
|
# Instead of putting all literals in the expected order, is also
|
46
48
|
# possible to group categories of macros. Visibility levels are handled
|
47
49
|
# automatically.
|
48
50
|
#
|
49
|
-
#
|
51
|
+
# [source,yaml]
|
52
|
+
# ----
|
50
53
|
# Layout/ClassStructure:
|
51
54
|
# Categories:
|
52
55
|
# association:
|
@@ -63,7 +66,7 @@ module RuboCop
|
|
63
66
|
# - include
|
64
67
|
# - prepend
|
65
68
|
# - extend
|
66
|
-
#
|
69
|
+
# ----
|
67
70
|
#
|
68
71
|
# @example
|
69
72
|
# # bad
|