rubocop 1.10.0 → 1.14.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 (487) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +15 -14
  3. data/assets/output.html.erb +1 -1
  4. data/config/default.yml +60 -3
  5. data/exe/rubocop +1 -3
  6. data/lib/rubocop.rb +6 -1
  7. data/lib/rubocop/cached_data.rb +1 -3
  8. data/lib/rubocop/cli.rb +4 -6
  9. data/lib/rubocop/cli/command/auto_genenerate_config.rb +9 -19
  10. data/lib/rubocop/cli/command/execute_runner.rb +1 -1
  11. data/lib/rubocop/cli/command/init_dotfile.rb +1 -3
  12. data/lib/rubocop/cli/command/show_cops.rb +1 -4
  13. data/lib/rubocop/cli/command/suggest_extensions.rb +3 -2
  14. data/lib/rubocop/comment_config.rb +45 -101
  15. data/lib/rubocop/config.rb +11 -26
  16. data/lib/rubocop/config_loader.rb +5 -11
  17. data/lib/rubocop/config_loader_resolver.rb +22 -14
  18. data/lib/rubocop/config_obsoletion/cop_rule.rb +1 -2
  19. data/lib/rubocop/config_store.rb +1 -2
  20. data/lib/rubocop/config_validator.rb +5 -10
  21. data/lib/rubocop/cop/autocorrect_logic.rb +3 -8
  22. data/lib/rubocop/cop/badge.rb +1 -2
  23. data/lib/rubocop/cop/base.rb +8 -6
  24. data/lib/rubocop/cop/bundler/duplicated_gem.rb +3 -3
  25. data/lib/rubocop/cop/bundler/gem_comment.rb +43 -10
  26. data/lib/rubocop/cop/bundler/gem_version.rb +99 -0
  27. data/lib/rubocop/cop/bundler/insecure_protocol_source.rb +1 -0
  28. data/lib/rubocop/cop/bundler/ordered_gems.rb +2 -4
  29. data/lib/rubocop/cop/commissioner.rb +2 -8
  30. data/lib/rubocop/cop/cop.rb +4 -18
  31. data/lib/rubocop/cop/corrector.rb +1 -4
  32. data/lib/rubocop/cop/correctors/alignment_corrector.rb +6 -12
  33. data/lib/rubocop/cop/correctors/each_to_for_corrector.rb +2 -4
  34. data/lib/rubocop/cop/correctors/for_to_each_corrector.rb +1 -2
  35. data/lib/rubocop/cop/correctors/line_break_corrector.rb +3 -6
  36. data/lib/rubocop/cop/correctors/multiline_literal_brace_corrector.rb +1 -3
  37. data/lib/rubocop/cop/correctors/ordered_gem_corrector.rb +1 -3
  38. data/lib/rubocop/cop/correctors/percent_literal_corrector.rb +2 -8
  39. data/lib/rubocop/cop/gemspec/date_assignment.rb +1 -0
  40. data/lib/rubocop/cop/gemspec/duplicated_assignment.rb +3 -2
  41. data/lib/rubocop/cop/gemspec/ordered_dependencies.rb +2 -4
  42. data/lib/rubocop/cop/gemspec/required_ruby_version.rb +2 -0
  43. data/lib/rubocop/cop/gemspec/ruby_version_globals_usage.rb +2 -0
  44. data/lib/rubocop/cop/generator.rb +3 -6
  45. data/lib/rubocop/cop/generator/configuration_injector.rb +1 -2
  46. data/lib/rubocop/cop/generator/require_file_injector.rb +2 -5
  47. data/lib/rubocop/cop/internal_affairs.rb +1 -0
  48. data/lib/rubocop/cop/internal_affairs/example_description.rb +7 -4
  49. data/lib/rubocop/cop/internal_affairs/method_name_equal.rb +3 -5
  50. data/lib/rubocop/cop/internal_affairs/node_destructuring.rb +3 -3
  51. data/lib/rubocop/cop/internal_affairs/node_matcher_directive.rb +151 -0
  52. data/lib/rubocop/cop/internal_affairs/node_type_predicate.rb +2 -3
  53. data/lib/rubocop/cop/internal_affairs/offense_location_keyword.rb +3 -2
  54. data/lib/rubocop/cop/internal_affairs/redundant_described_class_as_subject.rb +1 -0
  55. data/lib/rubocop/cop/internal_affairs/redundant_let_rubocop_config_new.rb +1 -0
  56. data/lib/rubocop/cop/internal_affairs/redundant_location_argument.rb +1 -0
  57. data/lib/rubocop/cop/internal_affairs/redundant_message_argument.rb +3 -0
  58. data/lib/rubocop/cop/internal_affairs/style_detected_api_use.rb +5 -2
  59. data/lib/rubocop/cop/internal_affairs/useless_message_assertion.rb +3 -3
  60. data/lib/rubocop/cop/layout/access_modifier_indentation.rb +12 -10
  61. data/lib/rubocop/cop/layout/argument_alignment.rb +8 -9
  62. data/lib/rubocop/cop/layout/array_alignment.rb +7 -6
  63. data/lib/rubocop/cop/layout/assignment_indentation.rb +8 -7
  64. data/lib/rubocop/cop/layout/begin_end_alignment.rb +1 -4
  65. data/lib/rubocop/cop/layout/block_alignment.rb +8 -19
  66. data/lib/rubocop/cop/layout/block_end_newline.rb +4 -8
  67. data/lib/rubocop/cop/layout/case_indentation.rb +1 -3
  68. data/lib/rubocop/cop/layout/class_structure.rb +5 -10
  69. data/lib/rubocop/cop/layout/closing_parenthesis_indentation.rb +18 -30
  70. data/lib/rubocop/cop/layout/comment_indentation.rb +17 -21
  71. data/lib/rubocop/cop/layout/def_end_alignment.rb +2 -6
  72. data/lib/rubocop/cop/layout/dot_position.rb +1 -3
  73. data/lib/rubocop/cop/layout/else_alignment.rb +10 -9
  74. data/lib/rubocop/cop/layout/empty_comment.rb +5 -12
  75. data/lib/rubocop/cop/layout/empty_line_after_guard_clause.rb +22 -8
  76. data/lib/rubocop/cop/layout/empty_line_between_defs.rb +2 -6
  77. data/lib/rubocop/cop/layout/empty_lines.rb +1 -3
  78. data/lib/rubocop/cop/layout/empty_lines_around_access_modifier.rb +8 -18
  79. data/lib/rubocop/cop/layout/empty_lines_around_exception_handling_keywords.rb +2 -8
  80. data/lib/rubocop/cop/layout/end_alignment.rb +1 -2
  81. data/lib/rubocop/cop/layout/end_of_line.rb +1 -1
  82. data/lib/rubocop/cop/layout/extra_spacing.rb +5 -9
  83. data/lib/rubocop/cop/layout/first_argument_indentation.rb +11 -5
  84. data/lib/rubocop/cop/layout/first_array_element_indentation.rb +10 -8
  85. data/lib/rubocop/cop/layout/first_array_element_line_break.rb +1 -2
  86. data/lib/rubocop/cop/layout/first_hash_element_indentation.rb +24 -20
  87. data/lib/rubocop/cop/layout/first_hash_element_line_break.rb +1 -2
  88. data/lib/rubocop/cop/layout/first_method_argument_line_break.rb +1 -2
  89. data/lib/rubocop/cop/layout/first_method_parameter_line_break.rb +1 -2
  90. data/lib/rubocop/cop/layout/first_parameter_indentation.rb +6 -5
  91. data/lib/rubocop/cop/layout/hash_alignment.rb +3 -6
  92. data/lib/rubocop/cop/layout/heredoc_argument_closing_parenthesis.rb +2 -9
  93. data/lib/rubocop/cop/layout/heredoc_indentation.rb +2 -6
  94. data/lib/rubocop/cop/layout/indentation_consistency.rb +9 -6
  95. data/lib/rubocop/cop/layout/indentation_style.rb +25 -30
  96. data/lib/rubocop/cop/layout/indentation_width.rb +21 -11
  97. data/lib/rubocop/cop/layout/initial_indentation.rb +1 -4
  98. data/lib/rubocop/cop/layout/line_length.rb +4 -15
  99. data/lib/rubocop/cop/layout/multiline_array_line_breaks.rb +1 -2
  100. data/lib/rubocop/cop/layout/multiline_block_layout.rb +7 -15
  101. data/lib/rubocop/cop/layout/multiline_hash_key_line_breaks.rb +1 -2
  102. data/lib/rubocop/cop/layout/multiline_method_argument_line_breaks.rb +1 -2
  103. data/lib/rubocop/cop/layout/multiline_method_call_indentation.rb +22 -15
  104. data/lib/rubocop/cop/layout/multiline_operation_indentation.rb +10 -5
  105. data/lib/rubocop/cop/layout/parameter_alignment.rb +6 -5
  106. data/lib/rubocop/cop/layout/redundant_line_break.rb +137 -0
  107. data/lib/rubocop/cop/layout/rescue_ensure_alignment.rb +3 -6
  108. data/lib/rubocop/cop/layout/single_line_block_chain.rb +53 -0
  109. data/lib/rubocop/cop/layout/space_after_colon.rb +1 -3
  110. data/lib/rubocop/cop/layout/space_after_method_name.rb +2 -4
  111. data/lib/rubocop/cop/layout/space_around_block_parameters.rb +6 -14
  112. data/lib/rubocop/cop/layout/space_around_equals_in_parameter_default.rb +1 -2
  113. data/lib/rubocop/cop/layout/space_around_keyword.rb +3 -6
  114. data/lib/rubocop/cop/layout/space_around_operators.rb +4 -9
  115. data/lib/rubocop/cop/layout/space_before_block_braces.rb +2 -3
  116. data/lib/rubocop/cop/layout/space_before_brackets.rb +1 -3
  117. data/lib/rubocop/cop/layout/space_before_comment.rb +1 -3
  118. data/lib/rubocop/cop/layout/space_before_first_arg.rb +5 -11
  119. data/lib/rubocop/cop/layout/space_in_lambda_literal.rb +2 -4
  120. data/lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb +5 -10
  121. data/lib/rubocop/cop/layout/space_inside_array_percent_literal.rb +2 -7
  122. data/lib/rubocop/cop/layout/space_inside_block_braces.rb +6 -11
  123. data/lib/rubocop/cop/layout/space_inside_hash_literal_braces.rb +1 -2
  124. data/lib/rubocop/cop/layout/space_inside_reference_brackets.rb +1 -2
  125. data/lib/rubocop/cop/legacy/corrections_proxy.rb +2 -8
  126. data/lib/rubocop/cop/legacy/corrector.rb +1 -3
  127. data/lib/rubocop/cop/lint/ambiguous_assignment.rb +1 -6
  128. data/lib/rubocop/cop/lint/ambiguous_block_association.rb +14 -7
  129. data/lib/rubocop/cop/lint/big_decimal_new.rb +1 -0
  130. data/lib/rubocop/cop/lint/boolean_symbol.rb +2 -2
  131. data/lib/rubocop/cop/lint/constant_definition_in_block.rb +2 -0
  132. data/lib/rubocop/cop/lint/constant_resolution.rb +2 -2
  133. data/lib/rubocop/cop/lint/debugger.rb +3 -1
  134. data/lib/rubocop/cop/lint/deprecated_class_methods.rb +79 -41
  135. data/lib/rubocop/cop/lint/deprecated_constants.rb +3 -3
  136. data/lib/rubocop/cop/lint/deprecated_open_ssl_constant.rb +3 -5
  137. data/lib/rubocop/cop/lint/duplicate_branch.rb +2 -3
  138. data/lib/rubocop/cop/lint/duplicate_hash_key.rb +1 -3
  139. data/lib/rubocop/cop/lint/duplicate_methods.rb +6 -7
  140. data/lib/rubocop/cop/lint/duplicate_require.rb +1 -0
  141. data/lib/rubocop/cop/lint/each_with_object_argument.rb +1 -0
  142. data/lib/rubocop/cop/lint/else_layout.rb +1 -3
  143. data/lib/rubocop/cop/lint/empty_ensure.rb +1 -3
  144. data/lib/rubocop/cop/lint/empty_file.rb +1 -3
  145. data/lib/rubocop/cop/lint/empty_interpolation.rb +1 -3
  146. data/lib/rubocop/cop/lint/ensure_return.rb +1 -3
  147. data/lib/rubocop/cop/lint/erb_new_arguments.rb +4 -7
  148. data/lib/rubocop/cop/lint/float_out_of_range.rb +1 -2
  149. data/lib/rubocop/cop/lint/format_parameter_mismatch.rb +4 -6
  150. data/lib/rubocop/cop/lint/hash_compare_by_identity.rb +1 -0
  151. data/lib/rubocop/cop/lint/heredoc_method_call_position.rb +1 -2
  152. data/lib/rubocop/cop/lint/implicit_string_concatenation.rb +1 -2
  153. data/lib/rubocop/cop/lint/ineffective_access_modifier.rb +4 -7
  154. data/lib/rubocop/cop/lint/inherit_exception.rb +2 -2
  155. data/lib/rubocop/cop/lint/interpolation_check.rb +3 -11
  156. data/lib/rubocop/cop/lint/literal_in_interpolation.rb +3 -6
  157. data/lib/rubocop/cop/lint/loop.rb +1 -2
  158. data/lib/rubocop/cop/lint/missing_cop_enable_directive.rb +3 -7
  159. data/lib/rubocop/cop/lint/missing_super.rb +1 -2
  160. data/lib/rubocop/cop/lint/mixed_regexp_capture_types.rb +1 -2
  161. data/lib/rubocop/cop/lint/multiple_comparison.rb +1 -0
  162. data/lib/rubocop/cop/lint/nested_method_definition.rb +4 -2
  163. data/lib/rubocop/cop/lint/nested_percent_literal.rb +1 -3
  164. data/lib/rubocop/cop/lint/next_without_accumulator.rb +1 -0
  165. data/lib/rubocop/cop/lint/non_deterministic_require_order.rb +8 -3
  166. data/lib/rubocop/cop/lint/non_local_exit_from_iterator.rb +3 -0
  167. data/lib/rubocop/cop/lint/number_conversion.rb +13 -5
  168. data/lib/rubocop/cop/lint/ordered_magic_comments.rb +1 -2
  169. data/lib/rubocop/cop/lint/out_of_range_regexp_ref.rb +1 -3
  170. data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb +1 -3
  171. data/lib/rubocop/cop/lint/percent_symbol_array.rb +1 -3
  172. data/lib/rubocop/cop/lint/raise_exception.rb +3 -2
  173. data/lib/rubocop/cop/lint/rand_one.rb +2 -2
  174. data/lib/rubocop/cop/lint/redundant_cop_disable_directive.rb +9 -22
  175. data/lib/rubocop/cop/lint/redundant_require_statement.rb +1 -0
  176. data/lib/rubocop/cop/lint/redundant_safe_navigation.rb +2 -3
  177. data/lib/rubocop/cop/lint/redundant_splat_expansion.rb +5 -7
  178. data/lib/rubocop/cop/lint/redundant_string_coercion.rb +2 -2
  179. data/lib/rubocop/cop/lint/redundant_with_index.rb +2 -4
  180. data/lib/rubocop/cop/lint/redundant_with_object.rb +2 -4
  181. data/lib/rubocop/cop/lint/regexp_as_condition.rb +1 -3
  182. data/lib/rubocop/cop/lint/require_parentheses.rb +2 -4
  183. data/lib/rubocop/cop/lint/rescue_exception.rb +1 -2
  184. data/lib/rubocop/cop/lint/rescue_type.rb +2 -7
  185. data/lib/rubocop/cop/lint/return_in_void_context.rb +1 -2
  186. data/lib/rubocop/cop/lint/safe_navigation_chain.rb +2 -2
  187. data/lib/rubocop/cop/lint/safe_navigation_consistency.rb +4 -10
  188. data/lib/rubocop/cop/lint/safe_navigation_with_empty.rb +2 -2
  189. data/lib/rubocop/cop/lint/send_with_mixin_argument.rb +3 -7
  190. data/lib/rubocop/cop/lint/shadowed_argument.rb +5 -11
  191. data/lib/rubocop/cop/lint/shadowed_exception.rb +7 -8
  192. data/lib/rubocop/cop/lint/shadowing_outer_local_variable.rb +1 -0
  193. data/lib/rubocop/cop/lint/struct_new_override.rb +2 -2
  194. data/lib/rubocop/cop/lint/suppressed_exception.rb +44 -1
  195. data/lib/rubocop/cop/lint/symbol_conversion.rb +91 -6
  196. data/lib/rubocop/cop/lint/syntax.rb +1 -3
  197. data/lib/rubocop/cop/lint/to_enum_arguments.rb +3 -0
  198. data/lib/rubocop/cop/lint/to_json.rb +1 -2
  199. data/lib/rubocop/cop/lint/trailing_comma_in_attribute_declaration.rb +1 -3
  200. data/lib/rubocop/cop/lint/underscore_prefixed_variable_name.rb +1 -3
  201. data/lib/rubocop/cop/lint/unified_integer.rb +1 -0
  202. data/lib/rubocop/cop/lint/unmodified_reduce_accumulator.rb +5 -0
  203. data/lib/rubocop/cop/lint/unreachable_code.rb +3 -5
  204. data/lib/rubocop/cop/lint/unreachable_loop.rb +15 -7
  205. data/lib/rubocop/cop/lint/unused_block_argument.rb +9 -7
  206. data/lib/rubocop/cop/lint/unused_method_argument.rb +2 -2
  207. data/lib/rubocop/cop/lint/uri_escape_unescape.rb +1 -0
  208. data/lib/rubocop/cop/lint/useless_access_modifier.rb +6 -4
  209. data/lib/rubocop/cop/lint/useless_assignment.rb +4 -9
  210. data/lib/rubocop/cop/lint/useless_setter_call.rb +2 -3
  211. data/lib/rubocop/cop/lint/useless_times.rb +3 -0
  212. data/lib/rubocop/cop/lint/void.rb +4 -11
  213. data/lib/rubocop/cop/message_annotator.rb +1 -3
  214. data/lib/rubocop/cop/metrics/block_nesting.rb +2 -7
  215. data/lib/rubocop/cop/metrics/class_length.rb +1 -3
  216. data/lib/rubocop/cop/metrics/cyclomatic_complexity.rb +1 -2
  217. data/lib/rubocop/cop/metrics/module_length.rb +3 -6
  218. data/lib/rubocop/cop/metrics/parameter_lists.rb +3 -5
  219. data/lib/rubocop/cop/metrics/perceived_complexity.rb +1 -2
  220. data/lib/rubocop/cop/metrics/utils/abc_size_calculator.rb +4 -7
  221. data/lib/rubocop/cop/metrics/utils/code_length_calculator.rb +6 -4
  222. data/lib/rubocop/cop/metrics/utils/repeated_attribute_discount.rb +4 -7
  223. data/lib/rubocop/cop/migration/department_name.rb +3 -7
  224. data/lib/rubocop/cop/mixin/alignment.rb +12 -7
  225. data/lib/rubocop/cop/mixin/check_line_breakable.rb +1 -1
  226. data/lib/rubocop/cop/mixin/code_length.rb +1 -3
  227. data/lib/rubocop/cop/mixin/comments_help.rb +5 -1
  228. data/lib/rubocop/cop/mixin/configurable_enforced_style.rb +2 -2
  229. data/lib/rubocop/cop/mixin/configurable_formatting.rb +3 -8
  230. data/lib/rubocop/cop/mixin/def_node.rb +3 -5
  231. data/lib/rubocop/cop/mixin/documentation_comment.rb +3 -6
  232. data/lib/rubocop/cop/mixin/empty_lines_around_body.rb +6 -7
  233. data/lib/rubocop/cop/mixin/empty_parameter.rb +2 -3
  234. data/lib/rubocop/cop/mixin/end_keyword_alignment.rb +1 -3
  235. data/lib/rubocop/cop/mixin/enforce_superclass.rb +4 -6
  236. data/lib/rubocop/cop/mixin/first_element_line_break.rb +1 -3
  237. data/lib/rubocop/cop/mixin/frozen_string_literal.rb +3 -9
  238. data/lib/rubocop/cop/mixin/gem_declaration.rb +13 -0
  239. data/lib/rubocop/cop/mixin/hash_alignment_styles.rb +3 -6
  240. data/lib/rubocop/cop/mixin/hash_transform_method.rb +8 -22
  241. data/lib/rubocop/cop/mixin/interpolation.rb +1 -3
  242. data/lib/rubocop/cop/mixin/line_length_help.rb +13 -10
  243. data/lib/rubocop/cop/mixin/match_range.rb +2 -5
  244. data/lib/rubocop/cop/mixin/method_complexity.rb +2 -3
  245. data/lib/rubocop/cop/mixin/method_preference.rb +1 -2
  246. data/lib/rubocop/cop/mixin/multiline_element_indentation.rb +4 -3
  247. data/lib/rubocop/cop/mixin/multiline_element_line_breaks.rb +1 -3
  248. data/lib/rubocop/cop/mixin/multiline_expression_indentation.rb +11 -40
  249. data/lib/rubocop/cop/mixin/multiline_literal_brace_layout.rb +1 -2
  250. data/lib/rubocop/cop/mixin/negative_conditional.rb +4 -2
  251. data/lib/rubocop/cop/mixin/ordered_gem_node.rb +1 -4
  252. data/lib/rubocop/cop/mixin/percent_array.rb +1 -3
  253. data/lib/rubocop/cop/mixin/percent_literal.rb +0 -6
  254. data/lib/rubocop/cop/mixin/preceding_following_alignment.rb +5 -11
  255. data/lib/rubocop/cop/mixin/preferred_delimiters.rb +4 -7
  256. data/lib/rubocop/cop/mixin/range_help.rb +10 -13
  257. data/lib/rubocop/cop/mixin/rational_literal.rb +1 -0
  258. data/lib/rubocop/cop/mixin/rescue_node.rb +2 -6
  259. data/lib/rubocop/cop/mixin/safe_assignment.rb +6 -2
  260. data/lib/rubocop/cop/mixin/space_after_punctuation.rb +2 -4
  261. data/lib/rubocop/cop/mixin/space_before_punctuation.rb +1 -2
  262. data/lib/rubocop/cop/mixin/statement_modifier.rb +1 -3
  263. data/lib/rubocop/cop/mixin/string_literals_help.rb +1 -1
  264. data/lib/rubocop/cop/mixin/trailing_body.rb +1 -2
  265. data/lib/rubocop/cop/mixin/trailing_comma.rb +1 -2
  266. data/lib/rubocop/cop/mixin/uncommunicative_name.rb +7 -13
  267. data/lib/rubocop/cop/mixin/unused_argument.rb +1 -3
  268. data/lib/rubocop/cop/mixin/visibility_help.rb +1 -0
  269. data/lib/rubocop/cop/naming/ascii_identifiers.rb +2 -4
  270. data/lib/rubocop/cop/naming/binary_operator_parameter_name.rb +2 -2
  271. data/lib/rubocop/cop/naming/constant_name.rb +2 -0
  272. data/lib/rubocop/cop/naming/file_name.rb +7 -16
  273. data/lib/rubocop/cop/naming/memoized_instance_variable_name.rb +8 -3
  274. data/lib/rubocop/cop/naming/method_name.rb +4 -2
  275. data/lib/rubocop/cop/naming/predicate_name.rb +2 -2
  276. data/lib/rubocop/cop/naming/rescued_exceptions_variable_name.rb +10 -0
  277. data/lib/rubocop/cop/offense.rb +3 -8
  278. data/lib/rubocop/cop/registry.rb +12 -11
  279. data/lib/rubocop/cop/security/eval.rb +1 -0
  280. data/lib/rubocop/cop/security/json_load.rb +1 -0
  281. data/lib/rubocop/cop/security/marshal_load.rb +1 -0
  282. data/lib/rubocop/cop/security/open.rb +1 -0
  283. data/lib/rubocop/cop/security/yaml_load.rb +1 -0
  284. data/lib/rubocop/cop/style/access_modifier_declarations.rb +4 -5
  285. data/lib/rubocop/cop/style/accessor_grouping.rb +1 -3
  286. data/lib/rubocop/cop/style/alias.rb +6 -12
  287. data/lib/rubocop/cop/style/and_or.rb +3 -1
  288. data/lib/rubocop/cop/style/arguments_forwarding.rb +4 -3
  289. data/lib/rubocop/cop/style/array_coercion.rb +2 -0
  290. data/lib/rubocop/cop/style/array_join.rb +1 -0
  291. data/lib/rubocop/cop/style/ascii_comments.rb +1 -2
  292. data/lib/rubocop/cop/style/attr.rb +2 -3
  293. data/lib/rubocop/cop/style/auto_resource_cleanup.rb +2 -5
  294. data/lib/rubocop/cop/style/bisected_attr_accessor.rb +59 -71
  295. data/lib/rubocop/cop/style/bisected_attr_accessor/macro.rb +60 -0
  296. data/lib/rubocop/cop/style/case_equality.rb +2 -1
  297. data/lib/rubocop/cop/style/case_like_if.rb +16 -6
  298. data/lib/rubocop/cop/style/character_literal.rb +2 -4
  299. data/lib/rubocop/cop/style/class_and_module_children.rb +6 -9
  300. data/lib/rubocop/cop/style/class_equality_comparison.rb +3 -0
  301. data/lib/rubocop/cop/style/class_methods.rb +1 -3
  302. data/lib/rubocop/cop/style/collection_compact.rb +3 -3
  303. data/lib/rubocop/cop/style/colon_method_call.rb +2 -3
  304. data/lib/rubocop/cop/style/combinable_loops.rb +3 -2
  305. data/lib/rubocop/cop/style/command_literal.rb +4 -9
  306. data/lib/rubocop/cop/style/comment_annotation.rb +3 -6
  307. data/lib/rubocop/cop/style/commented_keyword.rb +7 -13
  308. data/lib/rubocop/cop/style/conditional_assignment.rb +12 -24
  309. data/lib/rubocop/cop/style/constant_visibility.rb +1 -0
  310. data/lib/rubocop/cop/style/copyright.rb +3 -6
  311. data/lib/rubocop/cop/style/date_time.rb +5 -5
  312. data/lib/rubocop/cop/style/def_with_parentheses.rb +1 -2
  313. data/lib/rubocop/cop/style/dir.rb +1 -0
  314. data/lib/rubocop/cop/style/disable_cops_within_source_code_directive.rb +2 -2
  315. data/lib/rubocop/cop/style/documentation.rb +30 -3
  316. data/lib/rubocop/cop/style/documentation_method.rb +1 -0
  317. data/lib/rubocop/cop/style/double_negation.rb +1 -0
  318. data/lib/rubocop/cop/style/each_for_simple_loop.rb +2 -2
  319. data/lib/rubocop/cop/style/each_with_object.rb +1 -0
  320. data/lib/rubocop/cop/style/empty_case_condition.rb +2 -7
  321. data/lib/rubocop/cop/style/empty_else.rb +3 -9
  322. data/lib/rubocop/cop/style/empty_literal.rb +13 -8
  323. data/lib/rubocop/cop/style/empty_method.rb +3 -7
  324. data/lib/rubocop/cop/style/end_block.rb +1 -2
  325. data/lib/rubocop/cop/style/endless_method.rb +2 -3
  326. data/lib/rubocop/cop/style/eval_with_location.rb +5 -5
  327. data/lib/rubocop/cop/style/even_odd.rb +1 -0
  328. data/lib/rubocop/cop/style/expand_path_arguments.rb +4 -3
  329. data/lib/rubocop/cop/style/explicit_block_argument.rb +2 -4
  330. data/lib/rubocop/cop/style/float_division.rb +4 -0
  331. data/lib/rubocop/cop/style/format_string.rb +2 -0
  332. data/lib/rubocop/cop/style/format_string_token.rb +2 -4
  333. data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +3 -11
  334. data/lib/rubocop/cop/style/global_std_stream.rb +1 -0
  335. data/lib/rubocop/cop/style/guard_clause.rb +3 -7
  336. data/lib/rubocop/cop/style/hash_conversion.rb +57 -5
  337. data/lib/rubocop/cop/style/hash_each_methods.rb +2 -2
  338. data/lib/rubocop/cop/style/hash_except.rb +1 -0
  339. data/lib/rubocop/cop/style/hash_like_case.rb +2 -2
  340. data/lib/rubocop/cop/style/hash_syntax.rb +20 -24
  341. data/lib/rubocop/cop/style/hash_transform_keys.rb +4 -0
  342. data/lib/rubocop/cop/style/hash_transform_values.rb +4 -0
  343. data/lib/rubocop/cop/style/identical_conditional_branches.rb +1 -3
  344. data/lib/rubocop/cop/style/if_unless_modifier.rb +40 -13
  345. data/lib/rubocop/cop/style/if_with_boolean_literal_branches.rb +2 -0
  346. data/lib/rubocop/cop/style/implicit_runtime_error.rb +1 -0
  347. data/lib/rubocop/cop/style/infinite_loop.rb +2 -5
  348. data/lib/rubocop/cop/style/inverse_methods.rb +5 -7
  349. data/lib/rubocop/cop/style/ip_addresses.rb +1 -2
  350. data/lib/rubocop/cop/style/lambda.rb +2 -4
  351. data/lib/rubocop/cop/style/lambda_call.rb +1 -2
  352. data/lib/rubocop/cop/style/line_end_concatenation.rb +5 -12
  353. data/lib/rubocop/cop/style/method_call_with_args_parentheses.rb +47 -3
  354. data/lib/rubocop/cop/style/method_call_with_args_parentheses/omit_parentheses.rb +26 -16
  355. data/lib/rubocop/cop/style/method_call_without_args_parentheses.rb +1 -2
  356. data/lib/rubocop/cop/style/method_called_on_do_end_block.rb +2 -4
  357. data/lib/rubocop/cop/style/method_def_parentheses.rb +4 -8
  358. data/lib/rubocop/cop/style/min_max.rb +2 -2
  359. data/lib/rubocop/cop/style/missing_else.rb +2 -4
  360. data/lib/rubocop/cop/style/missing_respond_to_missing.rb +1 -2
  361. data/lib/rubocop/cop/style/mixin_grouping.rb +4 -10
  362. data/lib/rubocop/cop/style/mixin_usage.rb +3 -2
  363. data/lib/rubocop/cop/style/module_function.rb +8 -6
  364. data/lib/rubocop/cop/style/multiline_block_chain.rb +1 -2
  365. data/lib/rubocop/cop/style/multiline_method_signature.rb +11 -6
  366. data/lib/rubocop/cop/style/multiline_ternary_operator.rb +1 -2
  367. data/lib/rubocop/cop/style/multiple_comparison.rb +22 -5
  368. data/lib/rubocop/cop/style/mutable_constant.rb +7 -10
  369. data/lib/rubocop/cop/style/negated_if.rb +1 -2
  370. data/lib/rubocop/cop/style/negated_if_else_condition.rb +24 -2
  371. data/lib/rubocop/cop/style/negated_unless.rb +1 -2
  372. data/lib/rubocop/cop/style/nested_modifier.rb +3 -7
  373. data/lib/rubocop/cop/style/nested_ternary_operator.rb +2 -3
  374. data/lib/rubocop/cop/style/next.rb +4 -9
  375. data/lib/rubocop/cop/style/nil_comparison.rb +3 -0
  376. data/lib/rubocop/cop/style/nil_lambda.rb +1 -0
  377. data/lib/rubocop/cop/style/non_nil_check.rb +9 -5
  378. data/lib/rubocop/cop/style/numeric_literals.rb +3 -11
  379. data/lib/rubocop/cop/style/numeric_predicate.rb +5 -7
  380. data/lib/rubocop/cop/style/one_line_conditional.rb +1 -2
  381. data/lib/rubocop/cop/style/option_hash.rb +2 -3
  382. data/lib/rubocop/cop/style/optional_arguments.rb +2 -5
  383. data/lib/rubocop/cop/style/or_assignment.rb +4 -6
  384. data/lib/rubocop/cop/style/parallel_assignment.rb +12 -9
  385. data/lib/rubocop/cop/style/parentheses_around_condition.rb +1 -0
  386. data/lib/rubocop/cop/style/percent_literal_delimiters.rb +1 -3
  387. data/lib/rubocop/cop/style/percent_q_literals.rb +1 -2
  388. data/lib/rubocop/cop/style/perl_backrefs.rb +2 -9
  389. data/lib/rubocop/cop/style/preferred_hash_methods.rb +1 -4
  390. data/lib/rubocop/cop/style/proc.rb +2 -2
  391. data/lib/rubocop/cop/style/raise_args.rb +4 -8
  392. data/lib/rubocop/cop/style/random_with_offset.rb +8 -8
  393. data/lib/rubocop/cop/style/redundant_argument.rb +2 -11
  394. data/lib/rubocop/cop/style/redundant_assignment.rb +2 -3
  395. data/lib/rubocop/cop/style/redundant_begin.rb +47 -7
  396. data/lib/rubocop/cop/style/redundant_capital_w.rb +1 -2
  397. data/lib/rubocop/cop/style/redundant_condition.rb +2 -5
  398. data/lib/rubocop/cop/style/redundant_conditional.rb +5 -6
  399. data/lib/rubocop/cop/style/redundant_exception.rb +5 -6
  400. data/lib/rubocop/cop/style/redundant_fetch_block.rb +2 -0
  401. data/lib/rubocop/cop/style/redundant_file_extension_in_require.rb +2 -1
  402. data/lib/rubocop/cop/style/redundant_freeze.rb +2 -2
  403. data/lib/rubocop/cop/style/redundant_interpolation.rb +1 -2
  404. data/lib/rubocop/cop/style/redundant_parentheses.rb +21 -20
  405. data/lib/rubocop/cop/style/redundant_percent_q.rb +1 -2
  406. data/lib/rubocop/cop/style/redundant_regexp_escape.rb +1 -4
  407. data/lib/rubocop/cop/style/redundant_return.rb +6 -4
  408. data/lib/rubocop/cop/style/redundant_self.rb +9 -9
  409. data/lib/rubocop/cop/style/redundant_self_assignment.rb +4 -2
  410. data/lib/rubocop/cop/style/redundant_sort.rb +3 -5
  411. data/lib/rubocop/cop/style/redundant_sort_by.rb +1 -0
  412. data/lib/rubocop/cop/style/regexp_literal.rb +4 -8
  413. data/lib/rubocop/cop/style/rescue_modifier.rb +21 -14
  414. data/lib/rubocop/cop/style/rescue_standard_error.rb +5 -7
  415. data/lib/rubocop/cop/style/return_nil.rb +7 -2
  416. data/lib/rubocop/cop/style/safe_navigation.rb +12 -21
  417. data/lib/rubocop/cop/style/sample.rb +1 -0
  418. data/lib/rubocop/cop/style/send.rb +1 -2
  419. data/lib/rubocop/cop/style/signal_exception.rb +6 -7
  420. data/lib/rubocop/cop/style/single_argument_dig.rb +2 -2
  421. data/lib/rubocop/cop/style/single_line_block_params.rb +2 -5
  422. data/lib/rubocop/cop/style/single_line_methods.rb +21 -4
  423. data/lib/rubocop/cop/style/slicing_with_range.rb +1 -0
  424. data/lib/rubocop/cop/style/sole_nested_conditional.rb +31 -7
  425. data/lib/rubocop/cop/style/special_global_vars.rb +6 -18
  426. data/lib/rubocop/cop/style/stabby_lambda_parentheses.rb +1 -2
  427. data/lib/rubocop/cop/style/stderr_puts.rb +3 -6
  428. data/lib/rubocop/cop/style/string_chars.rb +39 -0
  429. data/lib/rubocop/cop/style/string_concatenation.rb +9 -10
  430. data/lib/rubocop/cop/style/string_hash_keys.rb +2 -0
  431. data/lib/rubocop/cop/style/string_literals.rb +2 -5
  432. data/lib/rubocop/cop/style/strip.rb +1 -0
  433. data/lib/rubocop/cop/style/struct_inheritance.rb +11 -0
  434. data/lib/rubocop/cop/style/symbol_literal.rb +1 -3
  435. data/lib/rubocop/cop/style/symbol_proc.rb +29 -10
  436. data/lib/rubocop/cop/style/ternary_parentheses.rb +4 -6
  437. data/lib/rubocop/cop/style/trailing_body_on_method_definition.rb +6 -2
  438. data/lib/rubocop/cop/style/trailing_comma_in_block_args.rb +2 -6
  439. data/lib/rubocop/cop/style/trailing_method_end_statement.rb +3 -6
  440. data/lib/rubocop/cop/style/trailing_underscore_variable.rb +4 -10
  441. data/lib/rubocop/cop/style/trivial_accessors.rb +3 -4
  442. data/lib/rubocop/cop/style/unless_else.rb +1 -2
  443. data/lib/rubocop/cop/style/unless_logical_operators.rb +105 -0
  444. data/lib/rubocop/cop/style/unpack_first.rb +1 -0
  445. data/lib/rubocop/cop/style/variable_interpolation.rb +1 -1
  446. data/lib/rubocop/cop/style/when_then.rb +1 -3
  447. data/lib/rubocop/cop/style/while_until_modifier.rb +1 -2
  448. data/lib/rubocop/cop/style/word_array.rb +1 -2
  449. data/lib/rubocop/cop/style/yoda_condition.rb +4 -11
  450. data/lib/rubocop/cop/style/zero_length_predicate.rb +6 -2
  451. data/lib/rubocop/cop/team.rb +2 -5
  452. data/lib/rubocop/cop/util.rb +8 -11
  453. data/lib/rubocop/cop/utils/format_string.rb +1 -3
  454. data/lib/rubocop/cop/variable_force.rb +6 -15
  455. data/lib/rubocop/cop/variable_force/assignment.rb +1 -2
  456. data/lib/rubocop/cop/variable_force/branch.rb +16 -2
  457. data/lib/rubocop/cop/variable_force/reference.rb +1 -3
  458. data/lib/rubocop/cop/variable_force/scope.rb +4 -8
  459. data/lib/rubocop/cop/variable_force/variable.rb +2 -4
  460. data/lib/rubocop/cops_documentation_generator.rb +7 -21
  461. data/lib/rubocop/directive_comment.rb +69 -9
  462. data/lib/rubocop/ext/regexp_parser.rb +3 -6
  463. data/lib/rubocop/file_finder.rb +1 -3
  464. data/lib/rubocop/formatter/clang_style_formatter.rb +4 -2
  465. data/lib/rubocop/formatter/disabled_config_formatter.rb +3 -8
  466. data/lib/rubocop/formatter/git_hub_actions_formatter.rb +1 -5
  467. data/lib/rubocop/formatter/html_formatter.rb +4 -10
  468. data/lib/rubocop/formatter/json_formatter.rb +1 -5
  469. data/lib/rubocop/formatter/junit_formatter.rb +3 -9
  470. data/lib/rubocop/formatter/progress_formatter.rb +1 -3
  471. data/lib/rubocop/formatter/tap_formatter.rb +4 -2
  472. data/lib/rubocop/magic_comment.rb +1 -1
  473. data/lib/rubocop/name_similarity.rb +1 -1
  474. data/lib/rubocop/options.rb +27 -41
  475. data/lib/rubocop/path_util.rb +1 -3
  476. data/lib/rubocop/rake_task.rb +3 -0
  477. data/lib/rubocop/remote_config.rb +4 -7
  478. data/lib/rubocop/result_cache.rb +5 -12
  479. data/lib/rubocop/rspec/cop_helper.rb +1 -1
  480. data/lib/rubocop/rspec/expect_offense.rb +4 -9
  481. data/lib/rubocop/rspec/shared_contexts.rb +8 -15
  482. data/lib/rubocop/runner.rb +7 -14
  483. data/lib/rubocop/target_finder.rb +19 -16
  484. data/lib/rubocop/target_ruby.rb +25 -21
  485. data/lib/rubocop/version.rb +1 -1
  486. metadata +18 -11
  487. data/lib/rubocop/core_ext/hash.rb +0 -20
@@ -18,13 +18,10 @@ module RuboCop
18
18
  # def foobar(a = 1, b = 2, c = 3)
19
19
  # end
20
20
  class OptionalArguments < Base
21
- MSG = 'Optional arguments should appear at the end ' \
22
- 'of the argument list.'
21
+ MSG = 'Optional arguments should appear at the end of the argument list.'
23
22
 
24
23
  def on_def(node)
25
- each_misplaced_optional_arg(node.arguments) do |argument|
26
- add_offense(argument)
27
- end
24
+ each_misplaced_optional_arg(node.arguments) { |argument| add_offense(argument) }
28
25
  end
29
26
 
30
27
  private
@@ -31,6 +31,7 @@ module RuboCop
31
31
 
32
32
  MSG = 'Use the double pipe equals operator `||=` instead.'
33
33
 
34
+ # @!method ternary_assignment?(node)
34
35
  def_node_matcher :ternary_assignment?, <<~PATTERN
35
36
  ({lvasgn ivasgn cvasgn gvasgn} _var
36
37
  (if
@@ -39,6 +40,7 @@ module RuboCop
39
40
  $_))
40
41
  PATTERN
41
42
 
43
+ # @!method unless_assignment?(node)
42
44
  def_node_matcher :unless_assignment?, <<~PATTERN
43
45
  (if
44
46
  ({lvar ivar cvar gvar} _var) nil?
@@ -49,18 +51,14 @@ module RuboCop
49
51
  def on_if(node)
50
52
  return unless unless_assignment?(node)
51
53
 
52
- add_offense(node) do |corrector|
53
- autocorrect(corrector, node)
54
- end
54
+ add_offense(node) { |corrector| autocorrect(corrector, node) }
55
55
  end
56
56
 
57
57
  def on_lvasgn(node)
58
58
  return unless (else_branch = ternary_assignment?(node))
59
59
  return if else_branch.if_type?
60
60
 
61
- add_offense(node) do |corrector|
62
- autocorrect(corrector, node)
63
- end
61
+ add_offense(node) { |corrector| autocorrect(corrector, node) }
64
62
  end
65
63
 
66
64
  alias on_ivasgn on_lvasgn
@@ -36,9 +36,7 @@ module RuboCop
36
36
  return if allowed_lhs?(lhs) || allowed_rhs?(rhs) ||
37
37
  allowed_masign?(lhs_elements, rhs_elements)
38
38
 
39
- add_offense(node) do |corrector|
40
- autocorrect(corrector, node)
41
- end
39
+ add_offense(node) { |corrector| autocorrect(corrector, node) }
42
40
  end
43
41
 
44
42
  private
@@ -72,9 +70,7 @@ module RuboCop
72
70
  elements = Array(node).compact
73
71
 
74
72
  # Account for edge case of `Constant::CONSTANT`
75
- !node.array_type? ||
76
- return_of_method_call?(node) ||
77
- elements.any?(&:splat_type?)
73
+ !node.array_type? || return_of_method_call?(node) || elements.any?(&:splat_type?)
78
74
  end
79
75
 
80
76
  def return_of_method_call?(node)
@@ -115,6 +111,7 @@ module RuboCop
115
111
  end
116
112
  end
117
113
 
114
+ # @!method implicit_self_getter?(node)
118
115
  def_node_matcher :implicit_self_getter?, '(send nil? $_)'
119
116
 
120
117
  # Helper class necessitated by silly design of TSort prior to Ruby 2.1
@@ -123,8 +120,13 @@ module RuboCop
123
120
  include TSort
124
121
  extend RuboCop::NodePattern::Macros
125
122
 
123
+ # @!method var_name(node)
126
124
  def_node_matcher :var_name, '{(casgn _ $_) (_ $_)}'
125
+
126
+ # @!method uses_var?(node)
127
127
  def_node_search :uses_var?, '{({lvar ivar cvar gvar} %) (const _ %)}'
128
+
129
+ # @!method matching_calls(node, receiver, method_name)
128
130
  def_node_search :matching_calls, '(send %1 %2 $...)'
129
131
 
130
132
  def initialize(assignments)
@@ -158,9 +160,10 @@ module RuboCop
158
160
  # Does `rhs` access the same value which is assigned by `lhs`?
159
161
  def accesses?(rhs, lhs)
160
162
  if lhs.method?(:[]=)
161
- matching_calls(rhs, lhs.receiver, :[]).any? do |args|
162
- args == lhs.arguments
163
- end
163
+ # FIXME: Workaround `rubocop:disable` comment for JRuby.
164
+ # rubocop:disable Performance/RedundantEqualityComparisonBlock
165
+ matching_calls(rhs, lhs.receiver, :[]).any? { |args| args == lhs.arguments }
166
+ # rubocop:enable Performance/RedundantEqualityComparisonBlock
164
167
  else
165
168
  access_method = lhs.method_name.to_s.chop.to_sym
166
169
  matching_calls(rhs, lhs.receiver, access_method).any?
@@ -71,6 +71,7 @@ module RuboCop
71
71
 
72
72
  private
73
73
 
74
+ # @!method control_op_condition(node)
74
75
  def_node_matcher :control_op_condition, <<~PATTERN
75
76
  (begin $_ ...)
76
77
  PATTERN
@@ -72,9 +72,7 @@ module RuboCop
72
72
  end
73
73
 
74
74
  def preferred_delimiters_for(type)
75
- PreferredDelimiters
76
- .new(type, @config, nil)
77
- .delimiters
75
+ PreferredDelimiters.new(type, @config, nil).delimiters
78
76
  end
79
77
 
80
78
  def uses_preferred_delimiter?(node, type)
@@ -30,8 +30,7 @@ module RuboCop
30
30
  include ConfigurableEnforcedStyle
31
31
  extend AutoCorrector
32
32
 
33
- LOWER_CASE_Q_MSG = 'Do not use `%Q` unless interpolation is ' \
34
- 'needed. Use `%q`.'
33
+ LOWER_CASE_Q_MSG = 'Do not use `%Q` unless interpolation is needed. Use `%q`.'
35
34
  UPPER_CASE_Q_MSG = 'Use `%Q` instead of `%q`.'
36
35
 
37
36
  def on_str(node)
@@ -36,11 +36,7 @@ module RuboCop
36
36
  # @param [RuboCop::AST::Node] node
37
37
  # @return [Boolean]
38
38
  def derived_from_braceless_interpolation?(node)
39
- %i[
40
- dstr
41
- regexp
42
- xstr
43
- ].include?(node.parent&.type)
39
+ %i[dstr regexp xstr].include?(node.parent&.type)
44
40
  end
45
41
 
46
42
  # @private
@@ -95,10 +91,7 @@ module RuboCop
95
91
 
96
92
  add_offense(
97
93
  node,
98
- message: format_message(
99
- node: node,
100
- preferred_expression: preferred_expression
101
- )
94
+ message: format_message(node: node, preferred_expression: preferred_expression)
102
95
  ) do |corrector|
103
96
  if derived_from_braceless_interpolation?(node)
104
97
  preferred_expression = "{#{preferred_expression}}"
@@ -31,10 +31,7 @@ module RuboCop
31
31
 
32
32
  MSG = 'Use `Hash#%<prefer>s` instead of `Hash#%<current>s`.'
33
33
 
34
- OFFENDING_SELECTORS = {
35
- short: %i[has_key? has_value?],
36
- verbose: %i[key? value?]
37
- }.freeze
34
+ OFFENDING_SELECTORS = { short: %i[has_key? has_value?], verbose: %i[key? value?] }.freeze
38
35
 
39
36
  RESTRICT_ON_SEND = OFFENDING_SELECTORS.values.flatten.freeze
40
37
 
@@ -18,8 +18,8 @@ module RuboCop
18
18
 
19
19
  MSG = 'Use `proc` instead of `Proc.new`.'
20
20
 
21
- def_node_matcher :proc_new?,
22
- '(block $(send (const {nil? cbase} :Proc) :new) ...)'
21
+ # @!method proc_new?(node)
22
+ def_node_matcher :proc_new?, '(block $(send (const {nil? cbase} :Proc) :new) ...)'
23
23
 
24
24
  def on_block(node)
25
25
  proc_new?(node) do |block_method|
@@ -43,10 +43,8 @@ module RuboCop
43
43
  include ConfigurableEnforcedStyle
44
44
  extend AutoCorrector
45
45
 
46
- EXPLODED_MSG = 'Provide an exception class and message ' \
47
- 'as arguments to `%<method>s`.'
48
- COMPACT_MSG = 'Provide an exception object ' \
49
- 'as an argument to `%<method>s`.'
46
+ EXPLODED_MSG = 'Provide an exception class and message as arguments to `%<method>s`.'
47
+ COMPACT_MSG = 'Provide an exception object as an argument to `%<method>s`.'
50
48
 
51
49
  RESTRICT_ON_SEND = %i[raise fail].freeze
52
50
 
@@ -66,8 +64,7 @@ module RuboCop
66
64
  def correction_compact_to_exploded(node)
67
65
  exception_node, _new, message_node = *node.first_argument
68
66
 
69
- arguments =
70
- [exception_node, message_node].compact.map(&:source).join(', ')
67
+ arguments = [exception_node, message_node].compact.map(&:source).join(', ')
71
68
 
72
69
  if node.parent && requires_parens?(node.parent)
73
70
  "#{node.method_name}(#{arguments})"
@@ -142,8 +139,7 @@ module RuboCop
142
139
  end
143
140
 
144
141
  def requires_parens?(parent)
145
- parent.and_type? || parent.or_type? ||
146
- parent.if_type? && parent.ternary?
142
+ parent.and_type? || parent.or_type? || parent.if_type? && parent.ternary?
147
143
  end
148
144
  end
149
145
  end
@@ -26,10 +26,10 @@ module RuboCop
26
26
  class RandomWithOffset < Base
27
27
  extend AutoCorrector
28
28
 
29
- MSG = 'Prefer ranges when generating random numbers instead of ' \
30
- 'integers with offsets.'
29
+ MSG = 'Prefer ranges when generating random numbers instead of integers with offsets.'
31
30
  RESTRICT_ON_SEND = %i[+ - succ pred next].freeze
32
31
 
32
+ # @!method integer_op_rand?(node)
33
33
  def_node_matcher :integer_op_rand?, <<~PATTERN
34
34
  (send
35
35
  int {:+ :-}
@@ -39,6 +39,7 @@ module RuboCop
39
39
  {int (irange int int) (erange int int)}))
40
40
  PATTERN
41
41
 
42
+ # @!method rand_op_integer?(node)
42
43
  def_node_matcher :rand_op_integer?, <<~PATTERN
43
44
  (send
44
45
  (send
@@ -49,6 +50,7 @@ module RuboCop
49
50
  int)
50
51
  PATTERN
51
52
 
53
+ # @!method rand_modified?(node)
52
54
  def_node_matcher :rand_modified?, <<~PATTERN
53
55
  (send
54
56
  (send
@@ -60,17 +62,14 @@ module RuboCop
60
62
 
61
63
  def on_send(node)
62
64
  return unless node.receiver
63
- return unless integer_op_rand?(node) ||
64
- rand_op_integer?(node) ||
65
- rand_modified?(node)
65
+ return unless integer_op_rand?(node) || rand_op_integer?(node) || rand_modified?(node)
66
66
 
67
- add_offense(node) do |corrector|
68
- autocorrect(corrector, node)
69
- end
67
+ add_offense(node) { |corrector| autocorrect(corrector, node) }
70
68
  end
71
69
 
72
70
  private
73
71
 
72
+ # @!method random_call(node)
74
73
  def_node_matcher :random_call, <<~PATTERN
75
74
  {(send (send $_ _ $_) ...)
76
75
  (send _ _ (send $_ _ $_))}
@@ -144,6 +143,7 @@ module RuboCop
144
143
  end
145
144
  end
146
145
 
146
+ # @!method to_int(node)
147
147
  def_node_matcher :to_int, <<~PATTERN
148
148
  (int $_)
149
149
  PATTERN
@@ -1,7 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'parser/current'
4
-
5
3
  module RuboCop
6
4
  module Cop
7
5
  module Style
@@ -68,17 +66,10 @@ module RuboCop
68
66
  end
69
67
 
70
68
  def redundant_arg_for_method(method_name)
71
- return nil unless cop_config['Methods'].key?(method_name)
69
+ arg = cop_config['Methods'].fetch(method_name) { return }
72
70
 
73
71
  @mem ||= {}
74
- @mem[method_name] ||=
75
- begin
76
- arg = cop_config['Methods'].fetch(method_name)
77
- buffer = Parser::Source::Buffer.new('(string)', 1)
78
- buffer.source = arg.inspect
79
- builder = RuboCop::AST::Builder.new
80
- Parser::CurrentRuby.new(builder).parse(buffer)
81
- end
72
+ @mem[method_name] ||= parse(arg.inspect).ast
82
73
  end
83
74
 
84
75
  def argument_range(node)
@@ -42,6 +42,7 @@ module RuboCop
42
42
 
43
43
  MSG = 'Redundant assignment before returning detected.'
44
44
 
45
+ # @!method redundant_assignment?(node)
45
46
  def_node_matcher :redundant_assignment?, <<~PATTERN
46
47
  (... $(lvasgn _name _expression) (lvar _name))
47
48
  PATTERN
@@ -80,9 +81,7 @@ module RuboCop
80
81
  end
81
82
 
82
83
  def check_rescue_node(node)
83
- node.child_nodes.each do |child_node|
84
- check_branch(child_node)
85
- end
84
+ node.child_nodes.each { |child_node| check_branch(child_node) }
86
85
  end
87
86
 
88
87
  def check_ensure_node(node)
@@ -36,7 +36,6 @@ module RuboCop
36
36
  # do_something
37
37
  #
38
38
  # # bad
39
- # # When using Ruby 2.5 or later.
40
39
  # do_something do
41
40
  # begin
42
41
  # something
@@ -63,6 +62,7 @@ module RuboCop
63
62
  # end
64
63
  # end
65
64
  class RedundantBegin < Base
65
+ include RangeHelp
66
66
  extend AutoCorrector
67
67
 
68
68
  MSG = 'Redundant `begin` block detected.'
@@ -75,8 +75,6 @@ module RuboCop
75
75
  alias on_defs on_def
76
76
 
77
77
  def on_block(node)
78
- return if target_ruby_version < 2.5
79
-
80
78
  return if node.send_node.lambda_literal?
81
79
  return if node.braces?
82
80
  return unless node.body&.kwbegin_type?
@@ -85,7 +83,9 @@ module RuboCop
85
83
  end
86
84
 
87
85
  def on_kwbegin(node)
88
- return if contain_rescue_or_ensure?(node) || valid_context_using_only_begin?(node)
86
+ return if empty_begin?(node) ||
87
+ contain_rescue_or_ensure?(node) ||
88
+ valid_context_using_only_begin?(node)
89
89
 
90
90
  register_offense(node)
91
91
  end
@@ -93,12 +93,44 @@ module RuboCop
93
93
  private
94
94
 
95
95
  def register_offense(node)
96
- add_offense(node.loc.begin) do |corrector|
97
- corrector.remove(node.loc.begin)
96
+ offense_range = node.loc.begin
97
+
98
+ add_offense(offense_range) do |corrector|
99
+ if any_ancestor_assignment_node?(node)
100
+ replace_begin_with_statement(corrector, offense_range, node)
101
+ else
102
+ corrector.remove(offense_range)
103
+ end
104
+
98
105
  corrector.remove(node.loc.end)
99
106
  end
100
107
  end
101
108
 
109
+ def replace_begin_with_statement(corrector, offense_range, node)
110
+ first_child = node.children.first
111
+
112
+ source = first_child.source
113
+ source = "(#{source})" if first_child.if_type?
114
+
115
+ corrector.replace(offense_range, source)
116
+ corrector.remove(range_between(offense_range.end_pos, first_child.source_range.end_pos))
117
+
118
+ restore_removed_comments(corrector, offense_range, node, first_child)
119
+ end
120
+
121
+ # Restore comments that occur between "begin" and "first_child".
122
+ # These comments will be moved to above the assignment line.
123
+ def restore_removed_comments(corrector, offense_range, node, first_child)
124
+ comments_range = range_between(offense_range.end_pos, first_child.source_range.begin_pos)
125
+ comments = comments_range.source
126
+
127
+ corrector.insert_before(node.parent, comments) unless comments.blank?
128
+ end
129
+
130
+ def empty_begin?(node)
131
+ node.children.empty?
132
+ end
133
+
102
134
  def contain_rescue_or_ensure?(node)
103
135
  first_child = node.children.first
104
136
 
@@ -108,9 +140,17 @@ module RuboCop
108
140
  def valid_context_using_only_begin?(node)
109
141
  parent = node.parent
110
142
 
111
- node.each_ancestor.any?(&:assignment?) || parent&.post_condition_loop? ||
143
+ valid_begin_assignment?(node) || parent&.post_condition_loop? ||
112
144
  parent&.send_type? || parent&.operator_keyword?
113
145
  end
146
+
147
+ def valid_begin_assignment?(node)
148
+ any_ancestor_assignment_node?(node) && !node.children.one?
149
+ end
150
+
151
+ def any_ancestor_assignment_node?(node)
152
+ node.each_ancestor.any?(&:assignment?)
153
+ end
114
154
  end
115
155
  end
116
156
  end
@@ -18,8 +18,7 @@ module RuboCop
18
18
  include PercentLiteral
19
19
  extend AutoCorrector
20
20
 
21
- MSG = 'Do not use `%W` unless interpolation is needed. ' \
22
- 'If not, use `%w`.'
21
+ MSG = 'Do not use `%W` unless interpolation is needed. If not, use `%w`.'
23
22
 
24
23
  def on_array(node)
25
24
  process(node, '%W')
@@ -78,9 +78,7 @@ module RuboCop
78
78
  return false if use_if_branch?(else_branch) || use_hash_key_assignment?(else_branch)
79
79
 
80
80
  condition == if_branch && !node.elsif? && (
81
- node.ternary? ||
82
- !else_branch.instance_of?(AST::Node) ||
83
- else_branch.single_line?
81
+ node.ternary? || !else_branch.instance_of?(AST::Node) || else_branch.single_line?
84
82
  )
85
83
  end
86
84
 
@@ -104,8 +102,7 @@ module RuboCop
104
102
 
105
103
  def make_ternary_form(node)
106
104
  _condition, if_branch, else_branch = *node
107
- ternary_form = [if_branch.source,
108
- else_source(else_branch)].join(' || ')
105
+ ternary_form = [if_branch.source, else_source(else_branch)].join(' || ')
109
106
 
110
107
  if node.parent&.send_type?
111
108
  "(#{ternary_form})"