rubocop 1.9.1 → 1.22.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +17 -14
- data/assets/output.html.erb +1 -1
- data/config/default.yml +326 -73
- data/config/obsoletion.yml +4 -0
- data/exe/rubocop +1 -3
- data/lib/rubocop/cached_data.rb +1 -3
- data/lib/rubocop/cli/command/auto_genenerate_config.rb +9 -19
- data/lib/rubocop/cli/command/execute_runner.rb +1 -1
- data/lib/rubocop/cli/command/init_dotfile.rb +1 -3
- data/lib/rubocop/cli/command/show_cops.rb +1 -4
- data/lib/rubocop/cli/command/suggest_extensions.rb +6 -5
- data/lib/rubocop/cli.rb +21 -5
- data/lib/rubocop/comment_config.rb +45 -101
- data/lib/rubocop/config.rb +16 -26
- data/lib/rubocop/config_loader.rb +11 -15
- data/lib/rubocop/config_loader_resolver.rb +44 -21
- data/lib/rubocop/config_obsoletion/cop_rule.rb +1 -2
- data/lib/rubocop/config_store.rb +1 -2
- data/lib/rubocop/config_validator.rb +37 -21
- data/lib/rubocop/cop/autocorrect_logic.rb +3 -8
- data/lib/rubocop/cop/badge.rb +1 -2
- data/lib/rubocop/cop/base.rb +13 -11
- data/lib/rubocop/cop/bundler/duplicated_gem.rb +4 -4
- data/lib/rubocop/cop/bundler/gem_comment.rb +43 -10
- data/lib/rubocop/cop/bundler/gem_filename.rb +103 -0
- data/lib/rubocop/cop/bundler/gem_version.rb +133 -0
- data/lib/rubocop/cop/bundler/insecure_protocol_source.rb +46 -21
- data/lib/rubocop/cop/bundler/ordered_gems.rb +5 -16
- data/lib/rubocop/cop/commissioner.rb +2 -8
- data/lib/rubocop/cop/cop.rb +4 -18
- data/lib/rubocop/cop/corrector.rb +5 -8
- data/lib/rubocop/cop/correctors/alignment_corrector.rb +6 -12
- data/lib/rubocop/cop/correctors/each_to_for_corrector.rb +2 -4
- data/lib/rubocop/cop/correctors/for_to_each_corrector.rb +1 -2
- data/lib/rubocop/cop/correctors/lambda_literal_to_method_corrector.rb +2 -2
- data/lib/rubocop/cop/correctors/line_break_corrector.rb +3 -6
- data/lib/rubocop/cop/correctors/multiline_literal_brace_corrector.rb +1 -3
- data/lib/rubocop/cop/correctors/ordered_gem_corrector.rb +11 -12
- data/lib/rubocop/cop/correctors/percent_literal_corrector.rb +2 -8
- data/lib/rubocop/cop/correctors/require_library_corrector.rb +23 -0
- data/lib/rubocop/cop/documentation.rb +1 -1
- data/lib/rubocop/cop/gemspec/date_assignment.rb +57 -0
- data/lib/rubocop/cop/gemspec/duplicated_assignment.rb +3 -2
- data/lib/rubocop/cop/gemspec/ordered_dependencies.rb +5 -16
- data/lib/rubocop/cop/gemspec/required_ruby_version.rb +32 -23
- data/lib/rubocop/cop/gemspec/ruby_version_globals_usage.rb +2 -0
- data/lib/rubocop/cop/generator/configuration_injector.rb +1 -2
- data/lib/rubocop/cop/generator/require_file_injector.rb +2 -5
- data/lib/rubocop/cop/generator.rb +18 -15
- data/lib/rubocop/cop/internal_affairs/example_description.rb +8 -5
- data/lib/rubocop/cop/internal_affairs/inherit_deprecated_cop_class.rb +34 -0
- data/lib/rubocop/cop/internal_affairs/location_line_equality_comparison.rb +60 -0
- data/lib/rubocop/cop/internal_affairs/method_name_equal.rb +3 -5
- data/lib/rubocop/cop/internal_affairs/node_destructuring.rb +3 -3
- data/lib/rubocop/cop/internal_affairs/node_matcher_directive.rb +151 -0
- data/lib/rubocop/cop/internal_affairs/node_type_predicate.rb +2 -3
- data/lib/rubocop/cop/internal_affairs/offense_location_keyword.rb +3 -2
- data/lib/rubocop/cop/internal_affairs/redundant_described_class_as_subject.rb +1 -0
- data/lib/rubocop/cop/internal_affairs/redundant_let_rubocop_config_new.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 +3 -0
- data/lib/rubocop/cop/internal_affairs/style_detected_api_use.rb +5 -2
- data/lib/rubocop/cop/internal_affairs/undefined_config.rb +71 -0
- data/lib/rubocop/cop/internal_affairs/useless_message_assertion.rb +3 -3
- data/lib/rubocop/cop/internal_affairs.rb +4 -0
- data/lib/rubocop/cop/layout/access_modifier_indentation.rb +12 -10
- data/lib/rubocop/cop/layout/argument_alignment.rb +36 -19
- data/lib/rubocop/cop/layout/array_alignment.rb +9 -8
- data/lib/rubocop/cop/layout/assignment_indentation.rb +9 -8
- data/lib/rubocop/cop/layout/begin_end_alignment.rb +1 -4
- data/lib/rubocop/cop/layout/block_alignment.rb +12 -23
- data/lib/rubocop/cop/layout/block_end_newline.rb +4 -8
- data/lib/rubocop/cop/layout/case_indentation.rb +57 -11
- data/lib/rubocop/cop/layout/class_structure.rb +12 -12
- data/lib/rubocop/cop/layout/closing_parenthesis_indentation.rb +24 -30
- data/lib/rubocop/cop/layout/comment_indentation.rb +18 -22
- data/lib/rubocop/cop/layout/def_end_alignment.rb +2 -6
- data/lib/rubocop/cop/layout/dot_position.rb +42 -9
- data/lib/rubocop/cop/layout/else_alignment.rb +10 -9
- data/lib/rubocop/cop/layout/empty_comment.rb +6 -13
- data/lib/rubocop/cop/layout/empty_line_after_guard_clause.rb +44 -23
- data/lib/rubocop/cop/layout/empty_line_between_defs.rb +2 -6
- data/lib/rubocop/cop/layout/empty_lines.rb +1 -3
- data/lib/rubocop/cop/layout/empty_lines_around_access_modifier.rb +8 -18
- data/lib/rubocop/cop/layout/empty_lines_around_exception_handling_keywords.rb +9 -12
- data/lib/rubocop/cop/layout/end_alignment.rb +10 -4
- data/lib/rubocop/cop/layout/end_of_line.rb +1 -1
- data/lib/rubocop/cop/layout/extra_spacing.rb +5 -9
- data/lib/rubocop/cop/layout/first_argument_indentation.rb +12 -6
- data/lib/rubocop/cop/layout/first_array_element_indentation.rb +13 -11
- data/lib/rubocop/cop/layout/first_array_element_line_break.rb +1 -2
- data/lib/rubocop/cop/layout/first_hash_element_indentation.rb +37 -21
- data/lib/rubocop/cop/layout/first_hash_element_line_break.rb +1 -2
- data/lib/rubocop/cop/layout/first_method_argument_line_break.rb +1 -2
- data/lib/rubocop/cop/layout/first_method_parameter_line_break.rb +1 -2
- data/lib/rubocop/cop/layout/first_parameter_indentation.rb +8 -7
- data/lib/rubocop/cop/layout/hash_alignment.rb +58 -31
- data/lib/rubocop/cop/layout/heredoc_argument_closing_parenthesis.rb +4 -11
- data/lib/rubocop/cop/layout/heredoc_indentation.rb +2 -13
- data/lib/rubocop/cop/layout/indentation_consistency.rb +9 -6
- data/lib/rubocop/cop/layout/indentation_style.rb +25 -30
- data/lib/rubocop/cop/layout/indentation_width.rb +34 -13
- data/lib/rubocop/cop/layout/initial_indentation.rb +1 -4
- data/lib/rubocop/cop/layout/leading_comment_space.rb +2 -2
- data/lib/rubocop/cop/layout/line_end_string_concatenation_indentation.rb +141 -0
- data/lib/rubocop/cop/layout/line_length.rb +13 -22
- data/lib/rubocop/cop/layout/multiline_array_brace_layout.rb +6 -6
- data/lib/rubocop/cop/layout/multiline_array_line_breaks.rb +1 -2
- data/lib/rubocop/cop/layout/multiline_assignment_layout.rb +29 -3
- data/lib/rubocop/cop/layout/multiline_block_layout.rb +10 -18
- data/lib/rubocop/cop/layout/multiline_hash_brace_layout.rb +6 -6
- data/lib/rubocop/cop/layout/multiline_hash_key_line_breaks.rb +1 -2
- data/lib/rubocop/cop/layout/multiline_method_argument_line_breaks.rb +4 -2
- data/lib/rubocop/cop/layout/multiline_method_call_brace_layout.rb +6 -6
- data/lib/rubocop/cop/layout/multiline_method_call_indentation.rb +22 -15
- data/lib/rubocop/cop/layout/multiline_method_definition_brace_layout.rb +6 -6
- data/lib/rubocop/cop/layout/multiline_operation_indentation.rb +13 -8
- data/lib/rubocop/cop/layout/parameter_alignment.rb +8 -7
- data/lib/rubocop/cop/layout/redundant_line_break.rb +140 -0
- data/lib/rubocop/cop/layout/rescue_ensure_alignment.rb +26 -16
- data/lib/rubocop/cop/layout/single_line_block_chain.rb +64 -0
- data/lib/rubocop/cop/layout/space_after_colon.rb +1 -3
- data/lib/rubocop/cop/layout/space_after_method_name.rb +2 -4
- data/lib/rubocop/cop/layout/space_after_not.rb +1 -0
- data/lib/rubocop/cop/layout/space_around_block_parameters.rb +6 -14
- data/lib/rubocop/cop/layout/space_around_equals_in_parameter_default.rb +2 -2
- data/lib/rubocop/cop/layout/space_around_keyword.rb +33 -8
- data/lib/rubocop/cop/layout/space_around_operators.rb +23 -11
- data/lib/rubocop/cop/layout/space_before_block_braces.rb +2 -3
- data/lib/rubocop/cop/layout/space_before_brackets.rb +3 -4
- data/lib/rubocop/cop/layout/space_before_comment.rb +3 -5
- data/lib/rubocop/cop/layout/space_before_first_arg.rb +5 -11
- data/lib/rubocop/cop/layout/space_in_lambda_literal.rb +2 -4
- data/lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb +5 -10
- data/lib/rubocop/cop/layout/space_inside_array_percent_literal.rb +2 -7
- data/lib/rubocop/cop/layout/space_inside_block_braces.rb +6 -11
- data/lib/rubocop/cop/layout/space_inside_hash_literal_braces.rb +1 -2
- data/lib/rubocop/cop/layout/space_inside_parens.rb +78 -32
- data/lib/rubocop/cop/layout/space_inside_reference_brackets.rb +1 -2
- data/lib/rubocop/cop/layout/trailing_whitespace.rb +24 -1
- data/lib/rubocop/cop/legacy/corrections_proxy.rb +2 -8
- data/lib/rubocop/cop/legacy/corrector.rb +1 -3
- data/lib/rubocop/cop/lint/ambiguous_assignment.rb +1 -6
- data/lib/rubocop/cop/lint/ambiguous_block_association.rb +14 -7
- data/lib/rubocop/cop/lint/ambiguous_operator_precedence.rb +111 -0
- data/lib/rubocop/cop/lint/ambiguous_range.rb +105 -0
- data/lib/rubocop/cop/lint/ambiguous_regexp_literal.rb +5 -2
- data/lib/rubocop/cop/lint/assignment_in_condition.rb +7 -5
- data/lib/rubocop/cop/lint/big_decimal_new.rb +1 -0
- data/lib/rubocop/cop/lint/binary_operator_with_identical_operands.rb +18 -5
- data/lib/rubocop/cop/lint/boolean_symbol.rb +7 -2
- data/lib/rubocop/cop/lint/constant_definition_in_block.rb +2 -0
- data/lib/rubocop/cop/lint/constant_resolution.rb +2 -2
- data/lib/rubocop/cop/lint/debugger.rb +59 -15
- data/lib/rubocop/cop/lint/deprecated_class_methods.rb +83 -41
- data/lib/rubocop/cop/lint/deprecated_constants.rb +5 -4
- data/lib/rubocop/cop/lint/deprecated_open_ssl_constant.rb +16 -9
- data/lib/rubocop/cop/lint/disjunctive_assignment_in_constructor.rb +24 -1
- data/lib/rubocop/cop/lint/duplicate_branch.rb +4 -4
- data/lib/rubocop/cop/lint/duplicate_hash_key.rb +1 -3
- data/lib/rubocop/cop/lint/duplicate_methods.rb +14 -12
- data/lib/rubocop/cop/lint/duplicate_require.rb +3 -2
- data/lib/rubocop/cop/lint/each_with_object_argument.rb +1 -0
- data/lib/rubocop/cop/lint/else_layout.rb +12 -10
- data/lib/rubocop/cop/lint/empty_block.rb +18 -2
- data/lib/rubocop/cop/lint/empty_ensure.rb +1 -3
- data/lib/rubocop/cop/lint/empty_file.rb +1 -3
- data/lib/rubocop/cop/lint/empty_in_pattern.rb +62 -0
- data/lib/rubocop/cop/lint/empty_interpolation.rb +1 -3
- data/lib/rubocop/cop/lint/ensure_return.rb +1 -3
- data/lib/rubocop/cop/lint/erb_new_arguments.rb +4 -7
- data/lib/rubocop/cop/lint/float_out_of_range.rb +1 -2
- data/lib/rubocop/cop/lint/format_parameter_mismatch.rb +4 -6
- data/lib/rubocop/cop/lint/hash_compare_by_identity.rb +13 -3
- data/lib/rubocop/cop/lint/heredoc_method_call_position.rb +1 -2
- data/lib/rubocop/cop/lint/implicit_string_concatenation.rb +1 -2
- data/lib/rubocop/cop/lint/incompatible_io_select_with_fiber_scheduler.rb +67 -0
- data/lib/rubocop/cop/lint/ineffective_access_modifier.rb +4 -7
- data/lib/rubocop/cop/lint/inherit_exception.rb +2 -2
- data/lib/rubocop/cop/lint/interpolation_check.rb +8 -11
- data/lib/rubocop/cop/lint/literal_as_condition.rb +13 -1
- data/lib/rubocop/cop/lint/literal_in_interpolation.rb +3 -6
- data/lib/rubocop/cop/lint/loop.rb +5 -5
- data/lib/rubocop/cop/lint/missing_cop_enable_directive.rb +32 -21
- data/lib/rubocop/cop/lint/missing_super.rb +1 -2
- data/lib/rubocop/cop/lint/mixed_regexp_capture_types.rb +1 -2
- data/lib/rubocop/cop/lint/multiple_comparison.rb +5 -4
- data/lib/rubocop/cop/lint/nested_method_definition.rb +4 -2
- data/lib/rubocop/cop/lint/nested_percent_literal.rb +2 -4
- data/lib/rubocop/cop/lint/next_without_accumulator.rb +1 -0
- data/lib/rubocop/cop/lint/non_deterministic_require_order.rb +13 -4
- data/lib/rubocop/cop/lint/non_local_exit_from_iterator.rb +3 -0
- data/lib/rubocop/cop/lint/number_conversion.rb +25 -6
- data/lib/rubocop/cop/lint/numbered_parameter_assignment.rb +1 -1
- data/lib/rubocop/cop/lint/or_assignment_to_constant.rb +4 -2
- data/lib/rubocop/cop/lint/ordered_magic_comments.rb +1 -2
- data/lib/rubocop/cop/lint/out_of_range_regexp_ref.rb +18 -3
- data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb +1 -3
- data/lib/rubocop/cop/lint/percent_string_array.rb +11 -1
- data/lib/rubocop/cop/lint/percent_symbol_array.rb +2 -4
- data/lib/rubocop/cop/lint/raise_exception.rb +7 -2
- data/lib/rubocop/cop/lint/rand_one.rb +2 -2
- data/lib/rubocop/cop/lint/redundant_cop_disable_directive.rb +108 -90
- data/lib/rubocop/cop/lint/redundant_cop_enable_directive.rb +5 -0
- data/lib/rubocop/cop/lint/redundant_require_statement.rb +1 -0
- data/lib/rubocop/cop/lint/redundant_safe_navigation.rb +7 -7
- data/lib/rubocop/cop/lint/redundant_splat_expansion.rb +10 -10
- data/lib/rubocop/cop/lint/redundant_string_coercion.rb +2 -2
- data/lib/rubocop/cop/lint/redundant_with_index.rb +2 -4
- data/lib/rubocop/cop/lint/redundant_with_object.rb +2 -4
- data/lib/rubocop/cop/lint/regexp_as_condition.rb +1 -3
- data/lib/rubocop/cop/lint/require_parentheses.rb +2 -4
- data/lib/rubocop/cop/lint/require_relative_self_path.rb +50 -0
- data/lib/rubocop/cop/lint/rescue_exception.rb +1 -2
- data/lib/rubocop/cop/lint/rescue_type.rb +2 -7
- data/lib/rubocop/cop/lint/return_in_void_context.rb +1 -2
- data/lib/rubocop/cop/lint/safe_navigation_chain.rb +2 -2
- data/lib/rubocop/cop/lint/safe_navigation_consistency.rb +4 -10
- data/lib/rubocop/cop/lint/safe_navigation_with_empty.rb +2 -2
- data/lib/rubocop/cop/lint/send_with_mixin_argument.rb +3 -7
- data/lib/rubocop/cop/lint/shadowed_argument.rb +6 -12
- data/lib/rubocop/cop/lint/shadowed_exception.rb +7 -8
- data/lib/rubocop/cop/lint/shadowing_outer_local_variable.rb +2 -1
- data/lib/rubocop/cop/lint/struct_new_override.rb +2 -2
- data/lib/rubocop/cop/lint/suppressed_exception.rb +44 -1
- data/lib/rubocop/cop/lint/symbol_conversion.rb +86 -11
- data/lib/rubocop/cop/lint/syntax.rb +1 -3
- data/lib/rubocop/cop/lint/to_enum_arguments.rb +3 -0
- data/lib/rubocop/cop/lint/to_json.rb +1 -2
- data/lib/rubocop/cop/lint/trailing_comma_in_attribute_declaration.rb +1 -3
- data/lib/rubocop/cop/lint/triple_quotes.rb +1 -1
- data/lib/rubocop/cop/lint/underscore_prefixed_variable_name.rb +1 -3
- data/lib/rubocop/cop/lint/unexpected_block_arity.rb +8 -3
- data/lib/rubocop/cop/lint/unified_integer.rb +1 -0
- data/lib/rubocop/cop/lint/unmodified_reduce_accumulator.rb +5 -0
- data/lib/rubocop/cop/lint/unreachable_code.rb +3 -5
- data/lib/rubocop/cop/lint/unreachable_loop.rb +15 -7
- data/lib/rubocop/cop/lint/unused_block_argument.rb +10 -8
- data/lib/rubocop/cop/lint/unused_method_argument.rb +4 -5
- data/lib/rubocop/cop/lint/uri_escape_unescape.rb +1 -0
- data/lib/rubocop/cop/lint/useless_access_modifier.rb +6 -4
- data/lib/rubocop/cop/lint/useless_assignment.rb +5 -10
- data/lib/rubocop/cop/lint/useless_method_definition.rb +3 -2
- data/lib/rubocop/cop/lint/useless_setter_call.rb +9 -7
- data/lib/rubocop/cop/lint/useless_times.rb +8 -4
- data/lib/rubocop/cop/lint/void.rb +5 -12
- data/lib/rubocop/cop/message_annotator.rb +1 -3
- data/lib/rubocop/cop/metrics/abc_size.rb +6 -0
- data/lib/rubocop/cop/metrics/block_nesting.rb +2 -7
- data/lib/rubocop/cop/metrics/class_length.rb +1 -3
- data/lib/rubocop/cop/metrics/cyclomatic_complexity.rb +1 -2
- data/lib/rubocop/cop/metrics/module_length.rb +3 -6
- data/lib/rubocop/cop/metrics/parameter_lists.rb +8 -7
- data/lib/rubocop/cop/metrics/perceived_complexity.rb +2 -3
- data/lib/rubocop/cop/metrics/utils/abc_size_calculator.rb +5 -8
- data/lib/rubocop/cop/metrics/utils/code_length_calculator.rb +8 -6
- data/lib/rubocop/cop/metrics/utils/repeated_attribute_discount.rb +4 -7
- data/lib/rubocop/cop/migration/department_name.rb +4 -6
- data/lib/rubocop/cop/mixin/alignment.rb +12 -7
- data/lib/rubocop/cop/mixin/annotation_comment.rb +57 -34
- data/lib/rubocop/cop/mixin/check_line_breakable.rb +29 -4
- data/lib/rubocop/cop/mixin/code_length.rb +2 -4
- data/lib/rubocop/cop/mixin/comments_help.rb +5 -1
- data/lib/rubocop/cop/mixin/configurable_enforced_style.rb +2 -2
- data/lib/rubocop/cop/mixin/configurable_formatting.rb +3 -8
- data/lib/rubocop/cop/mixin/def_node.rb +3 -5
- data/lib/rubocop/cop/mixin/documentation_comment.rb +8 -8
- data/lib/rubocop/cop/mixin/empty_lines_around_body.rb +6 -7
- data/lib/rubocop/cop/mixin/empty_parameter.rb +2 -3
- data/lib/rubocop/cop/mixin/end_keyword_alignment.rb +2 -5
- data/lib/rubocop/cop/mixin/enforce_superclass.rb +4 -6
- data/lib/rubocop/cop/mixin/first_element_line_break.rb +1 -3
- data/lib/rubocop/cop/mixin/frozen_string_literal.rb +30 -8
- data/lib/rubocop/cop/mixin/gem_declaration.rb +13 -0
- data/lib/rubocop/cop/mixin/hash_alignment_styles.rb +17 -9
- data/lib/rubocop/cop/mixin/hash_transform_method.rb +16 -25
- data/lib/rubocop/cop/mixin/heredoc.rb +5 -0
- data/lib/rubocop/cop/mixin/interpolation.rb +1 -3
- data/lib/rubocop/cop/mixin/line_length_help.rb +13 -10
- data/lib/rubocop/cop/mixin/match_range.rb +2 -5
- data/lib/rubocop/cop/mixin/method_complexity.rb +2 -3
- data/lib/rubocop/cop/mixin/method_preference.rb +1 -2
- data/lib/rubocop/cop/mixin/multiline_element_indentation.rb +5 -4
- data/lib/rubocop/cop/mixin/multiline_element_line_breaks.rb +1 -3
- data/lib/rubocop/cop/mixin/multiline_expression_indentation.rb +13 -42
- data/lib/rubocop/cop/mixin/multiline_literal_brace_layout.rb +2 -3
- data/lib/rubocop/cop/mixin/negative_conditional.rb +4 -2
- data/lib/rubocop/cop/mixin/ordered_gem_node.rb +10 -5
- data/lib/rubocop/cop/mixin/percent_array.rb +17 -8
- data/lib/rubocop/cop/mixin/percent_literal.rb +0 -6
- data/lib/rubocop/cop/mixin/preceding_following_alignment.rb +14 -12
- data/lib/rubocop/cop/mixin/preferred_delimiters.rb +6 -9
- data/lib/rubocop/cop/mixin/range_help.rb +10 -13
- data/lib/rubocop/cop/mixin/rational_literal.rb +1 -0
- data/lib/rubocop/cop/mixin/require_library.rb +59 -0
- data/lib/rubocop/cop/mixin/rescue_node.rb +2 -6
- data/lib/rubocop/cop/mixin/safe_assignment.rb +6 -2
- data/lib/rubocop/cop/mixin/space_after_punctuation.rb +2 -4
- data/lib/rubocop/cop/mixin/space_before_punctuation.rb +3 -4
- data/lib/rubocop/cop/mixin/statement_modifier.rb +2 -4
- data/lib/rubocop/cop/mixin/string_literals_help.rb +7 -5
- data/lib/rubocop/cop/mixin/symbol_help.rb +13 -0
- data/lib/rubocop/cop/mixin/trailing_body.rb +2 -3
- data/lib/rubocop/cop/mixin/trailing_comma.rb +1 -2
- data/lib/rubocop/cop/mixin/uncommunicative_name.rb +7 -13
- data/lib/rubocop/cop/mixin/unused_argument.rb +1 -3
- data/lib/rubocop/cop/mixin/visibility_help.rb +1 -0
- data/lib/rubocop/cop/naming/ascii_identifiers.rb +2 -7
- data/lib/rubocop/cop/naming/binary_operator_parameter_name.rb +2 -2
- data/lib/rubocop/cop/naming/block_parameter_name.rb +1 -1
- data/lib/rubocop/cop/naming/constant_name.rb +3 -1
- data/lib/rubocop/cop/naming/file_name.rb +7 -16
- data/lib/rubocop/cop/naming/inclusive_language.rb +266 -0
- data/lib/rubocop/cop/naming/memoized_instance_variable_name.rb +11 -5
- data/lib/rubocop/cop/naming/method_name.rb +4 -2
- data/lib/rubocop/cop/naming/predicate_name.rb +2 -2
- data/lib/rubocop/cop/naming/rescued_exceptions_variable_name.rb +17 -0
- data/lib/rubocop/cop/offense.rb +3 -8
- data/lib/rubocop/cop/registry.rb +13 -12
- data/lib/rubocop/cop/security/eval.rb +1 -0
- data/lib/rubocop/cop/security/io_methods.rb +49 -0
- data/lib/rubocop/cop/security/json_load.rb +9 -7
- data/lib/rubocop/cop/security/marshal_load.rb +1 -0
- data/lib/rubocop/cop/security/open.rb +5 -0
- data/lib/rubocop/cop/security/yaml_load.rb +5 -0
- data/lib/rubocop/cop/style/access_modifier_declarations.rb +4 -5
- data/lib/rubocop/cop/style/accessor_grouping.rb +3 -5
- data/lib/rubocop/cop/style/alias.rb +6 -12
- data/lib/rubocop/cop/style/and_or.rb +8 -1
- data/lib/rubocop/cop/style/arguments_forwarding.rb +17 -5
- data/lib/rubocop/cop/style/array_coercion.rb +23 -3
- data/lib/rubocop/cop/style/array_join.rb +1 -0
- data/lib/rubocop/cop/style/ascii_comments.rb +1 -5
- data/lib/rubocop/cop/style/attr.rb +2 -3
- data/lib/rubocop/cop/style/auto_resource_cleanup.rb +2 -5
- data/lib/rubocop/cop/style/bisected_attr_accessor/macro.rb +60 -0
- data/lib/rubocop/cop/style/bisected_attr_accessor.rb +59 -71
- data/lib/rubocop/cop/style/block_delimiters.rb +50 -2
- data/lib/rubocop/cop/style/case_equality.rb +8 -10
- data/lib/rubocop/cop/style/case_like_if.rb +21 -6
- data/lib/rubocop/cop/style/character_literal.rb +2 -4
- data/lib/rubocop/cop/style/class_and_module_children.rb +42 -10
- data/lib/rubocop/cop/style/class_equality_comparison.rb +3 -0
- data/lib/rubocop/cop/style/class_methods.rb +1 -3
- data/lib/rubocop/cop/style/collection_compact.rb +10 -8
- data/lib/rubocop/cop/style/collection_methods.rb +8 -6
- data/lib/rubocop/cop/style/colon_method_call.rb +2 -3
- data/lib/rubocop/cop/style/combinable_loops.rb +6 -4
- data/lib/rubocop/cop/style/command_literal.rb +4 -9
- data/lib/rubocop/cop/style/comment_annotation.rb +57 -30
- data/lib/rubocop/cop/style/commented_keyword.rb +16 -16
- data/lib/rubocop/cop/style/conditional_assignment.rb +31 -29
- data/lib/rubocop/cop/style/constant_visibility.rb +28 -0
- data/lib/rubocop/cop/style/copyright.rb +3 -6
- data/lib/rubocop/cop/style/date_time.rb +10 -5
- data/lib/rubocop/cop/style/def_with_parentheses.rb +1 -2
- data/lib/rubocop/cop/style/dir.rb +1 -0
- data/lib/rubocop/cop/style/disable_cops_within_source_code_directive.rb +2 -2
- data/lib/rubocop/cop/style/document_dynamic_eval_definition.rb +1 -1
- data/lib/rubocop/cop/style/documentation.rb +52 -10
- data/lib/rubocop/cop/style/documentation_method.rb +1 -0
- data/lib/rubocop/cop/style/double_cop_disable_directive.rb +1 -7
- data/lib/rubocop/cop/style/double_negation.rb +30 -8
- data/lib/rubocop/cop/style/each_for_simple_loop.rb +2 -2
- data/lib/rubocop/cop/style/each_with_object.rb +1 -0
- data/lib/rubocop/cop/style/empty_case_condition.rb +2 -7
- data/lib/rubocop/cop/style/empty_else.rb +3 -9
- data/lib/rubocop/cop/style/empty_literal.rb +21 -9
- data/lib/rubocop/cop/style/empty_method.rb +3 -7
- data/lib/rubocop/cop/style/encoding.rb +26 -15
- data/lib/rubocop/cop/style/end_block.rb +1 -2
- data/lib/rubocop/cop/style/endless_method.rb +2 -3
- data/lib/rubocop/cop/style/eval_with_location.rb +91 -31
- data/lib/rubocop/cop/style/even_odd.rb +1 -0
- data/lib/rubocop/cop/style/expand_path_arguments.rb +4 -3
- data/lib/rubocop/cop/style/explicit_block_argument.rb +48 -15
- data/lib/rubocop/cop/style/exponential_notation.rb +6 -7
- data/lib/rubocop/cop/style/float_division.rb +14 -2
- data/lib/rubocop/cop/style/format_string.rb +2 -0
- data/lib/rubocop/cop/style/format_string_token.rb +2 -4
- data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +15 -12
- data/lib/rubocop/cop/style/global_std_stream.rb +5 -0
- data/lib/rubocop/cop/style/guard_clause.rb +3 -7
- data/lib/rubocop/cop/style/hash_as_last_array_item.rb +11 -0
- data/lib/rubocop/cop/style/hash_conversion.rb +133 -0
- data/lib/rubocop/cop/style/hash_each_methods.rb +25 -3
- data/lib/rubocop/cop/style/hash_except.rb +5 -3
- data/lib/rubocop/cop/style/hash_like_case.rb +2 -2
- data/lib/rubocop/cop/style/hash_syntax.rb +21 -25
- data/lib/rubocop/cop/style/hash_transform_keys.rb +8 -9
- data/lib/rubocop/cop/style/hash_transform_values.rb +8 -6
- data/lib/rubocop/cop/style/identical_conditional_branches.rb +83 -8
- data/lib/rubocop/cop/style/if_unless_modifier.rb +40 -13
- data/lib/rubocop/cop/style/if_with_boolean_literal_branches.rb +20 -4
- data/lib/rubocop/cop/style/implicit_runtime_error.rb +1 -0
- data/lib/rubocop/cop/style/in_pattern_then.rb +56 -0
- data/lib/rubocop/cop/style/infinite_loop.rb +6 -8
- data/lib/rubocop/cop/style/inverse_methods.rb +14 -9
- data/lib/rubocop/cop/style/ip_addresses.rb +1 -2
- data/lib/rubocop/cop/style/lambda.rb +2 -4
- data/lib/rubocop/cop/style/lambda_call.rb +1 -2
- data/lib/rubocop/cop/style/line_end_concatenation.rb +19 -13
- data/lib/rubocop/cop/style/method_call_with_args_parentheses/omit_parentheses.rb +32 -21
- data/lib/rubocop/cop/style/method_call_with_args_parentheses.rb +47 -3
- data/lib/rubocop/cop/style/method_call_without_args_parentheses.rb +1 -2
- data/lib/rubocop/cop/style/method_called_on_do_end_block.rb +2 -4
- data/lib/rubocop/cop/style/method_def_parentheses.rb +14 -9
- data/lib/rubocop/cop/style/min_max.rb +2 -2
- data/lib/rubocop/cop/style/missing_else.rb +9 -4
- data/lib/rubocop/cop/style/missing_respond_to_missing.rb +1 -2
- data/lib/rubocop/cop/style/mixin_grouping.rb +4 -10
- data/lib/rubocop/cop/style/mixin_usage.rb +3 -2
- data/lib/rubocop/cop/style/module_function.rb +16 -15
- data/lib/rubocop/cop/style/multiline_block_chain.rb +1 -2
- data/lib/rubocop/cop/style/multiline_in_pattern_then.rb +62 -0
- data/lib/rubocop/cop/style/multiline_method_signature.rb +11 -6
- data/lib/rubocop/cop/style/multiline_ternary_operator.rb +1 -2
- data/lib/rubocop/cop/style/multiline_when_then.rb +3 -12
- data/lib/rubocop/cop/style/multiple_comparison.rb +23 -6
- data/lib/rubocop/cop/style/mutable_constant.rb +85 -23
- data/lib/rubocop/cop/style/negated_if.rb +1 -2
- data/lib/rubocop/cop/style/negated_if_else_condition.rb +24 -2
- data/lib/rubocop/cop/style/negated_unless.rb +1 -2
- data/lib/rubocop/cop/style/nested_modifier.rb +3 -7
- data/lib/rubocop/cop/style/nested_ternary_operator.rb +2 -3
- data/lib/rubocop/cop/style/next.rb +4 -9
- data/lib/rubocop/cop/style/nil_comparison.rb +3 -0
- data/lib/rubocop/cop/style/nil_lambda.rb +30 -12
- data/lib/rubocop/cop/style/non_nil_check.rb +11 -7
- data/lib/rubocop/cop/style/not.rb +2 -2
- data/lib/rubocop/cop/style/numbered_parameters.rb +46 -0
- data/lib/rubocop/cop/style/numbered_parameters_limit.rb +50 -0
- data/lib/rubocop/cop/style/numeric_literals.rb +6 -15
- data/lib/rubocop/cop/style/numeric_predicate.rb +10 -7
- data/lib/rubocop/cop/style/one_line_conditional.rb +1 -2
- data/lib/rubocop/cop/style/option_hash.rb +2 -3
- data/lib/rubocop/cop/style/optional_arguments.rb +6 -5
- data/lib/rubocop/cop/style/optional_boolean_parameter.rb +14 -4
- data/lib/rubocop/cop/style/or_assignment.rb +4 -6
- data/lib/rubocop/cop/style/parallel_assignment.rb +13 -10
- data/lib/rubocop/cop/style/parentheses_around_condition.rb +1 -0
- data/lib/rubocop/cop/style/percent_literal_delimiters.rb +2 -4
- data/lib/rubocop/cop/style/percent_q_literals.rb +3 -4
- data/lib/rubocop/cop/style/perl_backrefs.rb +2 -9
- data/lib/rubocop/cop/style/preferred_hash_methods.rb +10 -8
- data/lib/rubocop/cop/style/proc.rb +2 -2
- data/lib/rubocop/cop/style/quoted_symbols.rb +114 -0
- data/lib/rubocop/cop/style/raise_args.rb +6 -8
- data/lib/rubocop/cop/style/random_with_offset.rb +8 -8
- data/lib/rubocop/cop/style/redundant_argument.rb +21 -20
- data/lib/rubocop/cop/style/redundant_assignment.rb +2 -3
- data/lib/rubocop/cop/style/redundant_begin.rb +72 -7
- data/lib/rubocop/cop/style/redundant_capital_w.rb +1 -2
- data/lib/rubocop/cop/style/redundant_condition.rb +4 -8
- data/lib/rubocop/cop/style/redundant_conditional.rb +5 -6
- data/lib/rubocop/cop/style/redundant_exception.rb +5 -6
- data/lib/rubocop/cop/style/redundant_fetch_block.rb +6 -0
- data/lib/rubocop/cop/style/redundant_file_extension_in_require.rb +13 -3
- data/lib/rubocop/cop/style/redundant_freeze.rb +6 -6
- data/lib/rubocop/cop/style/redundant_interpolation.rb +2 -3
- data/lib/rubocop/cop/style/redundant_parentheses.rb +21 -20
- data/lib/rubocop/cop/style/redundant_percent_q.rb +3 -5
- data/lib/rubocop/cop/style/redundant_regexp_character_class.rb +1 -1
- data/lib/rubocop/cop/style/redundant_regexp_escape.rb +1 -4
- data/lib/rubocop/cop/style/redundant_return.rb +6 -4
- data/lib/rubocop/cop/style/redundant_self.rb +42 -10
- data/lib/rubocop/cop/style/redundant_self_assignment.rb +8 -5
- data/lib/rubocop/cop/style/redundant_self_assignment_branch.rb +83 -0
- data/lib/rubocop/cop/style/redundant_sort.rb +56 -25
- data/lib/rubocop/cop/style/redundant_sort_by.rb +1 -0
- data/lib/rubocop/cop/style/regexp_literal.rb +15 -10
- data/lib/rubocop/cop/style/rescue_modifier.rb +21 -14
- data/lib/rubocop/cop/style/rescue_standard_error.rb +5 -7
- data/lib/rubocop/cop/style/return_nil.rb +8 -2
- data/lib/rubocop/cop/style/safe_navigation.rb +25 -23
- data/lib/rubocop/cop/style/sample.rb +1 -0
- data/lib/rubocop/cop/style/select_by_regexp.rb +139 -0
- data/lib/rubocop/cop/style/semicolon.rb +32 -24
- data/lib/rubocop/cop/style/send.rb +1 -2
- data/lib/rubocop/cop/style/signal_exception.rb +6 -7
- data/lib/rubocop/cop/style/single_argument_dig.rb +7 -2
- data/lib/rubocop/cop/style/single_line_block_params.rb +5 -6
- data/lib/rubocop/cop/style/single_line_methods.rb +45 -18
- data/lib/rubocop/cop/style/slicing_with_range.rb +14 -0
- data/lib/rubocop/cop/style/sole_nested_conditional.rb +35 -7
- data/lib/rubocop/cop/style/special_global_vars.rb +33 -20
- data/lib/rubocop/cop/style/stabby_lambda_parentheses.rb +1 -2
- data/lib/rubocop/cop/style/static_class.rb +5 -5
- data/lib/rubocop/cop/style/stderr_puts.rb +3 -6
- data/lib/rubocop/cop/style/string_chars.rb +41 -0
- data/lib/rubocop/cop/style/string_concatenation.rb +45 -15
- data/lib/rubocop/cop/style/string_hash_keys.rb +6 -0
- data/lib/rubocop/cop/style/string_literals.rb +5 -7
- data/lib/rubocop/cop/style/string_literals_in_interpolation.rb +1 -0
- data/lib/rubocop/cop/style/strip.rb +1 -0
- data/lib/rubocop/cop/style/struct_inheritance.rb +15 -0
- data/lib/rubocop/cop/style/swap_values.rb +5 -3
- data/lib/rubocop/cop/style/symbol_array.rb +3 -3
- data/lib/rubocop/cop/style/symbol_literal.rb +1 -3
- data/lib/rubocop/cop/style/symbol_proc.rb +55 -10
- data/lib/rubocop/cop/style/ternary_parentheses.rb +4 -6
- data/lib/rubocop/cop/style/top_level_method_definition.rb +83 -0
- data/lib/rubocop/cop/style/trailing_body_on_method_definition.rb +6 -2
- data/lib/rubocop/cop/style/trailing_comma_in_block_args.rb +21 -6
- data/lib/rubocop/cop/style/trailing_method_end_statement.rb +3 -6
- data/lib/rubocop/cop/style/trailing_underscore_variable.rb +4 -10
- data/lib/rubocop/cop/style/trivial_accessors.rb +69 -5
- data/lib/rubocop/cop/style/unless_else.rb +1 -2
- data/lib/rubocop/cop/style/unless_logical_operators.rb +105 -0
- data/lib/rubocop/cop/style/unpack_first.rb +2 -1
- data/lib/rubocop/cop/style/variable_interpolation.rb +1 -1
- data/lib/rubocop/cop/style/when_then.rb +4 -2
- data/lib/rubocop/cop/style/while_until_modifier.rb +1 -2
- data/lib/rubocop/cop/style/word_array.rb +22 -5
- data/lib/rubocop/cop/style/yoda_condition.rb +28 -18
- data/lib/rubocop/cop/style/zero_length_predicate.rb +12 -2
- data/lib/rubocop/cop/team.rb +2 -5
- data/lib/rubocop/cop/util.rb +29 -16
- data/lib/rubocop/cop/utils/format_string.rb +1 -3
- data/lib/rubocop/cop/variable_force/assignment.rb +1 -2
- data/lib/rubocop/cop/variable_force/branch.rb +16 -2
- data/lib/rubocop/cop/variable_force/reference.rb +1 -3
- data/lib/rubocop/cop/variable_force/scope.rb +4 -8
- data/lib/rubocop/cop/variable_force/variable.rb +2 -4
- data/lib/rubocop/cop/variable_force/variable_table.rb +1 -1
- data/lib/rubocop/cop/variable_force.rb +6 -15
- data/lib/rubocop/cops_documentation_generator.rb +24 -26
- data/lib/rubocop/directive_comment.rb +123 -11
- data/lib/rubocop/ext/regexp_parser.rb +3 -6
- data/lib/rubocop/file_finder.rb +1 -3
- data/lib/rubocop/formatter/clang_style_formatter.rb +4 -2
- data/lib/rubocop/formatter/disabled_config_formatter.rb +3 -8
- data/lib/rubocop/formatter/git_hub_actions_formatter.rb +2 -6
- data/lib/rubocop/formatter/html_formatter.rb +4 -10
- data/lib/rubocop/formatter/json_formatter.rb +1 -5
- data/lib/rubocop/formatter/junit_formatter.rb +23 -14
- data/lib/rubocop/formatter/offense_count_formatter.rb +1 -1
- data/lib/rubocop/formatter/progress_formatter.rb +1 -3
- data/lib/rubocop/formatter/tap_formatter.rb +4 -2
- data/lib/rubocop/formatter/worst_offenders_formatter.rb +1 -1
- data/lib/rubocop/magic_comment.rb +45 -16
- data/lib/rubocop/name_similarity.rb +1 -1
- data/lib/rubocop/options.rb +153 -159
- data/lib/rubocop/path_util.rb +1 -3
- data/lib/rubocop/rake_task.rb +4 -1
- data/lib/rubocop/remote_config.rb +13 -8
- data/lib/rubocop/result_cache.rb +8 -15
- data/lib/rubocop/rspec/cop_helper.rb +3 -3
- data/lib/rubocop/rspec/expect_offense.rb +11 -12
- data/lib/rubocop/rspec/parallel_formatter.rb +90 -0
- data/lib/rubocop/rspec/shared_contexts.rb +8 -15
- data/lib/rubocop/rspec/support.rb +1 -0
- data/lib/rubocop/runner.rb +9 -17
- data/lib/rubocop/target_finder.rb +20 -17
- data/lib/rubocop/target_ruby.rb +25 -21
- data/lib/rubocop/version.rb +1 -1
- data/lib/rubocop.rb +30 -3
- metadata +44 -11
- data/lib/rubocop/core_ext/hash.rb +0 -20
@@ -0,0 +1,266 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module RuboCop
|
4
|
+
module Cop
|
5
|
+
module Naming
|
6
|
+
# This cops recommends the use of inclusive language instead of problematic terms.
|
7
|
+
# The cop can check the following locations for offenses:
|
8
|
+
# - identifiers
|
9
|
+
# - constants
|
10
|
+
# - variables
|
11
|
+
# - strings
|
12
|
+
# - symbols
|
13
|
+
# - comments
|
14
|
+
# - file paths
|
15
|
+
# Each of these locations can be individually enabled/disabled via configuration,
|
16
|
+
# for example CheckIdentifiers = true/false.
|
17
|
+
#
|
18
|
+
# Flagged terms are configurable for the cop. For each flagged term an optional
|
19
|
+
# Regex can be specified to identify offenses. Suggestions for replacing a flagged term can
|
20
|
+
# be configured and will be displayed as part of the offense message.
|
21
|
+
# An AllowedRegex can be specified for a flagged term to exempt allowed uses of the term.
|
22
|
+
# `WholeWord: true` can be set on a flagged term to indicate the cop should only match when
|
23
|
+
# a term matches the whole word (partial matches will not be offenses).
|
24
|
+
#
|
25
|
+
# @example FlaggedTerms: { whitelist: { Suggestions: ['allowlist'] } }
|
26
|
+
# # Suggest replacing identifier whitelist with allowlist
|
27
|
+
#
|
28
|
+
# # bad
|
29
|
+
# whitelist_users = %w(user1 user1)
|
30
|
+
#
|
31
|
+
# # good
|
32
|
+
# allowlist_users = %w(user1 user2)
|
33
|
+
#
|
34
|
+
# @example FlaggedTerms: { master: { Suggestions: ['main', 'primary', 'leader'] } }
|
35
|
+
# # Suggest replacing master in an instance variable name with main, primary, or leader
|
36
|
+
#
|
37
|
+
# # bad
|
38
|
+
# @master_node = 'node1.example.com'
|
39
|
+
#
|
40
|
+
# # good
|
41
|
+
# @primary_node = 'node1.example.com'
|
42
|
+
#
|
43
|
+
# @example FlaggedTerms: { whitelist: { Regex: !ruby/regexp '/white[-_\s]?list' } }
|
44
|
+
# # Identify problematic terms using a Regexp
|
45
|
+
#
|
46
|
+
# # bad
|
47
|
+
# white_list = %w(user1 user2)
|
48
|
+
#
|
49
|
+
# # good
|
50
|
+
# allow_list = %w(user1 user2)
|
51
|
+
#
|
52
|
+
# @example FlaggedTerms: { master: { AllowedRegex: 'master\'?s degree' } }
|
53
|
+
# # Specify allowed uses of the flagged term as a string or regexp.
|
54
|
+
#
|
55
|
+
# # bad
|
56
|
+
# # They had a masters
|
57
|
+
#
|
58
|
+
# # good
|
59
|
+
# # They had a master's degree
|
60
|
+
#
|
61
|
+
# @example FlaggedTerms: { slave: { WholeWord: true } }
|
62
|
+
# # Specify that only terms that are full matches will be flagged.
|
63
|
+
#
|
64
|
+
# # bad
|
65
|
+
# Slave
|
66
|
+
#
|
67
|
+
# # good (won't be flagged despite containing `slave`)
|
68
|
+
# TeslaVehicle
|
69
|
+
class InclusiveLanguage < Base
|
70
|
+
include RangeHelp
|
71
|
+
|
72
|
+
EMPTY_ARRAY = [].freeze
|
73
|
+
MSG = "Consider replacing '%<term>s'%<suffix>s."
|
74
|
+
MSG_FOR_FILE_PATH = "Consider replacing '%<term>s' in file path%<suffix>s."
|
75
|
+
|
76
|
+
WordLocation = Struct.new(:word, :position)
|
77
|
+
|
78
|
+
def initialize(config = nil, options = nil)
|
79
|
+
super
|
80
|
+
@flagged_term_hash = {}
|
81
|
+
@flagged_terms_regex = nil
|
82
|
+
@allowed_regex = nil
|
83
|
+
@check_token = preprocess_check_config
|
84
|
+
preprocess_flagged_terms
|
85
|
+
end
|
86
|
+
|
87
|
+
def on_new_investigation
|
88
|
+
investigate_filepath if cop_config['CheckFilepaths']
|
89
|
+
investigate_tokens
|
90
|
+
end
|
91
|
+
|
92
|
+
private
|
93
|
+
|
94
|
+
def investigate_tokens
|
95
|
+
processed_source.each_token do |token|
|
96
|
+
next unless check_token?(token.type)
|
97
|
+
|
98
|
+
word_locations = scan_for_words(token.text)
|
99
|
+
next if word_locations.empty?
|
100
|
+
|
101
|
+
add_offenses_for_token(token, word_locations)
|
102
|
+
end
|
103
|
+
end
|
104
|
+
|
105
|
+
def add_offenses_for_token(token, word_locations)
|
106
|
+
word_locations.each do |word_location|
|
107
|
+
start_position = token.pos.begin_pos + token.pos.source.index(word_location.word)
|
108
|
+
range = range_between(start_position, start_position + word_location.word.length)
|
109
|
+
add_offense(range, message: create_message(word_location.word))
|
110
|
+
end
|
111
|
+
end
|
112
|
+
|
113
|
+
def check_token?(type)
|
114
|
+
!!@check_token[type]
|
115
|
+
end
|
116
|
+
|
117
|
+
def preprocess_check_config # rubocop:disable Metrics/AbcSize
|
118
|
+
{
|
119
|
+
tIDENTIFIER: cop_config['CheckIdentifiers'],
|
120
|
+
tCONSTANT: cop_config['CheckConstants'],
|
121
|
+
tIVAR: cop_config['CheckVariables'],
|
122
|
+
tCVAR: cop_config['CheckVariables'],
|
123
|
+
tGVAR: cop_config['CheckVariables'],
|
124
|
+
tSYMBOL: cop_config['CheckSymbols'],
|
125
|
+
tSTRING: cop_config['CheckStrings'],
|
126
|
+
tSTRING_CONTENT: cop_config['CheckStrings'],
|
127
|
+
tCOMMENT: cop_config['CheckComments']
|
128
|
+
}.freeze
|
129
|
+
end
|
130
|
+
|
131
|
+
def preprocess_flagged_terms
|
132
|
+
allowed_strings = []
|
133
|
+
flagged_term_strings = []
|
134
|
+
cop_config['FlaggedTerms'].each do |term, term_definition|
|
135
|
+
next if term_definition.nil?
|
136
|
+
|
137
|
+
allowed_strings.concat(process_allowed_regex(term_definition['AllowedRegex']))
|
138
|
+
regex_string = ensure_regex_string(extract_regexp(term, term_definition))
|
139
|
+
flagged_term_strings << regex_string
|
140
|
+
|
141
|
+
add_to_flagged_term_hash(regex_string, term, term_definition)
|
142
|
+
end
|
143
|
+
|
144
|
+
set_regexes(flagged_term_strings, allowed_strings)
|
145
|
+
end
|
146
|
+
|
147
|
+
def extract_regexp(term, term_definition)
|
148
|
+
return term_definition['Regex'] if term_definition['Regex']
|
149
|
+
return /(?:\b|(?<=[\W_]))#{term}(?:\b|(?=[\W_]))/ if term_definition['WholeWord']
|
150
|
+
|
151
|
+
term
|
152
|
+
end
|
153
|
+
|
154
|
+
def add_to_flagged_term_hash(regex_string, term, term_definition)
|
155
|
+
@flagged_term_hash[Regexp.new(regex_string, Regexp::IGNORECASE)] =
|
156
|
+
term_definition.merge('Term' => term,
|
157
|
+
'SuggestionString' =>
|
158
|
+
preprocess_suggestions(term_definition['Suggestions']))
|
159
|
+
end
|
160
|
+
|
161
|
+
def set_regexes(flagged_term_strings, allowed_strings)
|
162
|
+
@flagged_terms_regex = array_to_ignorecase_regex(flagged_term_strings)
|
163
|
+
@allowed_regex = array_to_ignorecase_regex(allowed_strings) unless allowed_strings.empty?
|
164
|
+
end
|
165
|
+
|
166
|
+
def process_allowed_regex(allowed)
|
167
|
+
return EMPTY_ARRAY if allowed.nil?
|
168
|
+
|
169
|
+
Array(allowed).map do |allowed_term|
|
170
|
+
next if allowed_term.is_a?(String) && allowed_term.strip.empty?
|
171
|
+
|
172
|
+
ensure_regex_string(allowed_term)
|
173
|
+
end
|
174
|
+
end
|
175
|
+
|
176
|
+
def ensure_regex_string(regex)
|
177
|
+
regex.is_a?(Regexp) ? regex.source : regex
|
178
|
+
end
|
179
|
+
|
180
|
+
def array_to_ignorecase_regex(strings)
|
181
|
+
Regexp.new(strings.join('|'), Regexp::IGNORECASE)
|
182
|
+
end
|
183
|
+
|
184
|
+
def investigate_filepath
|
185
|
+
word_locations = scan_for_words(processed_source.file_path)
|
186
|
+
|
187
|
+
case word_locations.length
|
188
|
+
when 0
|
189
|
+
return
|
190
|
+
when 1
|
191
|
+
message = create_single_word_message_for_file(word_locations.first.word)
|
192
|
+
else
|
193
|
+
words = word_locations.map(&:word)
|
194
|
+
message = create_multiple_word_message_for_file(words)
|
195
|
+
end
|
196
|
+
|
197
|
+
range = source_range(processed_source.buffer, 1, 0)
|
198
|
+
add_offense(range, message: message)
|
199
|
+
end
|
200
|
+
|
201
|
+
def create_single_word_message_for_file(word)
|
202
|
+
create_message(word, MSG_FOR_FILE_PATH)
|
203
|
+
end
|
204
|
+
|
205
|
+
def create_multiple_word_message_for_file(words)
|
206
|
+
format(MSG_FOR_FILE_PATH, term: words.join("', '"), suffix: ' with other terms')
|
207
|
+
end
|
208
|
+
|
209
|
+
def scan_for_words(input)
|
210
|
+
mask_input(input).enum_for(:scan, @flagged_terms_regex).map do
|
211
|
+
match = Regexp.last_match
|
212
|
+
WordLocation.new(match.to_s, match.offset(0).first)
|
213
|
+
end
|
214
|
+
end
|
215
|
+
|
216
|
+
def mask_input(str)
|
217
|
+
return str if @allowed_regex.nil?
|
218
|
+
|
219
|
+
safe_str = if str.valid_encoding?
|
220
|
+
str
|
221
|
+
else
|
222
|
+
str.encode('UTF-8', invalid: :replace, undef: :replace)
|
223
|
+
end
|
224
|
+
safe_str.gsub(@allowed_regex) { |match| '*' * match.size }
|
225
|
+
end
|
226
|
+
|
227
|
+
def create_message(word, message = MSG)
|
228
|
+
flagged_term = find_flagged_term(word)
|
229
|
+
suggestions = flagged_term['SuggestionString']
|
230
|
+
suggestions = ' with another term' if suggestions.blank?
|
231
|
+
|
232
|
+
format(message, term: word, suffix: suggestions)
|
233
|
+
end
|
234
|
+
|
235
|
+
def find_flagged_term(word)
|
236
|
+
_regexp, flagged_term = @flagged_term_hash.find do |key, _term|
|
237
|
+
key.match?(word)
|
238
|
+
end
|
239
|
+
flagged_term
|
240
|
+
end
|
241
|
+
|
242
|
+
def preprocess_suggestions(suggestions)
|
243
|
+
return '' if suggestions.nil? ||
|
244
|
+
(suggestions.is_a?(String) && suggestions.strip.empty?) || suggestions.empty?
|
245
|
+
|
246
|
+
format_suggestions(suggestions)
|
247
|
+
end
|
248
|
+
|
249
|
+
def format_suggestions(suggestions)
|
250
|
+
quoted_suggestions = Array(suggestions).map { |word| "'#{word}'" }
|
251
|
+
suggestion_str = case quoted_suggestions.size
|
252
|
+
when 1
|
253
|
+
quoted_suggestions.first
|
254
|
+
when 2
|
255
|
+
quoted_suggestions.join(' or ')
|
256
|
+
else
|
257
|
+
last_quoted = quoted_suggestions.pop
|
258
|
+
quoted_suggestions << "or #{last_quoted}"
|
259
|
+
quoted_suggestions.join(', ')
|
260
|
+
end
|
261
|
+
" with #{suggestion_str}"
|
262
|
+
end
|
263
|
+
end
|
264
|
+
end
|
265
|
+
end
|
266
|
+
end
|
@@ -14,6 +14,11 @@ module RuboCop
|
|
14
14
|
# convention that is used to implicitly indicate that an ivar should not
|
15
15
|
# be set or referenced outside of the memoization method.
|
16
16
|
#
|
17
|
+
# @safety
|
18
|
+
# This cop relies on the pattern `@instance_var ||= ...`,
|
19
|
+
# but this is sometimes used for other purposes than memoization
|
20
|
+
# so this cop is considered unsafe.
|
21
|
+
#
|
17
22
|
# @example EnforcedStyleForLeadingUnderscores: disallowed (default)
|
18
23
|
# # bad
|
19
24
|
# # Method foo is memoized using an instance variable that is
|
@@ -143,11 +148,12 @@ module RuboCop
|
|
143
148
|
include ConfigurableEnforcedStyle
|
144
149
|
|
145
150
|
MSG = 'Memoized variable `%<var>s` does not match ' \
|
146
|
-
|
151
|
+
'method name `%<method>s`. Use `@%<suggested_var>s` instead.'
|
147
152
|
UNDERSCORE_REQUIRED = 'Memoized variable `%<var>s` does not start ' \
|
148
|
-
|
153
|
+
'with `_`. Use `@%<suggested_var>s` instead.'
|
149
154
|
DYNAMIC_DEFINE_METHODS = %i[define_method define_singleton_method].to_set.freeze
|
150
155
|
|
156
|
+
# @!method method_definition?(node)
|
151
157
|
def_node_matcher :method_definition?, <<~PATTERN
|
152
158
|
${
|
153
159
|
(block (send _ %DYNAMIC_DEFINE_METHODS ({sym str} $_)) ...)
|
@@ -179,6 +185,7 @@ module RuboCop
|
|
179
185
|
end
|
180
186
|
# rubocop:enable Metrics/AbcSize
|
181
187
|
|
188
|
+
# @!method defined_memoized?(node, ivar)
|
182
189
|
def_node_matcher :defined_memoized?, <<~PATTERN
|
183
190
|
(begin
|
184
191
|
(if (defined $(ivar %1)) (return $(ivar %1)) nil?)
|
@@ -241,8 +248,7 @@ module RuboCop
|
|
241
248
|
def message(variable)
|
242
249
|
variable_name = variable.to_s.sub('@', '')
|
243
250
|
|
244
|
-
return UNDERSCORE_REQUIRED if style == :required &&
|
245
|
-
!variable_name.start_with?('_')
|
251
|
+
return UNDERSCORE_REQUIRED if style == :required && !variable_name.start_with?('_')
|
246
252
|
|
247
253
|
MSG
|
248
254
|
end
|
@@ -254,7 +260,7 @@ module RuboCop
|
|
254
260
|
end
|
255
261
|
|
256
262
|
def variable_name_candidates(method_name)
|
257
|
-
no_underscore = method_name.
|
263
|
+
no_underscore = method_name.delete_prefix('_')
|
258
264
|
with_underscore = "_#{method_name}"
|
259
265
|
case style
|
260
266
|
when :required
|
@@ -35,7 +35,10 @@ module RuboCop
|
|
35
35
|
|
36
36
|
MSG = 'Use %<style>s for method names.'
|
37
37
|
|
38
|
+
# @!method sym_name(node)
|
38
39
|
def_node_matcher :sym_name, '(sym $_name)'
|
40
|
+
|
41
|
+
# @!method str_name(node)
|
39
42
|
def_node_matcher :str_name, '(str $_name)'
|
40
43
|
|
41
44
|
def on_send(node)
|
@@ -50,8 +53,7 @@ module RuboCop
|
|
50
53
|
end
|
51
54
|
|
52
55
|
def on_def(node)
|
53
|
-
return if node.operator_method? ||
|
54
|
-
matches_ignored_pattern?(node.method_name)
|
56
|
+
return if node.operator_method? || matches_ignored_pattern?(node.method_name)
|
55
57
|
|
56
58
|
check_name(node, node.method_name, node.loc.name)
|
57
59
|
end
|
@@ -30,6 +30,7 @@ module RuboCop
|
|
30
30
|
class PredicateName < Base
|
31
31
|
include AllowedMethods
|
32
32
|
|
33
|
+
# @!method dynamic_method_define(node)
|
33
34
|
def_node_matcher :dynamic_method_define, <<~PATTERN
|
34
35
|
(send nil? #method_definition_macros
|
35
36
|
(sym $_)
|
@@ -43,8 +44,7 @@ module RuboCop
|
|
43
44
|
|
44
45
|
add_offense(
|
45
46
|
node.first_argument.loc.expression,
|
46
|
-
message: message(method_name,
|
47
|
-
expected_name(method_name.to_s, prefix))
|
47
|
+
message: message(method_name, expected_name(method_name.to_s, prefix))
|
48
48
|
)
|
49
49
|
end
|
50
50
|
end
|
@@ -9,6 +9,11 @@ module RuboCop
|
|
9
9
|
# The `PreferredName` config option takes a `String`. It represents
|
10
10
|
# the required name of the variable. Its default is `e`.
|
11
11
|
#
|
12
|
+
# NOTE: This cop does not consider nested rescues because it cannot
|
13
|
+
# guarantee that the variable from the outer rescue is not used within
|
14
|
+
# the inner rescue (in which case, changing the inner variable would
|
15
|
+
# shadow the outer variable).
|
16
|
+
#
|
12
17
|
# @example PreferredName: e (default)
|
13
18
|
# # bad
|
14
19
|
# begin
|
@@ -62,9 +67,17 @@ module RuboCop
|
|
62
67
|
offending_name = variable_name(node)
|
63
68
|
return unless offending_name
|
64
69
|
|
70
|
+
# Handle nested rescues by only requiring the outer one to use the
|
71
|
+
# configured variable name, so that nested rescues don't use the same
|
72
|
+
# variable.
|
73
|
+
return if node.each_ancestor(:resbody).any?
|
74
|
+
|
65
75
|
preferred_name = preferred_name(offending_name)
|
66
76
|
return if preferred_name.to_sym == offending_name
|
67
77
|
|
78
|
+
# check variable shadowing for exception variable
|
79
|
+
return if shadowed_variable_name?(node)
|
80
|
+
|
68
81
|
range = offense_range(node)
|
69
82
|
message = message(node)
|
70
83
|
|
@@ -140,6 +153,10 @@ module RuboCop
|
|
140
153
|
preferred_name = preferred_name(offending_name)
|
141
154
|
format(MSG, preferred: preferred_name, bad: offending_name)
|
142
155
|
end
|
156
|
+
|
157
|
+
def shadowed_variable_name?(node)
|
158
|
+
node.each_descendant(:lvar).any? { |n| n.children.first.to_s == preferred_name(n) }
|
159
|
+
end
|
143
160
|
end
|
144
161
|
end
|
145
162
|
end
|
data/lib/rubocop/cop/offense.rb
CHANGED
@@ -7,8 +7,7 @@ module RuboCop
|
|
7
7
|
include Comparable
|
8
8
|
|
9
9
|
# @api private
|
10
|
-
COMPARISON_ATTRIBUTES = %i[line column cop_name
|
11
|
-
message severity].freeze
|
10
|
+
COMPARISON_ATTRIBUTES = %i[line column cop_name message severity].freeze
|
12
11
|
|
13
12
|
# @api public
|
14
13
|
#
|
@@ -141,9 +140,7 @@ module RuboCop
|
|
141
140
|
# @return [Parser::Source::Range]
|
142
141
|
# the range of the code that is highlighted
|
143
142
|
def highlighted_area
|
144
|
-
Parser::Source::Range.new(source_line,
|
145
|
-
column,
|
146
|
-
column + column_length)
|
143
|
+
Parser::Source::Range.new(source_line, column, column + column_length)
|
147
144
|
end
|
148
145
|
|
149
146
|
# @api private
|
@@ -220,9 +217,7 @@ module RuboCop
|
|
220
217
|
alias eql? ==
|
221
218
|
|
222
219
|
def hash
|
223
|
-
COMPARISON_ATTRIBUTES.reduce(0)
|
224
|
-
hash ^ public_send(attribute).hash
|
225
|
-
end
|
220
|
+
COMPARISON_ATTRIBUTES.reduce(0) { |hash, attribute| hash ^ public_send(attribute).hash }
|
226
221
|
end
|
227
222
|
|
228
223
|
# @api public
|
data/lib/rubocop/cop/registry.rb
CHANGED
@@ -10,12 +10,7 @@ module RuboCop
|
|
10
10
|
|
11
11
|
def initialize(name, origin, badges)
|
12
12
|
super(
|
13
|
-
format(
|
14
|
-
MSG,
|
15
|
-
name: name,
|
16
|
-
origin: origin,
|
17
|
-
options: badges.to_a.join(' or ')
|
18
|
-
)
|
13
|
+
format(MSG, name: name, origin: origin, options: badges.to_a.join(' or '))
|
19
14
|
)
|
20
15
|
end
|
21
16
|
end
|
@@ -64,6 +59,11 @@ module RuboCop
|
|
64
59
|
with(without_department.values.flatten)
|
65
60
|
end
|
66
61
|
|
62
|
+
# @return [Boolean] Checks if given name is department
|
63
|
+
def department?(name)
|
64
|
+
departments.include? name.to_sym
|
65
|
+
end
|
66
|
+
|
67
67
|
def contains_cop_matching?(names)
|
68
68
|
cops.any? { |cop| cop.match?(names) }
|
69
69
|
end
|
@@ -150,16 +150,13 @@ module RuboCop
|
|
150
150
|
end
|
151
151
|
|
152
152
|
def enabled(config, only = [], only_safe: false)
|
153
|
-
select
|
154
|
-
only.include?(cop.cop_name) || enabled?(cop, config, only_safe)
|
155
|
-
end
|
153
|
+
select { |cop| only.include?(cop.cop_name) || enabled?(cop, config, only_safe) }
|
156
154
|
end
|
157
155
|
|
158
156
|
def enabled?(cop, config, only_safe)
|
159
157
|
cfg = config.for_cop(cop)
|
160
158
|
|
161
|
-
cop_enabled = cfg.fetch('Enabled') == true ||
|
162
|
-
enabled_pending_cop?(cfg, config)
|
159
|
+
cop_enabled = cfg.fetch('Enabled') == true || enabled_pending_cop?(cfg, config)
|
163
160
|
|
164
161
|
if only_safe
|
165
162
|
cop_enabled && cfg.fetch('Safe', true)
|
@@ -179,13 +176,17 @@ module RuboCop
|
|
179
176
|
cops.map(&:cop_name)
|
180
177
|
end
|
181
178
|
|
179
|
+
def names_for_department(department)
|
180
|
+
cops.select { |cop| cop.department == department.to_sym }.map(&:cop_name)
|
181
|
+
end
|
182
|
+
|
182
183
|
def ==(other)
|
183
184
|
cops == other.cops
|
184
185
|
end
|
185
186
|
|
186
187
|
def sort!
|
187
188
|
clear_enrollment_queue
|
188
|
-
@registry =
|
189
|
+
@registry = @registry.sort_by { |badge, _| badge.cop_name }.to_h
|
189
190
|
|
190
191
|
self
|
191
192
|
end
|
@@ -0,0 +1,49 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module RuboCop
|
4
|
+
module Cop
|
5
|
+
module Security
|
6
|
+
# Checks for the first argument to `IO.read`, `IO.binread`, `IO.write`, `IO.binwrite`,
|
7
|
+
# `IO.foreach`, and `IO.readlines`.
|
8
|
+
#
|
9
|
+
# If argument starts with a pipe character (`'|'`) and the receiver is the `IO` class,
|
10
|
+
# a subprocess is created in the same way as `Kernel#open`, and its output is returned.
|
11
|
+
# `Kernel#open` may allow unintentional command injection, which is the reason these
|
12
|
+
# `IO` methods are a security risk.
|
13
|
+
# Consider to use `File.read` to disable the behavior of subprocess invocation.
|
14
|
+
#
|
15
|
+
# @safety
|
16
|
+
# This cop is unsafe because false positive will occur if the variable passed as
|
17
|
+
# the first argument is a command that is not a file path.
|
18
|
+
#
|
19
|
+
# @example
|
20
|
+
#
|
21
|
+
# # bad
|
22
|
+
# IO.read(path)
|
23
|
+
# IO.read('path')
|
24
|
+
#
|
25
|
+
# # good
|
26
|
+
# File.read(path)
|
27
|
+
# File.read('path')
|
28
|
+
# IO.read('| command') # Allow intentional command invocation.
|
29
|
+
#
|
30
|
+
class IoMethods < Base
|
31
|
+
extend AutoCorrector
|
32
|
+
|
33
|
+
MSG = '`File.%<method_name>s` is safer than `IO.%<method_name>s`.'
|
34
|
+
RESTRICT_ON_SEND = %i[read binread write binwrite foreach readlines].freeze
|
35
|
+
|
36
|
+
def on_send(node)
|
37
|
+
return unless (receiver = node.receiver) && receiver.source == 'IO'
|
38
|
+
|
39
|
+
argument = node.first_argument
|
40
|
+
return if argument.respond_to?(:value) && argument.value.strip.start_with?('|')
|
41
|
+
|
42
|
+
add_offense(node, message: format(MSG, method_name: node.method_name)) do |corrector|
|
43
|
+
corrector.replace(receiver, 'File')
|
44
|
+
end
|
45
|
+
end
|
46
|
+
end
|
47
|
+
end
|
48
|
+
end
|
49
|
+
end
|
@@ -6,13 +6,14 @@ module RuboCop
|
|
6
6
|
# This cop checks for the use of JSON class methods which have potential
|
7
7
|
# security issues.
|
8
8
|
#
|
9
|
-
#
|
10
|
-
#
|
11
|
-
#
|
12
|
-
#
|
13
|
-
#
|
14
|
-
#
|
15
|
-
#
|
9
|
+
# @safety
|
10
|
+
# This cop's autocorrection is unsafe because it's potentially dangerous.
|
11
|
+
# If using a stream, like `JSON.load(open('file'))`, it will need to call
|
12
|
+
# `#read` manually, like `JSON.parse(open('file').read)`.
|
13
|
+
# If reading single values (rather than proper JSON objects), like
|
14
|
+
# `JSON.load('false')`, it will need to pass the `quirks_mode: true`
|
15
|
+
# option, like `JSON.parse('false', quirks_mode: true)`.
|
16
|
+
# Other similar issues may apply.
|
16
17
|
#
|
17
18
|
# @example
|
18
19
|
# # bad
|
@@ -28,6 +29,7 @@ module RuboCop
|
|
28
29
|
MSG = 'Prefer `JSON.parse` over `JSON.%<method>s`.'
|
29
30
|
RESTRICT_ON_SEND = %i[load restore].freeze
|
30
31
|
|
32
|
+
# @!method json_load(node)
|
31
33
|
def_node_matcher :json_load, <<~PATTERN
|
32
34
|
(send (const {nil? cbase} :JSON) ${:load :restore} ...)
|
33
35
|
PATTERN
|
@@ -22,6 +22,7 @@ module RuboCop
|
|
22
22
|
MSG = 'Avoid using `Marshal.%<method>s`.'
|
23
23
|
RESTRICT_ON_SEND = %i[load restore].freeze
|
24
24
|
|
25
|
+
# @!method marshal_load(node)
|
25
26
|
def_node_matcher :marshal_load, <<~PATTERN
|
26
27
|
(send (const {nil? cbase} :Marshal) ${:load :restore}
|
27
28
|
!(send (const {nil? cbase} :Marshal) :dump ...))
|
@@ -11,6 +11,10 @@ module RuboCop
|
|
11
11
|
# the argument of `Kernel#open` and `URI.open`. It would be better to use
|
12
12
|
# `File.open`, `IO.popen` or `URI.parse#open` explicitly.
|
13
13
|
#
|
14
|
+
# @safety
|
15
|
+
# This cop could register false positives if `open` is redefined
|
16
|
+
# in a class and then used without a receiver in that class.
|
17
|
+
#
|
14
18
|
# @example
|
15
19
|
# # bad
|
16
20
|
# open(something)
|
@@ -24,6 +28,7 @@ module RuboCop
|
|
24
28
|
MSG = 'The use of `%<receiver>sopen` is a serious security risk.'
|
25
29
|
RESTRICT_ON_SEND = %i[open].freeze
|
26
30
|
|
31
|
+
# @!method open?(node)
|
27
32
|
def_node_matcher :open?, <<~PATTERN
|
28
33
|
(send ${nil? (const {nil? cbase} :URI)} :open $!str ...)
|
29
34
|
PATTERN
|
@@ -7,6 +7,10 @@ module RuboCop
|
|
7
7
|
# potential security issues leading to remote code execution when
|
8
8
|
# loading from an untrusted source.
|
9
9
|
#
|
10
|
+
# @safety
|
11
|
+
# The behaviour of the code might change depending on what was
|
12
|
+
# in the YAML payload, since `YAML.safe_load` is more restrictive.
|
13
|
+
#
|
10
14
|
# @example
|
11
15
|
# # bad
|
12
16
|
# YAML.load("--- foo")
|
@@ -21,6 +25,7 @@ module RuboCop
|
|
21
25
|
MSG = 'Prefer using `YAML.safe_load` over `YAML.load`.'
|
22
26
|
RESTRICT_ON_SEND = %i[load].freeze
|
23
27
|
|
28
|
+
# @!method yaml_load(node)
|
24
29
|
def_node_matcher :yaml_load, <<~PATTERN
|
25
30
|
(send (const {nil? cbase} :YAML) :load ...)
|
26
31
|
PATTERN
|
@@ -47,7 +47,7 @@ module RuboCop
|
|
47
47
|
#
|
48
48
|
# end
|
49
49
|
#
|
50
|
-
# @example AllowModifiersOnSymbols: true
|
50
|
+
# @example AllowModifiersOnSymbols: true (default)
|
51
51
|
# # good
|
52
52
|
# class Foo
|
53
53
|
#
|
@@ -77,8 +77,9 @@ module RuboCop
|
|
77
77
|
|
78
78
|
RESTRICT_ON_SEND = %i[private protected public module_function].freeze
|
79
79
|
|
80
|
+
# @!method access_modifier_with_symbol?(node)
|
80
81
|
def_node_matcher :access_modifier_with_symbol?, <<~PATTERN
|
81
|
-
(send nil? {:private :protected :public} (sym _))
|
82
|
+
(send nil? {:private :protected :public :module_function} (sym _))
|
82
83
|
PATTERN
|
83
84
|
|
84
85
|
def on_send(node)
|
@@ -87,9 +88,7 @@ module RuboCop
|
|
87
88
|
return if allow_modifiers_on_symbols?(node)
|
88
89
|
|
89
90
|
if offense?(node)
|
90
|
-
add_offense(node.loc.selector)
|
91
|
-
opposite_style_detected
|
92
|
-
end
|
91
|
+
add_offense(node.loc.selector) { opposite_style_detected }
|
93
92
|
else
|
94
93
|
correct_style_detected
|
95
94
|
end
|