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
@@ -89,10 +89,11 @@ module RuboCop
89
89
  # if condition
90
90
  # statement
91
91
  # end
92
- class EmptyElse < Cop
92
+ class EmptyElse < Base
93
93
  include OnNormalIfUnless
94
94
  include ConfigurableEnforcedStyle
95
95
  include RangeHelp
96
+ extend AutoCorrector
96
97
 
97
98
  MSG = 'Redundant `else`-clause.'
98
99
 
@@ -104,16 +105,6 @@ module RuboCop
104
105
  check(node)
105
106
  end
106
107
 
107
- def autocorrect(node)
108
- return false if autocorrect_forbidden?(node.type.to_s)
109
- return false if comment_in_else?(node)
110
-
111
- lambda do |corrector|
112
- end_pos = base_node(node).loc.end.begin_pos
113
- corrector.remove(range_between(node.loc.else.begin_pos, end_pos))
114
- end
115
- end
116
-
117
108
  private
118
109
 
119
110
  def check(node)
@@ -132,24 +123,31 @@ module RuboCop
132
123
  def empty_check(node)
133
124
  return unless node.else? && !node.else_branch
134
125
 
135
- add_offense(node, location: :else)
126
+ add_offense(node.loc.else) do |corrector|
127
+ autocorrect(corrector, node)
128
+ end
136
129
  end
137
130
 
138
131
  def nil_check(node)
139
132
  return unless node.else_branch&.nil_type?
140
133
 
141
- add_offense(node, location: :else)
134
+ add_offense(node.loc.else) do |corrector|
135
+ autocorrect(corrector, node)
136
+ end
142
137
  end
143
138
 
144
- def comment_in_else?(node)
145
- range = else_line_range(node.loc)
146
- processed_source.find_comment { |c| range.include?(c.loc.line) }
139
+ def autocorrect(corrector, node)
140
+ return false if autocorrect_forbidden?(node.type.to_s)
141
+ return false if comment_in_else?(node.loc)
142
+
143
+ end_pos = base_node(node).loc.end.begin_pos
144
+ corrector.remove(range_between(node.loc.else.begin_pos, end_pos))
147
145
  end
148
146
 
149
- def else_line_range(loc)
150
- return 0..0 if loc.else.nil? || loc.end.nil?
147
+ def comment_in_else?(loc)
148
+ return false if loc.else.nil? || loc.end.nil?
151
149
 
152
- loc.else.first_line..loc.end.first_line
150
+ processed_source.contains_comment?(loc.else.join(loc.end))
153
151
  end
154
152
 
155
153
  def base_node(node)
@@ -16,9 +16,10 @@ module RuboCop
16
16
  #
17
17
  # # good
18
18
  # -> (arg) { do_something(arg) }
19
- class EmptyLambdaParameter < Cop
19
+ class EmptyLambdaParameter < Base
20
20
  include EmptyParameter
21
21
  include RangeHelp
22
+ extend AutoCorrector
22
23
 
23
24
  MSG = 'Omit parentheses for the empty lambda parameters.'
24
25
 
@@ -29,15 +30,13 @@ module RuboCop
29
30
  check(node) if node.send_node.lambda_literal?
30
31
  end
31
32
 
32
- def autocorrect(node)
33
- lambda do |corrector|
34
- send_node = node.parent.send_node
35
- range = range_between(
36
- send_node.loc.expression.end_pos,
37
- node.loc.expression.end_pos
38
- )
39
- corrector.remove(range)
40
- end
33
+ private
34
+
35
+ def autocorrect(corrector, node)
36
+ send_node = node.parent.send_node
37
+ range = range_between(send_node.loc.expression.end_pos, node.loc.expression.end_pos)
38
+
39
+ corrector.remove(range)
41
40
  end
42
41
  end
43
42
  end
@@ -16,14 +16,16 @@ module RuboCop
16
16
  # a = []
17
17
  # h = {}
18
18
  # s = ''
19
- class EmptyLiteral < Cop
19
+ class EmptyLiteral < Base
20
20
  include FrozenStringLiteral
21
21
  include RangeHelp
22
+ extend AutoCorrector
22
23
 
23
24
  ARR_MSG = 'Use array literal `[]` instead of `Array.new`.'
24
25
  HASH_MSG = 'Use hash literal `{}` instead of `Hash.new`.'
25
- STR_MSG = 'Use string literal `%<prefer>s` instead of ' \
26
- '`String.new`.'
26
+ STR_MSG = 'Use string literal `%<prefer>s` instead of `String.new`.'
27
+
28
+ RESTRICT_ON_SEND = %i[new].freeze
27
29
 
28
30
  def_node_matcher :array_node, '(send (const {nil? cbase} :Array) :new)'
29
31
  def_node_matcher :hash_node, '(send (const {nil? cbase} :Hash) :new)'
@@ -34,26 +36,25 @@ module RuboCop
34
36
  '(block (send (const {nil? cbase} :Hash) :new) args _)'
35
37
 
36
38
  def on_send(node)
37
- add_offense(node, message: ARR_MSG) if offense_array_node?(node)
38
- add_offense(node, message: HASH_MSG) if offense_hash_node?(node)
39
-
40
- str_node(node) do
41
- return if frozen_string_literals_enabled?
42
-
43
- add_offense(node,
44
- message: format(STR_MSG,
45
- prefer: preferred_string_literal))
46
- end
47
- end
39
+ return unless (message = offense_message(node))
48
40
 
49
- def autocorrect(node)
50
- lambda do |corrector|
41
+ add_offense(node, message: message) do |corrector|
51
42
  corrector.replace(replacement_range(node), correction(node))
52
43
  end
53
44
  end
54
45
 
55
46
  private
56
47
 
48
+ def offense_message(node)
49
+ if offense_array_node?(node)
50
+ ARR_MSG
51
+ elsif offense_hash_node?(node)
52
+ HASH_MSG
53
+ elsif str_node(node) && !frozen_string_literals_enabled?
54
+ format(STR_MSG, prefer: preferred_string_literal)
55
+ end
56
+ end
57
+
57
58
  def preferred_string_literal
58
59
  enforce_double_quotes? ? '""' : "''"
59
60
  end
@@ -70,7 +71,7 @@ module RuboCop
70
71
  parent = node.parent
71
72
  return false unless parent && %i[send super zsuper].include?(parent.type)
72
73
 
73
- node.object_id == parent.arguments.first.object_id &&
74
+ node.equal?(parent.arguments.first) &&
74
75
  !parentheses?(node.parent)
75
76
  end
76
77
 
@@ -40,8 +40,9 @@ module RuboCop
40
40
  #
41
41
  # def self.foo(bar)
42
42
  # end
43
- class EmptyMethod < Cop
43
+ class EmptyMethod < Base
44
44
  include ConfigurableEnforcedStyle
45
+ extend AutoCorrector
45
46
 
46
47
  MSG_COMPACT = 'Put empty method definitions on a single line.'
47
48
  MSG_EXPANDED = 'Put the `end` of empty method definitions on the ' \
@@ -51,19 +52,15 @@ module RuboCop
51
52
  return if node.body || comment_lines?(node)
52
53
  return if correct_style?(node)
53
54
 
54
- add_offense(node)
55
- end
56
- alias on_defs on_def
57
-
58
- def autocorrect(node)
59
- lambda do |corrector|
55
+ add_offense(node) do |corrector|
60
56
  corrector.replace(node, corrected(node))
61
57
  end
62
58
  end
59
+ alias on_defs on_def
63
60
 
64
61
  private
65
62
 
66
- def message(_node)
63
+ def message(_range)
67
64
  compact_style? ? MSG_COMPACT : MSG_EXPANDED
68
65
  end
69
66
 
@@ -9,27 +9,23 @@ module RuboCop
9
9
  # # encoding: UTF-8
10
10
  # # coding: UTF-8
11
11
  # # -*- coding: UTF-8 -*-
12
- class Encoding < Cop
12
+ class Encoding < Base
13
13
  include RangeHelp
14
+ extend AutoCorrector
14
15
 
15
16
  MSG_UNNECESSARY = 'Unnecessary utf-8 encoding comment.'
16
17
  ENCODING_PATTERN = /#.*coding\s?[:=]\s?(?:UTF|utf)-8/.freeze
17
18
  SHEBANG = '#!'
18
19
 
19
- def investigate(processed_source)
20
+ def on_new_investigation
20
21
  return if processed_source.buffer.source.empty?
21
22
 
22
23
  line_number = encoding_line_number(processed_source)
23
24
  return unless (@message = offense(processed_source, line_number))
24
25
 
25
26
  range = processed_source.buffer.line_range(line_number + 1)
26
- add_offense(range, location: range, message: @message)
27
- end
28
-
29
- def autocorrect(range)
30
- lambda do |corrector|
31
- corrector.remove(range_with_surrounding_space(range: range,
32
- side: :right))
27
+ add_offense(range, message: @message) do |corrector|
28
+ corrector.remove(range_with_surrounding_space(range: range, side: :right))
33
29
  end
34
30
  end
35
31
 
@@ -12,16 +12,14 @@ module RuboCop
12
12
  # # good
13
13
  # at_exit { puts 'Goodbye!' }
14
14
  #
15
- class EndBlock < Cop
15
+ class EndBlock < Base
16
+ extend AutoCorrector
17
+
16
18
  MSG = 'Avoid the use of `END` blocks. ' \
17
19
  'Use `Kernel#at_exit` instead.'
18
20
 
19
21
  def on_postexe(node)
20
- add_offense(node, location: :keyword)
21
- end
22
-
23
- def autocorrect(node)
24
- lambda do |corrector|
22
+ add_offense(node.loc.keyword) do |corrector|
25
23
  corrector.replace(node.loc.keyword, 'at_exit')
26
24
  end
27
25
  end
@@ -31,13 +31,13 @@ module RuboCop
31
31
  # def do_something
32
32
  # end
33
33
  # RUBY
34
- class EvalWithLocation < Cop
34
+ class EvalWithLocation < Base
35
35
  MSG = 'Pass `__FILE__` and `__LINE__` to `eval` method, ' \
36
36
  'as they are used by backtraces.'
37
37
  MSG_INCORRECT_LINE = 'Use `%<expected>s` instead of `%<actual>s`, ' \
38
38
  'as they are used by backtraces.'
39
39
 
40
- EVAL_METHODS = %i[eval class_eval module_eval instance_eval].to_set.freeze
40
+ RESTRICT_ON_SEND = %i[eval class_eval module_eval instance_eval].freeze
41
41
 
42
42
  def_node_matcher :eval_without_location?, <<~PATTERN
43
43
  {
@@ -63,8 +63,6 @@ module RuboCop
63
63
  PATTERN
64
64
 
65
65
  def on_send(node)
66
- return unless EVAL_METHODS.include?(node.method_name)
67
-
68
66
  eval_without_location?(node) do |code|
69
67
  if with_lineno?(node)
70
68
  on_with_lineno(node, code)
@@ -126,23 +124,21 @@ module RuboCop
126
124
  end
127
125
  end
128
126
 
129
- def add_offense_for_same_line(node, line_node)
127
+ def add_offense_for_same_line(_node, line_node)
130
128
  return if special_line_keyword?(line_node)
131
129
 
132
130
  add_offense(
133
- node,
134
- location: line_node.loc.expression,
131
+ line_node.loc.expression,
135
132
  message: message_incorrect_line(line_node, nil, 0)
136
133
  )
137
134
  end
138
135
 
139
- def add_offense_for_different_line(node, line_node, line_diff)
136
+ def add_offense_for_different_line(_node, line_node, line_diff)
140
137
  sign = line_diff.positive? ? :+ : :-
141
138
  return if line_with_offset?(line_node, sign, line_diff.abs)
142
139
 
143
140
  add_offense(
144
- node,
145
- location: line_node.loc.expression,
141
+ line_node.loc.expression,
146
142
  message: message_incorrect_line(line_node, sign, line_diff.abs)
147
143
  )
148
144
  end
@@ -15,8 +15,11 @@ module RuboCop
15
15
  # # good
16
16
  # if x.even?
17
17
  # end
18
- class EvenOdd < Cop
18
+ class EvenOdd < Base
19
+ extend AutoCorrector
20
+
19
21
  MSG = 'Replace with `Integer#%<method>s?`.'
22
+ RESTRICT_ON_SEND = %i[== !=].freeze
20
23
 
21
24
  def_node_matcher :even_odd_candidate?, <<~PATTERN
22
25
  (send
@@ -27,18 +30,12 @@ module RuboCop
27
30
  PATTERN
28
31
 
29
32
  def on_send(node)
30
- even_odd_candidate?(node) do |_base_number, method, arg|
31
- replacement_method = replacement_method(arg, method)
32
- add_offense(node, message: format(MSG, method: replacement_method))
33
- end
34
- end
35
-
36
- def autocorrect(node)
37
33
  even_odd_candidate?(node) do |base_number, method, arg|
38
34
  replacement_method = replacement_method(arg, method)
39
-
40
- correction = "#{base_number.source}.#{replacement_method}?"
41
- ->(corrector) { corrector.replace(node, correction) }
35
+ add_offense(node, message: format(MSG, method: replacement_method)) do |corrector|
36
+ correction = "#{base_number.source}.#{replacement_method}?"
37
+ corrector.replace(node, correction)
38
+ end
42
39
  end
43
40
  end
44
41
 
@@ -40,8 +40,9 @@ module RuboCop
40
40
  # # good
41
41
  # Pathname.new(__dir__).expand_path
42
42
  #
43
- class ExpandPathArguments < Cop
43
+ class ExpandPathArguments < Base
44
44
  include RangeHelp
45
+ extend AutoCorrector
45
46
 
46
47
  MSG = 'Use `expand_path(%<new_path>s%<new_default_dir>s)` instead of ' \
47
48
  '`expand_path(%<current_path>s, __FILE__)`.'
@@ -51,6 +52,8 @@ module RuboCop
51
52
  'instead of ' \
52
53
  '`Pathname.new(__FILE__).parent.expand_path`.'
53
54
 
55
+ RESTRICT_ON_SEND = %i[expand_path].freeze
56
+
54
57
  def_node_matcher :file_expand_path, <<~PATTERN
55
58
  (send
56
59
  (const {nil? cbase} :File) :expand_path
@@ -73,49 +76,41 @@ module RuboCop
73
76
  $_) :parent) :expand_path)
74
77
  PATTERN
75
78
 
76
- # rubocop:disable Metrics/PerceivedComplexity
77
79
  def on_send(node)
78
- return unless node.method?(:expand_path)
79
-
80
- if (captured_values = file_expand_path(node))
81
- current_path, default_dir = captured_values
82
-
80
+ if (current_path, default_dir = file_expand_path(node))
83
81
  inspect_offense_for_expand_path(node, current_path, default_dir)
84
82
  elsif (default_dir = pathname_parent_expand_path(node))
85
83
  return unless unrecommended_argument?(default_dir)
86
84
 
87
- add_offense(node, message: PATHNAME_MSG)
85
+ add_offense(node, message: PATHNAME_MSG) do |corrector|
86
+ autocorrect(corrector, node)
87
+ end
88
88
  elsif (default_dir = pathname_new_parent_expand_path(node))
89
89
  return unless unrecommended_argument?(default_dir)
90
90
 
91
- add_offense(node, message: PATHNAME_NEW_MSG)
92
- end
93
- end
94
- # rubocop:enable Metrics/PerceivedComplexity
95
-
96
- def autocorrect(node)
97
- lambda do |corrector|
98
- if (captured_values = file_expand_path(node))
99
- current_path, default_dir = captured_values
100
-
101
- autocorrect_expand_path(corrector, current_path, default_dir)
102
- elsif (default_dir = pathname_parent_expand_path(node)) ||
103
- (default_dir = pathname_new_parent_expand_path(node))
104
- corrector.replace(default_dir, '__dir__')
105
- remove_parent_method(corrector, default_dir)
91
+ add_offense(node, message: PATHNAME_NEW_MSG) do |corrector|
92
+ autocorrect(corrector, node)
106
93
  end
107
94
  end
108
95
  end
109
96
 
110
97
  private
111
98
 
99
+ def autocorrect(corrector, node)
100
+ if (current_path, default_dir = file_expand_path(node))
101
+ autocorrect_expand_path(corrector, current_path, default_dir)
102
+ elsif (dir = pathname_parent_expand_path(node) || pathname_new_parent_expand_path(node))
103
+ corrector.replace(dir, '__dir__')
104
+ remove_parent_method(corrector, dir)
105
+ end
106
+ end
107
+
112
108
  def unrecommended_argument?(default_dir)
113
109
  default_dir.source == '__FILE__'
114
110
  end
115
111
 
116
112
  def inspect_offense_for_expand_path(node, current_path, default_dir)
117
- return unless unrecommended_argument?(default_dir) &&
118
- current_path.str_type?
113
+ return unless unrecommended_argument?(default_dir) && current_path.str_type?
119
114
 
120
115
  current_path = strip_surrounded_quotes!(current_path.source)
121
116
 
@@ -131,7 +126,9 @@ module RuboCop
131
126
  current_path: "'#{current_path}'"
132
127
  )
133
128
 
134
- add_offense(node, location: :selector, message: message)
129
+ add_offense(node.loc.selector, message: message) do |corrector|
130
+ autocorrect(corrector, node)
131
+ end
135
132
  end
136
133
 
137
134
  def autocorrect_expand_path(corrector, current_path, default_dir)
@@ -83,7 +83,7 @@ module RuboCop
83
83
  replacement = ' &block'
84
84
  replacement = ",#{replacement}" unless arg_range.source.end_with?(',')
85
85
  corrector.insert_after(arg_range, replacement) unless last_arg.blockarg_type?
86
- elsif node.send_type?
86
+ elsif node.call_type?
87
87
  corrector.insert_after(node, '(&block)')
88
88
  else
89
89
  corrector.insert_after(node.loc.name, '(&block)')