rubocop 1.84.2 → 1.86.1
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/config/default.yml +91 -15
- data/config/obsoletion.yml +5 -0
- data/lib/rubocop/cache_config.rb +1 -1
- data/lib/rubocop/cli/command/auto_generate_config.rb +1 -1
- data/lib/rubocop/cli/command/mcp.rb +19 -0
- data/lib/rubocop/cli/command/show_cops.rb +2 -2
- data/lib/rubocop/cli/command/show_docs_url.rb +1 -1
- data/lib/rubocop/cli.rb +6 -3
- data/lib/rubocop/config.rb +14 -10
- data/lib/rubocop/config_finder.rb +1 -1
- data/lib/rubocop/config_loader_resolver.rb +2 -1
- data/lib/rubocop/config_obsoletion/extracted_cop.rb +4 -2
- data/lib/rubocop/config_store.rb +1 -1
- data/lib/rubocop/config_validator.rb +1 -1
- data/lib/rubocop/cop/correctors/condition_corrector.rb +1 -1
- data/lib/rubocop/cop/correctors/percent_literal_corrector.rb +2 -2
- data/lib/rubocop/cop/documentation.rb +2 -3
- data/lib/rubocop/cop/gemspec/require_mfa.rb +1 -1
- data/lib/rubocop/cop/internal_affairs/itblock_handler.rb +69 -0
- data/lib/rubocop/cop/internal_affairs.rb +1 -0
- data/lib/rubocop/cop/layout/argument_alignment.rb +2 -2
- data/lib/rubocop/cop/layout/array_alignment.rb +1 -1
- data/lib/rubocop/cop/layout/dot_position.rb +1 -1
- data/lib/rubocop/cop/layout/empty_line_after_guard_clause.rb +9 -2
- data/lib/rubocop/cop/layout/empty_line_between_defs.rb +1 -1
- data/lib/rubocop/cop/layout/empty_lines_around_attribute_accessor.rb +1 -0
- data/lib/rubocop/cop/layout/empty_lines_around_block_body.rb +12 -2
- data/lib/rubocop/cop/layout/empty_lines_around_class_body.rb +16 -2
- data/lib/rubocop/cop/layout/empty_lines_around_module_body.rb +16 -2
- data/lib/rubocop/cop/layout/end_alignment.rb +6 -3
- data/lib/rubocop/cop/layout/first_hash_element_indentation.rb +7 -1
- data/lib/rubocop/cop/layout/hash_alignment.rb +1 -1
- data/lib/rubocop/cop/layout/indentation_width.rb +1 -1
- data/lib/rubocop/cop/layout/line_length.rb +5 -3
- data/lib/rubocop/cop/layout/multiline_assignment_layout.rb +9 -2
- data/lib/rubocop/cop/layout/multiline_method_call_indentation.rb +28 -3
- data/lib/rubocop/cop/layout/parameter_alignment.rb +1 -1
- data/lib/rubocop/cop/layout/redundant_line_break.rb +1 -1
- data/lib/rubocop/cop/layout/space_around_block_parameters.rb +1 -1
- data/lib/rubocop/cop/layout/space_around_keyword.rb +3 -1
- data/lib/rubocop/cop/layout/space_in_lambda_literal.rb +1 -0
- data/lib/rubocop/cop/lint/constant_reassignment.rb +59 -9
- data/lib/rubocop/cop/lint/constant_resolution.rb +1 -1
- data/lib/rubocop/cop/lint/data_define_override.rb +63 -0
- data/lib/rubocop/cop/lint/duplicate_methods.rb +55 -8
- data/lib/rubocop/cop/lint/empty_block.rb +1 -1
- data/lib/rubocop/cop/lint/empty_conditional_body.rb +6 -1
- data/lib/rubocop/cop/lint/empty_in_pattern.rb +8 -1
- data/lib/rubocop/cop/lint/empty_when.rb +8 -1
- data/lib/rubocop/cop/lint/interpolation_check.rb +7 -2
- data/lib/rubocop/cop/lint/next_without_accumulator.rb +2 -0
- data/lib/rubocop/cop/lint/non_deterministic_require_order.rb +3 -1
- data/lib/rubocop/cop/lint/number_conversion.rb +1 -1
- data/lib/rubocop/cop/lint/redundant_cop_enable_directive.rb +0 -9
- data/lib/rubocop/cop/lint/redundant_safe_navigation.rb +23 -6
- data/lib/rubocop/cop/lint/safe_navigation_chain.rb +17 -0
- data/lib/rubocop/cop/lint/safe_navigation_consistency.rb +7 -1
- data/lib/rubocop/cop/lint/syntax.rb +25 -1
- data/lib/rubocop/cop/lint/trailing_comma_in_attribute_declaration.rb +1 -0
- data/lib/rubocop/cop/lint/unmodified_reduce_accumulator.rb +1 -0
- data/lib/rubocop/cop/lint/unreachable_pattern_branch.rb +113 -0
- data/lib/rubocop/cop/lint/unused_method_argument.rb +10 -0
- data/lib/rubocop/cop/lint/useless_assignment.rb +1 -1
- data/lib/rubocop/cop/lint/useless_constant_scoping.rb +4 -4
- data/lib/rubocop/cop/lint/useless_default_value_argument.rb +2 -0
- data/lib/rubocop/cop/lint/utils/nil_receiver_checker.rb +22 -7
- data/lib/rubocop/cop/lint/void.rb +32 -12
- data/lib/rubocop/cop/metrics/block_nesting.rb +23 -0
- data/lib/rubocop/cop/migration/department_name.rb +12 -1
- data/lib/rubocop/cop/mixin/check_line_breakable.rb +1 -1
- data/lib/rubocop/cop/mixin/check_single_line_suitability.rb +2 -2
- data/lib/rubocop/cop/mixin/hash_transform_method/autocorrection.rb +63 -0
- data/lib/rubocop/cop/mixin/hash_transform_method.rb +10 -60
- data/lib/rubocop/cop/naming/block_parameter_name.rb +1 -1
- data/lib/rubocop/cop/registry.rb +20 -13
- data/lib/rubocop/cop/security/eval.rb +15 -2
- data/lib/rubocop/cop/style/access_modifier_declarations.rb +14 -2
- data/lib/rubocop/cop/style/accessor_grouping.rb +4 -2
- data/lib/rubocop/cop/style/alias.rb +4 -1
- data/lib/rubocop/cop/style/and_or.rb +1 -0
- data/lib/rubocop/cop/style/arguments_forwarding.rb +25 -7
- data/lib/rubocop/cop/style/array_join.rb +4 -2
- data/lib/rubocop/cop/style/ascii_comments.rb +6 -3
- data/lib/rubocop/cop/style/attr.rb +5 -2
- data/lib/rubocop/cop/style/bare_percent_literals.rb +3 -1
- data/lib/rubocop/cop/style/begin_block.rb +3 -1
- data/lib/rubocop/cop/style/block_delimiters.rb +25 -33
- data/lib/rubocop/cop/style/case_equality.rb +4 -0
- data/lib/rubocop/cop/style/class_and_module_children.rb +10 -2
- data/lib/rubocop/cop/style/collection_compact.rb +36 -16
- data/lib/rubocop/cop/style/colon_method_call.rb +3 -1
- data/lib/rubocop/cop/style/concat_array_literals.rb +2 -0
- data/lib/rubocop/cop/style/conditional_assignment.rb +0 -4
- data/lib/rubocop/cop/style/copyright.rb +1 -1
- data/lib/rubocop/cop/style/each_for_simple_loop.rb +1 -1
- data/lib/rubocop/cop/style/each_with_object.rb +2 -0
- data/lib/rubocop/cop/style/empty_block_parameter.rb +1 -1
- data/lib/rubocop/cop/style/empty_class_definition.rb +43 -20
- data/lib/rubocop/cop/style/empty_lambda_parameter.rb +1 -1
- data/lib/rubocop/cop/style/encoding.rb +7 -1
- data/lib/rubocop/cop/style/end_block.rb +3 -1
- data/lib/rubocop/cop/style/endless_method.rb +8 -3
- data/lib/rubocop/cop/style/file_open.rb +84 -0
- data/lib/rubocop/cop/style/for.rb +3 -0
- data/lib/rubocop/cop/style/format_string_token.rb +29 -2
- data/lib/rubocop/cop/style/global_vars.rb +5 -2
- data/lib/rubocop/cop/style/guard_clause.rb +9 -6
- data/lib/rubocop/cop/style/hash_as_last_array_item.rb +21 -5
- data/lib/rubocop/cop/style/hash_lookup_method.rb +7 -0
- data/lib/rubocop/cop/style/hash_transform_keys.rb +17 -7
- data/lib/rubocop/cop/style/hash_transform_values.rb +17 -7
- data/lib/rubocop/cop/style/if_inside_else.rb +1 -5
- data/lib/rubocop/cop/style/if_unless_modifier.rb +14 -3
- data/lib/rubocop/cop/style/if_with_semicolon.rb +7 -5
- data/lib/rubocop/cop/style/inline_comment.rb +4 -1
- data/lib/rubocop/cop/style/ip_addresses.rb +1 -2
- data/lib/rubocop/cop/style/magic_comment_format.rb +2 -2
- data/lib/rubocop/cop/style/map_join.rb +123 -0
- data/lib/rubocop/cop/style/method_call_with_args_parentheses/require_parentheses.rb +5 -3
- data/lib/rubocop/cop/style/module_member_existence_check.rb +1 -11
- data/lib/rubocop/cop/style/multiline_if_then.rb +3 -1
- data/lib/rubocop/cop/style/mutable_constant.rb +1 -1
- data/lib/rubocop/cop/style/nil_comparison.rb +2 -3
- data/lib/rubocop/cop/style/nil_lambda.rb +1 -1
- data/lib/rubocop/cop/style/non_nil_check.rb +5 -11
- data/lib/rubocop/cop/style/not.rb +2 -0
- data/lib/rubocop/cop/style/numeric_literals.rb +3 -2
- data/lib/rubocop/cop/style/one_class_per_file.rb +115 -0
- data/lib/rubocop/cop/style/one_line_conditional.rb +4 -3
- data/lib/rubocop/cop/style/parallel_assignment.rb +4 -0
- data/lib/rubocop/cop/style/partition_instead_of_double_select.rb +270 -0
- data/lib/rubocop/cop/style/percent_literal_delimiters.rb +2 -0
- data/lib/rubocop/cop/style/predicate_with_kind.rb +84 -0
- data/lib/rubocop/cop/style/proc.rb +3 -2
- data/lib/rubocop/cop/style/raise_args.rb +1 -1
- data/lib/rubocop/cop/style/reduce_to_hash.rb +184 -0
- data/lib/rubocop/cop/style/redundant_begin.rb +3 -3
- data/lib/rubocop/cop/style/redundant_each.rb +3 -3
- data/lib/rubocop/cop/style/redundant_fetch_block.rb +1 -1
- data/lib/rubocop/cop/style/redundant_interpolation_unfreeze.rb +26 -10
- data/lib/rubocop/cop/style/redundant_line_continuation.rb +16 -0
- data/lib/rubocop/cop/style/redundant_min_max_by.rb +93 -0
- data/lib/rubocop/cop/style/redundant_parentheses.rb +25 -22
- data/lib/rubocop/cop/style/redundant_percent_q.rb +4 -1
- data/lib/rubocop/cop/style/redundant_return.rb +3 -1
- data/lib/rubocop/cop/style/redundant_self_assignment_branch.rb +0 -5
- data/lib/rubocop/cop/style/redundant_struct_keyword_init.rb +114 -0
- data/lib/rubocop/cop/style/safe_navigation.rb +7 -7
- data/lib/rubocop/cop/style/select_by_kind.rb +158 -0
- data/lib/rubocop/cop/style/select_by_range.rb +197 -0
- data/lib/rubocop/cop/style/select_by_regexp.rb +51 -21
- data/lib/rubocop/cop/style/semicolon.rb +2 -0
- data/lib/rubocop/cop/style/single_line_block_params.rb +2 -2
- data/lib/rubocop/cop/style/single_line_do_end_block.rb +1 -1
- data/lib/rubocop/cop/style/single_line_methods.rb +3 -1
- data/lib/rubocop/cop/style/special_global_vars.rb +6 -1
- data/lib/rubocop/cop/style/symbol_proc.rb +4 -3
- data/lib/rubocop/cop/style/tally_method.rb +181 -0
- data/lib/rubocop/cop/style/trailing_comma_in_block_args.rb +1 -1
- data/lib/rubocop/cop/style/trailing_method_end_statement.rb +1 -0
- data/lib/rubocop/cop/style/yoda_expression.rb +1 -1
- data/lib/rubocop/cop/variable_force/branch.rb +2 -2
- data/lib/rubocop/directive_comment.rb +2 -1
- data/lib/rubocop/formatter/disabled_config_formatter.rb +1 -1
- data/lib/rubocop/formatter/formatter_set.rb +1 -1
- data/lib/rubocop/formatter/junit_formatter.rb +1 -1
- data/lib/rubocop/formatter/simple_text_formatter.rb +0 -2
- data/lib/rubocop/formatter/worst_offenders_formatter.rb +1 -1
- data/lib/rubocop/formatter.rb +22 -21
- data/lib/rubocop/lsp/diagnostic.rb +1 -0
- data/lib/rubocop/lsp/routes.rb +10 -3
- data/lib/rubocop/mcp/server.rb +200 -0
- data/lib/rubocop/options.rb +10 -1
- data/lib/rubocop/path_util.rb +14 -2
- data/lib/rubocop/plugin/loader.rb +1 -1
- data/lib/rubocop/result_cache.rb +22 -10
- data/lib/rubocop/rspec/cop_helper.rb +8 -0
- data/lib/rubocop/rspec/shared_contexts.rb +11 -2
- data/lib/rubocop/runner.rb +8 -3
- data/lib/rubocop/server/cache.rb +5 -7
- data/lib/rubocop/server/core.rb +2 -0
- data/lib/rubocop/target_finder.rb +1 -1
- data/lib/rubocop/target_ruby.rb +18 -12
- data/lib/rubocop/version.rb +2 -2
- data/lib/rubocop.rb +14 -0
- metadata +22 -5
|
@@ -4,7 +4,8 @@ module RuboCop
|
|
|
4
4
|
module Cop
|
|
5
5
|
module Style
|
|
6
6
|
# Checks for big numeric literals without `_` between groups
|
|
7
|
-
# of digits in them.
|
|
7
|
+
# of digits in them. Underscores make large numbers easier to
|
|
8
|
+
# read by visually separating groups of digits.
|
|
8
9
|
#
|
|
9
10
|
# Additional allowed patterns can be added by adding regexps to
|
|
10
11
|
# the `AllowedPatterns` configuration. All regexps are treated
|
|
@@ -116,7 +117,7 @@ module RuboCop
|
|
|
116
117
|
end
|
|
117
118
|
|
|
118
119
|
def allowed_numbers
|
|
119
|
-
cop_config.fetch('AllowedNumbers', []).map(&:to_s)
|
|
120
|
+
@allowed_numbers ||= cop_config.fetch('AllowedNumbers', []).map(&:to_s).freeze
|
|
120
121
|
end
|
|
121
122
|
|
|
122
123
|
def allowed_patterns
|
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module RuboCop
|
|
4
|
+
module Cop
|
|
5
|
+
module Style
|
|
6
|
+
# Checks that each source file defines at most one top-level class or module.
|
|
7
|
+
#
|
|
8
|
+
# Keeping one class or module per file makes it easier to find and navigate
|
|
9
|
+
# code, and follows the convention used by most Ruby projects.
|
|
10
|
+
#
|
|
11
|
+
# Classes and modules listed in `AllowedClasses` are not counted toward the
|
|
12
|
+
# limit. This is useful for small ancillary classes like custom exception
|
|
13
|
+
# classes that logically belong with the main class.
|
|
14
|
+
#
|
|
15
|
+
# @example
|
|
16
|
+
# # bad - Multiple top-level classes
|
|
17
|
+
# class Foo
|
|
18
|
+
# end
|
|
19
|
+
#
|
|
20
|
+
# class Bar
|
|
21
|
+
# end
|
|
22
|
+
#
|
|
23
|
+
# # bad - Multiple top-level modules
|
|
24
|
+
# module Foo
|
|
25
|
+
# end
|
|
26
|
+
#
|
|
27
|
+
# module Bar
|
|
28
|
+
# end
|
|
29
|
+
#
|
|
30
|
+
# # bad - A top-level class and a top-level module
|
|
31
|
+
# class Foo
|
|
32
|
+
# end
|
|
33
|
+
#
|
|
34
|
+
# module Bar
|
|
35
|
+
# end
|
|
36
|
+
#
|
|
37
|
+
# # good - A single top-level class
|
|
38
|
+
# class Foo
|
|
39
|
+
# end
|
|
40
|
+
#
|
|
41
|
+
# # good - A single top-level module
|
|
42
|
+
# module Foo
|
|
43
|
+
# end
|
|
44
|
+
#
|
|
45
|
+
# # good - Nested classes within a single top-level class
|
|
46
|
+
# class Foo
|
|
47
|
+
# class Bar
|
|
48
|
+
# end
|
|
49
|
+
# end
|
|
50
|
+
#
|
|
51
|
+
# # good - Multiple classes within a single top-level module
|
|
52
|
+
# module Foo
|
|
53
|
+
# class Bar
|
|
54
|
+
# end
|
|
55
|
+
#
|
|
56
|
+
# class Baz
|
|
57
|
+
# end
|
|
58
|
+
# end
|
|
59
|
+
#
|
|
60
|
+
# @example AllowedClasses: ['AllowedClass']
|
|
61
|
+
# # good
|
|
62
|
+
# class Foo
|
|
63
|
+
# end
|
|
64
|
+
#
|
|
65
|
+
# class AllowedClass
|
|
66
|
+
# end
|
|
67
|
+
#
|
|
68
|
+
class OneClassPerFile < Base
|
|
69
|
+
include RangeHelp
|
|
70
|
+
|
|
71
|
+
MSG = 'Do not define multiple classes/modules at the top level in a single file.'
|
|
72
|
+
|
|
73
|
+
def on_new_investigation
|
|
74
|
+
@top_level_definitions = []
|
|
75
|
+
end
|
|
76
|
+
|
|
77
|
+
def on_class(node)
|
|
78
|
+
check_top_level(node)
|
|
79
|
+
end
|
|
80
|
+
|
|
81
|
+
def on_module(node)
|
|
82
|
+
check_top_level(node)
|
|
83
|
+
end
|
|
84
|
+
|
|
85
|
+
private
|
|
86
|
+
|
|
87
|
+
def check_top_level(node)
|
|
88
|
+
return unless top_level_definition?(node)
|
|
89
|
+
return if allowed_class?(node)
|
|
90
|
+
|
|
91
|
+
@top_level_definitions << node
|
|
92
|
+
return unless @top_level_definitions.length > 1
|
|
93
|
+
|
|
94
|
+
add_offense(range_between(node.source_range.begin_pos, node.loc.name.end_pos))
|
|
95
|
+
end
|
|
96
|
+
|
|
97
|
+
def top_level_definition?(node)
|
|
98
|
+
if node.parent&.begin_type?
|
|
99
|
+
node.parent.root?
|
|
100
|
+
else
|
|
101
|
+
node.root?
|
|
102
|
+
end
|
|
103
|
+
end
|
|
104
|
+
|
|
105
|
+
def allowed_class?(node)
|
|
106
|
+
allowed_classes.include?(node.identifier.short_name)
|
|
107
|
+
end
|
|
108
|
+
|
|
109
|
+
def allowed_classes
|
|
110
|
+
@allowed_classes ||= cop_config.fetch('AllowedClasses', []).map(&:intern)
|
|
111
|
+
end
|
|
112
|
+
end
|
|
113
|
+
end
|
|
114
|
+
end
|
|
115
|
+
end
|
|
@@ -3,9 +3,10 @@
|
|
|
3
3
|
module RuboCop
|
|
4
4
|
module Cop
|
|
5
5
|
module Style
|
|
6
|
-
# Checks for uses of if/then/else/end constructs on a single line.
|
|
7
|
-
#
|
|
8
|
-
#
|
|
6
|
+
# Checks for uses of `if/then/else/end` constructs on a single line.
|
|
7
|
+
# A ternary operator (`?:`) or multi-line `if` is more readable.
|
|
8
|
+
# `AlwaysCorrectToMultiline` config option can be set to `true` to autocorrect all offenses to
|
|
9
|
+
# multi-line constructs. When `AlwaysCorrectToMultiline` is `false` (default case) the
|
|
9
10
|
# autocorrect will first try converting them to ternary operators.
|
|
10
11
|
#
|
|
11
12
|
# @example
|
|
@@ -4,6 +4,10 @@ module RuboCop
|
|
|
4
4
|
module Cop
|
|
5
5
|
module Style
|
|
6
6
|
# Checks for simple usages of parallel assignment.
|
|
7
|
+
# Parallel assignment is less readable than individual
|
|
8
|
+
# assignments and makes it harder to follow what each
|
|
9
|
+
# variable is being set to.
|
|
10
|
+
#
|
|
7
11
|
# This will only complain when the number of variables
|
|
8
12
|
# being assigned matched the number of assigning variables.
|
|
9
13
|
#
|
|
@@ -0,0 +1,270 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module RuboCop
|
|
4
|
+
module Cop
|
|
5
|
+
module Style
|
|
6
|
+
# Checks for consecutive calls to `select`/`filter`/`find_all` and `reject`
|
|
7
|
+
# on the same receiver with the same block body, where `partition` could be
|
|
8
|
+
# used instead. Also detects two `select` or two `reject` calls where one
|
|
9
|
+
# block negates the other with `!`. Using `partition` reduces two collection
|
|
10
|
+
# traversals to one.
|
|
11
|
+
#
|
|
12
|
+
# @safety
|
|
13
|
+
# This cop is unsafe because:
|
|
14
|
+
#
|
|
15
|
+
# * `Hash#select` and `Hash#reject` return hashes, but `Hash#partition`
|
|
16
|
+
# returns nested arrays.
|
|
17
|
+
# * When the receiver has side effects, calling it once (with `partition`)
|
|
18
|
+
# versus twice (with `select` + `reject`) may produce different results.
|
|
19
|
+
# * Custom classes may override `select`/`reject` without providing a
|
|
20
|
+
# compatible `partition` method.
|
|
21
|
+
#
|
|
22
|
+
# @example
|
|
23
|
+
# # bad
|
|
24
|
+
# positives = array.select { |x| x > 0 }
|
|
25
|
+
# negatives = array.reject { |x| x > 0 }
|
|
26
|
+
#
|
|
27
|
+
# # bad
|
|
28
|
+
# positives = array.filter { |x| x > 0 }
|
|
29
|
+
# negatives = array.reject { |x| x > 0 }
|
|
30
|
+
#
|
|
31
|
+
# # bad
|
|
32
|
+
# negatives = array.reject { |x| x > 0 }
|
|
33
|
+
# positives = array.select { |x| x > 0 }
|
|
34
|
+
#
|
|
35
|
+
# # bad
|
|
36
|
+
# positives = array.select(&:positive?)
|
|
37
|
+
# negatives = array.reject(&:positive?)
|
|
38
|
+
#
|
|
39
|
+
# # bad
|
|
40
|
+
# positives = array.select(&:positive?)
|
|
41
|
+
# negatives = array.reject { |x| x.positive? }
|
|
42
|
+
#
|
|
43
|
+
# # bad
|
|
44
|
+
# positives = array.select { |x| x.positive? }
|
|
45
|
+
# non_positives = array.select { |x| !x.positive? }
|
|
46
|
+
#
|
|
47
|
+
# # good
|
|
48
|
+
# positives, negatives = array.partition { |x| x > 0 }
|
|
49
|
+
#
|
|
50
|
+
# # good
|
|
51
|
+
# positives, non_positives = array.partition { |x| x.positive? }
|
|
52
|
+
#
|
|
53
|
+
# # good
|
|
54
|
+
# positives, negatives = array.partition(&:positive?)
|
|
55
|
+
#
|
|
56
|
+
class PartitionInsteadOfDoubleSelect < Base
|
|
57
|
+
include RangeHelp
|
|
58
|
+
extend AutoCorrector
|
|
59
|
+
|
|
60
|
+
MSG = 'Use `partition` instead of consecutive `%<first>s` and `%<second>s` calls.'
|
|
61
|
+
|
|
62
|
+
SELECT_METHODS = %i[select filter find_all].freeze
|
|
63
|
+
CANDIDATE_METHODS = (SELECT_METHODS + %i[reject]).to_set.freeze
|
|
64
|
+
RESTRICT_ON_SEND = (SELECT_METHODS + %i[reject]).freeze
|
|
65
|
+
|
|
66
|
+
# @!method symbol_proc_method?(node)
|
|
67
|
+
def_node_matcher :symbol_proc_method?, <<~PATTERN
|
|
68
|
+
(block _ (args (arg _name)) (send (lvar _name) $_method_name))
|
|
69
|
+
PATTERN
|
|
70
|
+
|
|
71
|
+
def on_block(node)
|
|
72
|
+
return unless CANDIDATE_METHODS.include?(node.method_name)
|
|
73
|
+
|
|
74
|
+
find_and_register_offense(node)
|
|
75
|
+
end
|
|
76
|
+
alias on_numblock on_block
|
|
77
|
+
alias on_itblock on_block
|
|
78
|
+
|
|
79
|
+
def on_send(node)
|
|
80
|
+
return unless node.last_argument&.block_pass_type?
|
|
81
|
+
|
|
82
|
+
find_and_register_offense(node)
|
|
83
|
+
end
|
|
84
|
+
alias on_csend on_send
|
|
85
|
+
|
|
86
|
+
private
|
|
87
|
+
|
|
88
|
+
def find_and_register_offense(node)
|
|
89
|
+
container = node_container(node)
|
|
90
|
+
return unless container
|
|
91
|
+
|
|
92
|
+
sibling_container = container.left_sibling
|
|
93
|
+
sibling = find_matching_candidate(node, sibling_container)
|
|
94
|
+
return unless sibling
|
|
95
|
+
|
|
96
|
+
register_offense(node, sibling, container, sibling_container)
|
|
97
|
+
end
|
|
98
|
+
|
|
99
|
+
def node_container(node)
|
|
100
|
+
parent = node.parent
|
|
101
|
+
if parent&.begin_type?
|
|
102
|
+
node
|
|
103
|
+
elsif parent&.assignment? && parent.parent&.begin_type?
|
|
104
|
+
parent
|
|
105
|
+
end
|
|
106
|
+
end
|
|
107
|
+
|
|
108
|
+
def find_matching_candidate(node, sibling_container)
|
|
109
|
+
return unless sibling_container
|
|
110
|
+
|
|
111
|
+
sibling = extract_candidate(sibling_container)
|
|
112
|
+
return unless sibling
|
|
113
|
+
return unless node.receiver == sibling.receiver
|
|
114
|
+
return unless matching_pair?(node, sibling)
|
|
115
|
+
|
|
116
|
+
sibling
|
|
117
|
+
end
|
|
118
|
+
|
|
119
|
+
def matching_pair?(node, sibling)
|
|
120
|
+
(complementary_pair?(node, sibling) && equivalent_predicate?(node, sibling)) ||
|
|
121
|
+
(node.method?(sibling.method_name) && negated_predicate?(node, sibling))
|
|
122
|
+
end
|
|
123
|
+
|
|
124
|
+
def extract_candidate(container)
|
|
125
|
+
extract_block(container) || extract_block_pass_send(container)
|
|
126
|
+
end
|
|
127
|
+
|
|
128
|
+
def extract_block(container)
|
|
129
|
+
if container.any_block_type?
|
|
130
|
+
container
|
|
131
|
+
elsif container.assignment?
|
|
132
|
+
rhs = container.children.last
|
|
133
|
+
rhs if rhs&.any_block_type?
|
|
134
|
+
end
|
|
135
|
+
end
|
|
136
|
+
|
|
137
|
+
def extract_block_pass_send(container)
|
|
138
|
+
node = container.assignment? ? container.children.last : container
|
|
139
|
+
return unless node&.type?(:call)
|
|
140
|
+
return unless node.last_argument&.block_pass_type?
|
|
141
|
+
|
|
142
|
+
node
|
|
143
|
+
end
|
|
144
|
+
|
|
145
|
+
def complementary_pair?(node1, node2)
|
|
146
|
+
m1 = node1.method_name
|
|
147
|
+
m2 = node2.method_name
|
|
148
|
+
(SELECT_METHODS.include?(m1) && m2 == :reject) ||
|
|
149
|
+
(m1 == :reject && SELECT_METHODS.include?(m2))
|
|
150
|
+
end
|
|
151
|
+
|
|
152
|
+
def equivalent_predicate?(node1, node2)
|
|
153
|
+
if node1.any_block_type? && node2.any_block_type?
|
|
154
|
+
same_block_contents?(node1, node2)
|
|
155
|
+
elsif node1.any_block_type?
|
|
156
|
+
block_matches_block_pass?(node1, node2)
|
|
157
|
+
elsif node2.any_block_type?
|
|
158
|
+
block_matches_block_pass?(node2, node1)
|
|
159
|
+
else
|
|
160
|
+
node1.last_argument == node2.last_argument
|
|
161
|
+
end
|
|
162
|
+
end
|
|
163
|
+
|
|
164
|
+
def same_block_contents?(block1, block2)
|
|
165
|
+
return false unless block1.type == block2.type
|
|
166
|
+
|
|
167
|
+
if block1.block_type?
|
|
168
|
+
block1.arguments == block2.arguments &&
|
|
169
|
+
block1.body == block2.body
|
|
170
|
+
else
|
|
171
|
+
block1.body == block2.body
|
|
172
|
+
end
|
|
173
|
+
end
|
|
174
|
+
|
|
175
|
+
def block_matches_block_pass?(block_node, send_node)
|
|
176
|
+
method_name = symbol_proc_method?(block_node)
|
|
177
|
+
return false unless method_name
|
|
178
|
+
|
|
179
|
+
sym_node = send_node.last_argument.children.first
|
|
180
|
+
sym_node.sym_type? && sym_node.children.first == method_name
|
|
181
|
+
end
|
|
182
|
+
|
|
183
|
+
def negated_predicate?(node1, node2)
|
|
184
|
+
return false unless node1.any_block_type? && node2.any_block_type?
|
|
185
|
+
return false unless node1.type == node2.type
|
|
186
|
+
return false if node1.block_type? && node1.arguments != node2.arguments
|
|
187
|
+
|
|
188
|
+
negated_body?(node1.body, node2.body) || negated_body?(node2.body, node1.body)
|
|
189
|
+
end
|
|
190
|
+
|
|
191
|
+
def negated_body?(body1, body2)
|
|
192
|
+
body1&.send_type? && body1.method?(:!) && body1.receiver == body2
|
|
193
|
+
end
|
|
194
|
+
|
|
195
|
+
def register_offense(node, sibling, container, sibling_container)
|
|
196
|
+
message = format(MSG, first: sibling.method_name, second: node.method_name)
|
|
197
|
+
|
|
198
|
+
add_offense(container, message: message) do |corrector|
|
|
199
|
+
next unless both_lvasgn?(container, sibling_container)
|
|
200
|
+
|
|
201
|
+
autocorrect(corrector, node, sibling, container, sibling_container)
|
|
202
|
+
end
|
|
203
|
+
end
|
|
204
|
+
|
|
205
|
+
def both_lvasgn?(container, sibling_container)
|
|
206
|
+
container.lvasgn_type? && sibling_container.lvasgn_type?
|
|
207
|
+
end
|
|
208
|
+
|
|
209
|
+
def autocorrect(corrector, node, sibling, container, sibling_container)
|
|
210
|
+
if complementary_pair?(node, sibling)
|
|
211
|
+
select_var, reject_var =
|
|
212
|
+
complementary_variable_order(sibling, container, sibling_container)
|
|
213
|
+
partition_node = select_node_for(sibling, container)
|
|
214
|
+
else
|
|
215
|
+
select_var, reject_var, partition_node =
|
|
216
|
+
negation_partition_args(node, sibling, container, sibling_container)
|
|
217
|
+
end
|
|
218
|
+
|
|
219
|
+
partition_call = build_partition_call(partition_node)
|
|
220
|
+
replacement = "#{select_var}, #{reject_var} = #{partition_call}"
|
|
221
|
+
|
|
222
|
+
corrector.replace(sibling_container, replacement)
|
|
223
|
+
range = range_by_whole_lines(container.source_range, include_final_newline: true)
|
|
224
|
+
corrector.remove(range)
|
|
225
|
+
end
|
|
226
|
+
|
|
227
|
+
def complementary_variable_order(sibling, container, sibling_container)
|
|
228
|
+
if SELECT_METHODS.include?(sibling.method_name)
|
|
229
|
+
[sibling_container.children.first, container.children.first]
|
|
230
|
+
else
|
|
231
|
+
[container.children.first, sibling_container.children.first]
|
|
232
|
+
end
|
|
233
|
+
end
|
|
234
|
+
|
|
235
|
+
def negation_partition_args(node, sibling, container, sibling_container)
|
|
236
|
+
node_is_negated = negated_body?(node.body, sibling.body)
|
|
237
|
+
is_select = SELECT_METHODS.include?(node.method_name)
|
|
238
|
+
# For select: non-negated is truthy (first). For reject: negated is truthy (first).
|
|
239
|
+
node_is_truthy = is_select != node_is_negated
|
|
240
|
+
partition_node = node_is_negated ? sibling : node
|
|
241
|
+
|
|
242
|
+
if node_is_truthy
|
|
243
|
+
[container.children.first, sibling_container.children.first, partition_node]
|
|
244
|
+
else
|
|
245
|
+
[sibling_container.children.first, container.children.first, partition_node]
|
|
246
|
+
end
|
|
247
|
+
end
|
|
248
|
+
|
|
249
|
+
def select_node_for(sibling, container)
|
|
250
|
+
if SELECT_METHODS.include?(sibling.method_name)
|
|
251
|
+
sibling
|
|
252
|
+
else
|
|
253
|
+
container.children.last
|
|
254
|
+
end
|
|
255
|
+
end
|
|
256
|
+
|
|
257
|
+
def build_partition_call(node)
|
|
258
|
+
source = node.source
|
|
259
|
+
send_node = node.any_block_type? ? node.send_node : node
|
|
260
|
+
selector = send_node.loc.selector
|
|
261
|
+
offset = node.source_range.begin_pos
|
|
262
|
+
method_start = selector.begin_pos - offset
|
|
263
|
+
method_end = selector.end_pos - offset
|
|
264
|
+
|
|
265
|
+
"#{source[0...method_start]}partition#{source[method_end..]}"
|
|
266
|
+
end
|
|
267
|
+
end
|
|
268
|
+
end
|
|
269
|
+
end
|
|
270
|
+
end
|
|
@@ -4,6 +4,8 @@ module RuboCop
|
|
|
4
4
|
module Cop
|
|
5
5
|
module Style
|
|
6
6
|
# Enforces the consistent usage of `%`-literal delimiters.
|
|
7
|
+
# Using consistent delimiters across the codebase reduces
|
|
8
|
+
# cognitive load when reading `%`-literals.
|
|
7
9
|
#
|
|
8
10
|
# Specify the 'default' key to set all preferred delimiters at once. You
|
|
9
11
|
# can continue to specify individual preferred delimiters to override the
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module RuboCop
|
|
4
|
+
module Cop
|
|
5
|
+
module Style
|
|
6
|
+
# Looks for uses of `any?`, `all?`, `none?`, or `one?` with a block
|
|
7
|
+
# containing only an `is_a?`, `kind_of?`, or `instance_of?` check, and
|
|
8
|
+
# suggests using the predicate method with the class argument directly.
|
|
9
|
+
#
|
|
10
|
+
# @safety
|
|
11
|
+
# This cop is unsafe because `instance_of?` checks for an exact class
|
|
12
|
+
# match, while the pattern argument uses `===` which also matches
|
|
13
|
+
# subclasses. For `is_a?` and `kind_of?`, the behavior is equivalent.
|
|
14
|
+
#
|
|
15
|
+
# @example
|
|
16
|
+
# # bad
|
|
17
|
+
# array.any? { |x| x.is_a?(Integer) }
|
|
18
|
+
# array.all? { |x| x.kind_of?(String) }
|
|
19
|
+
# array.none? { |x| x.is_a?(Float) }
|
|
20
|
+
# array.one? { |x| x.instance_of?(Symbol) }
|
|
21
|
+
#
|
|
22
|
+
# # good
|
|
23
|
+
# array.any?(Integer)
|
|
24
|
+
# array.all?(String)
|
|
25
|
+
# array.none?(Float)
|
|
26
|
+
# array.one?(Symbol)
|
|
27
|
+
class PredicateWithKind < Base
|
|
28
|
+
extend AutoCorrector
|
|
29
|
+
include RangeHelp
|
|
30
|
+
|
|
31
|
+
MSG = 'Prefer `%<replacement>s` to `%<original>s` with a kind check.'
|
|
32
|
+
RESTRICT_ON_SEND = %i[any? all? none? one?].freeze
|
|
33
|
+
KIND_METHODS = %i[is_a? kind_of? instance_of?].to_set.freeze
|
|
34
|
+
|
|
35
|
+
# @!method kind_check?(node)
|
|
36
|
+
def_node_matcher :kind_check?, <<~PATTERN
|
|
37
|
+
{
|
|
38
|
+
(block call (args (arg $_)) $(send (lvar _) %KIND_METHODS _))
|
|
39
|
+
(numblock call $1 $(send (lvar _) %KIND_METHODS _))
|
|
40
|
+
(itblock call $_ $(send (lvar _) %KIND_METHODS _))
|
|
41
|
+
}
|
|
42
|
+
PATTERN
|
|
43
|
+
|
|
44
|
+
# @!method kind_call?(node, name)
|
|
45
|
+
def_node_matcher :kind_call?, <<~PATTERN
|
|
46
|
+
(send (lvar %1) %KIND_METHODS _)
|
|
47
|
+
PATTERN
|
|
48
|
+
|
|
49
|
+
def on_send(node)
|
|
50
|
+
return unless (block_node = node.block_node)
|
|
51
|
+
return if block_node.body&.begin_type?
|
|
52
|
+
return unless (kind_check_node = extract_send_node(block_node))
|
|
53
|
+
|
|
54
|
+
klass = kind_check_node.first_argument
|
|
55
|
+
replacement = "#{node.method_name}(#{klass.source})"
|
|
56
|
+
|
|
57
|
+
register_offense(node, block_node, klass, replacement)
|
|
58
|
+
end
|
|
59
|
+
alias on_csend on_send
|
|
60
|
+
|
|
61
|
+
private
|
|
62
|
+
|
|
63
|
+
def extract_send_node(block_node)
|
|
64
|
+
return unless (block_arg_name, kind_check_node = kind_check?(block_node))
|
|
65
|
+
|
|
66
|
+
block_arg_name = :"_#{block_arg_name}" if block_node.numblock_type?
|
|
67
|
+
block_arg_name = :it if block_node.type?(:itblock)
|
|
68
|
+
|
|
69
|
+
kind_check_node if kind_call?(kind_check_node, block_arg_name)
|
|
70
|
+
end
|
|
71
|
+
|
|
72
|
+
def register_offense(node, block_node, klass, replacement)
|
|
73
|
+
original = "#{node.method_name} { ... }"
|
|
74
|
+
message = format(MSG, replacement: replacement, original: original)
|
|
75
|
+
|
|
76
|
+
add_offense(block_node, message: message) do |corrector|
|
|
77
|
+
range = range_between(node.loc.selector.begin_pos, block_node.loc.end.end_pos)
|
|
78
|
+
corrector.replace(range, "#{node.method_name}(#{klass.source})")
|
|
79
|
+
end
|
|
80
|
+
end
|
|
81
|
+
end
|
|
82
|
+
end
|
|
83
|
+
end
|
|
84
|
+
end
|
|
@@ -3,8 +3,9 @@
|
|
|
3
3
|
module RuboCop
|
|
4
4
|
module Cop
|
|
5
5
|
module Style
|
|
6
|
-
# Checks for uses of Proc.new where Kernel#proc
|
|
7
|
-
# would be more appropriate.
|
|
6
|
+
# Checks for uses of `Proc.new` where `Kernel#proc`
|
|
7
|
+
# would be more appropriate. `proc` is the shorter and
|
|
8
|
+
# more idiomatic way to create procs in Ruby.
|
|
8
9
|
#
|
|
9
10
|
# @example
|
|
10
11
|
# # bad
|
|
@@ -51,7 +51,7 @@ module RuboCop
|
|
|
51
51
|
EXPLODED_MSG = 'Provide an exception class and message as arguments to `%<method>s`.'
|
|
52
52
|
COMPACT_MSG = 'Provide an exception object as an argument to `%<method>s`.'
|
|
53
53
|
ACCEPTABLE_ARG_TYPES = %i[
|
|
54
|
-
hash forwarded_restarg splat
|
|
54
|
+
hash forwarded_restarg splat forwarded_kwrestarg forwarded_args
|
|
55
55
|
].freeze
|
|
56
56
|
|
|
57
57
|
RESTRICT_ON_SEND = %i[raise fail].freeze
|