rubocop 0.75.1 → 0.80.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.
Files changed (199) hide show
  1. checksums.yaml +4 -4
  2. data/LICENSE.txt +1 -1
  3. data/README.md +4 -4
  4. data/config/default.yml +374 -335
  5. data/lib/rubocop.rb +53 -32
  6. data/lib/rubocop/ast/builder.rb +43 -41
  7. data/lib/rubocop/ast/node.rb +5 -13
  8. data/lib/rubocop/ast/node/block_node.rb +2 -0
  9. data/lib/rubocop/ast/node/def_node.rb +11 -0
  10. data/lib/rubocop/ast/node/forward_args_node.rb +18 -0
  11. data/lib/rubocop/ast/node/regexp_node.rb +2 -4
  12. data/lib/rubocop/ast/node/return_node.rb +24 -0
  13. data/lib/rubocop/ast/traversal.rb +20 -3
  14. data/lib/rubocop/cli.rb +11 -227
  15. data/lib/rubocop/cli/command.rb +21 -0
  16. data/lib/rubocop/cli/command/auto_genenerate_config.rb +105 -0
  17. data/lib/rubocop/cli/command/base.rb +33 -0
  18. data/lib/rubocop/cli/command/execute_runner.rb +76 -0
  19. data/lib/rubocop/cli/command/init_dotfile.rb +45 -0
  20. data/lib/rubocop/cli/command/show_cops.rb +80 -0
  21. data/lib/rubocop/cli/command/version.rb +17 -0
  22. data/lib/rubocop/cli/environment.rb +21 -0
  23. data/lib/rubocop/comment_config.rb +8 -3
  24. data/lib/rubocop/config.rb +8 -1
  25. data/lib/rubocop/config_loader.rb +20 -20
  26. data/lib/rubocop/config_loader_resolver.rb +2 -1
  27. data/lib/rubocop/config_obsoletion.rb +73 -10
  28. data/lib/rubocop/config_validator.rb +77 -110
  29. data/lib/rubocop/cop/autocorrect_logic.rb +7 -4
  30. data/lib/rubocop/cop/bundler/gem_comment.rb +4 -4
  31. data/lib/rubocop/cop/bundler/insecure_protocol_source.rb +2 -2
  32. data/lib/rubocop/cop/commissioner.rb +15 -7
  33. data/lib/rubocop/cop/cop.rb +31 -6
  34. data/lib/rubocop/cop/corrector.rb +8 -7
  35. data/lib/rubocop/cop/correctors/space_corrector.rb +1 -2
  36. data/lib/rubocop/cop/gemspec/ordered_dependencies.rb +1 -1
  37. data/lib/rubocop/cop/generator.rb +3 -4
  38. data/lib/rubocop/cop/generator/configuration_injector.rb +2 -2
  39. data/lib/rubocop/cop/internal_affairs.rb +1 -0
  40. data/lib/rubocop/cop/internal_affairs/method_name_equal.rb +59 -0
  41. data/lib/rubocop/cop/layout/{align_arguments.rb → argument_alignment.rb} +1 -1
  42. data/lib/rubocop/cop/layout/{align_array.rb → array_alignment.rb} +1 -1
  43. data/lib/rubocop/cop/layout/{indent_assignment.rb → assignment_indentation.rb} +1 -1
  44. data/lib/rubocop/cop/layout/comment_indentation.rb +10 -13
  45. data/lib/rubocop/cop/layout/empty_comment.rb +7 -16
  46. data/lib/rubocop/cop/layout/empty_line_between_defs.rb +2 -1
  47. data/lib/rubocop/cop/layout/end_of_line.rb +8 -3
  48. data/lib/rubocop/cop/layout/extra_spacing.rb +1 -1
  49. data/lib/rubocop/cop/layout/{indent_first_argument.rb → first_argument_indentation.rb} +14 -12
  50. data/lib/rubocop/cop/layout/{indent_first_array_element.rb → first_array_element_indentation.rb} +4 -4
  51. data/lib/rubocop/cop/layout/{indent_first_hash_element.rb → first_hash_element_indentation.rb} +4 -4
  52. data/lib/rubocop/cop/layout/{indent_first_parameter.rb → first_parameter_indentation.rb} +3 -3
  53. data/lib/rubocop/cop/layout/{align_hash.rb → hash_alignment.rb} +16 -8
  54. data/lib/rubocop/cop/layout/{indent_heredoc.rb → heredoc_indentation.rb} +5 -5
  55. data/lib/rubocop/cop/layout/leading_comment_space.rb +33 -2
  56. data/lib/rubocop/cop/layout/{leading_blank_lines.rb → leading_empty_lines.rb} +1 -1
  57. data/lib/rubocop/cop/{metrics → layout}/line_length.rb +68 -112
  58. data/lib/rubocop/cop/layout/multiline_assignment_layout.rb +1 -1
  59. data/lib/rubocop/cop/layout/multiline_block_layout.rb +14 -5
  60. data/lib/rubocop/cop/layout/multiline_hash_brace_layout.rb +0 -4
  61. data/lib/rubocop/cop/layout/multiline_method_argument_line_breaks.rb +1 -1
  62. data/lib/rubocop/cop/layout/{align_parameters.rb → parameter_alignment.rb} +1 -1
  63. data/lib/rubocop/cop/layout/rescue_ensure_alignment.rb +2 -0
  64. data/lib/rubocop/cop/layout/space_around_keyword.rb +12 -0
  65. data/lib/rubocop/cop/layout/space_around_operators.rb +50 -7
  66. data/lib/rubocop/cop/layout/space_before_block_braces.rb +17 -0
  67. data/lib/rubocop/cop/layout/space_before_first_arg.rb +8 -0
  68. data/lib/rubocop/cop/layout/space_in_lambda_literal.rb +9 -7
  69. data/lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb +7 -4
  70. data/lib/rubocop/cop/layout/space_inside_hash_literal_braces.rb +2 -9
  71. data/lib/rubocop/cop/layout/space_inside_parens.rb +6 -6
  72. data/lib/rubocop/cop/layout/{trailing_blank_lines.rb → trailing_empty_lines.rb} +1 -1
  73. data/lib/rubocop/cop/layout/trailing_whitespace.rb +18 -2
  74. data/lib/rubocop/cop/lint/debugger.rb +1 -1
  75. data/lib/rubocop/cop/lint/disjunctive_assignment_in_constructor.rb +1 -1
  76. data/lib/rubocop/cop/lint/{duplicated_key.rb → duplicate_hash_key.rb} +1 -1
  77. data/lib/rubocop/cop/lint/each_with_object_argument.rb +1 -1
  78. data/lib/rubocop/cop/lint/erb_new_arguments.rb +9 -8
  79. data/lib/rubocop/cop/lint/ineffective_access_modifier.rb +1 -1
  80. data/lib/rubocop/cop/lint/missing_cop_enable_directive.rb +2 -2
  81. data/lib/rubocop/cop/lint/{multiple_compare.rb → multiple_comparison.rb} +1 -1
  82. data/lib/rubocop/cop/lint/non_deterministic_require_order.rb +89 -0
  83. data/lib/rubocop/cop/lint/{unneeded_cop_disable_directive.rb → redundant_cop_disable_directive.rb} +26 -26
  84. data/lib/rubocop/cop/lint/{unneeded_cop_enable_directive.rb → redundant_cop_enable_directive.rb} +18 -15
  85. data/lib/rubocop/cop/lint/{unneeded_require_statement.rb → redundant_require_statement.rb} +1 -1
  86. data/lib/rubocop/cop/lint/{unneeded_splat_expansion.rb → redundant_splat_expansion.rb} +6 -6
  87. data/lib/rubocop/cop/lint/{string_conversion_in_interpolation.rb → redundant_string_coercion.rb} +1 -1
  88. data/lib/rubocop/cop/lint/redundant_with_index.rb +2 -2
  89. data/lib/rubocop/cop/lint/redundant_with_object.rb +2 -2
  90. data/lib/rubocop/cop/lint/safe_navigation_chain.rb +5 -6
  91. data/lib/rubocop/cop/lint/{handle_exceptions.rb → suppressed_exception.rb} +1 -1
  92. data/lib/rubocop/cop/lint/useless_access_modifier.rb +57 -23
  93. data/lib/rubocop/cop/lint/useless_setter_call.rb +5 -1
  94. data/lib/rubocop/cop/lint/void.rb +4 -4
  95. data/lib/rubocop/cop/metrics/abc_size.rb +1 -1
  96. data/lib/rubocop/cop/metrics/method_length.rb +1 -1
  97. data/lib/rubocop/cop/metrics/utils/abc_size_calculator.rb +23 -6
  98. data/lib/rubocop/cop/migration/department_name.rb +30 -2
  99. data/lib/rubocop/cop/mixin/alignment.rb +1 -1
  100. data/lib/rubocop/cop/mixin/configurable_enforced_style.rb +4 -0
  101. data/lib/rubocop/cop/mixin/frozen_string_literal.rb +7 -7
  102. data/lib/rubocop/cop/mixin/{hash_alignment.rb → hash_alignment_styles.rb} +1 -1
  103. data/lib/rubocop/cop/mixin/hash_transform_method.rb +172 -0
  104. data/lib/rubocop/cop/mixin/line_length_help.rb +88 -0
  105. data/lib/rubocop/cop/mixin/method_complexity.rb +2 -1
  106. data/lib/rubocop/cop/mixin/nil_methods.rb +4 -4
  107. data/lib/rubocop/cop/mixin/rational_literal.rb +18 -0
  108. data/lib/rubocop/cop/mixin/statement_modifier.rb +7 -4
  109. data/lib/rubocop/cop/mixin/trailing_comma.rb +16 -18
  110. data/lib/rubocop/cop/naming/{uncommunicative_block_param_name.rb → block_parameter_name.rb} +3 -3
  111. data/lib/rubocop/cop/naming/file_name.rb +12 -5
  112. data/lib/rubocop/cop/naming/heredoc_delimiter_naming.rb +5 -5
  113. data/lib/rubocop/cop/naming/memoized_instance_variable_name.rb +1 -1
  114. data/lib/rubocop/cop/naming/{uncommunicative_method_param_name.rb → method_parameter_name.rb} +4 -4
  115. data/lib/rubocop/cop/naming/predicate_name.rb +6 -6
  116. data/lib/rubocop/cop/offense.rb +11 -0
  117. data/lib/rubocop/cop/registry.rb +8 -3
  118. data/lib/rubocop/cop/style/alias.rb +1 -1
  119. data/lib/rubocop/cop/style/array_join.rb +1 -1
  120. data/lib/rubocop/cop/style/attr.rb +10 -2
  121. data/lib/rubocop/cop/style/block_delimiters.rb +60 -1
  122. data/lib/rubocop/cop/style/comment_annotation.rb +5 -5
  123. data/lib/rubocop/cop/style/conditional_assignment.rb +2 -2
  124. data/lib/rubocop/cop/style/copyright.rb +11 -7
  125. data/lib/rubocop/cop/style/double_cop_disable_directive.rb +2 -2
  126. data/lib/rubocop/cop/style/empty_case_condition.rb +2 -2
  127. data/lib/rubocop/cop/style/empty_literal.rb +2 -2
  128. data/lib/rubocop/cop/style/empty_method.rb +5 -5
  129. data/lib/rubocop/cop/style/eval_with_location.rb +1 -1
  130. data/lib/rubocop/cop/style/even_odd.rb +1 -1
  131. data/lib/rubocop/cop/style/format_string.rb +10 -7
  132. data/lib/rubocop/cop/style/format_string_token.rb +2 -0
  133. data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +99 -11
  134. data/lib/rubocop/cop/style/guard_clause.rb +3 -2
  135. data/lib/rubocop/cop/style/hash_each_methods.rb +87 -0
  136. data/lib/rubocop/cop/style/hash_syntax.rb +2 -2
  137. data/lib/rubocop/cop/style/hash_transform_keys.rb +79 -0
  138. data/lib/rubocop/cop/style/hash_transform_values.rb +79 -0
  139. data/lib/rubocop/cop/style/if_unless_modifier.rb +45 -3
  140. data/lib/rubocop/cop/style/infinite_loop.rb +5 -4
  141. data/lib/rubocop/cop/style/inverse_methods.rb +19 -13
  142. data/lib/rubocop/cop/style/ip_addresses.rb +4 -4
  143. data/lib/rubocop/cop/style/line_end_concatenation.rb +14 -10
  144. data/lib/rubocop/cop/style/method_call_with_args_parentheses.rb +7 -205
  145. data/lib/rubocop/cop/style/method_call_with_args_parentheses/omit_parentheses.rb +169 -0
  146. data/lib/rubocop/cop/style/method_call_with_args_parentheses/require_parentheses.rb +54 -0
  147. data/lib/rubocop/cop/style/method_def_parentheses.rb +17 -9
  148. data/lib/rubocop/cop/style/mixin_grouping.rb +1 -1
  149. data/lib/rubocop/cop/style/multiline_method_signature.rb +1 -1
  150. data/lib/rubocop/cop/style/multiline_when_then.rb +6 -2
  151. data/lib/rubocop/cop/style/nested_modifier.rb +4 -2
  152. data/lib/rubocop/cop/style/nested_parenthesized_calls.rb +5 -5
  153. data/lib/rubocop/cop/style/next.rb +5 -5
  154. data/lib/rubocop/cop/style/non_nil_check.rb +21 -9
  155. data/lib/rubocop/cop/style/numeric_literals.rb +7 -3
  156. data/lib/rubocop/cop/style/numeric_predicate.rb +4 -3
  157. data/lib/rubocop/cop/style/option_hash.rb +3 -3
  158. data/lib/rubocop/cop/style/or_assignment.rb +3 -2
  159. data/lib/rubocop/cop/style/percent_literal_delimiters.rb +7 -7
  160. data/lib/rubocop/cop/style/{unneeded_capital_w.rb → redundant_capital_w.rb} +1 -1
  161. data/lib/rubocop/cop/style/{unneeded_condition.rb → redundant_condition.rb} +3 -3
  162. data/lib/rubocop/cop/style/{unneeded_interpolation.rb → redundant_interpolation.rb} +1 -1
  163. data/lib/rubocop/cop/style/redundant_parentheses.rb +3 -3
  164. data/lib/rubocop/cop/style/{unneeded_percent_q.rb → redundant_percent_q.rb} +1 -1
  165. data/lib/rubocop/cop/style/redundant_return.rb +27 -29
  166. data/lib/rubocop/cop/style/{unneeded_sort.rb → redundant_sort.rb} +5 -5
  167. data/lib/rubocop/cop/style/safe_navigation.rb +13 -10
  168. data/lib/rubocop/cop/style/semicolon.rb +2 -2
  169. data/lib/rubocop/cop/style/special_global_vars.rb +5 -7
  170. data/lib/rubocop/cop/style/symbol_array.rb +2 -2
  171. data/lib/rubocop/cop/style/ternary_parentheses.rb +1 -1
  172. data/lib/rubocop/cop/style/trailing_comma_in_arguments.rb +0 -22
  173. data/lib/rubocop/cop/style/trailing_underscore_variable.rb +7 -1
  174. data/lib/rubocop/cop/style/trivial_accessors.rb +5 -5
  175. data/lib/rubocop/cop/style/while_until_modifier.rb +1 -1
  176. data/lib/rubocop/cop/style/yoda_condition.rb +16 -1
  177. data/lib/rubocop/cop/team.rb +5 -0
  178. data/lib/rubocop/cop/util.rb +1 -1
  179. data/lib/rubocop/cop/utils/format_string.rb +10 -18
  180. data/lib/rubocop/cop/variable_force.rb +11 -6
  181. data/lib/rubocop/formatter/base_formatter.rb +2 -2
  182. data/lib/rubocop/formatter/clang_style_formatter.rb +1 -3
  183. data/lib/rubocop/formatter/formatter_set.rb +1 -0
  184. data/lib/rubocop/formatter/json_formatter.rb +6 -5
  185. data/lib/rubocop/formatter/junit_formatter.rb +63 -0
  186. data/lib/rubocop/formatter/tap_formatter.rb +1 -3
  187. data/lib/rubocop/node_pattern.rb +100 -12
  188. data/lib/rubocop/options.rb +17 -11
  189. data/lib/rubocop/processed_source.rb +1 -1
  190. data/lib/rubocop/rake_task.rb +1 -0
  191. data/lib/rubocop/result_cache.rb +24 -8
  192. data/lib/rubocop/rspec/shared_contexts.rb +5 -0
  193. data/lib/rubocop/runner.rb +50 -29
  194. data/lib/rubocop/target_finder.rb +12 -6
  195. data/lib/rubocop/target_ruby.rb +151 -0
  196. data/lib/rubocop/version.rb +1 -1
  197. metadata +69 -35
  198. data/lib/rubocop/cop/mixin/safe_mode.rb +0 -24
  199. data/lib/rubocop/cop/style/braces_around_hash_parameters.rb +0 -209
@@ -117,7 +117,7 @@ module RuboCop
117
117
  end
118
118
 
119
119
  def correct_visibility?(node, modifier, ignored_methods)
120
- return true if modifier.nil? || modifier.method_name == :public
120
+ return true if modifier.nil? || modifier.method?(:public)
121
121
 
122
122
  ignored_methods.include?(node.method_name)
123
123
  end
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- # rubocop:disable Lint/UnneededCopDisableDirective
3
+ # rubocop:disable Lint/RedundantCopDisableDirective
4
4
  module RuboCop
5
5
  module Cop
6
6
  module Lint
@@ -81,4 +81,4 @@ module RuboCop
81
81
  end
82
82
  end
83
83
  end
84
- # rubocop:enable Lint/UnneededCopDisableDirective, Layout/SpaceAroundOperators
84
+ # rubocop:enable Lint/RedundantCopDisableDirective, Layout/SpaceAroundOperators
@@ -21,7 +21,7 @@ module RuboCop
21
21
  #
22
22
  # x < y && y < z
23
23
  # 10 <= x && x <= 20
24
- class MultipleCompare < Cop
24
+ class MultipleComparison < Cop
25
25
  MSG = 'Use the `&&` operator to compare multiple values.'
26
26
 
27
27
  def_node_matcher :multiple_compare?, <<~PATTERN
@@ -0,0 +1,89 @@
1
+ # frozen_string_literal: true
2
+
3
+ module RuboCop
4
+ module Cop
5
+ module Lint
6
+ # `Dir[...]` and `Dir.glob(...)` do not make any guarantees about
7
+ # the order in which files are returned. The final order is
8
+ # determined by the operating system and file system.
9
+ # This means that using them in cases where the order matters,
10
+ # such as requiring files, can lead to intermittent failures
11
+ # that are hard to debug. To ensure this doesn't happen,
12
+ # always sort the list.
13
+ #
14
+ # @example
15
+ #
16
+ # # bad
17
+ # Dir["./lib/**/*.rb"].each do |file|
18
+ # require file
19
+ # end
20
+ #
21
+ # # good
22
+ # Dir["./lib/**/*.rb"].sort.each do |file|
23
+ # require file
24
+ # end
25
+ #
26
+ # @example
27
+ #
28
+ # # bad
29
+ # Dir.glob(Rails.root.join(__dir__, 'test', '*.rb')) do |file|
30
+ # require file
31
+ # end
32
+ #
33
+ # # good
34
+ # Dir.glob(Rails.root.join(__dir__, 'test', '*.rb')).sort.each do |file|
35
+ # require file
36
+ # end
37
+ #
38
+ class NonDeterministicRequireOrder < Cop
39
+ MSG = 'Sort files before requiring them.'
40
+
41
+ def on_block(node)
42
+ return unless node.body
43
+ return unless unsorted_dir_loop?(node.send_node)
44
+
45
+ loop_variable(node.arguments) do |var_name|
46
+ return unless var_is_required?(node.body, var_name)
47
+
48
+ add_offense(node.send_node)
49
+ end
50
+ end
51
+
52
+ def autocorrect(node)
53
+ if unsorted_dir_block?(node)
54
+ lambda do |corrector|
55
+ corrector.replace(node.loc.expression, "#{node.source}.sort.each")
56
+ end
57
+ else
58
+ lambda do |corrector|
59
+ source = node.receiver.source
60
+ corrector.replace(node.loc.expression, "#{source}.sort.each")
61
+ end
62
+ end
63
+ end
64
+
65
+ private
66
+
67
+ def unsorted_dir_loop?(node)
68
+ unsorted_dir_block?(node) || unsorted_dir_each?(node)
69
+ end
70
+
71
+ def_node_matcher :unsorted_dir_block?, <<~PATTERN
72
+ (send (const nil? :Dir) :glob ...)
73
+ PATTERN
74
+
75
+ def_node_matcher :unsorted_dir_each?, <<~PATTERN
76
+ (send (send (const nil? :Dir) {:[] :glob} ...) :each)
77
+ PATTERN
78
+
79
+ def_node_matcher :loop_variable, <<~PATTERN
80
+ (args (arg $_))
81
+ PATTERN
82
+
83
+ def_node_search :var_is_required?, <<~PATTERN
84
+ (send nil? :require (lvar %1))
85
+ PATTERN
86
+ end
87
+ end
88
+ end
89
+ end
@@ -1,8 +1,8 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- # The Lint/UnneededCopDisableDirective cop needs to be disabled so as
4
- # to be able to provide a (bad) example of an unneeded disable.
5
- # rubocop:disable Lint/UnneededCopDisableDirective
3
+ # The Lint/RedundantCopDisableDirective cop needs to be disabled so as
4
+ # to be able to provide a (bad) example of a redundant disable.
5
+ # rubocop:disable Lint/RedundantCopDisableDirective
6
6
  module RuboCop
7
7
  module Cop
8
8
  module Lint
@@ -19,27 +19,27 @@ module RuboCop
19
19
  #
20
20
  # @example
21
21
  # # bad
22
- # # rubocop:disable Metrics/LineLength
22
+ # # rubocop:disable Layout/LineLength
23
23
  # x += 1
24
- # # rubocop:enable Metrics/LineLength
24
+ # # rubocop:enable Layout/LineLength
25
25
  #
26
26
  # # good
27
27
  # x += 1
28
- class UnneededCopDisableDirective < Cop
28
+ class RedundantCopDisableDirective < Cop
29
29
  include NameSimilarity
30
30
  include RangeHelp
31
31
 
32
- COP_NAME = 'Lint/UnneededCopDisableDirective'
32
+ COP_NAME = 'Lint/RedundantCopDisableDirective'
33
33
 
34
34
  def check(offenses, cop_disabled_line_ranges, comments)
35
- unneeded_cops = Hash.new { |h, k| h[k] = Set.new }
35
+ redundant_cops = Hash.new { |h, k| h[k] = Set.new }
36
36
 
37
- each_unneeded_disable(cop_disabled_line_ranges,
38
- offenses, comments) do |comment, unneeded_cop|
39
- unneeded_cops[comment].add(unneeded_cop)
37
+ each_redundant_disable(cop_disabled_line_ranges,
38
+ offenses, comments) do |comment, redundant_cop|
39
+ redundant_cops[comment].add(redundant_cop)
40
40
  end
41
41
 
42
- add_offenses(unneeded_cops)
42
+ add_offenses(redundant_cops)
43
43
  end
44
44
 
45
45
  def autocorrect(args)
@@ -89,8 +89,8 @@ module RuboCop
89
89
  newlines: false)
90
90
  end
91
91
 
92
- def each_unneeded_disable(cop_disabled_line_ranges, offenses, comments,
93
- &block)
92
+ def each_redundant_disable(cop_disabled_line_ranges, offenses, comments,
93
+ &block)
94
94
  disabled_ranges = cop_disabled_line_ranges[COP_NAME] || [0..0]
95
95
 
96
96
  cop_disabled_line_ranges.each do |cop, line_ranges|
@@ -110,9 +110,9 @@ module RuboCop
110
110
  comment = comments.find { |c| c.loc.line == line_range.begin }
111
111
  next if ignore_offense?(disabled_ranges, line_range)
112
112
 
113
- unneeded_cop = find_unneeded(comment, offenses, cop, line_range,
114
- line_ranges[ix + 1])
115
- yield comment, unneeded_cop if unneeded_cop
113
+ redundant_cop = find_redundant(comment, offenses, cop, line_range,
114
+ line_ranges[ix + 1])
115
+ yield comment, redundant_cop if redundant_cop
116
116
  end
117
117
  end
118
118
 
@@ -123,24 +123,24 @@ module RuboCop
123
123
 
124
124
  # If a cop is disabled in a range that begins on the same line as
125
125
  # the end of the previous range, it means that the cop was
126
- # already disabled by an earlier comment. So it's unneeded
126
+ # already disabled by an earlier comment. So it's redundant
127
127
  # whether there are offenses or not.
128
- unneeded_comment = comments.find do |c|
128
+ redundant_comment = comments.find do |c|
129
129
  c.loc.line == range.begin &&
130
130
  # Comments disabling all cops don't count since it's reasonable
131
131
  # to disable a few select cops first and then all cops further
132
132
  # down in the code.
133
133
  !all_disabled?(c)
134
134
  end
135
- yield unneeded_comment if unneeded_comment
135
+ yield redundant_comment if redundant_comment
136
136
  end
137
137
  end
138
138
 
139
- def find_unneeded(comment, offenses, cop, line_range, next_line_range)
139
+ def find_redundant(comment, offenses, cop, line_range, next_line_range)
140
140
  if all_disabled?(comment)
141
141
  # If there's a disable all comment followed by a comment
142
142
  # specifically disabling `cop`, we don't report the `all`
143
- # comment. If the disable all comment is truly unneeded, we will
143
+ # comment. If the disable all comment is truly redundant, we will
144
144
  # detect that when examining the comments of another cop, and we
145
145
  # get the full line range for the disable all.
146
146
  if (next_line_range.nil? ||
@@ -170,8 +170,8 @@ module RuboCop
170
170
  cops_string.split(/,\s*/).size
171
171
  end
172
172
 
173
- def add_offenses(unneeded_cops)
174
- unneeded_cops.each do |comment, cops|
173
+ def add_offenses(redundant_cops)
174
+ redundant_cops.each do |comment, cops|
175
175
  if all_disabled?(comment) ||
176
176
  directive_count(comment) == cops.size
177
177
  add_offense_for_entire_comment(comment, cops)
@@ -213,7 +213,7 @@ module RuboCop
213
213
  end
214
214
 
215
215
  def matching_range(haystack, needle)
216
- offset = (haystack.source =~ Regexp.new(Regexp.escape(needle)))
216
+ offset = haystack.source.index(needle)
217
217
  return unless offset
218
218
 
219
219
  offset += haystack.begin_pos
@@ -260,4 +260,4 @@ module RuboCop
260
260
  end
261
261
  end
262
262
  end
263
- # rubocop:enable Lint/UnneededCopDisableDirective
263
+ # rubocop:enable Lint/RedundantCopDisableDirective
@@ -1,9 +1,11 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- # The Lint/UnneededCopEnableDirective cop needs to be disabled so as
4
- # to be able to provide a (bad) example of an unneeded enable.
3
+ # The Lint/RedundantCopEnableDirective and Lint/RedundantCopDisableDirective
4
+ # cops need to be disabled so as to be able to provide a (bad) example of an
5
+ # unneeded enable.
5
6
 
6
- # rubocop:disable Lint/UnneededCopEnableDirective
7
+ # rubocop:disable Lint/RedundantCopEnableDirective
8
+ # rubocop:disable Lint/RedundantCopDisableDirective
7
9
  module RuboCop
8
10
  module Cop
9
11
  module Lint
@@ -15,24 +17,24 @@ module RuboCop
15
17
  # @example
16
18
  # # bad
17
19
  # foo = 1
18
- # # rubocop:enable Metrics/LineLength
20
+ # # rubocop:enable Layout/LineLength
19
21
  #
20
22
  # # good
21
23
  # foo = 1
22
24
  # @example
23
25
  # # bad
24
- # # rubocop:disable Metrics/LineLength
25
- # baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarrrrrrrrrrrrr
26
- # # rubocop:enable Metrics/LineLength
26
+ # # rubocop:disable Style/StringLiterals
27
+ # foo = "1"
28
+ # # rubocop:enable Style/StringLiterals
27
29
  # baz
28
30
  # # rubocop:enable all
29
31
  #
30
32
  # # good
31
- # # rubocop:disable Metrics/LineLength
32
- # baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarrrrrrrrrrrrr
33
+ # # rubocop:disable Style/StringLiterals
34
+ # foo = "1"
33
35
  # # rubocop:enable all
34
36
  # baz
35
- class UnneededCopEnableDirective < Cop
37
+ class RedundantCopEnableDirective < Cop
36
38
  include RangeHelp
37
39
  include SurroundingSpace
38
40
 
@@ -94,16 +96,14 @@ module RuboCop
94
96
 
95
97
  def range_to_remove(begin_pos, end_pos, comma_pos, comment)
96
98
  start = comment_start(comment)
97
- buffer = processed_source.buffer
98
- range_class = Parser::Source::Range
99
99
 
100
100
  case comma_pos
101
101
  when :before
102
- range_class.new(buffer, start + begin_pos - 1, start + end_pos)
102
+ range_between(start + begin_pos - 1, start + end_pos)
103
103
  when :after
104
- range_class.new(buffer, start + begin_pos, start + end_pos + 1)
104
+ range_between(start + begin_pos, start + end_pos + 1)
105
105
  else
106
- range_class.new(buffer, start, comment.loc.expression.end_pos)
106
+ range_between(start, comment.loc.expression.end_pos)
107
107
  end
108
108
  end
109
109
 
@@ -114,3 +114,6 @@ module RuboCop
114
114
  end
115
115
  end
116
116
  end
117
+
118
+ # rubocop:enable Lint/RedundantCopDisableDirective
119
+ # rubocop:enable Lint/RedundantCopEnableDirective
@@ -21,7 +21,7 @@ module RuboCop
21
21
  #
22
22
  # # good
23
23
  # require 'unloaded_feature'
24
- class UnneededRequireStatement < Cop
24
+ class RedundantRequireStatement < Cop
25
25
  include RangeHelp
26
26
 
27
27
  MSG = 'Remove unnecessary `require` statement.'
@@ -49,7 +49,7 @@ module RuboCop
49
49
  # else
50
50
  # baz
51
51
  # end
52
- class UnneededSplatExpansion < Cop
52
+ class RedundantSplatExpansion < Cop
53
53
  MSG = 'Replace splat expansion with comma separated values.'
54
54
  ARRAY_PARAM_MSG = 'Pass array contents as separate arguments.'
55
55
  PERCENT_W = '%w'
@@ -70,7 +70,7 @@ module RuboCop
70
70
  PATTERN
71
71
 
72
72
  def on_splat(node)
73
- unneeded_splat_expansion(node) do
73
+ redundant_splat_expansion(node) do
74
74
  if array_splat?(node) &&
75
75
  (method_argument?(node) || part_of_an_array?(node))
76
76
  add_offense(node, message: ARRAY_PARAM_MSG)
@@ -90,7 +90,7 @@ module RuboCop
90
90
 
91
91
  private
92
92
 
93
- def unneeded_splat_expansion(node)
93
+ def redundant_splat_expansion(node)
94
94
  literal_expansion(node) do |expanded_item|
95
95
  if expanded_item.send_type?
96
96
  return if array_new_inside_array_literal?(expanded_item)
@@ -119,7 +119,7 @@ module RuboCop
119
119
  [node.parent.loc.expression, variable.source]
120
120
  elsif !variable.array_type?
121
121
  [loc.expression, "[#{variable.source}]"]
122
- elsif unneeded_brackets?(node)
122
+ elsif redundant_brackets?(node)
123
123
  [loc.expression, remove_brackets(variable)]
124
124
  else
125
125
  [loc.operator, '']
@@ -141,12 +141,12 @@ module RuboCop
141
141
  parent.array_type? && parent.loc.begin && parent.loc.end
142
142
  end
143
143
 
144
- def unneeded_brackets?(node)
144
+ def redundant_brackets?(node)
145
145
  parent = node.parent
146
146
  grandparent = node.parent.parent
147
147
 
148
148
  parent.when_type? || parent.send_type? || part_of_an_array?(node) ||
149
- (grandparent&.resbody_type?)
149
+ grandparent&.resbody_type?
150
150
  end
151
151
 
152
152
  def remove_brackets(array)
@@ -17,7 +17,7 @@ module RuboCop
17
17
  # # good
18
18
  #
19
19
  # "result is #{something}"
20
- class StringConversionInInterpolation < Cop
20
+ class RedundantStringCoercion < Cop
21
21
  include Interpolation
22
22
 
23
23
  MSG_DEFAULT = 'Redundant use of `Object#to_s` in interpolation.'
@@ -50,7 +50,7 @@ module RuboCop
50
50
  def autocorrect(node)
51
51
  lambda do |corrector|
52
52
  redundant_with_index?(node) do |send|
53
- if send.method_name == :each_with_index
53
+ if send.method?(:each_with_index)
54
54
  corrector.replace(send.loc.selector, 'each')
55
55
  else
56
56
  corrector.remove(with_index_range(send))
@@ -63,7 +63,7 @@ module RuboCop
63
63
  private
64
64
 
65
65
  def message(node)
66
- if node.method_name == :each_with_index
66
+ if node.method?(:each_with_index)
67
67
  MSG_EACH_WITH_INDEX
68
68
  else
69
69
  MSG_WITH_INDEX
@@ -51,7 +51,7 @@ module RuboCop
51
51
  def autocorrect(node)
52
52
  lambda do |corrector|
53
53
  redundant_with_object?(node) do |send|
54
- if send.method_name == :each_with_object
54
+ if send.method?(:each_with_object)
55
55
  corrector.replace(with_object_range(send), 'each')
56
56
  else
57
57
  corrector.remove(with_object_range(send))
@@ -64,7 +64,7 @@ module RuboCop
64
64
  private
65
65
 
66
66
  def message(node)
67
- if node.method_name == :each_with_object
67
+ if node.method?(:each_with_object)
68
68
  MSG_EACH_WITH_OBJECT
69
69
  else
70
70
  MSG_WITH_OBJECT
@@ -42,9 +42,9 @@ module RuboCop
42
42
 
43
43
  method_chain = method_chain(node)
44
44
  location =
45
- Parser::Source::Range.new(node.loc.expression.source_buffer,
46
- safe_nav.loc.expression.end_pos,
47
- method_chain.loc.expression.end_pos)
45
+ Parser::Source::Range.new(node.source_range.source_buffer,
46
+ safe_nav.source_range.end_pos,
47
+ method_chain.source_range.end_pos)
48
48
  add_offense(node, location: location)
49
49
  end
50
50
  end
@@ -54,9 +54,8 @@ module RuboCop
54
54
  def method_chain(node)
55
55
  chain = node
56
56
  while chain.send_type?
57
- chain = chain.parent if chain.parent &&
58
- %i[send csend].include?(chain.parent.type)
59
- break
57
+ chain = chain.parent if chain.parent&.call_type?
58
+ break # FIXME: Unconditional break. Why while "loop" then?
60
59
  end
61
60
  chain
62
61
  end