rubocop 1.67.0 → 1.73.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/LICENSE.txt +1 -1
- data/README.md +4 -4
- data/config/default.yml +168 -19
- data/config/internal_affairs.yml +16 -0
- data/lib/rubocop/cached_data.rb +12 -4
- data/lib/rubocop/cli/command/execute_runner.rb +4 -4
- data/lib/rubocop/cli/command/show_cops.rb +24 -2
- data/lib/rubocop/cli/command/suggest_extensions.rb +7 -1
- data/lib/rubocop/cli/command/version.rb +2 -2
- data/lib/rubocop/comment_config.rb +2 -2
- data/lib/rubocop/config.rb +17 -4
- data/lib/rubocop/config_loader.rb +48 -8
- data/lib/rubocop/config_loader_resolver.rb +35 -10
- data/lib/rubocop/config_validator.rb +19 -9
- data/lib/rubocop/cop/autocorrect_logic.rb +36 -19
- data/lib/rubocop/cop/base.rb +7 -1
- data/lib/rubocop/cop/bundler/duplicated_gem.rb +2 -2
- data/lib/rubocop/cop/bundler/gem_comment.rb +1 -1
- data/lib/rubocop/cop/bundler/gem_filename.rb +0 -1
- data/lib/rubocop/cop/bundler/insecure_protocol_source.rb +0 -1
- data/lib/rubocop/cop/correctors/alignment_corrector.rb +1 -12
- data/lib/rubocop/cop/correctors/for_to_each_corrector.rb +1 -1
- data/lib/rubocop/cop/correctors/percent_literal_corrector.rb +10 -0
- data/lib/rubocop/cop/gemspec/deprecated_attribute_assignment.rb +1 -2
- data/lib/rubocop/cop/gemspec/required_ruby_version.rb +0 -2
- data/lib/rubocop/cop/generator.rb +6 -0
- data/lib/rubocop/cop/internal_affairs/cop_enabled.rb +85 -0
- data/lib/rubocop/cop/internal_affairs/example_description.rb +4 -2
- data/lib/rubocop/cop/internal_affairs/location_exists.rb +116 -0
- data/lib/rubocop/cop/internal_affairs/location_expression.rb +2 -1
- data/lib/rubocop/cop/internal_affairs/location_line_equality_comparison.rb +3 -4
- data/lib/rubocop/cop/internal_affairs/node_first_or_last_argument.rb +3 -2
- data/lib/rubocop/cop/internal_affairs/node_matcher_directive.rb +1 -1
- data/lib/rubocop/cop/internal_affairs/node_pattern_groups/ast_processor.rb +63 -0
- data/lib/rubocop/cop/internal_affairs/node_pattern_groups/ast_walker.rb +131 -0
- data/lib/rubocop/cop/internal_affairs/node_pattern_groups.rb +229 -0
- data/lib/rubocop/cop/internal_affairs/node_type_multiple_predicates.rb +126 -0
- data/lib/rubocop/cop/internal_affairs/node_type_predicate.rb +4 -3
- data/lib/rubocop/cop/internal_affairs/numblock_handler.rb +1 -1
- data/lib/rubocop/cop/internal_affairs/on_send_without_on_csend.rb +90 -0
- data/lib/rubocop/cop/internal_affairs/operator_keyword.rb +48 -0
- data/lib/rubocop/cop/internal_affairs/plugin.rb +33 -0
- data/lib/rubocop/cop/internal_affairs/redundant_source_range.rb +3 -1
- data/lib/rubocop/cop/internal_affairs/single_line_comparison.rb +5 -4
- data/lib/rubocop/cop/internal_affairs/style_detected_api_use.rb +0 -2
- data/lib/rubocop/cop/internal_affairs/undefined_config.rb +7 -1
- data/lib/rubocop/cop/internal_affairs.rb +6 -16
- data/lib/rubocop/cop/layout/access_modifier_indentation.rb +1 -1
- data/lib/rubocop/cop/layout/argument_alignment.rb +2 -9
- data/lib/rubocop/cop/layout/array_alignment.rb +1 -1
- data/lib/rubocop/cop/layout/begin_end_alignment.rb +0 -1
- data/lib/rubocop/cop/layout/block_alignment.rb +3 -2
- data/lib/rubocop/cop/layout/class_structure.rb +9 -9
- data/lib/rubocop/cop/layout/dot_position.rb +1 -1
- data/lib/rubocop/cop/layout/else_alignment.rb +2 -2
- data/lib/rubocop/cop/layout/empty_line_after_guard_clause.rb +2 -2
- data/lib/rubocop/cop/layout/empty_line_between_defs.rb +7 -11
- data/lib/rubocop/cop/layout/empty_lines_around_access_modifier.rb +29 -4
- data/lib/rubocop/cop/layout/empty_lines_around_begin_body.rb +5 -6
- data/lib/rubocop/cop/layout/empty_lines_around_exception_handling_keywords.rb +4 -5
- data/lib/rubocop/cop/layout/empty_lines_around_method_body.rb +23 -1
- data/lib/rubocop/cop/layout/end_alignment.rb +1 -1
- data/lib/rubocop/cop/layout/extra_spacing.rb +1 -1
- data/lib/rubocop/cop/layout/first_argument_indentation.rb +3 -8
- data/lib/rubocop/cop/layout/first_array_element_indentation.rb +2 -7
- data/lib/rubocop/cop/layout/first_hash_element_indentation.rb +2 -7
- data/lib/rubocop/cop/layout/first_hash_element_line_break.rb +1 -1
- data/lib/rubocop/cop/layout/first_parameter_indentation.rb +2 -2
- data/lib/rubocop/cop/layout/hash_alignment.rb +6 -4
- data/lib/rubocop/cop/layout/heredoc_argument_closing_parenthesis.rb +2 -1
- data/lib/rubocop/cop/layout/indentation_width.rb +7 -7
- data/lib/rubocop/cop/layout/leading_comment_space.rb +44 -1
- data/lib/rubocop/cop/layout/line_continuation_leading_space.rb +11 -2
- data/lib/rubocop/cop/layout/line_continuation_spacing.rb +7 -1
- data/lib/rubocop/cop/layout/line_end_string_concatenation_indentation.rb +2 -2
- data/lib/rubocop/cop/layout/line_length.rb +119 -4
- data/lib/rubocop/cop/layout/multiline_hash_key_line_breaks.rb +1 -1
- data/lib/rubocop/cop/layout/multiline_method_argument_line_breaks.rb +25 -0
- data/lib/rubocop/cop/layout/multiline_method_call_brace_layout.rb +2 -1
- data/lib/rubocop/cop/layout/multiline_method_call_indentation.rb +4 -4
- data/lib/rubocop/cop/layout/multiline_method_definition_brace_layout.rb +1 -1
- data/lib/rubocop/cop/layout/multiline_operation_indentation.rb +2 -3
- data/lib/rubocop/cop/layout/parameter_alignment.rb +3 -4
- data/lib/rubocop/cop/layout/redundant_line_break.rb +10 -41
- data/lib/rubocop/cop/layout/rescue_ensure_alignment.rb +4 -3
- data/lib/rubocop/cop/layout/single_line_block_chain.rb +1 -1
- data/lib/rubocop/cop/layout/space_after_colon.rb +2 -2
- data/lib/rubocop/cop/layout/space_after_comma.rb +1 -1
- data/lib/rubocop/cop/layout/space_after_method_name.rb +1 -1
- data/lib/rubocop/cop/layout/space_after_semicolon.rb +1 -1
- data/lib/rubocop/cop/layout/space_around_keyword.rb +2 -1
- data/lib/rubocop/cop/layout/space_around_method_call_operator.rb +1 -1
- data/lib/rubocop/cop/layout/space_around_operators.rb +19 -20
- data/lib/rubocop/cop/layout/space_before_brackets.rb +5 -5
- data/lib/rubocop/cop/layout/space_before_comma.rb +1 -1
- data/lib/rubocop/cop/layout/space_before_semicolon.rb +1 -1
- data/lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb +6 -0
- data/lib/rubocop/cop/layout/space_inside_block_braces.rb +4 -0
- data/lib/rubocop/cop/layout/space_inside_hash_literal_braces.rb +4 -0
- data/lib/rubocop/cop/layout/space_inside_string_interpolation.rb +0 -1
- data/lib/rubocop/cop/layout/trailing_whitespace.rb +5 -3
- data/lib/rubocop/cop/lint/ambiguous_block_association.rb +1 -1
- data/lib/rubocop/cop/lint/array_literal_in_regexp.rb +119 -0
- data/lib/rubocop/cop/lint/assignment_in_condition.rb +1 -3
- data/lib/rubocop/cop/lint/binary_operator_with_identical_operands.rb +10 -12
- data/lib/rubocop/cop/lint/circular_argument_reference.rb +6 -0
- data/lib/rubocop/cop/lint/constant_definition_in_block.rb +3 -3
- data/lib/rubocop/cop/lint/constant_reassignment.rb +148 -0
- data/lib/rubocop/cop/lint/cop_directive_syntax.rb +84 -0
- data/lib/rubocop/cop/lint/debugger.rb +1 -1
- data/lib/rubocop/cop/lint/deprecated_open_ssl_constant.rb +2 -1
- data/lib/rubocop/cop/lint/duplicate_branch.rb +39 -4
- data/lib/rubocop/cop/lint/duplicate_match_pattern.rb +1 -1
- data/lib/rubocop/cop/lint/duplicate_methods.rb +0 -14
- data/lib/rubocop/cop/lint/duplicate_regexp_character_class_element.rb +1 -1
- data/lib/rubocop/cop/lint/duplicate_set_element.rb +20 -7
- data/lib/rubocop/cop/lint/empty_ensure.rb +1 -1
- data/lib/rubocop/cop/lint/empty_expression.rb +0 -2
- data/lib/rubocop/cop/lint/empty_file.rb +0 -2
- data/lib/rubocop/cop/lint/ensure_return.rb +1 -1
- data/lib/rubocop/cop/lint/float_comparison.rb +20 -14
- data/lib/rubocop/cop/lint/float_out_of_range.rb +2 -4
- data/lib/rubocop/cop/lint/format_parameter_mismatch.rb +2 -2
- data/lib/rubocop/cop/lint/hash_new_with_keyword_arguments_as_default.rb +55 -0
- data/lib/rubocop/cop/lint/implicit_string_concatenation.rb +1 -1
- data/lib/rubocop/cop/lint/interpolation_check.rb +9 -0
- data/lib/rubocop/cop/lint/it_without_arguments_in_block.rb +3 -0
- data/lib/rubocop/cop/lint/literal_as_condition.rb +105 -7
- data/lib/rubocop/cop/lint/literal_assignment_in_condition.rb +1 -1
- data/lib/rubocop/cop/lint/literal_in_interpolation.rb +24 -6
- data/lib/rubocop/cop/lint/missing_super.rb +2 -2
- data/lib/rubocop/cop/lint/mixed_case_range.rb +4 -7
- data/lib/rubocop/cop/lint/mixed_regexp_capture_types.rb +1 -1
- data/lib/rubocop/cop/lint/nested_method_definition.rb +9 -5
- data/lib/rubocop/cop/lint/next_without_accumulator.rb +1 -1
- data/lib/rubocop/cop/lint/no_return_in_begin_end_blocks.rb +2 -2
- data/lib/rubocop/cop/lint/non_atomic_file_operation.rb +12 -3
- data/lib/rubocop/cop/lint/non_deterministic_require_order.rb +3 -3
- data/lib/rubocop/cop/lint/non_local_exit_from_iterator.rb +1 -1
- data/lib/rubocop/cop/lint/number_conversion.rb +0 -1
- data/lib/rubocop/cop/lint/numbered_parameter_assignment.rb +1 -2
- data/lib/rubocop/cop/lint/numeric_operation_with_constant_result.rb +93 -0
- data/lib/rubocop/cop/lint/or_assignment_to_constant.rb +1 -2
- data/lib/rubocop/cop/lint/out_of_range_regexp_ref.rb +3 -2
- data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb +1 -5
- data/lib/rubocop/cop/lint/redundant_cop_enable_directive.rb +1 -1
- data/lib/rubocop/cop/lint/redundant_regexp_quantifiers.rb +1 -1
- data/lib/rubocop/cop/lint/redundant_require_statement.rb +0 -21
- data/lib/rubocop/cop/lint/redundant_safe_navigation.rb +12 -7
- data/lib/rubocop/cop/lint/redundant_splat_expansion.rb +8 -7
- data/lib/rubocop/cop/lint/redundant_string_coercion.rb +2 -2
- data/lib/rubocop/cop/lint/redundant_type_conversion.rb +252 -0
- data/lib/rubocop/cop/lint/refinement_import_methods.rb +1 -1
- data/lib/rubocop/cop/lint/regexp_as_condition.rb +0 -1
- data/lib/rubocop/cop/lint/rescue_exception.rb +1 -1
- data/lib/rubocop/cop/lint/rescue_type.rb +3 -7
- data/lib/rubocop/cop/lint/safe_navigation_chain.rb +17 -1
- data/lib/rubocop/cop/lint/safe_navigation_consistency.rb +5 -1
- data/lib/rubocop/cop/lint/self_assignment.rb +8 -10
- data/lib/rubocop/cop/lint/shadowed_exception.rb +1 -1
- data/lib/rubocop/cop/lint/shared_mutable_default.rb +65 -0
- data/lib/rubocop/cop/lint/suppressed_exception.rb +1 -1
- data/lib/rubocop/cop/lint/suppressed_exception_in_number_conversion.rb +111 -0
- data/lib/rubocop/cop/lint/symbol_conversion.rb +1 -1
- data/lib/rubocop/cop/lint/syntax.rb +4 -1
- data/lib/rubocop/cop/lint/unescaped_bracket_in_regexp.rb +88 -0
- data/lib/rubocop/cop/lint/unexpected_block_arity.rb +1 -1
- data/lib/rubocop/cop/lint/unmodified_reduce_accumulator.rb +1 -1
- data/lib/rubocop/cop/lint/unreachable_code.rb +51 -2
- data/lib/rubocop/cop/lint/unreachable_loop.rb +1 -1
- data/lib/rubocop/cop/lint/unused_method_argument.rb +18 -2
- data/lib/rubocop/cop/lint/useless_access_modifier.rb +4 -4
- data/lib/rubocop/cop/lint/useless_assignment.rb +1 -1
- data/lib/rubocop/cop/lint/useless_constant_scoping.rb +80 -0
- data/lib/rubocop/cop/lint/useless_defined.rb +55 -0
- data/lib/rubocop/cop/lint/useless_else_without_rescue.rb +4 -0
- data/lib/rubocop/cop/lint/useless_method_definition.rb +1 -1
- data/lib/rubocop/cop/lint/useless_numeric_operation.rb +2 -1
- data/lib/rubocop/cop/lint/useless_rescue.rb +1 -1
- data/lib/rubocop/cop/lint/useless_ruby2_keywords.rb +2 -2
- data/lib/rubocop/cop/lint/useless_setter_call.rb +14 -25
- data/lib/rubocop/cop/lint/void.rb +14 -11
- data/lib/rubocop/cop/metrics/block_nesting.rb +1 -1
- data/lib/rubocop/cop/metrics/class_length.rb +9 -9
- data/lib/rubocop/cop/metrics/collection_literal_length.rb +7 -0
- data/lib/rubocop/cop/metrics/cyclomatic_complexity.rb +5 -2
- data/lib/rubocop/cop/metrics/method_length.rb +8 -1
- data/lib/rubocop/cop/metrics/module_length.rb +1 -1
- data/lib/rubocop/cop/metrics/perceived_complexity.rb +1 -1
- data/lib/rubocop/cop/metrics/utils/abc_size_calculator.rb +1 -1
- data/lib/rubocop/cop/metrics/utils/code_length_calculator.rb +2 -3
- data/lib/rubocop/cop/metrics/utils/repeated_attribute_discount.rb +7 -7
- data/lib/rubocop/cop/mixin/alignment.rb +2 -2
- data/lib/rubocop/cop/mixin/allowed_pattern.rb +4 -4
- data/lib/rubocop/cop/mixin/check_assignment.rb +4 -12
- data/lib/rubocop/cop/mixin/check_line_breakable.rb +20 -10
- data/lib/rubocop/cop/mixin/check_single_line_suitability.rb +49 -0
- data/lib/rubocop/cop/mixin/comments_help.rb +8 -3
- data/lib/rubocop/cop/mixin/dig_help.rb +27 -0
- data/lib/rubocop/cop/mixin/endless_method_rewriter.rb +24 -0
- data/lib/rubocop/cop/mixin/frozen_string_literal.rb +4 -2
- data/lib/rubocop/cop/mixin/hash_shorthand_syntax.rb +22 -22
- data/lib/rubocop/cop/mixin/hash_subset.rb +203 -0
- data/lib/rubocop/cop/mixin/hash_transform_method.rb +74 -74
- data/lib/rubocop/cop/mixin/line_length_help.rb +5 -4
- data/lib/rubocop/cop/mixin/method_complexity.rb +1 -1
- data/lib/rubocop/cop/mixin/multiline_expression_indentation.rb +5 -9
- data/lib/rubocop/cop/mixin/percent_literal.rb +1 -1
- data/lib/rubocop/cop/mixin/preceding_following_alignment.rb +68 -30
- data/lib/rubocop/cop/mixin/range_help.rb +3 -4
- data/lib/rubocop/cop/mixin/space_before_punctuation.rb +1 -1
- data/lib/rubocop/cop/mixin/statement_modifier.rb +8 -3
- data/lib/rubocop/cop/mixin/string_help.rb +2 -2
- data/lib/rubocop/cop/mixin/string_literals_help.rb +1 -1
- data/lib/rubocop/cop/mixin/target_ruby_version.rb +17 -1
- data/lib/rubocop/cop/mixin/trailing_comma.rb +15 -3
- data/lib/rubocop/cop/naming/accessor_method_name.rb +6 -6
- data/lib/rubocop/cop/naming/block_forwarding.rb +20 -16
- data/lib/rubocop/cop/naming/constant_name.rb +6 -7
- data/lib/rubocop/cop/naming/file_name.rb +0 -2
- data/lib/rubocop/cop/naming/memoized_instance_variable_name.rb +11 -12
- data/lib/rubocop/cop/naming/predicate_name.rb +44 -0
- data/lib/rubocop/cop/naming/rescued_exceptions_variable_name.rb +6 -14
- data/lib/rubocop/cop/naming/variable_name.rb +63 -6
- data/lib/rubocop/cop/naming/variable_number.rb +2 -3
- data/lib/rubocop/cop/offense.rb +2 -3
- data/lib/rubocop/cop/security/compound_hash.rb +2 -0
- data/lib/rubocop/cop/security/yaml_load.rb +3 -2
- data/lib/rubocop/cop/style/access_modifier_declarations.rb +86 -28
- data/lib/rubocop/cop/style/accessor_grouping.rb +19 -5
- data/lib/rubocop/cop/style/ambiguous_endless_method_definition.rb +79 -0
- data/lib/rubocop/cop/style/and_or.rb +1 -1
- data/lib/rubocop/cop/style/arguments_forwarding.rb +39 -23
- data/lib/rubocop/cop/style/array_first_last.rb +18 -2
- data/lib/rubocop/cop/style/array_intersect.rb +5 -4
- data/lib/rubocop/cop/style/bitwise_predicate.rb +100 -0
- data/lib/rubocop/cop/style/block_delimiters.rb +41 -24
- data/lib/rubocop/cop/style/case_like_if.rb +8 -11
- data/lib/rubocop/cop/style/class_and_module_children.rb +6 -3
- data/lib/rubocop/cop/style/collection_methods.rb +1 -1
- data/lib/rubocop/cop/style/combinable_defined.rb +115 -0
- data/lib/rubocop/cop/style/combinable_loops.rb +2 -2
- data/lib/rubocop/cop/style/commented_keyword.rb +11 -1
- data/lib/rubocop/cop/style/concat_array_literals.rb +1 -1
- data/lib/rubocop/cop/style/conditional_assignment.rb +25 -25
- data/lib/rubocop/cop/style/constant_visibility.rb +3 -12
- data/lib/rubocop/cop/style/dig_chain.rb +89 -0
- data/lib/rubocop/cop/style/documentation.rb +1 -1
- data/lib/rubocop/cop/style/double_negation.rb +3 -3
- data/lib/rubocop/cop/style/each_for_simple_loop.rb +4 -7
- data/lib/rubocop/cop/style/each_with_object.rb +2 -3
- data/lib/rubocop/cop/style/empty_else.rb +4 -2
- data/lib/rubocop/cop/style/empty_literal.rb +1 -1
- data/lib/rubocop/cop/style/empty_method.rb +1 -1
- data/lib/rubocop/cop/style/endless_method.rb +150 -18
- data/lib/rubocop/cop/style/eval_with_location.rb +1 -1
- data/lib/rubocop/cop/style/exact_regexp_match.rb +2 -3
- data/lib/rubocop/cop/style/explicit_block_argument.rb +15 -2
- data/lib/rubocop/cop/style/exponential_notation.rb +1 -1
- data/lib/rubocop/cop/style/fetch_env_var.rb +2 -1
- data/lib/rubocop/cop/style/file_null.rb +89 -0
- data/lib/rubocop/cop/style/file_touch.rb +75 -0
- data/lib/rubocop/cop/style/float_division.rb +8 -4
- data/lib/rubocop/cop/style/for.rb +0 -1
- data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +1 -1
- data/lib/rubocop/cop/style/global_vars.rb +1 -3
- data/lib/rubocop/cop/style/guard_clause.rb +15 -2
- data/lib/rubocop/cop/style/hash_conversion.rb +1 -2
- data/lib/rubocop/cop/style/hash_each_methods.rb +3 -6
- data/lib/rubocop/cop/style/hash_except.rb +35 -147
- data/lib/rubocop/cop/style/hash_slice.rb +80 -0
- data/lib/rubocop/cop/style/hash_syntax.rb +6 -3
- data/lib/rubocop/cop/style/identical_conditional_branches.rb +22 -3
- data/lib/rubocop/cop/style/if_inside_else.rb +0 -1
- data/lib/rubocop/cop/style/if_unless_modifier.rb +3 -3
- data/lib/rubocop/cop/style/if_with_boolean_literal_branches.rb +2 -3
- data/lib/rubocop/cop/style/if_with_semicolon.rb +20 -9
- data/lib/rubocop/cop/style/infinite_loop.rb +1 -1
- data/lib/rubocop/cop/style/inverse_methods.rb +6 -7
- data/lib/rubocop/cop/style/it_assignment.rb +36 -0
- data/lib/rubocop/cop/style/keyword_arguments_merging.rb +67 -0
- data/lib/rubocop/cop/style/keyword_parameters_order.rb +1 -1
- data/lib/rubocop/cop/style/lambda_call.rb +3 -2
- data/lib/rubocop/cop/style/line_end_concatenation.rb +10 -4
- data/lib/rubocop/cop/style/map_into_array.rb +7 -2
- data/lib/rubocop/cop/style/map_to_hash.rb +1 -1
- data/lib/rubocop/cop/style/map_to_set.rb +3 -2
- data/lib/rubocop/cop/style/method_call_with_args_parentheses/omit_parentheses.rb +20 -13
- data/lib/rubocop/cop/style/method_call_with_args_parentheses.rb +2 -0
- data/lib/rubocop/cop/style/method_call_without_args_parentheses.rb +8 -11
- data/lib/rubocop/cop/style/method_called_on_do_end_block.rb +2 -4
- data/lib/rubocop/cop/style/method_def_parentheses.rb +1 -1
- data/lib/rubocop/cop/style/missing_else.rb +2 -0
- data/lib/rubocop/cop/style/missing_respond_to_missing.rb +33 -3
- data/lib/rubocop/cop/style/multiline_block_chain.rb +1 -1
- data/lib/rubocop/cop/style/multiline_memoization.rb +1 -1
- data/lib/rubocop/cop/style/multiple_comparison.rb +52 -51
- data/lib/rubocop/cop/style/mutable_constant.rb +7 -8
- data/lib/rubocop/cop/style/negated_if_else_condition.rb +7 -5
- data/lib/rubocop/cop/style/nested_parenthesized_calls.rb +1 -1
- data/lib/rubocop/cop/style/nested_ternary_operator.rb +5 -4
- data/lib/rubocop/cop/style/not.rb +1 -1
- data/lib/rubocop/cop/style/object_then.rb +14 -15
- data/lib/rubocop/cop/style/one_line_conditional.rb +25 -4
- data/lib/rubocop/cop/style/open_struct_use.rb +5 -5
- data/lib/rubocop/cop/style/operator_method_call.rb +5 -6
- data/lib/rubocop/cop/style/or_assignment.rb +3 -6
- data/lib/rubocop/cop/style/parallel_assignment.rb +9 -18
- data/lib/rubocop/cop/style/parentheses_around_condition.rb +2 -2
- data/lib/rubocop/cop/style/percent_literal_delimiters.rb +1 -1
- data/lib/rubocop/cop/style/proc.rb +1 -2
- data/lib/rubocop/cop/style/quoted_symbols.rb +1 -1
- data/lib/rubocop/cop/style/raise_args.rb +7 -5
- data/lib/rubocop/cop/style/random_with_offset.rb +3 -3
- data/lib/rubocop/cop/style/redundant_argument.rb +3 -1
- data/lib/rubocop/cop/style/redundant_assignment.rb +1 -1
- data/lib/rubocop/cop/style/redundant_begin.rb +1 -1
- data/lib/rubocop/cop/style/redundant_condition.rb +72 -23
- data/lib/rubocop/cop/style/redundant_current_directory_in_path.rb +2 -1
- data/lib/rubocop/cop/style/redundant_double_splat_hash_braces.rb +6 -10
- data/lib/rubocop/cop/style/redundant_each.rb +1 -1
- data/lib/rubocop/cop/style/redundant_exception.rb +2 -2
- data/lib/rubocop/cop/style/redundant_format.rb +250 -0
- data/lib/rubocop/cop/style/redundant_freeze.rb +2 -2
- data/lib/rubocop/cop/style/redundant_initialize.rb +12 -3
- data/lib/rubocop/cop/style/redundant_line_continuation.rb +54 -15
- data/lib/rubocop/cop/style/redundant_parentheses.rb +36 -24
- data/lib/rubocop/cop/style/redundant_regexp_argument.rb +4 -0
- data/lib/rubocop/cop/style/redundant_regexp_character_class.rb +1 -1
- data/lib/rubocop/cop/style/redundant_regexp_escape.rb +1 -1
- data/lib/rubocop/cop/style/redundant_return.rb +2 -2
- data/lib/rubocop/cop/style/redundant_self.rb +8 -15
- data/lib/rubocop/cop/style/redundant_self_assignment.rb +20 -32
- data/lib/rubocop/cop/style/redundant_self_assignment_branch.rb +4 -4
- data/lib/rubocop/cop/style/redundant_sort.rb +3 -3
- data/lib/rubocop/cop/style/redundant_string_escape.rb +2 -2
- data/lib/rubocop/cop/style/rescue_modifier.rb +2 -3
- data/lib/rubocop/cop/style/return_nil.rb +1 -1
- data/lib/rubocop/cop/style/safe_navigation.rb +14 -2
- data/lib/rubocop/cop/style/safe_navigation_chain_length.rb +52 -0
- data/lib/rubocop/cop/style/select_by_regexp.rb +1 -1
- data/lib/rubocop/cop/style/self_assignment.rb +11 -17
- data/lib/rubocop/cop/style/semicolon.rb +1 -1
- data/lib/rubocop/cop/style/send_with_literal_method_name.rb +2 -1
- data/lib/rubocop/cop/style/signal_exception.rb +2 -3
- data/lib/rubocop/cop/style/single_argument_dig.rb +9 -5
- data/lib/rubocop/cop/style/single_line_block_params.rb +1 -1
- data/lib/rubocop/cop/style/single_line_do_end_block.rb +12 -3
- data/lib/rubocop/cop/style/single_line_methods.rb +6 -7
- data/lib/rubocop/cop/style/slicing_with_range.rb +40 -11
- data/lib/rubocop/cop/style/sole_nested_conditional.rb +4 -5
- data/lib/rubocop/cop/style/special_global_vars.rb +1 -1
- data/lib/rubocop/cop/style/string_concatenation.rb +15 -14
- data/lib/rubocop/cop/style/string_literals.rb +1 -1
- data/lib/rubocop/cop/style/string_methods.rb +1 -1
- data/lib/rubocop/cop/style/super_arguments.rb +65 -17
- data/lib/rubocop/cop/style/swap_values.rb +4 -15
- data/lib/rubocop/cop/style/ternary_parentheses.rb +25 -4
- data/lib/rubocop/cop/style/top_level_method_definition.rb +1 -1
- data/lib/rubocop/cop/style/trailing_comma_in_arguments.rb +4 -1
- data/lib/rubocop/cop/style/trailing_comma_in_array_literal.rb +47 -6
- data/lib/rubocop/cop/style/trailing_comma_in_hash_literal.rb +48 -6
- data/lib/rubocop/cop/style/trailing_underscore_variable.rb +4 -4
- data/lib/rubocop/cop/style/trivial_accessors.rb +1 -1
- data/lib/rubocop/cop/style/variable_interpolation.rb +1 -2
- data/lib/rubocop/cop/style/while_until_modifier.rb +0 -1
- data/lib/rubocop/cop/style/yoda_condition.rb +8 -4
- data/lib/rubocop/cop/style/yoda_expression.rb +2 -1
- data/lib/rubocop/cop/util.rb +12 -5
- data/lib/rubocop/cop/utils/format_string.rb +7 -5
- data/lib/rubocop/cop/variable_force/assignment.rb +18 -3
- data/lib/rubocop/cop/variable_force/branch.rb +1 -1
- data/lib/rubocop/cop/variable_force/variable.rb +18 -2
- data/lib/rubocop/cop/variable_force/variable_table.rb +5 -5
- data/lib/rubocop/cop/variable_force.rb +4 -10
- data/lib/rubocop/cops_documentation_generator.rb +44 -23
- data/lib/rubocop/directive_comment.rb +44 -10
- data/lib/rubocop/formatter/disabled_config_formatter.rb +1 -1
- data/lib/rubocop/formatter/formatter_set.rb +1 -1
- data/lib/rubocop/lsp/diagnostic.rb +189 -0
- data/lib/rubocop/lsp/logger.rb +2 -2
- data/lib/rubocop/lsp/routes.rb +7 -23
- data/lib/rubocop/lsp/runtime.rb +17 -49
- data/lib/rubocop/lsp/server.rb +0 -2
- data/lib/rubocop/lsp/stdin_runner.rb +83 -0
- data/lib/rubocop/magic_comment.rb +3 -3
- data/lib/rubocop/options.rb +28 -12
- data/lib/rubocop/path_util.rb +15 -8
- data/lib/rubocop/plugin/configuration_integrator.rb +143 -0
- data/lib/rubocop/plugin/load_error.rb +26 -0
- data/lib/rubocop/plugin/loader.rb +100 -0
- data/lib/rubocop/plugin/not_supported_error.rb +29 -0
- data/lib/rubocop/plugin.rb +46 -0
- data/lib/rubocop/rake_task.rb +4 -1
- data/lib/rubocop/result_cache.rb +13 -13
- data/lib/rubocop/rspec/cop_helper.rb +9 -0
- data/lib/rubocop/rspec/expect_offense.rb +6 -2
- data/lib/rubocop/rspec/shared_contexts.rb +19 -1
- data/lib/rubocop/rspec/support.rb +2 -2
- data/lib/rubocop/runner.rb +21 -14
- data/lib/rubocop/server/cache.rb +35 -2
- data/lib/rubocop/server/cli.rb +2 -2
- data/lib/rubocop/target_finder.rb +1 -0
- data/lib/rubocop/target_ruby.rb +16 -1
- data/lib/rubocop/version.rb +41 -7
- data/lib/rubocop.rb +27 -1
- data/lib/ruby_lsp/rubocop/addon.rb +75 -0
- data/lib/ruby_lsp/rubocop/runtime_adapter.rb +47 -0
- metadata +73 -20
- data/lib/rubocop/cop/utils/regexp_ranges.rb +0 -113
- data/lib/rubocop/rspec/host_environment_simulation_helper.rb +0 -28
@@ -90,8 +90,10 @@ module RuboCop
|
|
90
90
|
description_text = string_contents(current_description)
|
91
91
|
return unless (new_description = correct_description(description_text, description_map))
|
92
92
|
|
93
|
+
quote = current_description.dstr_type? ? '"' : "'"
|
94
|
+
|
93
95
|
add_offense(current_description, message: message) do |corrector|
|
94
|
-
corrector.replace(current_description, "
|
96
|
+
corrector.replace(current_description, "#{quote}#{new_description}#{quote}")
|
95
97
|
end
|
96
98
|
end
|
97
99
|
|
@@ -106,7 +108,7 @@ module RuboCop
|
|
106
108
|
end
|
107
109
|
|
108
110
|
def string_contents(node)
|
109
|
-
node.
|
111
|
+
node.type?(:str, :dstr) ? node.value : node.source
|
110
112
|
end
|
111
113
|
end
|
112
114
|
end
|
@@ -0,0 +1,116 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module RuboCop
|
4
|
+
module Cop
|
5
|
+
module InternalAffairs
|
6
|
+
# When a node location may not exist, `Node#loc?` or `Node#loc_is?`
|
7
|
+
# can be used instead of calling `Node#respond_to?` before using
|
8
|
+
# the value.
|
9
|
+
#
|
10
|
+
# @example
|
11
|
+
# # bad
|
12
|
+
# node.loc.respond_to?(:begin) && node.loc.begin
|
13
|
+
#
|
14
|
+
# # good
|
15
|
+
# node.loc?(:begin)
|
16
|
+
#
|
17
|
+
# # bad
|
18
|
+
# node.loc.respond_to?(:begin) && node.loc.begin.is?('(')
|
19
|
+
#
|
20
|
+
# # good
|
21
|
+
# node.loc_is?(:begin, '(')
|
22
|
+
#
|
23
|
+
# # bad
|
24
|
+
# node.loc.respond_to?(:begin) && node.loc.begin.source == '('
|
25
|
+
#
|
26
|
+
# # good
|
27
|
+
# node.loc_is?(:begin, '(')
|
28
|
+
#
|
29
|
+
class LocationExists < Base
|
30
|
+
extend AutoCorrector
|
31
|
+
|
32
|
+
MSG = 'Use `%<replacement>s` instead of `%<source>s`.'
|
33
|
+
|
34
|
+
# @!method replaceable_with_loc_is(node)
|
35
|
+
def_node_matcher :replaceable_with_loc_is, <<~PATTERN
|
36
|
+
(and
|
37
|
+
(call
|
38
|
+
(call $_receiver :loc) :respond_to?
|
39
|
+
$(sym _location))
|
40
|
+
{
|
41
|
+
(call
|
42
|
+
(call
|
43
|
+
(call _receiver :loc) _location) :is?
|
44
|
+
$(str _))
|
45
|
+
(call
|
46
|
+
(call
|
47
|
+
(call
|
48
|
+
(call _receiver :loc) _location) :source) :==
|
49
|
+
$(str _))
|
50
|
+
})
|
51
|
+
PATTERN
|
52
|
+
|
53
|
+
# @!method replaceable_with_loc(node)
|
54
|
+
def_node_matcher :replaceable_with_loc, <<~PATTERN
|
55
|
+
(and
|
56
|
+
(call
|
57
|
+
(call $_receiver :loc) :respond_to?
|
58
|
+
$(sym _location))
|
59
|
+
(call
|
60
|
+
(call _receiver :loc) _location))
|
61
|
+
PATTERN
|
62
|
+
|
63
|
+
def on_and(node)
|
64
|
+
replace_with_loc(node) || replace_with_loc_is(node)
|
65
|
+
end
|
66
|
+
|
67
|
+
private
|
68
|
+
|
69
|
+
def replace_with_loc(node)
|
70
|
+
replaceable_with_loc(node) do |receiver, location|
|
71
|
+
if node.parent&.assignment?
|
72
|
+
register_offense(node, replace_assignment(receiver, location))
|
73
|
+
else
|
74
|
+
register_offense(node, replacement(receiver, "loc?(#{location.source})"))
|
75
|
+
end
|
76
|
+
end
|
77
|
+
end
|
78
|
+
|
79
|
+
def replace_with_loc_is(node)
|
80
|
+
replaceable_with_loc_is(node) do |receiver, location, value|
|
81
|
+
replacement = replacement(receiver, "loc_is?(#{location.source}, #{value.source})")
|
82
|
+
register_offense(node, replacement)
|
83
|
+
end
|
84
|
+
end
|
85
|
+
|
86
|
+
def register_offense(node, replacement)
|
87
|
+
message = format(MSG, replacement: replacement, source: node.source)
|
88
|
+
|
89
|
+
add_offense(node, message: message) do |corrector|
|
90
|
+
corrector.replace(node, replacement)
|
91
|
+
end
|
92
|
+
end
|
93
|
+
|
94
|
+
def replacement(receiver, rest)
|
95
|
+
"#{replace_receiver(receiver)}#{rest}"
|
96
|
+
end
|
97
|
+
|
98
|
+
def replace_assignment(receiver, location)
|
99
|
+
prefix = replace_receiver(receiver)
|
100
|
+
|
101
|
+
"#{prefix}loc#{dot(receiver)}#{location.value} if #{prefix}loc?(#{location.source})"
|
102
|
+
end
|
103
|
+
|
104
|
+
def replace_receiver(receiver)
|
105
|
+
return '' unless receiver
|
106
|
+
|
107
|
+
"#{receiver.source}#{dot(receiver)}"
|
108
|
+
end
|
109
|
+
|
110
|
+
def dot(node)
|
111
|
+
node.parent.loc.dot.source
|
112
|
+
end
|
113
|
+
end
|
114
|
+
end
|
115
|
+
end
|
116
|
+
end
|
@@ -22,7 +22,7 @@ module RuboCop
|
|
22
22
|
|
23
23
|
def on_send(node)
|
24
24
|
return unless (parent = node.parent)
|
25
|
-
return unless parent.
|
25
|
+
return unless parent.call_type? && parent.method?(:expression)
|
26
26
|
return unless parent.receiver.receiver
|
27
27
|
|
28
28
|
offense = node.loc.selector.join(parent.source_range.end)
|
@@ -31,6 +31,7 @@ module RuboCop
|
|
31
31
|
corrector.replace(offense, 'source_range')
|
32
32
|
end
|
33
33
|
end
|
34
|
+
alias on_csend on_send
|
34
35
|
end
|
35
36
|
end
|
36
37
|
end
|
@@ -19,6 +19,7 @@ module RuboCop
|
|
19
19
|
extend AutoCorrector
|
20
20
|
|
21
21
|
MSG = 'Use `%<preferred>s`.'
|
22
|
+
RESTRICT_ON_SEND = [:==].freeze
|
22
23
|
|
23
24
|
# @!method line_send(node)
|
24
25
|
def_node_matcher :line_send, <<~PATTERN
|
@@ -36,10 +37,8 @@ module RuboCop
|
|
36
37
|
def on_send(node)
|
37
38
|
return unless location_line_equality_comparison?(node)
|
38
39
|
|
39
|
-
|
40
|
-
|
41
|
-
lhs_receiver = extract_receiver(lhs)
|
42
|
-
rhs_receiver = extract_receiver(rhs)
|
40
|
+
lhs_receiver = extract_receiver(node.receiver)
|
41
|
+
rhs_receiver = extract_receiver(node.first_argument)
|
43
42
|
preferred = "same_line?(#{lhs_receiver}, #{rhs_receiver})"
|
44
43
|
|
45
44
|
add_offense(node, message: format(MSG, preferred: preferred)) do |corrector|
|
@@ -27,8 +27,8 @@ module RuboCop
|
|
27
27
|
# @!method arguments_first_or_last?(node)
|
28
28
|
def_node_matcher :arguments_first_or_last?, <<~PATTERN
|
29
29
|
{
|
30
|
-
(
|
31
|
-
(
|
30
|
+
(call (call !nil? :arguments) ${:first :last})
|
31
|
+
(call (call !nil? :arguments) :[] (int ${0 -1}))
|
32
32
|
}
|
33
33
|
PATTERN
|
34
34
|
|
@@ -47,6 +47,7 @@ module RuboCop
|
|
47
47
|
end
|
48
48
|
end
|
49
49
|
end
|
50
|
+
alias on_csend on_send
|
50
51
|
end
|
51
52
|
end
|
52
53
|
end
|
@@ -0,0 +1,63 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module RuboCop
|
4
|
+
module Cop
|
5
|
+
module InternalAffairs
|
6
|
+
class NodePatternGroups
|
7
|
+
# AST Processor for NodePattern ASTs, for use with `InternalAffairs/NodePatternGroups`.
|
8
|
+
#
|
9
|
+
# Looks for sequences and subsequences where the first item is a `node_type` node,
|
10
|
+
# and converts them to `node_sequence` nodes (not a true `Rubocop::AST::NodePattern`
|
11
|
+
# node type).
|
12
|
+
#
|
13
|
+
# The resulting AST will be walked by `InternalAffairs::NodePatternGroups::ASTWalker`
|
14
|
+
# in order to find node types in a `union` node that can be rewritten as a node group.
|
15
|
+
#
|
16
|
+
# NOTE: The `on_*` methods in this class relate not to the normal node types but
|
17
|
+
# rather to the Node Pattern node types. Not every node type is handled.
|
18
|
+
#
|
19
|
+
class ASTProcessor
|
20
|
+
include ::AST::Processor::Mixin
|
21
|
+
|
22
|
+
def handler_missing(node)
|
23
|
+
node.updated(nil, process_children(node))
|
24
|
+
end
|
25
|
+
|
26
|
+
# Look for `sequence` and `subsequence` nodes that contain a `node_type` node as
|
27
|
+
# their first child. These are rewritten as `node_sequence` nodes so that it is
|
28
|
+
# possible to compare nodes while looking for replacement candidates for node groups.
|
29
|
+
# This is necessary so that extended patterns can be matched and replaced.
|
30
|
+
# ie. `{(send _ :foo ...) (csend _ :foo ...)}` can become `(call _ :foo ...)`
|
31
|
+
def on_sequence(node)
|
32
|
+
first_child = node.child
|
33
|
+
|
34
|
+
if first_child.type == :node_type
|
35
|
+
children = [first_child.child, *process_children(node, 1..)]
|
36
|
+
|
37
|
+
# The `node_sequence` node contains the `node_type` symbol as its first child,
|
38
|
+
# followed by all the other nodes contained in the `sequence` node.
|
39
|
+
# The location is copied from the sequence, so that the entire sequence can
|
40
|
+
# eventually be corrected in the cop.
|
41
|
+
n(:node_sequence, children, location: node.location)
|
42
|
+
else
|
43
|
+
node.updated(nil, process_children(node))
|
44
|
+
end
|
45
|
+
end
|
46
|
+
alias on_subsequence on_sequence
|
47
|
+
|
48
|
+
private
|
49
|
+
|
50
|
+
def n(type, children = [], properties = {})
|
51
|
+
NodePattern::Node.new(type, children, properties)
|
52
|
+
end
|
53
|
+
|
54
|
+
def process_children(node, range = 0..-1)
|
55
|
+
node.children[range].map do |child|
|
56
|
+
child.is_a?(::AST::Node) ? process(child) : child
|
57
|
+
end
|
58
|
+
end
|
59
|
+
end
|
60
|
+
end
|
61
|
+
end
|
62
|
+
end
|
63
|
+
end
|
@@ -0,0 +1,131 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module RuboCop
|
4
|
+
module Cop
|
5
|
+
module InternalAffairs
|
6
|
+
# rubocop:disable InternalAffairs/RedundantSourceRange -- node here is a `NodePattern::Node`
|
7
|
+
class NodePatternGroups
|
8
|
+
# Walks an AST that has been processed by `InternalAffairs::NodePatternGroups::Processor`
|
9
|
+
# in order to find `node_type` and `node_sequence` nodes that can be replaced with a node
|
10
|
+
# group in `InternalAffairs/NodePatternGroups`.
|
11
|
+
#
|
12
|
+
# Calling `ASTWalker#walk` sets `node_groups` with an array of `NodeGroup` structs
|
13
|
+
# that contain metadata about nodes that can be replaced, including location data. That
|
14
|
+
# metadata is used by the cop to register offenses and perform corrections.
|
15
|
+
class ASTWalker
|
16
|
+
# Struct to contain data about parts of a node pattern that can be replaced
|
17
|
+
NodeGroup = Struct.new(
|
18
|
+
:name, # The name of the node group that will be inserted
|
19
|
+
:union, # The entire `union` node
|
20
|
+
:node_types, # An array of `node_type` nodes that will be removed
|
21
|
+
:sequence?, # The pattern matches a node type with given attributes
|
22
|
+
:start_index, # The index in the union of the first node type to remove
|
23
|
+
:offense_range, # The range to mark an offense on
|
24
|
+
:ranges, # Range of each element to remove, since they may not be adjacent
|
25
|
+
:pipe, # Is the union delimited by pipes?
|
26
|
+
:other_elements?, # Does the union have other elements other than those to remove?
|
27
|
+
keyword_init: true
|
28
|
+
)
|
29
|
+
|
30
|
+
def initialize
|
31
|
+
reset!
|
32
|
+
end
|
33
|
+
|
34
|
+
def reset!
|
35
|
+
@node_groups = []
|
36
|
+
end
|
37
|
+
|
38
|
+
attr_reader :node_groups
|
39
|
+
|
40
|
+
# Recursively walk the AST in a depth-first manner.
|
41
|
+
# Only `union` nodes are handled further.
|
42
|
+
def walk(node)
|
43
|
+
return if node.nil?
|
44
|
+
|
45
|
+
on_union(node) if node.type == :union
|
46
|
+
|
47
|
+
node.child_nodes.each do |child|
|
48
|
+
walk(child)
|
49
|
+
end
|
50
|
+
end
|
51
|
+
|
52
|
+
# Search `union` nodes for `node_type` and `node_sequence` nodes that can be
|
53
|
+
# collapsed into a node group.
|
54
|
+
# * `node_type` nodes are nodes with no further configuration (ie. `send`)
|
55
|
+
# * `node_sequence` nodes are nodes with further configuration (ie. `(send ...)`)
|
56
|
+
#
|
57
|
+
# Each group of types that can be collapsed will have a `NodeGroup` record added
|
58
|
+
# to `node_groups`, which is then used by the cop.
|
59
|
+
def on_union(node)
|
60
|
+
all_node_types = each_child_node(node, :node_type, :node_sequence).to_a
|
61
|
+
|
62
|
+
each_node_group(all_node_types) do |group_name, node_types|
|
63
|
+
next unless sequences_match?(node_types)
|
64
|
+
|
65
|
+
node_groups << node_group_data(
|
66
|
+
group_name, node, node_types,
|
67
|
+
all_node_types.index(node_types.first),
|
68
|
+
(node.children - node_types).any?
|
69
|
+
)
|
70
|
+
end
|
71
|
+
end
|
72
|
+
|
73
|
+
private
|
74
|
+
|
75
|
+
def each_child_node(node, *types)
|
76
|
+
return to_enum(__method__, node, *types) unless block_given?
|
77
|
+
|
78
|
+
node.children.each do |child|
|
79
|
+
yield child if types.empty? || types.include?(child.type)
|
80
|
+
end
|
81
|
+
|
82
|
+
self
|
83
|
+
end
|
84
|
+
|
85
|
+
def each_node_group(types_to_check)
|
86
|
+
# Find all node groups where all of the members are present in the union
|
87
|
+
type_names = types_to_check.map(&:child)
|
88
|
+
|
89
|
+
NODE_GROUPS.select { |_, group| group & type_names == group }.each_key do |name|
|
90
|
+
nodes = get_relevant_nodes(types_to_check, name)
|
91
|
+
|
92
|
+
yield name, nodes
|
93
|
+
end
|
94
|
+
end
|
95
|
+
|
96
|
+
def get_relevant_nodes(node_types, group_name)
|
97
|
+
node_types.each_with_object([]) do |node_type, arr|
|
98
|
+
next unless NODE_GROUPS[group_name].include?(node_type.child)
|
99
|
+
|
100
|
+
arr << node_type
|
101
|
+
end
|
102
|
+
end
|
103
|
+
|
104
|
+
def node_group_data(name, union, node_types, start_index, other)
|
105
|
+
NodeGroup.new(
|
106
|
+
name: name,
|
107
|
+
union: union,
|
108
|
+
node_types: node_types,
|
109
|
+
sequence?: node_types.first.type == :node_sequence,
|
110
|
+
start_index: start_index,
|
111
|
+
pipe: union.source_range.source['|'],
|
112
|
+
other_elements?: other
|
113
|
+
)
|
114
|
+
end
|
115
|
+
|
116
|
+
def sequences_match?(types)
|
117
|
+
# Ensure all given types have the same type and the same sequence
|
118
|
+
# ie. `(send ...)` and `(csend ...) is a match
|
119
|
+
# `(send)` and `(csend ...)` is not a match
|
120
|
+
# `send` and `(csend ...)` is not a match
|
121
|
+
|
122
|
+
types.each_cons(2).all? do |left, right|
|
123
|
+
left.type == right.type && left.children[1..] == right.children[1..]
|
124
|
+
end
|
125
|
+
end
|
126
|
+
end
|
127
|
+
end
|
128
|
+
# rubocop:enable InternalAffairs/RedundantSourceRange
|
129
|
+
end
|
130
|
+
end
|
131
|
+
end
|
@@ -0,0 +1,229 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module RuboCop
|
4
|
+
module Cop
|
5
|
+
module InternalAffairs
|
6
|
+
# Use node groups (`any_block`, `argument`, `boolean`, `call`, `numeric`, `range`)
|
7
|
+
# in node patterns instead of a union (`{ ... }`) of the member types of the group.
|
8
|
+
#
|
9
|
+
# @example
|
10
|
+
# # bad
|
11
|
+
# def_node_matcher :my_matcher, <<~PATTERN
|
12
|
+
# {send csend}
|
13
|
+
# PATTERN
|
14
|
+
#
|
15
|
+
# # good
|
16
|
+
# def_node_matcher :my_matcher, <<~PATTERN
|
17
|
+
# call
|
18
|
+
# PATTERN
|
19
|
+
#
|
20
|
+
class NodePatternGroups < Base
|
21
|
+
require_relative 'node_pattern_groups/ast_processor'
|
22
|
+
require_relative 'node_pattern_groups/ast_walker'
|
23
|
+
|
24
|
+
include RangeHelp
|
25
|
+
extend AutoCorrector
|
26
|
+
|
27
|
+
MSG = 'Replace `%<names>s` in node pattern union with `%<replacement>s`.'
|
28
|
+
RESTRICT_ON_SEND = %i[def_node_matcher def_node_search].freeze
|
29
|
+
NODE_GROUPS = {
|
30
|
+
any_block: %i[block numblock],
|
31
|
+
argument: %i[arg optarg restarg kwarg kwoptarg kwrestarg blockarg forward_arg shadowarg],
|
32
|
+
boolean: %i[true false],
|
33
|
+
call: %i[send csend],
|
34
|
+
numeric: %i[int float rational complex],
|
35
|
+
range: %i[irange erange]
|
36
|
+
}.freeze
|
37
|
+
|
38
|
+
def on_new_investigation
|
39
|
+
@walker = ASTWalker.new
|
40
|
+
end
|
41
|
+
|
42
|
+
# When a Node Pattern matcher is defined, investigate the pattern string to search
|
43
|
+
# for node types that can be replaced with a node group (ie. `{send csend}` can be
|
44
|
+
# replaced with `call`).
|
45
|
+
#
|
46
|
+
# In order to deal with node patterns in an efficient and non-brittle way, we will
|
47
|
+
# parse the Node Pattern string given to this `send` node using
|
48
|
+
# `RuboCop::AST::NodePattern::Parser::WithMeta`. `WithMeta` is important! We need
|
49
|
+
# location information so that we can calculate the exact locations within the
|
50
|
+
# pattern to report and correct.
|
51
|
+
#
|
52
|
+
# The resulting AST is processed by `NodePatternGroups::ASTProccessor` which rewrites
|
53
|
+
# the AST slightly to handle node sequences (ie. `(send _ :foo ...)`). See the
|
54
|
+
# documentation of that class for more details.
|
55
|
+
#
|
56
|
+
# Then the processed AST is walked, and metadata is collected for node types that
|
57
|
+
# can be replaced with a node group.
|
58
|
+
#
|
59
|
+
# Finally, the metadata is used to register offenses and make corrections, using
|
60
|
+
# the location data captured earlier. The ranges captured while parsing the Node
|
61
|
+
# Pattern are offset using the string argument to this `send` node to ensure
|
62
|
+
# that offenses are registered at the correct location.
|
63
|
+
#
|
64
|
+
def on_send(node)
|
65
|
+
pattern_node = node.arguments[1]
|
66
|
+
return unless acceptable_heredoc?(pattern_node) || pattern_node.str_type?
|
67
|
+
|
68
|
+
process_pattern(pattern_node)
|
69
|
+
return if node_groups.nil?
|
70
|
+
|
71
|
+
apply_range_offsets(pattern_node)
|
72
|
+
|
73
|
+
node_groups.each_with_index do |group, index|
|
74
|
+
register_offense(group, index)
|
75
|
+
end
|
76
|
+
end
|
77
|
+
|
78
|
+
def after_send(_)
|
79
|
+
@walker.reset!
|
80
|
+
end
|
81
|
+
|
82
|
+
private
|
83
|
+
|
84
|
+
def node_groups
|
85
|
+
@walker.node_groups
|
86
|
+
end
|
87
|
+
|
88
|
+
# rubocop:disable InternalAffairs/RedundantSourceRange -- `node` here is a NodePatternNode
|
89
|
+
def register_offense(group, index)
|
90
|
+
replacement = replacement(group)
|
91
|
+
message = format(
|
92
|
+
MSG,
|
93
|
+
names: group.node_types.map { |node| node.source_range.source }.join('`, `'),
|
94
|
+
replacement: replacement
|
95
|
+
)
|
96
|
+
|
97
|
+
add_offense(group.offense_range, message: message) do |corrector|
|
98
|
+
# Only correct one group at a time to avoid clobbering.
|
99
|
+
# Other offenses will be corrected in the subsequent iterations of the
|
100
|
+
# correction loop.
|
101
|
+
next if index.positive?
|
102
|
+
|
103
|
+
if group.other_elements?
|
104
|
+
replace_types_with_node_group(corrector, group, replacement)
|
105
|
+
else
|
106
|
+
replace_union(corrector, group, replacement)
|
107
|
+
end
|
108
|
+
end
|
109
|
+
end
|
110
|
+
|
111
|
+
def replacement(group)
|
112
|
+
if group.sequence?
|
113
|
+
# If the original nodes were in a sequence (ie. wrapped in parentheses),
|
114
|
+
# use it to generate the resulting NodePattern syntax.
|
115
|
+
first_node_type = group.node_types.first
|
116
|
+
template = first_node_type.source_range.source
|
117
|
+
template.sub(first_node_type.child.to_s, group.name.to_s)
|
118
|
+
else
|
119
|
+
group.name
|
120
|
+
end
|
121
|
+
end
|
122
|
+
# rubocop:enable InternalAffairs/RedundantSourceRange
|
123
|
+
|
124
|
+
# When there are other elements in the union, remove the node types that can be replaced.
|
125
|
+
def replace_types_with_node_group(corrector, group, replacement)
|
126
|
+
ranges = group.ranges.map.with_index do |range, index|
|
127
|
+
# Collect whitespace and pipes preceding each element
|
128
|
+
range_for_full_union_element(range, index, group.pipe)
|
129
|
+
end
|
130
|
+
|
131
|
+
ranges.each { |range| corrector.remove(range) }
|
132
|
+
|
133
|
+
corrector.insert_before(ranges.first, replacement)
|
134
|
+
end
|
135
|
+
|
136
|
+
# If the union contains pipes, remove the pipe character as well.
|
137
|
+
# Unfortunately we don't get the location of the pipe in `loc` object, so we have
|
138
|
+
# to find it.
|
139
|
+
def range_for_full_union_element(range, index, pipe)
|
140
|
+
if index.positive?
|
141
|
+
range = if pipe
|
142
|
+
range_with_preceding_pipe(range)
|
143
|
+
else
|
144
|
+
range_with_surrounding_space(range: range, side: :left, newlines: true)
|
145
|
+
end
|
146
|
+
end
|
147
|
+
|
148
|
+
range
|
149
|
+
end
|
150
|
+
|
151
|
+
# Collect a preceding pipe and any whitespace left of the pipe
|
152
|
+
def range_with_preceding_pipe(range)
|
153
|
+
pos = range.begin_pos - 1
|
154
|
+
|
155
|
+
while pos
|
156
|
+
unless processed_source.buffer.source[pos].match?(/[\s|]/)
|
157
|
+
return range.with(begin_pos: pos + 1)
|
158
|
+
end
|
159
|
+
|
160
|
+
pos -= 1
|
161
|
+
end
|
162
|
+
|
163
|
+
range
|
164
|
+
end
|
165
|
+
|
166
|
+
# When there are no other elements, the entire union can be replaced
|
167
|
+
def replace_union(corrector, group, replacement)
|
168
|
+
corrector.replace(group.ranges.first, replacement)
|
169
|
+
end
|
170
|
+
|
171
|
+
# rubocop:disable Metrics/AbcSize
|
172
|
+
# Calculate the ranges for each node within the pattern string that will
|
173
|
+
# be replaced or removed. Takes the offset of the string node into account.
|
174
|
+
def apply_range_offsets(pattern_node)
|
175
|
+
range, offset = range_with_offset(pattern_node)
|
176
|
+
|
177
|
+
node_groups.each do |node_group|
|
178
|
+
node_group.ranges ||= []
|
179
|
+
node_group.offense_range = pattern_range(range, node_group.union, offset)
|
180
|
+
|
181
|
+
if node_group.other_elements?
|
182
|
+
node_group.node_types.each do |node_type|
|
183
|
+
node_group.ranges << pattern_range(range, node_type, offset)
|
184
|
+
end
|
185
|
+
else
|
186
|
+
node_group.ranges << node_group.offense_range
|
187
|
+
end
|
188
|
+
end
|
189
|
+
end
|
190
|
+
# rubocop:enable Metrics/AbcSize
|
191
|
+
|
192
|
+
def pattern_range(range, node, offset)
|
193
|
+
begin_pos = node.source_range.begin_pos
|
194
|
+
end_pos = node.source_range.end_pos
|
195
|
+
size = end_pos - begin_pos
|
196
|
+
|
197
|
+
range.adjust(begin_pos: begin_pos + offset).resize(size)
|
198
|
+
end
|
199
|
+
|
200
|
+
def range_with_offset(pattern_node)
|
201
|
+
if pattern_node.heredoc?
|
202
|
+
[pattern_node.loc.heredoc_body, 0]
|
203
|
+
else
|
204
|
+
[pattern_node.source_range, pattern_node.loc.begin.size]
|
205
|
+
end
|
206
|
+
end
|
207
|
+
|
208
|
+
# A heredoc can be a `dstr` without interpolation, but if there is interpolation
|
209
|
+
# there'll be a `begin` node, in which case, we cannot evaluate the pattern.
|
210
|
+
def acceptable_heredoc?(node)
|
211
|
+
node.type?(:str, :dstr) && node.heredoc? && node.each_child_node(:begin).none?
|
212
|
+
end
|
213
|
+
|
214
|
+
def process_pattern(pattern_node)
|
215
|
+
parser = RuboCop::AST::NodePattern::Parser::WithMeta.new
|
216
|
+
ast = parser.parse(pattern_value(pattern_node))
|
217
|
+
ast = ASTProcessor.new.process(ast)
|
218
|
+
@walker.walk(ast)
|
219
|
+
rescue RuboCop::AST::NodePattern::Invalid
|
220
|
+
# if the pattern is invalid, no offenses will be registered
|
221
|
+
end
|
222
|
+
|
223
|
+
def pattern_value(pattern_node)
|
224
|
+
pattern_node.heredoc? ? pattern_node.loc.heredoc_body.source : pattern_node.value
|
225
|
+
end
|
226
|
+
end
|
227
|
+
end
|
228
|
+
end
|
229
|
+
end
|