rubocop 0.78.0 → 0.82.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 (209) hide show
  1. checksums.yaml +4 -4
  2. data/LICENSE.txt +1 -1
  3. data/README.md +4 -4
  4. data/config/default.yml +158 -48
  5. data/lib/rubocop.rb +19 -4
  6. data/lib/rubocop/ast/builder.rb +45 -42
  7. data/lib/rubocop/ast/node.rb +12 -19
  8. data/lib/rubocop/ast/node/array_node.rb +13 -0
  9. data/lib/rubocop/ast/node/block_node.rb +5 -1
  10. data/lib/rubocop/ast/node/case_match_node.rb +56 -0
  11. data/lib/rubocop/ast/node/def_node.rb +11 -0
  12. data/lib/rubocop/ast/node/forward_args_node.rb +18 -0
  13. data/lib/rubocop/ast/node/mixin/method_dispatch_node.rb +8 -0
  14. data/lib/rubocop/ast/node/regexp_node.rb +2 -4
  15. data/lib/rubocop/ast/traversal.rb +29 -10
  16. data/lib/rubocop/cli.rb +10 -4
  17. data/lib/rubocop/cli/command/show_cops.rb +11 -4
  18. data/lib/rubocop/comment_config.rb +6 -1
  19. data/lib/rubocop/config.rb +36 -10
  20. data/lib/rubocop/config_loader.rb +42 -33
  21. data/lib/rubocop/config_loader_resolver.rb +1 -1
  22. data/lib/rubocop/config_obsoletion.rb +4 -1
  23. data/lib/rubocop/config_validator.rb +66 -92
  24. data/lib/rubocop/cop/autocorrect_logic.rb +6 -3
  25. data/lib/rubocop/cop/badge.rb +5 -5
  26. data/lib/rubocop/cop/bundler/insecure_protocol_source.rb +1 -1
  27. data/lib/rubocop/cop/corrector.rb +48 -24
  28. data/lib/rubocop/cop/correctors/alignment_corrector.rb +2 -2
  29. data/lib/rubocop/cop/correctors/condition_corrector.rb +1 -2
  30. data/lib/rubocop/cop/correctors/empty_line_corrector.rb +1 -1
  31. data/lib/rubocop/cop/correctors/lambda_literal_to_method_corrector.rb +3 -3
  32. data/lib/rubocop/cop/correctors/line_break_corrector.rb +2 -2
  33. data/lib/rubocop/cop/correctors/percent_literal_corrector.rb +1 -1
  34. data/lib/rubocop/cop/correctors/string_literal_corrector.rb +2 -2
  35. data/lib/rubocop/cop/gemspec/ordered_dependencies.rb +1 -1
  36. data/lib/rubocop/cop/generator.rb +3 -4
  37. data/lib/rubocop/cop/generator/configuration_injector.rb +1 -1
  38. data/lib/rubocop/cop/internal_affairs/offense_location_keyword.rb +1 -1
  39. data/lib/rubocop/cop/layout/array_alignment.rb +53 -10
  40. data/lib/rubocop/cop/layout/block_end_newline.rb +5 -3
  41. data/lib/rubocop/cop/layout/dot_position.rb +1 -1
  42. data/lib/rubocop/cop/layout/else_alignment.rb +8 -0
  43. data/lib/rubocop/cop/layout/empty_line_between_defs.rb +2 -1
  44. data/lib/rubocop/cop/layout/end_of_line.rb +2 -2
  45. data/lib/rubocop/cop/layout/first_array_element_indentation.rb +16 -10
  46. data/lib/rubocop/cop/layout/first_hash_element_indentation.rb +1 -1
  47. data/lib/rubocop/cop/layout/hash_alignment.rb +8 -4
  48. data/lib/rubocop/cop/layout/heredoc_argument_closing_parenthesis.rb +2 -2
  49. data/lib/rubocop/cop/layout/heredoc_indentation.rb +2 -2
  50. data/lib/rubocop/cop/layout/{tab.rb → indentation_style.rb} +48 -6
  51. data/lib/rubocop/cop/layout/leading_comment_space.rb +34 -3
  52. data/lib/rubocop/cop/layout/line_length.rb +32 -3
  53. data/lib/rubocop/cop/layout/multiline_block_layout.rb +15 -6
  54. data/lib/rubocop/cop/layout/multiline_hash_brace_layout.rb +0 -4
  55. data/lib/rubocop/cop/layout/multiline_method_call_indentation.rb +1 -1
  56. data/lib/rubocop/cop/layout/space_around_block_parameters.rb +3 -3
  57. data/lib/rubocop/cop/layout/space_around_method_call_operator.rb +133 -0
  58. data/lib/rubocop/cop/layout/space_around_operators.rb +19 -1
  59. data/lib/rubocop/cop/layout/space_before_block_braces.rb +2 -2
  60. data/lib/rubocop/cop/layout/space_before_first_arg.rb +8 -0
  61. data/lib/rubocop/cop/layout/space_in_lambda_literal.rb +1 -1
  62. data/lib/rubocop/cop/layout/space_inside_block_braces.rb +2 -2
  63. data/lib/rubocop/cop/layout/space_inside_hash_literal_braces.rb +2 -9
  64. data/lib/rubocop/cop/layout/space_inside_range_literal.rb +2 -2
  65. data/lib/rubocop/cop/lint/boolean_symbol.rb +12 -0
  66. data/lib/rubocop/cop/lint/debugger.rb +2 -2
  67. data/lib/rubocop/cop/lint/erb_new_arguments.rb +1 -1
  68. data/lib/rubocop/cop/lint/implicit_string_concatenation.rb +1 -1
  69. data/lib/rubocop/cop/lint/inherit_exception.rb +1 -1
  70. data/lib/rubocop/cop/lint/interpolation_check.rb +1 -1
  71. data/lib/rubocop/cop/lint/literal_in_interpolation.rb +1 -1
  72. data/lib/rubocop/cop/lint/loop.rb +6 -4
  73. data/lib/rubocop/cop/lint/multiple_comparison.rb +1 -1
  74. data/lib/rubocop/cop/lint/nested_method_definition.rb +2 -2
  75. data/lib/rubocop/cop/lint/non_deterministic_require_order.rb +2 -2
  76. data/lib/rubocop/cop/lint/number_conversion.rb +1 -1
  77. data/lib/rubocop/cop/lint/percent_string_array.rb +2 -2
  78. data/lib/rubocop/cop/lint/raise_exception.rb +75 -0
  79. data/lib/rubocop/cop/lint/redundant_cop_disable_directive.rb +1 -1
  80. data/lib/rubocop/cop/lint/redundant_cop_enable_directive.rb +12 -7
  81. data/lib/rubocop/cop/lint/redundant_string_coercion.rb +1 -1
  82. data/lib/rubocop/cop/lint/safe_navigation_chain.rb +1 -1
  83. data/lib/rubocop/cop/lint/struct_new_override.rb +58 -0
  84. data/lib/rubocop/cop/lint/suppressed_exception.rb +12 -22
  85. data/lib/rubocop/cop/lint/unified_integer.rb +0 -2
  86. data/lib/rubocop/cop/lint/unused_method_argument.rb +32 -6
  87. data/lib/rubocop/cop/lint/uri_regexp.rb +4 -4
  88. data/lib/rubocop/cop/lint/useless_setter_call.rb +4 -0
  89. data/lib/rubocop/cop/migration/department_name.rb +47 -6
  90. data/lib/rubocop/cop/mixin/configurable_enforced_style.rb +4 -0
  91. data/lib/rubocop/cop/mixin/end_keyword_alignment.rb +6 -1
  92. data/lib/rubocop/cop/mixin/frozen_string_literal.rb +7 -7
  93. data/lib/rubocop/cop/mixin/hash_transform_method.rb +171 -0
  94. data/lib/rubocop/cop/mixin/line_length_help.rb +1 -1
  95. data/lib/rubocop/cop/mixin/method_complexity.rb +5 -0
  96. data/lib/rubocop/cop/mixin/statement_modifier.rb +4 -3
  97. data/lib/rubocop/cop/mixin/trailing_comma.rb +3 -10
  98. data/lib/rubocop/cop/naming/class_and_module_camel_case.rb +1 -1
  99. data/lib/rubocop/cop/naming/constant_name.rb +2 -1
  100. data/lib/rubocop/cop/naming/heredoc_delimiter_naming.rb +1 -1
  101. data/lib/rubocop/cop/naming/memoized_instance_variable_name.rb +1 -1
  102. data/lib/rubocop/cop/naming/method_name.rb +30 -0
  103. data/lib/rubocop/cop/naming/method_parameter_name.rb +1 -1
  104. data/lib/rubocop/cop/naming/rescued_exceptions_variable_name.rb +1 -1
  105. data/lib/rubocop/cop/registry.rb +15 -3
  106. data/lib/rubocop/cop/style/access_modifier_declarations.rb +26 -6
  107. data/lib/rubocop/cop/style/alias.rb +4 -4
  108. data/lib/rubocop/cop/style/and_or.rb +5 -6
  109. data/lib/rubocop/cop/style/array_join.rb +1 -1
  110. data/lib/rubocop/cop/style/block_delimiters.rb +60 -1
  111. data/lib/rubocop/cop/style/case_equality.rb +24 -1
  112. data/lib/rubocop/cop/style/character_literal.rb +2 -2
  113. data/lib/rubocop/cop/style/collection_methods.rb +2 -0
  114. data/lib/rubocop/cop/style/conditional_assignment.rb +8 -8
  115. data/lib/rubocop/cop/style/copyright.rb +1 -1
  116. data/lib/rubocop/cop/style/dir.rb +1 -1
  117. data/lib/rubocop/cop/style/disable_cops_within_source_code_directive.rb +49 -0
  118. data/lib/rubocop/cop/style/documentation.rb +43 -5
  119. data/lib/rubocop/cop/style/double_cop_disable_directive.rb +1 -1
  120. data/lib/rubocop/cop/style/each_for_simple_loop.rb +1 -1
  121. data/lib/rubocop/cop/style/each_with_object.rb +3 -3
  122. data/lib/rubocop/cop/style/empty_method.rb +1 -1
  123. data/lib/rubocop/cop/style/end_block.rb +6 -0
  124. data/lib/rubocop/cop/style/even_odd.rb +1 -1
  125. data/lib/rubocop/cop/style/expand_path_arguments.rb +3 -3
  126. data/lib/rubocop/cop/style/exponential_notation.rb +119 -0
  127. data/lib/rubocop/cop/style/format_string.rb +2 -2
  128. data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +89 -11
  129. data/lib/rubocop/cop/style/hash_each_methods.rb +89 -0
  130. data/lib/rubocop/cop/style/hash_syntax.rb +3 -5
  131. data/lib/rubocop/cop/style/hash_transform_keys.rb +83 -0
  132. data/lib/rubocop/cop/style/hash_transform_values.rb +80 -0
  133. data/lib/rubocop/cop/style/if_unless_modifier.rb +23 -3
  134. data/lib/rubocop/cop/style/inverse_methods.rb +9 -5
  135. data/lib/rubocop/cop/style/lambda.rb +3 -2
  136. data/lib/rubocop/cop/style/lambda_call.rb +2 -2
  137. data/lib/rubocop/cop/style/method_call_with_args_parentheses.rb +7 -205
  138. data/lib/rubocop/cop/style/method_call_with_args_parentheses/omit_parentheses.rb +169 -0
  139. data/lib/rubocop/cop/style/method_call_with_args_parentheses/require_parentheses.rb +54 -0
  140. data/lib/rubocop/cop/style/mixin_grouping.rb +1 -1
  141. data/lib/rubocop/cop/style/module_function.rb +58 -12
  142. data/lib/rubocop/cop/style/multiline_if_modifier.rb +1 -1
  143. data/lib/rubocop/cop/style/multiline_memoization.rb +1 -1
  144. data/lib/rubocop/cop/style/multiline_when_then.rb +5 -1
  145. data/lib/rubocop/cop/style/mutable_constant.rb +2 -4
  146. data/lib/rubocop/cop/style/nested_parenthesized_calls.rb +4 -4
  147. data/lib/rubocop/cop/style/next.rb +2 -2
  148. data/lib/rubocop/cop/style/nil_comparison.rb +1 -1
  149. data/lib/rubocop/cop/style/non_nil_check.rb +4 -4
  150. data/lib/rubocop/cop/style/not.rb +1 -1
  151. data/lib/rubocop/cop/style/numeric_literal_prefix.rb +1 -1
  152. data/lib/rubocop/cop/style/numeric_literals.rb +1 -1
  153. data/lib/rubocop/cop/style/numeric_predicate.rb +5 -4
  154. data/lib/rubocop/cop/style/one_line_conditional.rb +4 -3
  155. data/lib/rubocop/cop/style/or_assignment.rb +4 -3
  156. data/lib/rubocop/cop/style/percent_literal_delimiters.rb +7 -7
  157. data/lib/rubocop/cop/style/percent_q_literals.rb +1 -1
  158. data/lib/rubocop/cop/style/perl_backrefs.rb +2 -2
  159. data/lib/rubocop/cop/style/proc.rb +1 -1
  160. data/lib/rubocop/cop/style/raise_args.rb +1 -1
  161. data/lib/rubocop/cop/style/random_with_offset.rb +3 -3
  162. data/lib/rubocop/cop/style/redundant_condition.rb +18 -6
  163. data/lib/rubocop/cop/style/redundant_conditional.rb +1 -1
  164. data/lib/rubocop/cop/style/redundant_exception.rb +3 -3
  165. data/lib/rubocop/cop/style/redundant_interpolation.rb +2 -2
  166. data/lib/rubocop/cop/style/redundant_percent_q.rb +2 -2
  167. data/lib/rubocop/cop/style/redundant_return.rb +5 -7
  168. data/lib/rubocop/cop/style/redundant_self.rb +1 -1
  169. data/lib/rubocop/cop/style/redundant_sort.rb +2 -2
  170. data/lib/rubocop/cop/style/rescue_modifier.rb +1 -1
  171. data/lib/rubocop/cop/style/return_nil.rb +1 -1
  172. data/lib/rubocop/cop/style/safe_navigation.rb +1 -1
  173. data/lib/rubocop/cop/style/self_assignment.rb +1 -1
  174. data/lib/rubocop/cop/style/special_global_vars.rb +1 -1
  175. data/lib/rubocop/cop/style/stabby_lambda_parentheses.rb +1 -4
  176. data/lib/rubocop/cop/style/string_hash_keys.rb +1 -1
  177. data/lib/rubocop/cop/style/symbol_array.rb +3 -3
  178. data/lib/rubocop/cop/style/symbol_literal.rb +2 -2
  179. data/lib/rubocop/cop/style/ternary_parentheses.rb +2 -3
  180. data/lib/rubocop/cop/style/trailing_comma_in_arguments.rb +35 -22
  181. data/lib/rubocop/cop/style/trailing_comma_in_array_literal.rb +41 -0
  182. data/lib/rubocop/cop/style/trailing_comma_in_block_args.rb +88 -0
  183. data/lib/rubocop/cop/style/trailing_comma_in_hash_literal.rb +44 -0
  184. data/lib/rubocop/cop/style/trivial_accessors.rb +1 -1
  185. data/lib/rubocop/cop/style/unpack_first.rb +0 -4
  186. data/lib/rubocop/cop/style/variable_interpolation.rb +1 -1
  187. data/lib/rubocop/cop/style/while_until_modifier.rb +1 -1
  188. data/lib/rubocop/cop/style/word_array.rb +1 -1
  189. data/lib/rubocop/cop/style/yoda_condition.rb +16 -1
  190. data/lib/rubocop/cop/style/zero_length_predicate.rb +1 -1
  191. data/lib/rubocop/cop/variable_force.rb +4 -1
  192. data/lib/rubocop/formatter/clang_style_formatter.rb +1 -1
  193. data/lib/rubocop/formatter/formatter_set.rb +1 -1
  194. data/lib/rubocop/formatter/junit_formatter.rb +74 -0
  195. data/lib/rubocop/formatter/pacman_formatter.rb +1 -1
  196. data/lib/rubocop/formatter/tap_formatter.rb +1 -1
  197. data/lib/rubocop/node_pattern.rb +96 -10
  198. data/lib/rubocop/options.rb +7 -1
  199. data/lib/rubocop/processed_source.rb +1 -4
  200. data/lib/rubocop/rspec/cop_helper.rb +1 -1
  201. data/lib/rubocop/rspec/expect_offense.rb +1 -1
  202. data/lib/rubocop/rspec/shared_contexts.rb +5 -4
  203. data/lib/rubocop/runner.rb +1 -1
  204. data/lib/rubocop/target_ruby.rb +151 -0
  205. data/lib/rubocop/version.rb +1 -1
  206. metadata +39 -12
  207. data/lib/rubocop/cop/lint/end_in_method.rb +0 -40
  208. data/lib/rubocop/cop/style/braces_around_hash_parameters.rb +0 -209
  209. data/lib/rubocop/formatter/disabled_lines_formatter.rb +0 -57
@@ -111,15 +111,15 @@ module RuboCop
111
111
 
112
112
  return if expr == new_code
113
113
 
114
- ->(corrector) { corrector.replace(node.source_range, new_code) }
114
+ ->(corrector) { corrector.replace(node, new_code) }
115
115
  end
116
116
 
117
117
  def autocorrect_non_nil(node, inner_node)
118
118
  lambda do |corrector|
119
119
  if inner_node.receiver
120
- corrector.replace(node.source_range, inner_node.receiver.source)
120
+ corrector.replace(node, inner_node.receiver.source)
121
121
  else
122
- corrector.replace(node.source_range, 'self')
122
+ corrector.replace(node, 'self')
123
123
  end
124
124
  end
125
125
  end
@@ -127,7 +127,7 @@ module RuboCop
127
127
  def autocorrect_unless_nil(node, receiver)
128
128
  lambda do |corrector|
129
129
  corrector.replace(node.parent.loc.keyword, 'if')
130
- corrector.replace(node.source_range, receiver.source)
130
+ corrector.replace(node, receiver.source)
131
131
  end
132
132
  end
133
133
  end
@@ -69,7 +69,7 @@ module RuboCop
69
69
  def correct_with_parens(range, node)
70
70
  lambda do |corrector|
71
71
  corrector.replace(range, '!(')
72
- corrector.insert_after(node.source_range, ')')
72
+ corrector.insert_after(node, ')')
73
73
  end
74
74
  end
75
75
 
@@ -59,7 +59,7 @@ module RuboCop
59
59
  def autocorrect(node)
60
60
  lambda do |corrector|
61
61
  type = literal_type(node)
62
- corrector.replace(node.source_range,
62
+ corrector.replace(node,
63
63
  send(:"format_#{type}", node.source))
64
64
  end
65
65
  end
@@ -48,7 +48,7 @@ module RuboCop
48
48
 
49
49
  def autocorrect(node)
50
50
  lambda do |corrector|
51
- corrector.replace(node.source_range, format_number(node))
51
+ corrector.replace(node, format_number(node))
52
52
  end
53
53
  end
54
54
 
@@ -54,9 +54,10 @@ module RuboCop
54
54
  }.freeze
55
55
 
56
56
  def on_send(node)
57
- return if node.each_ancestor(:send, :block).any? do |ancestor|
58
- ignored_method?(ancestor.method_name)
59
- end
57
+ return if ignored_method?(node.method_name) ||
58
+ node.each_ancestor(:send, :block).any? do |ancestor|
59
+ ignored_method?(ancestor.method_name)
60
+ end
60
61
 
61
62
  numeric, replacement = check(node)
62
63
 
@@ -72,7 +73,7 @@ module RuboCop
72
73
  _, replacement = check(node)
73
74
 
74
75
  lambda do |corrector|
75
- corrector.replace(node.loc.expression, replacement)
76
+ corrector.replace(node, replacement)
76
77
  end
77
78
  end
78
79
 
@@ -36,7 +36,7 @@ module RuboCop
36
36
 
37
37
  def autocorrect(node)
38
38
  lambda do |corrector|
39
- corrector.replace(node.source_range, replacement(node))
39
+ corrector.replace(node, replacement(node))
40
40
  end
41
41
  end
42
42
 
@@ -91,9 +91,10 @@ module RuboCop
91
91
 
92
92
  def keyword_with_changed_precedence?(node)
93
93
  return false unless node.keyword?
94
- return true if node.prefix_not?
94
+ return true if node.respond_to?(:prefix_not?) && node.prefix_not?
95
95
 
96
- node.arguments? && !node.parenthesized_call?
96
+ node.respond_to?(:arguments?) && node.arguments? &&
97
+ !node.parenthesized_call?
97
98
  end
98
99
  end
99
100
  end
@@ -34,7 +34,7 @@ module RuboCop
34
34
  (if
35
35
  ({lvar ivar cvar gvar} _var)
36
36
  ({lvar ivar cvar gvar} _var)
37
- _))
37
+ $_))
38
38
  PATTERN
39
39
 
40
40
  def_node_matcher :unless_assignment?, <<~PATTERN
@@ -51,7 +51,8 @@ module RuboCop
51
51
  end
52
52
 
53
53
  def on_lvasgn(node)
54
- return unless ternary_assignment?(node)
54
+ return unless (else_branch = ternary_assignment?(node))
55
+ return if else_branch.if_type?
55
56
 
56
57
  add_offense(node)
57
58
  end
@@ -68,7 +69,7 @@ module RuboCop
68
69
  end
69
70
 
70
71
  lambda do |corrector|
71
- corrector.replace(node.source_range,
72
+ corrector.replace(node,
72
73
  "#{variable} ||= #{default.source}")
73
74
  end
74
75
  end
@@ -88,27 +88,27 @@ module RuboCop
88
88
  end
89
89
 
90
90
  def contains_preferred_delimiter?(node, type)
91
- preferred_delimiters = preferred_delimiters_for(type)
92
- node
93
- .children.map { |n| string_source(n) }.compact
94
- .any? { |s| preferred_delimiters.any? { |d| s.include?(d) } }
91
+ contains_delimiter?(node, preferred_delimiters_for(type))
95
92
  end
96
93
 
97
94
  def include_same_character_as_used_for_delimiter?(node, type)
98
95
  return false unless %w[%w %i].include?(type)
99
96
 
100
97
  used_delimiters = matchpairs(begin_source(node)[-1])
101
- escaped_delimiters = used_delimiters.map { |d| "\\#{d}" }.join('|')
98
+ contains_delimiter?(node, used_delimiters)
99
+ end
102
100
 
101
+ def contains_delimiter?(node, delimiters)
102
+ delimiters_regexp = Regexp.union(delimiters)
103
103
  node
104
104
  .children.map { |n| string_source(n) }.compact
105
- .any? { |s| Regexp.new(escaped_delimiters) =~ s }
105
+ .any? { |s| delimiters_regexp =~ s }
106
106
  end
107
107
 
108
108
  def string_source(node)
109
109
  if node.is_a?(String)
110
110
  node
111
- elsif node.respond_to?(:type) && node.str_type?
111
+ elsif node.respond_to?(:type) && (node.str_type? || node.sym_type?)
112
112
  node.source
113
113
  end
114
114
  end
@@ -39,7 +39,7 @@ module RuboCop
39
39
 
40
40
  def autocorrect(node)
41
41
  lambda do |corrector|
42
- corrector.replace(node.source_range, corrected(node.source))
42
+ corrector.replace(node, corrected(node.source))
43
43
  end
44
44
  end
45
45
 
@@ -24,10 +24,10 @@ module RuboCop
24
24
  backref, = *node
25
25
  parent_type = node.parent ? node.parent.type : nil
26
26
  if %i[dstr xstr regexp].include?(parent_type)
27
- corrector.replace(node.source_range,
27
+ corrector.replace(node,
28
28
  "{Regexp.last_match(#{backref})}")
29
29
  else
30
- corrector.replace(node.source_range,
30
+ corrector.replace(node,
31
31
  "Regexp.last_match(#{backref})")
32
32
  end
33
33
  end
@@ -26,7 +26,7 @@ module RuboCop
26
26
  end
27
27
 
28
28
  def autocorrect(node)
29
- ->(corrector) { corrector.replace(node.source_range, 'proc') }
29
+ ->(corrector) { corrector.replace(node, 'proc') }
30
30
  end
31
31
  end
32
32
  end
@@ -58,7 +58,7 @@ module RuboCop
58
58
  correction_compact_to_exploded(node)
59
59
  end
60
60
 
61
- ->(corrector) { corrector.replace(node.source_range, replacement) }
61
+ ->(corrector) { corrector.replace(node, replacement) }
62
62
  end
63
63
 
64
64
  private
@@ -66,13 +66,13 @@ module RuboCop
66
66
  def autocorrect(node)
67
67
  lambda do |corrector|
68
68
  if integer_op_rand?(node)
69
- corrector.replace(node.source_range,
69
+ corrector.replace(node,
70
70
  corrected_integer_op_rand(node))
71
71
  elsif rand_op_integer?(node)
72
- corrector.replace(node.source_range,
72
+ corrector.replace(node,
73
73
  corrected_rand_op_integer(node))
74
74
  elsif rand_modified?(node)
75
- corrector.replace(node.source_range,
75
+ corrector.replace(node,
76
76
  corrected_rand_modified(node))
77
77
  end
78
78
  end
@@ -46,13 +46,13 @@ module RuboCop
46
46
  def autocorrect(node)
47
47
  lambda do |corrector|
48
48
  if node.ternary?
49
- corrector.replace(range_of_offense(node), '||')
49
+ correct_ternary(corrector, node)
50
50
  elsif node.modifier_form? || !node.else_branch
51
- corrector.replace(node.source_range, node.if_branch.source)
51
+ corrector.replace(node, node.if_branch.source)
52
52
  else
53
53
  corrected = make_ternary_form(node)
54
54
 
55
- corrector.replace(node.source_range, corrected)
55
+ corrector.replace(node, corrected)
56
56
  end
57
57
  end
58
58
  end
@@ -90,9 +90,13 @@ module RuboCop
90
90
  end
91
91
 
92
92
  def else_source(else_branch)
93
- wrap_else =
94
- else_branch.basic_conditional? && else_branch.modifier_form?
95
- wrap_else ? "(#{else_branch.source})" : else_branch.source
93
+ if else_branch.basic_conditional? &&
94
+ else_branch.modifier_form? ||
95
+ else_branch.range_type?
96
+ "(#{else_branch.source})"
97
+ else
98
+ else_branch.source
99
+ end
96
100
  end
97
101
 
98
102
  def make_ternary_form(node)
@@ -106,6 +110,14 @@ module RuboCop
106
110
  ternary_form
107
111
  end
108
112
  end
113
+
114
+ def correct_ternary(corrector, node)
115
+ corrector.replace(range_of_offense(node), '||')
116
+
117
+ return unless node.else_branch.range_type?
118
+
119
+ corrector.wrap(node.else_branch, '(', ')')
120
+ end
109
121
  end
110
122
  end
111
123
  end
@@ -40,7 +40,7 @@ module RuboCop
40
40
 
41
41
  def autocorrect(node)
42
42
  lambda do |corrector|
43
- corrector.replace(node.loc.expression, replacement_condition(node))
43
+ corrector.replace(node, replacement_condition(node))
44
44
  end
45
45
  end
46
46
 
@@ -32,17 +32,17 @@ module RuboCop
32
32
  exploded?(node) do |command, message|
33
33
  return lambda do |corrector|
34
34
  if node.parenthesized?
35
- corrector.replace(node.source_range,
35
+ corrector.replace(node,
36
36
  "#{command}(#{message.source})")
37
37
  else
38
- corrector.replace(node.source_range,
38
+ corrector.replace(node,
39
39
  "#{command} #{message.source}")
40
40
  end
41
41
  end
42
42
  end
43
43
  compact?(node) do |new_call, message|
44
44
  lambda do |corrector|
45
- corrector.replace(new_call.source_range, message.source)
45
+ corrector.replace(new_call, message.source)
46
46
  end
47
47
  end
48
48
  end
@@ -72,13 +72,13 @@ module RuboCop
72
72
 
73
73
  def autocorrect_variable_interpolation(embedded_node, node)
74
74
  replacement = "#{embedded_node.loc.expression.source}.to_s"
75
- ->(corrector) { corrector.replace(node.loc.expression, replacement) }
75
+ ->(corrector) { corrector.replace(node, replacement) }
76
76
  end
77
77
 
78
78
  def autocorrect_single_variable_interpolation(embedded_node, node)
79
79
  variable_loc = embedded_node.children.first.loc
80
80
  replacement = "#{variable_loc.expression.source}.to_s"
81
- ->(corrector) { corrector.replace(node.loc.expression, replacement) }
81
+ ->(corrector) { corrector.replace(node, replacement) }
82
82
  end
83
83
 
84
84
  def autocorrect_other(embedded_node, node)
@@ -47,7 +47,7 @@ module RuboCop
47
47
 
48
48
  def autocorrect(node)
49
49
  delimiter =
50
- node.source =~ /^%Q[^"]+$|'/ ? QUOTE : SINGLE_QUOTE
50
+ /^%Q[^"]+$|'/.match?(node.source) ? QUOTE : SINGLE_QUOTE
51
51
  lambda do |corrector|
52
52
  corrector.replace(node.loc.begin, delimiter)
53
53
  corrector.replace(node.loc.end, delimiter)
@@ -95,7 +95,7 @@ module RuboCop
95
95
  def acceptable_q?(node)
96
96
  src = node.source
97
97
 
98
- return true if src =~ STRING_INTERPOLATION_REGEXP
98
+ return true if STRING_INTERPOLATION_REGEXP.match?(src)
99
99
 
100
100
  src.scan(/\\./).any? { |s| s =~ ESCAPED_NON_BACKSLASH }
101
101
  end
@@ -71,7 +71,7 @@ module RuboCop
71
71
  private
72
72
 
73
73
  def correct_without_arguments(return_node, corrector)
74
- corrector.replace(return_node.source_range, 'nil')
74
+ corrector.replace(return_node, 'nil')
75
75
  end
76
76
 
77
77
  def correct_with_arguments(return_node, corrector)
@@ -91,15 +91,13 @@ module RuboCop
91
91
  end
92
92
 
93
93
  def add_brackets(corrector, node)
94
- kids = node.children.map(&:source_range)
95
- corrector.insert_before(kids.first, '[')
96
- corrector.insert_after(kids.last, ']')
94
+ corrector.insert_before(node.children.first, '[')
95
+ corrector.insert_after(node.children.last, ']')
97
96
  end
98
97
 
99
98
  def add_braces(corrector, node)
100
- kids = node.children.map(&:source_range)
101
- corrector.insert_before(kids.first, '{')
102
- corrector.insert_after(kids.last, '}')
99
+ corrector.insert_before(node.children.first, '{')
100
+ corrector.insert_after(node.children.last, '}')
103
101
  end
104
102
 
105
103
  # rubocop:disable Metrics/CyclomaticComplexity
@@ -110,7 +110,7 @@ module RuboCop
110
110
 
111
111
  def autocorrect(node)
112
112
  lambda do |corrector|
113
- corrector.remove(node.receiver.source_range)
113
+ corrector.remove(node.receiver)
114
114
  corrector.remove(node.loc.dot)
115
115
  end
116
116
  end
@@ -63,9 +63,9 @@ module RuboCop
63
63
  (send $(send _ $:sort_by _) ${:last :first})
64
64
  (send $(send _ $:sort_by _) ${:[] :at :slice} {(int 0) (int -1)})
65
65
 
66
- (send (block $(send _ ${:sort_by :sort}) ...) ${:last :first})
66
+ (send ({block numblock} $(send _ ${:sort_by :sort}) ...) ${:last :first})
67
67
  (send
68
- (block $(send _ ${:sort_by :sort}) ...)
68
+ ({block numblock} $(send _ ${:sort_by :sort}) ...)
69
69
  ${:[] :at :slice} {(int 0) (int -1)}
70
70
  )
71
71
  }
@@ -64,7 +64,7 @@ module RuboCop
64
64
  "\n#{offset(node)}end"
65
65
 
66
66
  lambda do |corrector|
67
- corrector.replace(node.source_range, correction)
67
+ corrector.replace(node, correction)
68
68
  end
69
69
  end
70
70
  end
@@ -60,7 +60,7 @@ module RuboCop
60
60
  def autocorrect(node)
61
61
  lambda do |corrector|
62
62
  corrected = style == :return ? 'return' : 'return nil'
63
- corrector.replace(node.source_range, corrected)
63
+ corrector.replace(node, corrected)
64
64
  end
65
65
  end
66
66
 
@@ -131,7 +131,7 @@ module RuboCop
131
131
  comments = comments(node)
132
132
  return if comments.empty?
133
133
 
134
- corrector.insert_before(method_call.loc.expression,
134
+ corrector.insert_before(method_call,
135
135
  "#{comments.map(&:text).join("\n")}\n")
136
136
  end
137
137
 
@@ -88,7 +88,7 @@ module RuboCop
88
88
  def apply_autocorrect(node, rhs, operator, new_rhs)
89
89
  lambda do |corrector|
90
90
  corrector.insert_before(node.loc.operator, operator)
91
- corrector.replace(rhs.source_range, new_rhs.source)
91
+ corrector.replace(rhs, new_rhs.source)
92
92
  end
93
93
  end
94
94
  end
@@ -145,7 +145,7 @@ module RuboCop
145
145
  node = node.parent
146
146
  end
147
147
 
148
- corrector.replace(node.source_range, replacement(node, global_var))
148
+ corrector.replace(node, replacement(node, global_var))
149
149
  end
150
150
  end
151
151
 
@@ -57,10 +57,7 @@ module RuboCop
57
57
 
58
58
  def missing_parentheses_corrector(node)
59
59
  lambda do |corrector|
60
- args_loc = node.loc.expression
61
-
62
- corrector.insert_before(args_loc, '(')
63
- corrector.insert_after(args_loc, ')')
60
+ corrector.wrap(node, '(', ')')
64
61
  end
65
62
  end
66
63