rubocop 0.89.0 → 0.92.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 (416) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +2 -2
  3. data/config/default.yml +128 -14
  4. data/lib/rubocop.rb +30 -4
  5. data/lib/rubocop/cached_data.rb +1 -0
  6. data/lib/rubocop/cli/command.rb +1 -0
  7. data/lib/rubocop/cli/command/auto_genenerate_config.rb +1 -0
  8. data/lib/rubocop/cli/command/base.rb +1 -0
  9. data/lib/rubocop/cli/command/execute_runner.rb +9 -0
  10. data/lib/rubocop/cli/command/init_dotfile.rb +1 -0
  11. data/lib/rubocop/cli/command/show_cops.rb +2 -1
  12. data/lib/rubocop/cli/command/version.rb +1 -0
  13. data/lib/rubocop/cli/environment.rb +1 -0
  14. data/lib/rubocop/comment_config.rb +17 -10
  15. data/lib/rubocop/config.rb +1 -1
  16. data/lib/rubocop/config_loader.rb +21 -10
  17. data/lib/rubocop/config_loader_resolver.rb +1 -0
  18. data/lib/rubocop/config_obsoletion.rb +1 -0
  19. data/lib/rubocop/config_regeneration.rb +33 -0
  20. data/lib/rubocop/config_store.rb +3 -3
  21. data/lib/rubocop/config_validator.rb +4 -1
  22. data/lib/rubocop/cop/base.rb +23 -0
  23. data/lib/rubocop/cop/bundler/duplicated_gem.rb +5 -1
  24. data/lib/rubocop/cop/bundler/gem_comment.rb +8 -3
  25. data/lib/rubocop/cop/bundler/insecure_protocol_source.rb +2 -0
  26. data/lib/rubocop/cop/commissioner.rb +47 -7
  27. data/lib/rubocop/cop/correctors/alignment_corrector.rb +4 -4
  28. data/lib/rubocop/cop/correctors/condition_corrector.rb +3 -5
  29. data/lib/rubocop/cop/correctors/empty_line_corrector.rb +9 -10
  30. data/lib/rubocop/cop/correctors/line_break_corrector.rb +4 -4
  31. data/lib/rubocop/cop/correctors/multiline_literal_brace_corrector.rb +8 -3
  32. data/lib/rubocop/cop/correctors/parentheses_corrector.rb +5 -8
  33. data/lib/rubocop/cop/correctors/percent_literal_corrector.rb +5 -10
  34. data/lib/rubocop/cop/correctors/punctuation_corrector.rb +8 -10
  35. data/lib/rubocop/cop/documentation.rb +22 -0
  36. data/lib/rubocop/cop/generator.rb +2 -1
  37. data/lib/rubocop/cop/internal_affairs/method_name_equal.rb +1 -0
  38. data/lib/rubocop/cop/internal_affairs/node_type_predicate.rb +1 -0
  39. data/lib/rubocop/cop/internal_affairs/offense_location_keyword.rb +1 -0
  40. data/lib/rubocop/cop/internal_affairs/redundant_location_argument.rb +1 -0
  41. data/lib/rubocop/cop/internal_affairs/redundant_message_argument.rb +1 -0
  42. data/lib/rubocop/cop/layout/array_alignment.rb +1 -0
  43. data/lib/rubocop/cop/layout/begin_end_alignment.rb +77 -0
  44. data/lib/rubocop/cop/layout/block_alignment.rb +23 -19
  45. data/lib/rubocop/cop/layout/case_indentation.rb +4 -7
  46. data/lib/rubocop/cop/layout/class_structure.rb +14 -17
  47. data/lib/rubocop/cop/layout/closing_heredoc_indentation.rb +4 -6
  48. data/lib/rubocop/cop/layout/comment_indentation.rb +1 -1
  49. data/lib/rubocop/cop/layout/condition_position.rb +13 -15
  50. data/lib/rubocop/cop/layout/def_end_alignment.rb +8 -5
  51. data/lib/rubocop/cop/layout/dot_position.rb +21 -17
  52. data/lib/rubocop/cop/layout/empty_comment.rb +30 -23
  53. data/lib/rubocop/cop/layout/empty_line_after_guard_clause.rb +21 -18
  54. data/lib/rubocop/cop/layout/empty_line_after_magic_comment.rb +13 -13
  55. data/lib/rubocop/cop/layout/empty_line_after_multiline_condition.rb +136 -0
  56. data/lib/rubocop/cop/layout/empty_line_between_defs.rb +21 -23
  57. data/lib/rubocop/cop/layout/empty_lines.rb +6 -7
  58. data/lib/rubocop/cop/layout/empty_lines_around_access_modifier.rb +18 -14
  59. data/lib/rubocop/cop/layout/empty_lines_around_arguments.rb +7 -8
  60. data/lib/rubocop/cop/layout/empty_lines_around_attribute_accessor.rb +4 -7
  61. data/lib/rubocop/cop/layout/empty_lines_around_begin_body.rb +2 -5
  62. data/lib/rubocop/cop/layout/empty_lines_around_block_body.rb +2 -5
  63. data/lib/rubocop/cop/layout/empty_lines_around_class_body.rb +2 -5
  64. data/lib/rubocop/cop/layout/empty_lines_around_exception_handling_keywords.rb +3 -7
  65. data/lib/rubocop/cop/layout/empty_lines_around_method_body.rb +2 -5
  66. data/lib/rubocop/cop/layout/empty_lines_around_module_body.rb +2 -5
  67. data/lib/rubocop/cop/layout/end_alignment.rb +11 -17
  68. data/lib/rubocop/cop/layout/extra_spacing.rb +14 -21
  69. data/lib/rubocop/cop/layout/first_array_element_line_break.rb +2 -5
  70. data/lib/rubocop/cop/layout/first_hash_element_line_break.rb +2 -5
  71. data/lib/rubocop/cop/layout/first_method_argument_line_break.rb +4 -8
  72. data/lib/rubocop/cop/layout/first_method_parameter_line_break.rb +2 -5
  73. data/lib/rubocop/cop/layout/hash_alignment.rb +17 -20
  74. data/lib/rubocop/cop/layout/heredoc_argument_closing_parenthesis.rb +15 -14
  75. data/lib/rubocop/cop/layout/heredoc_indentation.rb +14 -11
  76. data/lib/rubocop/cop/layout/initial_indentation.rb +6 -7
  77. data/lib/rubocop/cop/layout/leading_comment_space.rb +12 -10
  78. data/lib/rubocop/cop/layout/leading_empty_lines.rb +6 -11
  79. data/lib/rubocop/cop/layout/multiline_array_brace_layout.rb +2 -5
  80. data/lib/rubocop/cop/layout/multiline_array_line_breaks.rb +2 -5
  81. data/lib/rubocop/cop/layout/multiline_assignment_layout.rb +10 -14
  82. data/lib/rubocop/cop/layout/multiline_block_layout.rb +21 -19
  83. data/lib/rubocop/cop/layout/multiline_hash_brace_layout.rb +2 -5
  84. data/lib/rubocop/cop/layout/multiline_hash_key_line_breaks.rb +2 -5
  85. data/lib/rubocop/cop/layout/multiline_method_argument_line_breaks.rb +5 -9
  86. data/lib/rubocop/cop/layout/multiline_method_call_brace_layout.rb +2 -5
  87. data/lib/rubocop/cop/layout/multiline_method_definition_brace_layout.rb +2 -5
  88. data/lib/rubocop/cop/layout/rescue_ensure_alignment.rb +41 -22
  89. data/lib/rubocop/cop/layout/space_after_colon.rb +11 -7
  90. data/lib/rubocop/cop/layout/space_after_comma.rb +2 -5
  91. data/lib/rubocop/cop/layout/space_after_method_name.rb +5 -6
  92. data/lib/rubocop/cop/layout/space_after_not.rb +9 -11
  93. data/lib/rubocop/cop/layout/space_after_semicolon.rb +2 -5
  94. data/lib/rubocop/cop/layout/space_around_equals_in_parameter_default.rb +22 -17
  95. data/lib/rubocop/cop/layout/space_around_keyword.rb +17 -18
  96. data/lib/rubocop/cop/layout/space_around_operators.rb +17 -16
  97. data/lib/rubocop/cop/layout/space_before_block_braces.rb +23 -22
  98. data/lib/rubocop/cop/layout/space_before_comma.rb +3 -5
  99. data/lib/rubocop/cop/layout/space_before_comment.rb +10 -7
  100. data/lib/rubocop/cop/layout/space_before_first_arg.rb +7 -7
  101. data/lib/rubocop/cop/layout/space_before_semicolon.rb +2 -5
  102. data/lib/rubocop/cop/layout/space_in_lambda_literal.rb +9 -17
  103. data/lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb +20 -23
  104. data/lib/rubocop/cop/layout/space_inside_array_percent_literal.rb +3 -8
  105. data/lib/rubocop/cop/layout/space_inside_block_braces.rb +17 -16
  106. data/lib/rubocop/cop/layout/space_inside_hash_literal_braces.rb +19 -37
  107. data/lib/rubocop/cop/layout/space_inside_parens.rb +9 -14
  108. data/lib/rubocop/cop/layout/space_inside_percent_literal_delimiters.rb +5 -10
  109. data/lib/rubocop/cop/layout/space_inside_range_literal.rb +8 -17
  110. data/lib/rubocop/cop/layout/space_inside_reference_brackets.rb +16 -24
  111. data/lib/rubocop/cop/layout/space_inside_string_interpolation.rb +12 -13
  112. data/lib/rubocop/cop/layout/trailing_empty_lines.rb +10 -15
  113. data/lib/rubocop/cop/layout/trailing_whitespace.rb +11 -11
  114. data/lib/rubocop/cop/lint/ambiguous_operator.rb +2 -0
  115. data/lib/rubocop/cop/lint/big_decimal_new.rb +1 -2
  116. data/lib/rubocop/cop/lint/binary_operator_with_identical_operands.rb +2 -1
  117. data/lib/rubocop/cop/lint/constant_definition_in_block.rb +74 -0
  118. data/lib/rubocop/cop/lint/constant_resolution.rb +1 -1
  119. data/lib/rubocop/cop/lint/debugger.rb +2 -3
  120. data/lib/rubocop/cop/lint/deprecated_class_methods.rb +1 -3
  121. data/lib/rubocop/cop/lint/duplicate_methods.rb +2 -4
  122. data/lib/rubocop/cop/lint/duplicate_require.rb +46 -0
  123. data/lib/rubocop/cop/lint/duplicate_rescue_exception.rb +2 -15
  124. data/lib/rubocop/cop/lint/each_with_object_argument.rb +1 -0
  125. data/lib/rubocop/cop/lint/empty_file.rb +50 -0
  126. data/lib/rubocop/cop/lint/erb_new_arguments.rb +2 -0
  127. data/lib/rubocop/cop/lint/float_comparison.rb +2 -2
  128. data/lib/rubocop/cop/lint/format_parameter_mismatch.rb +2 -2
  129. data/lib/rubocop/cop/lint/identity_comparison.rb +51 -0
  130. data/lib/rubocop/cop/lint/ineffective_access_modifier.rb +2 -5
  131. data/lib/rubocop/cop/lint/inherit_exception.rb +2 -2
  132. data/lib/rubocop/cop/lint/missing_super.rb +11 -11
  133. data/lib/rubocop/cop/lint/mixed_regexp_capture_types.rb +2 -35
  134. data/lib/rubocop/cop/lint/multiple_comparison.rb +3 -1
  135. data/lib/rubocop/cop/lint/number_conversion.rb +1 -0
  136. data/lib/rubocop/cop/lint/out_of_range_regexp_ref.rb +33 -15
  137. data/lib/rubocop/cop/lint/percent_string_array.rb +8 -12
  138. data/lib/rubocop/cop/lint/raise_exception.rb +1 -0
  139. data/lib/rubocop/cop/lint/rand_one.rb +2 -1
  140. data/lib/rubocop/cop/lint/redundant_cop_disable_directive.rb +36 -29
  141. data/lib/rubocop/cop/lint/redundant_cop_enable_directive.rb +14 -4
  142. data/lib/rubocop/cop/lint/redundant_require_statement.rb +1 -0
  143. data/lib/rubocop/cop/lint/rescue_type.rb +0 -1
  144. data/lib/rubocop/cop/lint/send_with_mixin_argument.rb +3 -1
  145. data/lib/rubocop/cop/lint/shadowed_exception.rb +6 -6
  146. data/lib/rubocop/cop/lint/shadowing_outer_local_variable.rb +4 -4
  147. data/lib/rubocop/cop/lint/struct_new_override.rb +1 -0
  148. data/lib/rubocop/cop/lint/to_json.rb +16 -5
  149. data/lib/rubocop/cop/lint/top_level_return_with_argument.rb +1 -1
  150. data/lib/rubocop/cop/lint/trailing_comma_in_attribute_declaration.rb +57 -0
  151. data/lib/rubocop/cop/lint/unreachable_loop.rb +3 -6
  152. data/lib/rubocop/cop/lint/uri_escape_unescape.rb +3 -1
  153. data/lib/rubocop/cop/lint/uri_regexp.rb +10 -25
  154. data/lib/rubocop/cop/lint/useless_access_modifier.rb +3 -9
  155. data/lib/rubocop/cop/lint/useless_method_definition.rb +70 -0
  156. data/lib/rubocop/cop/lint/useless_times.rb +106 -0
  157. data/lib/rubocop/cop/metrics/utils/abc_size_calculator.rb +27 -16
  158. data/lib/rubocop/cop/metrics/utils/code_length_calculator.rb +1 -0
  159. data/lib/rubocop/cop/migration/department_name.rb +2 -2
  160. data/lib/rubocop/cop/mixin/alignment.rb +5 -1
  161. data/lib/rubocop/cop/mixin/allowed_methods.rb +2 -0
  162. data/lib/rubocop/cop/mixin/annotation_comment.rb +5 -0
  163. data/lib/rubocop/cop/mixin/check_line_breakable.rb +17 -8
  164. data/lib/rubocop/cop/mixin/comments_help.rb +48 -0
  165. data/lib/rubocop/cop/mixin/configurable_naming.rb +2 -2
  166. data/lib/rubocop/cop/mixin/configurable_numbering.rb +3 -3
  167. data/lib/rubocop/cop/mixin/empty_lines_around_body.rb +8 -7
  168. data/lib/rubocop/cop/mixin/empty_parameter.rb +3 -1
  169. data/lib/rubocop/cop/mixin/end_keyword_alignment.rb +12 -1
  170. data/lib/rubocop/cop/mixin/enforce_superclass.rb +0 -2
  171. data/lib/rubocop/cop/mixin/first_element_line_break.rb +3 -1
  172. data/lib/rubocop/cop/mixin/hash_transform_method.rb +31 -12
  173. data/lib/rubocop/cop/mixin/line_length_help.rb +1 -3
  174. data/lib/rubocop/cop/mixin/multiline_element_line_breaks.rb +3 -1
  175. data/lib/rubocop/cop/mixin/multiline_literal_brace_layout.rb +13 -12
  176. data/lib/rubocop/cop/mixin/negative_conditional.rb +2 -2
  177. data/lib/rubocop/cop/mixin/percent_array.rb +16 -9
  178. data/lib/rubocop/cop/mixin/range_help.rb +18 -4
  179. data/lib/rubocop/cop/mixin/regexp_literal_help.rb +1 -1
  180. data/lib/rubocop/cop/mixin/rescue_node.rb +11 -1
  181. data/lib/rubocop/cop/mixin/space_after_punctuation.rb +4 -3
  182. data/lib/rubocop/cop/mixin/space_before_punctuation.rb +4 -3
  183. data/lib/rubocop/cop/mixin/statement_modifier.rb +12 -6
  184. data/lib/rubocop/cop/mixin/surrounding_space.rb +8 -4
  185. data/lib/rubocop/cop/mixin/trailing_comma.rb +9 -11
  186. data/lib/rubocop/cop/mixin/visibility_help.rb +4 -16
  187. data/lib/rubocop/cop/naming/binary_operator_parameter_name.rb +1 -1
  188. data/lib/rubocop/cop/naming/file_name.rb +1 -1
  189. data/lib/rubocop/cop/offense.rb +1 -0
  190. data/lib/rubocop/cop/security/eval.rb +1 -0
  191. data/lib/rubocop/cop/security/json_load.rb +1 -0
  192. data/lib/rubocop/cop/security/marshal_load.rb +1 -0
  193. data/lib/rubocop/cop/security/open.rb +1 -0
  194. data/lib/rubocop/cop/security/yaml_load.rb +1 -0
  195. data/lib/rubocop/cop/severity.rb +0 -8
  196. data/lib/rubocop/cop/style/access_modifier_declarations.rb +8 -19
  197. data/lib/rubocop/cop/style/accessor_grouping.rb +20 -20
  198. data/lib/rubocop/cop/style/alias.rb +36 -33
  199. data/lib/rubocop/cop/style/and_or.rb +9 -11
  200. data/lib/rubocop/cop/style/array_coercion.rb +4 -0
  201. data/lib/rubocop/cop/style/array_join.rb +7 -8
  202. data/lib/rubocop/cop/style/ascii_comments.rb +4 -4
  203. data/lib/rubocop/cop/style/attr.rb +12 -9
  204. data/lib/rubocop/cop/style/auto_resource_cleanup.rb +4 -5
  205. data/lib/rubocop/cop/style/bare_percent_literals.rb +10 -12
  206. data/lib/rubocop/cop/style/begin_block.rb +2 -2
  207. data/lib/rubocop/cop/style/bisected_attr_accessor.rb +9 -12
  208. data/lib/rubocop/cop/style/block_comments.rb +14 -18
  209. data/lib/rubocop/cop/style/block_delimiters.rb +23 -23
  210. data/lib/rubocop/cop/style/case_equality.rb +11 -3
  211. data/lib/rubocop/cop/style/case_like_if.rb +37 -18
  212. data/lib/rubocop/cop/style/class_and_module_children.rb +16 -11
  213. data/lib/rubocop/cop/style/class_check.rb +6 -11
  214. data/lib/rubocop/cop/style/class_methods.rb +7 -11
  215. data/lib/rubocop/cop/style/class_methods_definitions.rb +157 -0
  216. data/lib/rubocop/cop/style/class_vars.rb +7 -12
  217. data/lib/rubocop/cop/style/collection_methods.rb +11 -17
  218. data/lib/rubocop/cop/style/colon_method_call.rb +6 -7
  219. data/lib/rubocop/cop/style/colon_method_definition.rb +6 -6
  220. data/lib/rubocop/cop/style/combinable_loops.rb +84 -0
  221. data/lib/rubocop/cop/style/command_literal.rb +23 -24
  222. data/lib/rubocop/cop/style/comment_annotation.rb +15 -15
  223. data/lib/rubocop/cop/style/commented_keyword.rb +8 -9
  224. data/lib/rubocop/cop/style/conditional_assignment.rb +50 -61
  225. data/lib/rubocop/cop/style/constant_visibility.rb +3 -2
  226. data/lib/rubocop/cop/style/copyright.rb +12 -12
  227. data/lib/rubocop/cop/style/date_time.rb +13 -2
  228. data/lib/rubocop/cop/style/def_with_parentheses.rb +8 -10
  229. data/lib/rubocop/cop/style/dir.rb +8 -10
  230. data/lib/rubocop/cop/style/disable_cops_within_source_code_directive.rb +7 -9
  231. data/lib/rubocop/cop/style/documentation.rb +2 -4
  232. data/lib/rubocop/cop/style/documentation_method.rb +1 -1
  233. data/lib/rubocop/cop/style/double_cop_disable_directive.rb +12 -15
  234. data/lib/rubocop/cop/style/double_negation.rb +3 -2
  235. data/lib/rubocop/cop/style/each_for_simple_loop.rb +5 -8
  236. data/lib/rubocop/cop/style/each_with_object.rb +16 -17
  237. data/lib/rubocop/cop/style/empty_block_parameter.rb +9 -10
  238. data/lib/rubocop/cop/style/empty_case_condition.rb +19 -20
  239. data/lib/rubocop/cop/style/empty_else.rb +17 -19
  240. data/lib/rubocop/cop/style/empty_lambda_parameter.rb +9 -10
  241. data/lib/rubocop/cop/style/empty_literal.rb +18 -17
  242. data/lib/rubocop/cop/style/empty_method.rb +5 -8
  243. data/lib/rubocop/cop/style/encoding.rb +5 -9
  244. data/lib/rubocop/cop/style/end_block.rb +4 -6
  245. data/lib/rubocop/cop/style/eval_with_location.rb +6 -10
  246. data/lib/rubocop/cop/style/even_odd.rb +8 -11
  247. data/lib/rubocop/cop/style/expand_path_arguments.rb +23 -26
  248. data/lib/rubocop/cop/style/explicit_block_argument.rb +1 -1
  249. data/lib/rubocop/cop/style/exponential_notation.rb +1 -1
  250. data/lib/rubocop/cop/style/float_division.rb +3 -1
  251. data/lib/rubocop/cop/style/for.rb +11 -15
  252. data/lib/rubocop/cop/style/format_string.rb +18 -23
  253. data/lib/rubocop/cop/style/format_string_token.rb +4 -7
  254. data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +19 -41
  255. data/lib/rubocop/cop/style/global_vars.rb +2 -2
  256. data/lib/rubocop/cop/style/guard_clause.rb +4 -4
  257. data/lib/rubocop/cop/style/hash_as_last_array_item.rb +24 -5
  258. data/lib/rubocop/cop/style/hash_each_methods.rb +5 -8
  259. data/lib/rubocop/cop/style/hash_syntax.rb +6 -7
  260. data/lib/rubocop/cop/style/hash_transform_keys.rb +19 -11
  261. data/lib/rubocop/cop/style/hash_transform_values.rb +18 -10
  262. data/lib/rubocop/cop/style/identical_conditional_branches.rb +1 -1
  263. data/lib/rubocop/cop/style/if_inside_else.rb +2 -2
  264. data/lib/rubocop/cop/style/if_unless_modifier.rb +11 -17
  265. data/lib/rubocop/cop/style/if_unless_modifier_of_if_unless.rb +3 -7
  266. data/lib/rubocop/cop/style/if_with_semicolon.rb +3 -6
  267. data/lib/rubocop/cop/style/implicit_runtime_error.rb +2 -1
  268. data/lib/rubocop/cop/style/infinite_loop.rb +23 -23
  269. data/lib/rubocop/cop/style/inline_comment.rb +3 -3
  270. data/lib/rubocop/cop/style/inverse_methods.rb +20 -29
  271. data/lib/rubocop/cop/style/keyword_parameters_order.rb +53 -0
  272. data/lib/rubocop/cop/style/lambda.rb +7 -12
  273. data/lib/rubocop/cop/style/lambda_call.rb +17 -14
  274. data/lib/rubocop/cop/style/line_end_concatenation.rb +19 -16
  275. data/lib/rubocop/cop/style/method_call_with_args_parentheses.rb +2 -1
  276. data/lib/rubocop/cop/style/method_call_with_args_parentheses/omit_parentheses.rb +11 -11
  277. data/lib/rubocop/cop/style/method_call_with_args_parentheses/require_parentheses.rb +4 -8
  278. data/lib/rubocop/cop/style/method_call_without_args_parentheses.rb +7 -6
  279. data/lib/rubocop/cop/style/method_called_on_do_end_block.rb +12 -3
  280. data/lib/rubocop/cop/style/method_def_parentheses.rb +11 -16
  281. data/lib/rubocop/cop/style/min_max.rb +8 -12
  282. data/lib/rubocop/cop/style/missing_else.rb +13 -13
  283. data/lib/rubocop/cop/style/missing_respond_to_missing.rb +1 -1
  284. data/lib/rubocop/cop/style/mixin_grouping.rb +24 -27
  285. data/lib/rubocop/cop/style/mixin_usage.rb +9 -28
  286. data/lib/rubocop/cop/style/module_function.rb +10 -13
  287. data/lib/rubocop/cop/style/multiline_block_chain.rb +2 -2
  288. data/lib/rubocop/cop/style/multiline_if_modifier.rb +3 -10
  289. data/lib/rubocop/cop/style/multiline_if_then.rb +4 -10
  290. data/lib/rubocop/cop/style/multiline_memoization.rb +12 -10
  291. data/lib/rubocop/cop/style/multiline_method_signature.rb +1 -1
  292. data/lib/rubocop/cop/style/multiline_ternary_operator.rb +17 -6
  293. data/lib/rubocop/cop/style/multiline_when_then.rb +10 -11
  294. data/lib/rubocop/cop/style/multiple_comparison.rb +1 -1
  295. data/lib/rubocop/cop/style/mutable_constant.rb +23 -20
  296. data/lib/rubocop/cop/style/negated_if.rb +6 -6
  297. data/lib/rubocop/cop/style/negated_unless.rb +6 -6
  298. data/lib/rubocop/cop/style/negated_while.rb +7 -15
  299. data/lib/rubocop/cop/style/nested_modifier.rb +10 -13
  300. data/lib/rubocop/cop/style/nested_parenthesized_calls.rb +14 -12
  301. data/lib/rubocop/cop/style/nested_ternary_operator.rb +14 -16
  302. data/lib/rubocop/cop/style/next.rb +10 -14
  303. data/lib/rubocop/cop/style/nil_comparison.rb +13 -11
  304. data/lib/rubocop/cop/style/non_nil_check.rb +34 -26
  305. data/lib/rubocop/cop/style/not.rb +20 -26
  306. data/lib/rubocop/cop/style/numeric_literal_prefix.rb +4 -9
  307. data/lib/rubocop/cop/style/numeric_predicate.rb +5 -14
  308. data/lib/rubocop/cop/style/one_line_conditional.rb +73 -23
  309. data/lib/rubocop/cop/style/option_hash.rb +1 -1
  310. data/lib/rubocop/cop/style/optional_arguments.rb +1 -1
  311. data/lib/rubocop/cop/style/optional_boolean_parameter.rb +12 -1
  312. data/lib/rubocop/cop/style/or_assignment.rb +13 -10
  313. data/lib/rubocop/cop/style/parallel_assignment.rb +14 -14
  314. data/lib/rubocop/cop/style/parentheses_around_condition.rb +6 -6
  315. data/lib/rubocop/cop/style/percent_literal_delimiters.rb +13 -19
  316. data/lib/rubocop/cop/style/percent_q_literals.rb +8 -10
  317. data/lib/rubocop/cop/style/perl_backrefs.rb +8 -10
  318. data/lib/rubocop/cop/style/preferred_hash_methods.rb +11 -14
  319. data/lib/rubocop/cop/style/proc.rb +6 -6
  320. data/lib/rubocop/cop/style/raise_args.rb +15 -24
  321. data/lib/rubocop/cop/style/random_with_offset.rb +19 -19
  322. data/lib/rubocop/cop/style/redundant_assignment.rb +8 -18
  323. data/lib/rubocop/cop/style/redundant_begin.rb +7 -9
  324. data/lib/rubocop/cop/style/redundant_capital_w.rb +6 -9
  325. data/lib/rubocop/cop/style/redundant_condition.rb +5 -6
  326. data/lib/rubocop/cop/style/redundant_conditional.rb +4 -5
  327. data/lib/rubocop/cop/style/redundant_exception.rb +1 -3
  328. data/lib/rubocop/cop/style/redundant_fetch_block.rb +3 -12
  329. data/lib/rubocop/cop/style/redundant_file_extension_in_require.rb +9 -8
  330. data/lib/rubocop/cop/style/redundant_freeze.rb +5 -7
  331. data/lib/rubocop/cop/style/redundant_interpolation.rb +25 -24
  332. data/lib/rubocop/cop/style/redundant_parentheses.rb +21 -15
  333. data/lib/rubocop/cop/style/redundant_percent_q.rb +9 -11
  334. data/lib/rubocop/cop/style/redundant_regexp_character_class.rb +6 -13
  335. data/lib/rubocop/cop/style/redundant_regexp_escape.rb +5 -14
  336. data/lib/rubocop/cop/style/redundant_return.rb +17 -17
  337. data/lib/rubocop/cop/style/redundant_self.rb +9 -11
  338. data/lib/rubocop/cop/style/redundant_self_assignment.rb +116 -0
  339. data/lib/rubocop/cop/style/redundant_sort.rb +12 -31
  340. data/lib/rubocop/cop/style/redundant_sort_by.rb +5 -9
  341. data/lib/rubocop/cop/style/regexp_literal.rb +10 -21
  342. data/lib/rubocop/cop/style/rescue_modifier.rb +29 -9
  343. data/lib/rubocop/cop/style/rescue_standard_error.rb +20 -16
  344. data/lib/rubocop/cop/style/return_nil.rb +5 -5
  345. data/lib/rubocop/cop/style/safe_navigation.rb +22 -16
  346. data/lib/rubocop/cop/style/sample.rb +12 -14
  347. data/lib/rubocop/cop/style/self_assignment.rb +26 -22
  348. data/lib/rubocop/cop/style/semicolon.rb +6 -9
  349. data/lib/rubocop/cop/style/send.rb +4 -5
  350. data/lib/rubocop/cop/style/signal_exception.rb +23 -19
  351. data/lib/rubocop/cop/style/single_argument_dig.rb +1 -0
  352. data/lib/rubocop/cop/style/single_line_block_params.rb +4 -2
  353. data/lib/rubocop/cop/style/single_line_methods.rb +18 -17
  354. data/lib/rubocop/cop/style/slicing_with_range.rb +6 -8
  355. data/lib/rubocop/cop/style/sole_nested_conditional.rb +66 -0
  356. data/lib/rubocop/cop/style/special_global_vars.rb +10 -15
  357. data/lib/rubocop/cop/style/stabby_lambda_parentheses.rb +17 -21
  358. data/lib/rubocop/cop/style/stderr_puts.rb +5 -6
  359. data/lib/rubocop/cop/style/string_concatenation.rb +16 -2
  360. data/lib/rubocop/cop/style/string_hash_keys.rb +6 -7
  361. data/lib/rubocop/cop/style/string_methods.rb +7 -17
  362. data/lib/rubocop/cop/style/strip.rb +9 -14
  363. data/lib/rubocop/cop/style/struct_inheritance.rb +3 -6
  364. data/lib/rubocop/cop/style/symbol_array.rb +5 -16
  365. data/lib/rubocop/cop/style/symbol_literal.rb +4 -6
  366. data/lib/rubocop/cop/style/symbol_proc.rb +14 -18
  367. data/lib/rubocop/cop/style/ternary_parentheses.rb +22 -22
  368. data/lib/rubocop/cop/style/trailing_body_on_class.rb +3 -6
  369. data/lib/rubocop/cop/style/trailing_body_on_method_definition.rb +4 -7
  370. data/lib/rubocop/cop/style/trailing_body_on_module.rb +3 -6
  371. data/lib/rubocop/cop/style/trailing_comma_in_arguments.rb +2 -5
  372. data/lib/rubocop/cop/style/trailing_comma_in_array_literal.rb +2 -5
  373. data/lib/rubocop/cop/style/trailing_comma_in_block_args.rb +11 -9
  374. data/lib/rubocop/cop/style/trailing_comma_in_hash_literal.rb +2 -5
  375. data/lib/rubocop/cop/style/trailing_underscore_variable.rb +8 -17
  376. data/lib/rubocop/cop/style/trivial_accessors.rb +26 -30
  377. data/lib/rubocop/cop/style/unless_else.rb +5 -8
  378. data/lib/rubocop/cop/style/unpack_first.rb +5 -8
  379. data/lib/rubocop/cop/style/variable_interpolation.rb +7 -10
  380. data/lib/rubocop/cop/style/when_then.rb +4 -6
  381. data/lib/rubocop/cop/style/while_until_do.rb +6 -16
  382. data/lib/rubocop/cop/style/while_until_modifier.rb +6 -20
  383. data/lib/rubocop/cop/style/word_array.rb +5 -23
  384. data/lib/rubocop/cop/style/yoda_condition.rb +4 -15
  385. data/lib/rubocop/cop/style/zero_length_predicate.rb +12 -18
  386. data/lib/rubocop/cop/team.rb +1 -0
  387. data/lib/rubocop/cop/util.rb +2 -1
  388. data/lib/rubocop/cop/utils/format_string.rb +3 -5
  389. data/lib/rubocop/cop/variable_force.rb +2 -0
  390. data/lib/rubocop/cops_documentation_generator.rb +5 -3
  391. data/lib/rubocop/core_ext/string.rb +2 -2
  392. data/lib/rubocop/directive_comment.rb +32 -0
  393. data/lib/rubocop/ext/regexp_node.rb +46 -0
  394. data/lib/rubocop/file_finder.rb +1 -0
  395. data/lib/rubocop/formatter/auto_gen_config_formatter.rb +2 -1
  396. data/lib/rubocop/formatter/disabled_config_formatter.rb +13 -6
  397. data/lib/rubocop/formatter/html_formatter.rb +2 -0
  398. data/lib/rubocop/formatter/junit_formatter.rb +1 -1
  399. data/lib/rubocop/formatter/progress_formatter.rb +2 -1
  400. data/lib/rubocop/formatter/quiet_formatter.rb +1 -1
  401. data/lib/rubocop/formatter/simple_text_formatter.rb +36 -6
  402. data/lib/rubocop/name_similarity.rb +1 -0
  403. data/lib/rubocop/options.rb +43 -20
  404. data/lib/rubocop/remote_config.rb +1 -0
  405. data/lib/rubocop/result_cache.rb +31 -13
  406. data/lib/rubocop/rspec/cop_helper.rb +4 -1
  407. data/lib/rubocop/rspec/expect_offense.rb +14 -9
  408. data/lib/rubocop/rspec/shared_contexts.rb +13 -5
  409. data/lib/rubocop/runner.rb +35 -15
  410. data/lib/rubocop/string_interpreter.rb +3 -0
  411. data/lib/rubocop/target_finder.rb +5 -1
  412. data/lib/rubocop/target_ruby.rb +7 -1
  413. data/lib/rubocop/version.rb +7 -1
  414. data/lib/rubocop/yaml_duplication_checker.rb +1 -0
  415. metadata +26 -14
  416. data/lib/rubocop/cop/tokens_util.rb +0 -84
@@ -41,7 +41,9 @@ module RuboCop
41
41
  # self.bar == bar # Resolves name clash with argument of the block.
42
42
  # end
43
43
  # end
44
- class RedundantSelf < Cop
44
+ class RedundantSelf < Base
45
+ extend AutoCorrector
46
+
45
47
  MSG = 'Redundant `self` detected.'
46
48
  KERNEL_METHODS = Kernel.methods(false)
47
49
  KEYWORDS = %i[alias and begin break case class def defined? do
@@ -57,7 +59,7 @@ module RuboCop
57
59
  def initialize(config = nil, options = nil)
58
60
  super
59
61
  @allowed_send_nodes = []
60
- @local_variables_scopes = Hash.new { |hash, key| hash[key] = [] }
62
+ @local_variables_scopes = Hash.new { |hash, key| hash[key] = [] }.compare_by_identity
61
63
  end
62
64
 
63
65
  # Assignment of self.x
@@ -106,24 +108,20 @@ module RuboCop
106
108
 
107
109
  return if allowed_send_node?(node)
108
110
 
109
- add_offense(node)
111
+ add_offense(node) do |corrector|
112
+ corrector.remove(node.receiver)
113
+ corrector.remove(node.loc.dot)
114
+ end
110
115
  end
111
116
 
112
117
  def on_block(node)
113
118
  add_scope(node, @local_variables_scopes[node])
114
119
  end
115
120
 
116
- def autocorrect(node)
117
- lambda do |corrector|
118
- corrector.remove(node.receiver)
119
- corrector.remove(node.loc.dot)
120
- end
121
- end
122
-
123
121
  private
124
122
 
125
123
  def add_scope(node, local_variables = [])
126
- node.descendants.each do |child_node|
124
+ node.each_descendant do |child_node|
127
125
  @local_variables_scopes[child_node] = local_variables
128
126
  end
129
127
  end
@@ -0,0 +1,116 @@
1
+ # frozen_string_literal: true
2
+
3
+ module RuboCop
4
+ module Cop
5
+ module Style
6
+ # This cop checks for places where redundant assignments are made for in place
7
+ # modification methods.
8
+ #
9
+ # This cop is marked as unsafe, because it can produce false positives for
10
+ # user defined methods having one of the expected names, but not modifying
11
+ # its receiver in place.
12
+ #
13
+ # @example
14
+ # # bad
15
+ # args = args.concat(ary)
16
+ # hash = hash.merge!(other)
17
+ #
18
+ # # good
19
+ # args.concat(foo)
20
+ # args += foo
21
+ # hash.merge!(other)
22
+ #
23
+ # # bad
24
+ # self.foo = foo.concat(ary)
25
+ #
26
+ # # good
27
+ # foo.concat(ary)
28
+ # self.foo += ary
29
+ #
30
+ class RedundantSelfAssignment < Base
31
+ include RangeHelp
32
+ extend AutoCorrector
33
+
34
+ MSG = 'Redundant self assignment detected. '\
35
+ 'Method `%<method_name>s` modifies its receiver in place.'
36
+
37
+ METHODS_RETURNING_SELF = %i[
38
+ append clear collect! compare_by_identity concat delete_if
39
+ fill initialize_copy insert keep_if map! merge! prepend push
40
+ rehash replace reverse! rotate! shuffle! sort! sort_by!
41
+ transform_keys! transform_values! unshift update
42
+ ].to_set.freeze
43
+
44
+ ASSIGNMENT_TYPE_TO_RECEIVER_TYPE = {
45
+ lvasgn: :lvar,
46
+ ivasgn: :ivar,
47
+ cvasgn: :cvar,
48
+ gvasgn: :gvar
49
+ }.freeze
50
+
51
+ def on_lvasgn(node)
52
+ lhs, rhs = *node
53
+ receiver, method_name, = *rhs
54
+ return unless receiver && method_returning_self?(method_name)
55
+
56
+ receiver_type = ASSIGNMENT_TYPE_TO_RECEIVER_TYPE[node.type]
57
+ return unless receiver.type == receiver_type && receiver.children.first == lhs
58
+
59
+ message = format(MSG, method_name: method_name)
60
+ add_offense(node.loc.operator, message: message) do |corrector|
61
+ corrector.replace(node, rhs.source)
62
+ end
63
+ end
64
+ alias on_ivasgn on_lvasgn
65
+ alias on_cvasgn on_lvasgn
66
+ alias on_gvasgn on_lvasgn
67
+
68
+ def on_send(node)
69
+ # TODO: replace with #end_with? after supporting only ruby >= 2.7
70
+ return unless node.method_name.match?(/=$/)
71
+ return unless redundant_assignment?(node)
72
+
73
+ message = format(MSG, method_name: node.first_argument.method_name)
74
+ add_offense(node.loc.operator, message: message) do |corrector|
75
+ corrector.remove(correction_range(node))
76
+ end
77
+ end
78
+
79
+ private
80
+
81
+ def method_returning_self?(method_name)
82
+ METHODS_RETURNING_SELF.include?(method_name)
83
+ end
84
+
85
+ def_node_matcher :redundant_self_assignment?, <<~PATTERN
86
+ (send
87
+ (self) _
88
+ (send
89
+ (send
90
+ {(self) nil?} %1) #method_returning_self?
91
+ ...))
92
+ PATTERN
93
+
94
+ def_node_matcher :redundant_nonself_assignment?, <<~PATTERN
95
+ (send
96
+ %1 _
97
+ (send
98
+ (send
99
+ %1 %2) #method_returning_self?
100
+ ...))
101
+ PATTERN
102
+
103
+ def redundant_assignment?(node)
104
+ receiver_name = node.method_name.to_s[0...-1].to_sym
105
+
106
+ redundant_self_assignment?(node, receiver_name) ||
107
+ redundant_nonself_assignment?(node, node.receiver, receiver_name)
108
+ end
109
+
110
+ def correction_range(node)
111
+ range_between(node.source_range.begin_pos, node.first_argument.source_range.begin_pos)
112
+ end
113
+ end
114
+ end
115
+ end
116
+ end
@@ -49,13 +49,14 @@ module RuboCop
49
49
  # # good
50
50
  # arr.max_by(&:foo)
51
51
  #
52
- class RedundantSort < Cop
52
+ class RedundantSort < Base
53
53
  include RangeHelp
54
+ extend AutoCorrector
54
55
 
55
56
  MSG = 'Use `%<suggestion>s` instead of '\
56
57
  '`%<sorter>s...%<accessor_source>s`.'
57
58
 
58
- SORT_METHODS = %i[sort sort_by].freeze
59
+ RESTRICT_ON_SEND = %i[sort sort_by].freeze
59
60
 
60
61
  def_node_matcher :redundant_sort?, <<~MATCHER
61
62
  {
@@ -73,10 +74,7 @@ module RuboCop
73
74
  }
74
75
  MATCHER
75
76
 
76
- # rubocop:disable Metrics/AbcSize
77
77
  def on_send(node)
78
- return unless sort_method?(node)
79
-
80
78
  if (sort_node, sorter, accessor = redundant_sort?(node.parent))
81
79
  ancestor = node.parent
82
80
  elsif (sort_node, sorter, accessor = redundant_sort?(node.parent&.parent))
@@ -85,38 +83,21 @@ module RuboCop
85
83
  return
86
84
  end
87
85
 
88
- add_offense(ancestor,
89
- location: offense_range(sort_node, ancestor),
90
- message: message(ancestor,
91
- sorter,
92
- accessor))
93
- end
94
- # rubocop:enable Metrics/AbcSize
95
-
96
- def autocorrect(node)
97
- sort_node, sorter, accessor = redundant_sort?(node)
98
-
99
- lambda do |corrector|
100
- # Remove accessor, e.g. `first` or `[-1]`.
101
- corrector.remove(
102
- range_between(
103
- accessor_start(node),
104
- node.loc.expression.end_pos
105
- )
106
- )
86
+ message = message(ancestor, sorter, accessor)
107
87
 
108
- # Replace "sort" or "sort_by" with the appropriate min/max method.
109
- corrector.replace(
110
- sort_node.loc.selector,
111
- suggestion(sorter, accessor, arg_value(node))
112
- )
88
+ add_offense(offense_range(sort_node, ancestor), message: message) do |corrector|
89
+ autocorrect(corrector, ancestor, sort_node, sorter, accessor)
113
90
  end
114
91
  end
115
92
 
116
93
  private
117
94
 
118
- def sort_method?(node)
119
- SORT_METHODS.include?(node.method_name)
95
+ def autocorrect(corrector, node, sort_node, sorter, accessor)
96
+ # Remove accessor, e.g. `first` or `[-1]`.
97
+ corrector.remove(range_between(accessor_start(node), node.loc.expression.end_pos))
98
+
99
+ # Replace "sort" or "sort_by" with the appropriate min/max method.
100
+ corrector.replace(sort_node.loc.selector, suggestion(sorter, accessor, arg_value(node)))
120
101
  end
121
102
 
122
103
  def offense_range(sort_node, ancestor)
@@ -15,8 +15,9 @@ module RuboCop
15
15
  #
16
16
  # # good
17
17
  # array.sort
18
- class RedundantSortBy < Cop
18
+ class RedundantSortBy < Base
19
19
  include RangeHelp
20
+ extend AutoCorrector
20
21
 
21
22
  MSG = 'Use `sort` instead of `sort_by { |%<var>s| %<var>s }`.'
22
23
 
@@ -28,17 +29,12 @@ module RuboCop
28
29
  redundant_sort_by(node) do |send, var_name|
29
30
  range = sort_by_range(send, node)
30
31
 
31
- add_offense(node,
32
- location: range,
33
- message: format(MSG, var: var_name))
32
+ add_offense(range, message: format(MSG, var: var_name)) do |corrector|
33
+ corrector.replace(range, 'sort')
34
+ end
34
35
  end
35
36
  end
36
37
 
37
- def autocorrect(node)
38
- send = node.send_node
39
- ->(corrector) { corrector.replace(sort_by_range(send, node), 'sort') }
40
- end
41
-
42
38
  private
43
39
 
44
40
  def sort_by_range(send, node)
@@ -81,23 +81,24 @@ module RuboCop
81
81
  # @example AllowInnerSlashes: true
82
82
  # # good
83
83
  # x =~ /home\//
84
- class RegexpLiteral < Cop
84
+ class RegexpLiteral < Base
85
85
  include ConfigurableEnforcedStyle
86
86
  include RangeHelp
87
+ extend AutoCorrector
87
88
 
88
89
  MSG_USE_SLASHES = 'Use `//` around regular expression.'
89
90
  MSG_USE_PERCENT_R = 'Use `%r` around regular expression.'
90
91
 
91
92
  def on_regexp(node)
92
- if slash_literal?(node)
93
- check_slash_literal(node)
94
- else
95
- check_percent_r_literal(node)
96
- end
97
- end
93
+ message = if slash_literal?(node)
94
+ MSG_USE_PERCENT_R unless allowed_slash_literal?(node)
95
+ else
96
+ MSG_USE_SLASHES unless allowed_percent_r_literal?(node)
97
+ end
98
+
99
+ return unless message
98
100
 
99
- def autocorrect(node)
100
- lambda do |corrector|
101
+ add_offense(node, message: message) do |corrector|
101
102
  correct_delimiters(node, corrector)
102
103
  correct_inner_slashes(node, corrector)
103
104
  end
@@ -105,18 +106,6 @@ module RuboCop
105
106
 
106
107
  private
107
108
 
108
- def check_slash_literal(node)
109
- return if allowed_slash_literal?(node)
110
-
111
- add_offense(node, message: MSG_USE_PERCENT_R)
112
- end
113
-
114
- def check_percent_r_literal(node)
115
- return if allowed_percent_r_literal?(node)
116
-
117
- add_offense(node, message: MSG_USE_SLASHES)
118
- end
119
-
120
109
  def allowed_slash_literal?(node)
121
110
  style == :slashes && !contains_disallowed_slash?(node) ||
122
111
  allowed_mixed_slash?(node)
@@ -52,20 +52,40 @@ module RuboCop
52
52
  end
53
53
 
54
54
  def autocorrect(node)
55
+ parenthesized = parenthesized?(node)
56
+ lambda do |corrector|
57
+ corrector.replace(node, corrected_block(node, parenthesized))
58
+ ParenthesesCorrector.correct(corrector, node.parent) if parenthesized
59
+ end
60
+ end
61
+
62
+ private
63
+
64
+ def parenthesized?(node)
65
+ node.parent && parentheses?(node.parent)
66
+ end
67
+
68
+ def corrected_block(node, parenthesized)
55
69
  operation, rescue_modifier, = *node
56
70
  *_, rescue_args = *rescue_modifier
57
71
 
58
- indent = indentation(node)
59
- correction =
60
- "begin\n" \
61
- "#{operation.source.gsub(/^/, indent)}" \
62
- "\n#{offset(node)}rescue\n" \
63
- "#{rescue_args.source.gsub(/^/, indent)}" \
64
- "\n#{offset(node)}end"
72
+ node_indentation, node_offset = indentation_and_offset(node, parenthesized)
65
73
 
66
- lambda do |corrector|
67
- corrector.replace(node, correction)
74
+ "begin\n" \
75
+ "#{operation.source.gsub(/^/, node_indentation)}" \
76
+ "\n#{node_offset}rescue\n" \
77
+ "#{rescue_args.source.gsub(/^/, node_indentation)}" \
78
+ "\n#{node_offset}end"
79
+ end
80
+
81
+ def indentation_and_offset(node, parenthesized)
82
+ node_indentation = indentation(node)
83
+ node_offset = offset(node)
84
+ if parenthesized
85
+ node_indentation = node_indentation[0...-1]
86
+ node_offset = node_offset[0...-1]
68
87
  end
88
+ [node_indentation, node_offset]
69
89
  end
70
90
  end
71
91
  end
@@ -70,10 +70,11 @@ module RuboCop
70
70
  # rescue StandardError, SecurityError
71
71
  # bar
72
72
  # end
73
- class RescueStandardError < Cop
73
+ class RescueStandardError < Base
74
74
  include RescueNode
75
75
  include ConfigurableEnforcedStyle
76
76
  include RangeHelp
77
+ extend AutoCorrector
77
78
 
78
79
  MSG_IMPLICIT = 'Omit the error class when rescuing ' \
79
80
  '`StandardError` by itself.'
@@ -94,28 +95,31 @@ module RuboCop
94
95
  case style
95
96
  when :implicit
96
97
  rescue_standard_error?(node) do |error|
97
- add_offense(node,
98
- location: node.loc.keyword.join(error.loc.expression),
99
- message: MSG_IMPLICIT)
98
+ offense_for_implicit_enforced_style(node, error)
100
99
  end
101
100
  when :explicit
102
101
  rescue_without_error_class?(node) do
103
- add_offense(node, location: :keyword, message: MSG_EXPLICIT)
102
+ offense_for_exlicit_enforced_style(node)
104
103
  end
105
104
  end
106
105
  end
107
106
 
108
- def autocorrect(node)
109
- lambda do |corrector|
110
- case style
111
- when :implicit
112
- error = rescue_standard_error?(node)
113
- range = range_between(node.loc.keyword.end_pos,
114
- error.loc.expression.end_pos)
115
- corrector.remove(range)
116
- when :explicit
117
- corrector.insert_after(node.loc.keyword, ' StandardError')
118
- end
107
+ private
108
+
109
+ def offense_for_implicit_enforced_style(node, error)
110
+ range = node.loc.keyword.join(error.loc.expression)
111
+
112
+ add_offense(range, message: MSG_IMPLICIT) do |corrector|
113
+ error = rescue_standard_error?(node)
114
+ range = range_between(node.loc.keyword.end_pos, error.loc.expression.end_pos)
115
+
116
+ corrector.remove(range)
117
+ end
118
+ end
119
+
120
+ def offense_for_exlicit_enforced_style(node)
121
+ add_offense(node.loc.keyword, message: MSG_EXPLICIT) do |corrector|
122
+ corrector.insert_after(node.loc.keyword, ' StandardError')
119
123
  end
120
124
  end
121
125
  end
@@ -28,8 +28,9 @@ module RuboCop
28
28
  # def foo(arg)
29
29
  # return nil if arg
30
30
  # end
31
- class ReturnNil < Cop
31
+ class ReturnNil < Base
32
32
  include ConfigurableEnforcedStyle
33
+ extend AutoCorrector
33
34
 
34
35
  RETURN_MSG = 'Use `return` instead of `return nil`.'
35
36
  RETURN_NIL_MSG = 'Use `return nil` instead of `return`.'
@@ -54,12 +55,11 @@ module RuboCop
54
55
  return nil if chained_send?(send_node)
55
56
  end
56
57
 
57
- add_offense(node) unless correct_style?(node)
58
- end
58
+ return if correct_style?(node)
59
59
 
60
- def autocorrect(node)
61
- lambda do |corrector|
60
+ add_offense(node) do |corrector|
62
61
  corrected = style == :return ? 'return' : 'return nil'
62
+
63
63
  corrector.replace(node, corrected)
64
64
  end
65
65
  end