rubocop 0.49.1 → 0.52.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 (506) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +6 -9
  3. data/bin/rubocop +1 -1
  4. data/config/default.yml +264 -118
  5. data/config/disabled.yml +13 -9
  6. data/config/enabled.yml +1156 -918
  7. data/lib/rubocop.rb +555 -489
  8. data/lib/rubocop/ast/builder.rb +6 -1
  9. data/lib/rubocop/ast/node.rb +68 -52
  10. data/lib/rubocop/ast/node/args_node.rb +15 -10
  11. data/lib/rubocop/ast/node/array_node.rb +10 -1
  12. data/lib/rubocop/ast/node/block_node.rb +9 -0
  13. data/lib/rubocop/ast/node/def_node.rb +71 -0
  14. data/lib/rubocop/ast/node/for_node.rb +8 -0
  15. data/lib/rubocop/ast/node/if_node.rb +10 -2
  16. data/lib/rubocop/ast/node/mixin/basic_literal_node.rb +16 -0
  17. data/lib/rubocop/ast/node/mixin/collection_node.rb +15 -0
  18. data/lib/rubocop/ast/node/mixin/method_dispatch_node.rb +174 -0
  19. data/lib/rubocop/ast/node/mixin/method_identifier_predicates.rb +89 -0
  20. data/lib/rubocop/ast/node/mixin/parameterized_node.rb +18 -31
  21. data/lib/rubocop/ast/node/regexp_node.rb +35 -0
  22. data/lib/rubocop/ast/node/send_node.rb +21 -150
  23. data/lib/rubocop/ast/node/str_node.rb +14 -0
  24. data/lib/rubocop/ast/node/super_node.rb +3 -24
  25. data/lib/rubocop/ast/node/symbol_node.rb +20 -0
  26. data/lib/rubocop/ast/node/yield_node.rb +21 -0
  27. data/lib/rubocop/ast/traversal.rb +7 -7
  28. data/lib/rubocop/cached_data.rb +1 -6
  29. data/lib/rubocop/cli.rb +59 -13
  30. data/lib/rubocop/comment_config.rb +2 -5
  31. data/lib/rubocop/config.rb +136 -29
  32. data/lib/rubocop/config_loader.rb +61 -104
  33. data/lib/rubocop/config_loader_resolver.rb +102 -4
  34. data/lib/rubocop/cop/autocorrect_logic.rb +1 -1
  35. data/lib/rubocop/cop/bundler/duplicated_gem.rb +13 -11
  36. data/lib/rubocop/cop/bundler/insecure_protocol_source.rb +67 -0
  37. data/lib/rubocop/cop/bundler/ordered_gems.rb +7 -58
  38. data/lib/rubocop/cop/commissioner.rb +6 -3
  39. data/lib/rubocop/cop/cop.rb +11 -6
  40. data/lib/rubocop/cop/gemspec/duplicated_assignment.rb +102 -0
  41. data/lib/rubocop/cop/gemspec/ordered_dependencies.rb +97 -0
  42. data/lib/rubocop/cop/gemspec/required_ruby_version.rb +87 -0
  43. data/lib/rubocop/cop/generator.rb +122 -25
  44. data/lib/rubocop/cop/internal_affairs.rb +6 -2
  45. data/lib/rubocop/cop/internal_affairs/node_destructuring.rb +46 -0
  46. data/lib/rubocop/cop/internal_affairs/node_type_predicate.rb +16 -5
  47. data/lib/rubocop/cop/internal_affairs/offense_location_keyword.rb +54 -0
  48. data/lib/rubocop/cop/internal_affairs/redundant_location_argument.rb +59 -0
  49. data/lib/rubocop/cop/internal_affairs/redundant_message_argument.rb +71 -0
  50. data/lib/rubocop/cop/internal_affairs/useless_message_assertion.rb +3 -3
  51. data/lib/rubocop/cop/layout/access_modifier_indentation.rb +6 -10
  52. data/lib/rubocop/cop/layout/align_array.rb +2 -2
  53. data/lib/rubocop/cop/layout/align_hash.rb +18 -18
  54. data/lib/rubocop/cop/layout/align_parameters.rb +11 -23
  55. data/lib/rubocop/cop/layout/block_end_newline.rb +20 -6
  56. data/lib/rubocop/cop/layout/case_indentation.rb +15 -18
  57. data/lib/rubocop/cop/layout/class_structure.rb +306 -0
  58. data/lib/rubocop/cop/layout/closing_parenthesis_indentation.rb +7 -6
  59. data/lib/rubocop/cop/layout/comment_indentation.rb +42 -3
  60. data/lib/rubocop/cop/layout/dot_position.rb +31 -13
  61. data/lib/rubocop/cop/layout/else_alignment.rb +37 -17
  62. data/lib/rubocop/cop/layout/empty_line_after_magic_comment.rb +1 -1
  63. data/lib/rubocop/cop/layout/empty_line_between_defs.rb +22 -18
  64. data/lib/rubocop/cop/layout/empty_lines.rb +16 -2
  65. data/lib/rubocop/cop/layout/empty_lines_around_access_modifier.rb +23 -6
  66. data/lib/rubocop/cop/layout/empty_lines_around_arguments.rb +89 -0
  67. data/lib/rubocop/cop/layout/empty_lines_around_begin_body.rb +2 -2
  68. data/lib/rubocop/cop/layout/empty_lines_around_block_body.rb +4 -8
  69. data/lib/rubocop/cop/layout/empty_lines_around_class_body.rb +30 -5
  70. data/lib/rubocop/cop/layout/empty_lines_around_exception_handling_keywords.rb +10 -6
  71. data/lib/rubocop/cop/layout/empty_lines_around_method_body.rb +5 -5
  72. data/lib/rubocop/cop/layout/empty_lines_around_module_body.rb +22 -7
  73. data/lib/rubocop/cop/layout/end_of_line.rb +2 -2
  74. data/lib/rubocop/cop/layout/extra_spacing.rb +23 -26
  75. data/lib/rubocop/cop/layout/first_method_parameter_line_break.rb +3 -3
  76. data/lib/rubocop/cop/layout/first_parameter_indentation.rb +9 -3
  77. data/lib/rubocop/cop/layout/indent_array.rb +68 -21
  78. data/lib/rubocop/cop/layout/indent_hash.rb +71 -26
  79. data/lib/rubocop/cop/layout/indent_heredoc.rb +70 -35
  80. data/lib/rubocop/cop/layout/indentation_consistency.rb +1 -2
  81. data/lib/rubocop/cop/layout/indentation_width.rb +40 -27
  82. data/lib/rubocop/cop/layout/initial_indentation.rb +10 -7
  83. data/lib/rubocop/cop/layout/leading_comment_space.rb +32 -17
  84. data/lib/rubocop/cop/layout/multiline_array_brace_layout.rb +47 -14
  85. data/lib/rubocop/cop/layout/multiline_assignment_layout.rb +12 -11
  86. data/lib/rubocop/cop/layout/multiline_block_layout.rb +19 -16
  87. data/lib/rubocop/cop/layout/multiline_hash_brace_layout.rb +46 -13
  88. data/lib/rubocop/cop/layout/multiline_method_call_indentation.rb +29 -27
  89. data/lib/rubocop/cop/layout/multiline_method_definition_brace_layout.rb +7 -3
  90. data/lib/rubocop/cop/layout/multiline_operation_indentation.rb +6 -0
  91. data/lib/rubocop/cop/layout/rescue_ensure_alignment.rb +12 -4
  92. data/lib/rubocop/cop/layout/space_after_colon.rb +13 -6
  93. data/lib/rubocop/cop/layout/space_after_comma.rb +11 -1
  94. data/lib/rubocop/cop/layout/space_after_method_name.rb +8 -6
  95. data/lib/rubocop/cop/layout/space_after_not.rb +1 -1
  96. data/lib/rubocop/cop/layout/space_after_semicolon.rb +8 -1
  97. data/lib/rubocop/cop/layout/space_around_block_parameters.rb +32 -25
  98. data/lib/rubocop/cop/layout/space_around_equals_in_parameter_default.rb +28 -17
  99. data/lib/rubocop/cop/layout/space_around_keyword.rb +22 -16
  100. data/lib/rubocop/cop/layout/space_around_operators.rb +27 -14
  101. data/lib/rubocop/cop/layout/space_before_block_braces.rb +61 -12
  102. data/lib/rubocop/cop/layout/space_before_comma.rb +12 -1
  103. data/lib/rubocop/cop/layout/space_before_comment.rb +10 -5
  104. data/lib/rubocop/cop/layout/space_before_first_arg.rb +5 -4
  105. data/lib/rubocop/cop/layout/space_before_semicolon.rb +8 -1
  106. data/lib/rubocop/cop/layout/space_in_lambda_literal.rb +12 -14
  107. data/lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb +235 -0
  108. data/lib/rubocop/cop/layout/space_inside_array_percent_literal.rb +4 -4
  109. data/lib/rubocop/cop/layout/space_inside_block_braces.rb +89 -18
  110. data/lib/rubocop/cop/layout/space_inside_hash_literal_braces.rb +62 -36
  111. data/lib/rubocop/cop/layout/space_inside_parens.rb +40 -3
  112. data/lib/rubocop/cop/layout/space_inside_percent_literal_delimiters.rb +1 -1
  113. data/lib/rubocop/cop/layout/space_inside_range_literal.rb +15 -15
  114. data/lib/rubocop/cop/layout/space_inside_reference_brackets.rb +81 -0
  115. data/lib/rubocop/cop/layout/space_inside_string_interpolation.rb +32 -17
  116. data/lib/rubocop/cop/layout/tab.rb +7 -4
  117. data/lib/rubocop/cop/layout/trailing_blank_lines.rb +11 -9
  118. data/lib/rubocop/cop/layout/trailing_whitespace.rb +1 -1
  119. data/lib/rubocop/cop/lint/ambiguous_block_association.rb +12 -19
  120. data/lib/rubocop/cop/lint/assignment_in_condition.rb +16 -2
  121. data/lib/rubocop/cop/lint/block_alignment.rb +42 -30
  122. data/lib/rubocop/cop/lint/boolean_symbol.rb +38 -0
  123. data/lib/rubocop/cop/lint/circular_argument_reference.rb +3 -14
  124. data/lib/rubocop/cop/lint/condition_position.rb +5 -1
  125. data/lib/rubocop/cop/lint/debugger.rb +18 -11
  126. data/lib/rubocop/cop/lint/def_end_alignment.rb +9 -14
  127. data/lib/rubocop/cop/lint/deprecated_class_methods.rb +4 -4
  128. data/lib/rubocop/cop/lint/duplicate_case_condition.rb +3 -3
  129. data/lib/rubocop/cop/lint/duplicate_methods.rb +75 -5
  130. data/lib/rubocop/cop/lint/duplicated_key.rb +1 -1
  131. data/lib/rubocop/cop/lint/each_with_object_argument.rb +1 -1
  132. data/lib/rubocop/cop/lint/else_layout.rb +3 -3
  133. data/lib/rubocop/cop/lint/empty_ensure.rb +1 -1
  134. data/lib/rubocop/cop/lint/empty_expression.rb +1 -1
  135. data/lib/rubocop/cop/lint/empty_interpolation.rb +1 -1
  136. data/lib/rubocop/cop/lint/empty_when.rb +1 -1
  137. data/lib/rubocop/cop/lint/end_alignment.rb +13 -14
  138. data/lib/rubocop/cop/lint/end_in_method.rb +1 -1
  139. data/lib/rubocop/cop/lint/ensure_return.rb +1 -1
  140. data/lib/rubocop/cop/lint/float_out_of_range.rb +5 -5
  141. data/lib/rubocop/cop/lint/format_parameter_mismatch.rb +36 -41
  142. data/lib/rubocop/cop/lint/handle_exceptions.rb +1 -1
  143. data/lib/rubocop/cop/lint/implicit_string_concatenation.rb +1 -1
  144. data/lib/rubocop/cop/lint/ineffective_access_modifier.rb +25 -20
  145. data/lib/rubocop/cop/lint/inherit_exception.rb +16 -19
  146. data/lib/rubocop/cop/lint/interpolation_check.rb +37 -0
  147. data/lib/rubocop/cop/lint/{literal_in_condition.rb → literal_as_condition.rb} +21 -7
  148. data/lib/rubocop/cop/lint/literal_in_interpolation.rb +1 -1
  149. data/lib/rubocop/cop/lint/loop.rb +1 -1
  150. data/lib/rubocop/cop/lint/missing_cop_enable_directive.rb +81 -0
  151. data/lib/rubocop/cop/lint/multiple_compare.rb +1 -1
  152. data/lib/rubocop/cop/lint/nested_method_definition.rb +6 -8
  153. data/lib/rubocop/cop/lint/nested_percent_literal.rb +58 -0
  154. data/lib/rubocop/cop/lint/next_without_accumulator.rb +1 -1
  155. data/lib/rubocop/cop/lint/non_local_exit_from_iterator.rb +4 -4
  156. data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb +4 -3
  157. data/lib/rubocop/cop/lint/percent_string_array.rb +13 -22
  158. data/lib/rubocop/cop/lint/percent_symbol_array.rb +12 -12
  159. data/lib/rubocop/cop/lint/rand_one.rb +8 -2
  160. data/lib/rubocop/cop/lint/redundant_with_index.rb +80 -0
  161. data/lib/rubocop/cop/lint/redundant_with_object.rb +81 -0
  162. data/lib/rubocop/cop/lint/regexp_as_condition.rb +29 -0
  163. data/lib/rubocop/cop/lint/require_parentheses.rb +5 -3
  164. data/lib/rubocop/cop/lint/rescue_exception.rb +1 -1
  165. data/lib/rubocop/cop/lint/rescue_type.rb +18 -9
  166. data/lib/rubocop/cop/lint/return_in_void_context.rb +74 -0
  167. data/lib/rubocop/cop/lint/safe_navigation_chain.rb +1 -1
  168. data/lib/rubocop/cop/lint/script_permission.rb +8 -1
  169. data/lib/rubocop/cop/lint/shadowed_argument.rb +146 -0
  170. data/lib/rubocop/cop/lint/shadowed_exception.rb +37 -10
  171. data/lib/rubocop/cop/lint/shadowing_outer_local_variable.rb +1 -1
  172. data/lib/rubocop/cop/lint/string_conversion_in_interpolation.rb +7 -7
  173. data/lib/rubocop/cop/lint/syntax.rb +23 -20
  174. data/lib/rubocop/cop/lint/underscore_prefixed_variable_name.rb +1 -1
  175. data/lib/rubocop/cop/lint/unified_integer.rb +5 -4
  176. data/lib/rubocop/cop/lint/unneeded_disable.rb +41 -16
  177. data/lib/rubocop/cop/lint/unneeded_require_statement.rb +51 -0
  178. data/lib/rubocop/cop/lint/unneeded_splat_expansion.rb +45 -19
  179. data/lib/rubocop/cop/lint/unreachable_code.rb +53 -8
  180. data/lib/rubocop/cop/lint/unused_method_argument.rb +2 -1
  181. data/lib/rubocop/cop/lint/uri_escape_unescape.rb +74 -0
  182. data/lib/rubocop/cop/lint/uri_regexp.rb +73 -0
  183. data/lib/rubocop/cop/lint/useless_access_modifier.rb +12 -16
  184. data/lib/rubocop/cop/lint/useless_assignment.rb +1 -1
  185. data/lib/rubocop/cop/lint/useless_comparison.rb +1 -1
  186. data/lib/rubocop/cop/lint/useless_setter_call.rb +15 -12
  187. data/lib/rubocop/cop/lint/void.rb +38 -27
  188. data/lib/rubocop/cop/message_annotator.rb +4 -2
  189. data/lib/rubocop/cop/metrics/abc_size.rb +2 -2
  190. data/lib/rubocop/cop/metrics/block_nesting.rb +1 -1
  191. data/lib/rubocop/cop/metrics/class_length.rb +3 -1
  192. data/lib/rubocop/cop/metrics/cyclomatic_complexity.rb +2 -1
  193. data/lib/rubocop/cop/metrics/line_length.rb +8 -5
  194. data/lib/rubocop/cop/metrics/method_length.rb +8 -3
  195. data/lib/rubocop/cop/metrics/module_length.rb +3 -1
  196. data/lib/rubocop/cop/metrics/parameter_lists.rb +14 -5
  197. data/lib/rubocop/cop/metrics/perceived_complexity.rb +2 -1
  198. data/lib/rubocop/cop/mixin/array_hash_indentation.rb +3 -2
  199. data/lib/rubocop/cop/mixin/autocorrect_alignment.rb +2 -2
  200. data/lib/rubocop/cop/mixin/code_length.rb +1 -1
  201. data/lib/rubocop/cop/mixin/configurable_formatting.rb +1 -1
  202. data/lib/rubocop/cop/mixin/def_node.rb +1 -1
  203. data/lib/rubocop/cop/mixin/documentation_comment.rb +1 -1
  204. data/lib/rubocop/cop/mixin/empty_lines_around_body.rb +14 -7
  205. data/lib/rubocop/cop/mixin/empty_parameter.rb +23 -0
  206. data/lib/rubocop/cop/mixin/end_keyword_alignment.rb +8 -4
  207. data/lib/rubocop/cop/mixin/enforce_superclass.rb +3 -3
  208. data/lib/rubocop/cop/mixin/first_element_line_break.rb +12 -3
  209. data/lib/rubocop/cop/mixin/heredoc.rb +28 -0
  210. data/lib/rubocop/cop/mixin/method_complexity.rb +33 -7
  211. data/lib/rubocop/cop/mixin/multiline_expression_indentation.rb +74 -33
  212. data/lib/rubocop/cop/mixin/multiline_literal_brace_layout.rb +34 -8
  213. data/lib/rubocop/cop/mixin/negative_conditional.rb +4 -1
  214. data/lib/rubocop/cop/mixin/ordered_gem_node.rb +67 -0
  215. data/lib/rubocop/cop/mixin/parentheses.rb +12 -0
  216. data/lib/rubocop/cop/mixin/parser_diagnostic.rb +4 -1
  217. data/lib/rubocop/cop/mixin/percent_array.rb +52 -0
  218. data/lib/rubocop/cop/mixin/space_after_punctuation.rb +9 -8
  219. data/lib/rubocop/cop/mixin/space_before_punctuation.rb +11 -10
  220. data/lib/rubocop/cop/mixin/statement_modifier.rb +7 -17
  221. data/lib/rubocop/cop/mixin/string_help.rb +1 -1
  222. data/lib/rubocop/cop/mixin/string_literals_help.rb +1 -1
  223. data/lib/rubocop/cop/mixin/surrounding_space.rb +95 -8
  224. data/lib/rubocop/cop/mixin/too_many_lines.rb +2 -2
  225. data/lib/rubocop/cop/mixin/trailing_comma.rb +25 -17
  226. data/lib/rubocop/cop/mixin/unused_argument.rb +6 -2
  227. data/lib/rubocop/cop/naming/accessor_method_name.rb +55 -0
  228. data/lib/rubocop/cop/{style → naming}/ascii_identifiers.rb +35 -2
  229. data/lib/rubocop/cop/{style/op_method.rb → naming/binary_operator_parameter_name.rb} +7 -6
  230. data/lib/rubocop/cop/naming/class_and_module_camel_case.rb +33 -0
  231. data/lib/rubocop/cop/naming/constant_name.rb +58 -0
  232. data/lib/rubocop/cop/{style → naming}/file_name.rb +28 -13
  233. data/lib/rubocop/cop/naming/heredoc_delimiter_case.rb +62 -0
  234. data/lib/rubocop/cop/naming/heredoc_delimiter_naming.rb +59 -0
  235. data/lib/rubocop/cop/naming/method_name.rb +40 -0
  236. data/lib/rubocop/cop/naming/predicate_name.rb +101 -0
  237. data/lib/rubocop/cop/naming/variable_name.rb +50 -0
  238. data/lib/rubocop/cop/{style → naming}/variable_number.rb +11 -28
  239. data/lib/rubocop/cop/offense.rb +6 -1
  240. data/lib/rubocop/cop/performance/caller.rb +39 -11
  241. data/lib/rubocop/cop/performance/case_when_splat.rb +3 -7
  242. data/lib/rubocop/cop/performance/casecmp.rb +9 -8
  243. data/lib/rubocop/cop/performance/compare_with_block.rb +23 -13
  244. data/lib/rubocop/cop/performance/count.rb +7 -4
  245. data/lib/rubocop/cop/performance/detect.rb +9 -6
  246. data/lib/rubocop/cop/performance/double_start_end_with.rb +12 -20
  247. data/lib/rubocop/cop/performance/end_with.rb +6 -6
  248. data/lib/rubocop/cop/performance/fixed_size.rb +1 -1
  249. data/lib/rubocop/cop/performance/flat_map.rb +5 -2
  250. data/lib/rubocop/cop/performance/hash_each_methods.rb +85 -40
  251. data/lib/rubocop/cop/performance/lstrip_rstrip.rb +9 -6
  252. data/lib/rubocop/cop/performance/range_include.rb +3 -3
  253. data/lib/rubocop/cop/performance/redundant_block_call.rb +28 -28
  254. data/lib/rubocop/cop/performance/redundant_match.rb +13 -12
  255. data/lib/rubocop/cop/performance/redundant_merge.rb +44 -26
  256. data/lib/rubocop/cop/performance/redundant_sort_by.rb +9 -6
  257. data/lib/rubocop/cop/performance/regexp_match.rb +19 -10
  258. data/lib/rubocop/cop/performance/reverse_each.rb +1 -1
  259. data/lib/rubocop/cop/performance/sample.rb +1 -1
  260. data/lib/rubocop/cop/performance/size.rb +3 -3
  261. data/lib/rubocop/cop/performance/start_with.rb +6 -6
  262. data/lib/rubocop/cop/performance/string_replacement.rb +6 -6
  263. data/lib/rubocop/cop/performance/times_map.rb +32 -22
  264. data/lib/rubocop/cop/performance/unfreeze_string.rb +50 -0
  265. data/lib/rubocop/cop/performance/uri_default_parser.rb +47 -0
  266. data/lib/rubocop/cop/rails/action_filter.rb +23 -1
  267. data/lib/rubocop/cop/rails/active_support_aliases.rb +4 -5
  268. data/lib/rubocop/cop/rails/application_job.rb +5 -3
  269. data/lib/rubocop/cop/rails/application_record.rb +5 -3
  270. data/lib/rubocop/cop/rails/blank.rb +20 -17
  271. data/lib/rubocop/cop/rails/create_table_with_timestamps.rb +82 -0
  272. data/lib/rubocop/cop/rails/date.rb +7 -6
  273. data/lib/rubocop/cop/rails/delegate.rb +53 -29
  274. data/lib/rubocop/cop/rails/delegate_allow_blank.rb +4 -4
  275. data/lib/rubocop/cop/rails/dynamic_find_by.rb +2 -2
  276. data/lib/rubocop/cop/rails/enum_uniqueness.rb +4 -4
  277. data/lib/rubocop/cop/rails/environment_comparison.rb +66 -0
  278. data/lib/rubocop/cop/rails/exit.rb +8 -1
  279. data/lib/rubocop/cop/rails/file_path.rb +8 -11
  280. data/lib/rubocop/cop/rails/find_by.rb +2 -1
  281. data/lib/rubocop/cop/rails/find_each.rb +1 -1
  282. data/lib/rubocop/cop/rails/has_and_belongs_to_many.rb +8 -1
  283. data/lib/rubocop/cop/rails/has_many_or_has_one_dependent.rb +76 -0
  284. data/lib/rubocop/cop/rails/http_positional_arguments.rb +40 -44
  285. data/lib/rubocop/cop/rails/inverse_of.rb +96 -0
  286. data/lib/rubocop/cop/rails/lexically_scoped_action_filter.rb +112 -0
  287. data/lib/rubocop/cop/rails/not_null_column.rb +6 -6
  288. data/lib/rubocop/cop/rails/output.rb +11 -2
  289. data/lib/rubocop/cop/rails/output_safety.rb +16 -21
  290. data/lib/rubocop/cop/rails/pluralization_grammar.rb +10 -10
  291. data/lib/rubocop/cop/rails/presence.rb +105 -0
  292. data/lib/rubocop/cop/rails/present.rb +14 -17
  293. data/lib/rubocop/cop/rails/read_write_attribute.rb +13 -13
  294. data/lib/rubocop/cop/rails/redundant_receiver_in_with_options.rb +91 -0
  295. data/lib/rubocop/cop/rails/relative_date_constant.rb +11 -11
  296. data/lib/rubocop/cop/rails/request_referer.rb +3 -3
  297. data/lib/rubocop/cop/rails/reversible_migration.rb +36 -35
  298. data/lib/rubocop/cop/rails/safe_navigation.rb +7 -8
  299. data/lib/rubocop/cop/rails/save_bang.rb +19 -17
  300. data/lib/rubocop/cop/rails/scope_args.rb +2 -2
  301. data/lib/rubocop/cop/rails/skips_model_validations.rb +2 -2
  302. data/lib/rubocop/cop/rails/time_zone.rb +3 -2
  303. data/lib/rubocop/cop/rails/uniq_before_pluck.rb +4 -2
  304. data/lib/rubocop/cop/rails/unknown_env.rb +63 -0
  305. data/lib/rubocop/cop/rails/validation.rb +8 -8
  306. data/lib/rubocop/cop/registry.rb +2 -1
  307. data/lib/rubocop/cop/security/eval.rb +4 -4
  308. data/lib/rubocop/cop/security/json_load.rb +7 -5
  309. data/lib/rubocop/cop/security/marshal_load.rb +8 -6
  310. data/lib/rubocop/cop/security/yaml_load.rb +4 -4
  311. data/lib/rubocop/cop/style/alias.rb +49 -27
  312. data/lib/rubocop/cop/style/and_or.rb +65 -45
  313. data/lib/rubocop/cop/style/array_join.rb +10 -1
  314. data/lib/rubocop/cop/style/ascii_comments.rb +24 -4
  315. data/lib/rubocop/cop/style/attr.rb +15 -5
  316. data/lib/rubocop/cop/style/auto_resource_cleanup.rb +7 -5
  317. data/lib/rubocop/cop/style/bare_percent_literals.rb +31 -10
  318. data/lib/rubocop/cop/style/begin_block.rb +1 -1
  319. data/lib/rubocop/cop/style/block_comments.rb +17 -3
  320. data/lib/rubocop/cop/style/block_delimiters.rb +82 -16
  321. data/lib/rubocop/cop/style/braces_around_hash_parameters.rb +68 -32
  322. data/lib/rubocop/cop/style/case_equality.rb +13 -1
  323. data/lib/rubocop/cop/style/character_literal.rb +10 -0
  324. data/lib/rubocop/cop/style/class_and_module_children.rb +8 -4
  325. data/lib/rubocop/cop/style/class_check.rb +29 -10
  326. data/lib/rubocop/cop/style/class_methods.rb +10 -9
  327. data/lib/rubocop/cop/style/class_vars.rb +5 -4
  328. data/lib/rubocop/cop/style/collection_methods.rb +5 -3
  329. data/lib/rubocop/cop/style/colon_method_call.rb +18 -2
  330. data/lib/rubocop/cop/style/colon_method_definition.rb +36 -0
  331. data/lib/rubocop/cop/style/command_literal.rb +90 -30
  332. data/lib/rubocop/cop/style/comment_annotation.rb +39 -11
  333. data/lib/rubocop/cop/style/commented_keyword.rb +84 -0
  334. data/lib/rubocop/cop/style/conditional_assignment.rb +41 -41
  335. data/lib/rubocop/cop/style/copyright.rb +27 -28
  336. data/lib/rubocop/cop/style/date_time.rb +44 -0
  337. data/lib/rubocop/cop/style/def_with_parentheses.rb +31 -5
  338. data/lib/rubocop/cop/style/dir.rb +48 -0
  339. data/lib/rubocop/cop/style/documentation.rb +17 -2
  340. data/lib/rubocop/cop/style/documentation_method.rb +2 -6
  341. data/lib/rubocop/cop/style/double_negation.rb +1 -1
  342. data/lib/rubocop/cop/style/each_for_simple_loop.rb +8 -8
  343. data/lib/rubocop/cop/style/each_with_object.rb +6 -5
  344. data/lib/rubocop/cop/style/empty_block_parameter.rb +47 -0
  345. data/lib/rubocop/cop/style/empty_case_condition.rb +3 -3
  346. data/lib/rubocop/cop/style/empty_else.rb +55 -24
  347. data/lib/rubocop/cop/style/empty_lambda_parameter.rb +43 -0
  348. data/lib/rubocop/cop/style/empty_literal.rb +25 -14
  349. data/lib/rubocop/cop/style/empty_method.rb +29 -25
  350. data/lib/rubocop/cop/style/encoding.rb +8 -51
  351. data/lib/rubocop/cop/style/end_block.rb +1 -1
  352. data/lib/rubocop/cop/style/eval_with_location.rb +146 -0
  353. data/lib/rubocop/cop/style/even_odd.rb +4 -2
  354. data/lib/rubocop/cop/style/extend_self.rb +92 -0
  355. data/lib/rubocop/cop/style/flip_flop.rb +13 -2
  356. data/lib/rubocop/cop/style/for.rb +6 -2
  357. data/lib/rubocop/cop/style/format_string.rb +33 -5
  358. data/lib/rubocop/cop/style/format_string_token.rb +17 -15
  359. data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +7 -6
  360. data/lib/rubocop/cop/style/global_vars.rb +12 -2
  361. data/lib/rubocop/cop/style/guard_clause.rb +6 -4
  362. data/lib/rubocop/cop/style/hash_syntax.rb +56 -56
  363. data/lib/rubocop/cop/style/identical_conditional_branches.rb +12 -8
  364. data/lib/rubocop/cop/style/if_inside_else.rb +11 -11
  365. data/lib/rubocop/cop/style/if_unless_modifier.rb +8 -7
  366. data/lib/rubocop/cop/style/if_unless_modifier_of_if_unless.rb +3 -2
  367. data/lib/rubocop/cop/style/if_with_semicolon.rb +10 -1
  368. data/lib/rubocop/cop/style/implicit_runtime_error.rb +7 -6
  369. data/lib/rubocop/cop/style/infinite_loop.rb +4 -4
  370. data/lib/rubocop/cop/style/inline_comment.rb +1 -1
  371. data/lib/rubocop/cop/style/inverse_methods.rb +24 -14
  372. data/lib/rubocop/cop/style/lambda.rb +45 -43
  373. data/lib/rubocop/cop/style/lambda_call.rb +37 -10
  374. data/lib/rubocop/cop/style/line_end_concatenation.rb +5 -5
  375. data/lib/rubocop/cop/style/method_call_with_args_parentheses.rb +3 -19
  376. data/lib/rubocop/cop/style/method_call_without_args_parentheses.rb +6 -4
  377. data/lib/rubocop/cop/style/method_called_on_do_end_block.rb +1 -1
  378. data/lib/rubocop/cop/style/method_def_parentheses.rb +20 -25
  379. data/lib/rubocop/cop/style/method_missing.rb +13 -26
  380. data/lib/rubocop/cop/style/min_max.rb +68 -0
  381. data/lib/rubocop/cop/style/missing_else.rb +20 -6
  382. data/lib/rubocop/cop/style/mixin_grouping.rb +31 -21
  383. data/lib/rubocop/cop/style/mixin_usage.rb +71 -0
  384. data/lib/rubocop/cop/style/module_function.rb +27 -11
  385. data/lib/rubocop/cop/style/multiline_block_chain.rb +1 -1
  386. data/lib/rubocop/cop/style/multiline_if_modifier.rb +8 -4
  387. data/lib/rubocop/cop/style/multiline_if_then.rb +15 -13
  388. data/lib/rubocop/cop/style/multiline_memoization.rb +33 -17
  389. data/lib/rubocop/cop/style/multiline_ternary_operator.rb +1 -1
  390. data/lib/rubocop/cop/style/multiple_comparison.rb +1 -1
  391. data/lib/rubocop/cop/style/mutable_constant.rb +11 -15
  392. data/lib/rubocop/cop/style/negated_if.rb +27 -31
  393. data/lib/rubocop/cop/style/negated_while.rb +1 -5
  394. data/lib/rubocop/cop/style/nested_modifier.rb +1 -1
  395. data/lib/rubocop/cop/style/nested_parenthesized_calls.rb +26 -23
  396. data/lib/rubocop/cop/style/nested_ternary_operator.rb +1 -1
  397. data/lib/rubocop/cop/style/next.rb +41 -12
  398. data/lib/rubocop/cop/style/nil_comparison.rb +8 -8
  399. data/lib/rubocop/cop/style/non_nil_check.rb +41 -38
  400. data/lib/rubocop/cop/style/not.rb +15 -5
  401. data/lib/rubocop/cop/style/numeric_literal_prefix.rb +8 -4
  402. data/lib/rubocop/cop/style/numeric_literals.rb +9 -9
  403. data/lib/rubocop/cop/style/numeric_predicate.rb +21 -21
  404. data/lib/rubocop/cop/style/one_line_conditional.rb +9 -4
  405. data/lib/rubocop/cop/style/option_hash.rb +11 -25
  406. data/lib/rubocop/cop/style/optional_arguments.rb +1 -2
  407. data/lib/rubocop/cop/style/or_assignment.rb +88 -0
  408. data/lib/rubocop/cop/style/parallel_assignment.rb +16 -16
  409. data/lib/rubocop/cop/style/parentheses_around_condition.rb +30 -13
  410. data/lib/rubocop/cop/style/percent_literal_delimiters.rb +25 -4
  411. data/lib/rubocop/cop/style/percent_q_literals.rb +29 -8
  412. data/lib/rubocop/cop/style/perl_backrefs.rb +8 -1
  413. data/lib/rubocop/cop/style/preferred_hash_methods.rb +7 -11
  414. data/lib/rubocop/cop/style/proc.rb +10 -2
  415. data/lib/rubocop/cop/style/raise_args.rb +22 -29
  416. data/lib/rubocop/cop/style/random_with_offset.rb +160 -0
  417. data/lib/rubocop/cop/style/redundant_begin.rb +16 -5
  418. data/lib/rubocop/cop/style/redundant_conditional.rb +96 -0
  419. data/lib/rubocop/cop/style/redundant_exception.rb +4 -4
  420. data/lib/rubocop/cop/style/redundant_freeze.rb +1 -1
  421. data/lib/rubocop/cop/style/redundant_parentheses.rb +14 -12
  422. data/lib/rubocop/cop/style/redundant_return.rb +28 -15
  423. data/lib/rubocop/cop/style/redundant_self.rb +35 -27
  424. data/lib/rubocop/cop/style/regexp_literal.rb +88 -27
  425. data/lib/rubocop/cop/style/rescue_modifier.rb +12 -1
  426. data/lib/rubocop/cop/style/rescue_standard_error.rb +122 -0
  427. data/lib/rubocop/cop/style/return_nil.rb +89 -0
  428. data/lib/rubocop/cop/style/safe_navigation.rb +100 -48
  429. data/lib/rubocop/cop/style/self_assignment.rb +13 -13
  430. data/lib/rubocop/cop/style/semicolon.rb +19 -9
  431. data/lib/rubocop/cop/style/send.rb +10 -1
  432. data/lib/rubocop/cop/style/signal_exception.rb +104 -3
  433. data/lib/rubocop/cop/style/single_line_block_params.rb +16 -15
  434. data/lib/rubocop/cop/style/single_line_methods.rb +26 -18
  435. data/lib/rubocop/cop/style/special_global_vars.rb +19 -14
  436. data/lib/rubocop/cop/style/stabby_lambda_parentheses.rb +23 -50
  437. data/lib/rubocop/cop/style/stderr_puts.rb +54 -0
  438. data/lib/rubocop/cop/style/string_hash_keys.rb +36 -0
  439. data/lib/rubocop/cop/style/string_literals.rb +26 -3
  440. data/lib/rubocop/cop/style/string_literals_in_interpolation.rb +16 -1
  441. data/lib/rubocop/cop/style/string_methods.rb +19 -8
  442. data/lib/rubocop/cop/style/struct_inheritance.rb +3 -3
  443. data/lib/rubocop/cop/style/symbol_array.rb +7 -35
  444. data/lib/rubocop/cop/style/symbol_literal.rb +1 -1
  445. data/lib/rubocop/cop/style/symbol_proc.rb +11 -25
  446. data/lib/rubocop/cop/style/ternary_parentheses.rb +46 -51
  447. data/lib/rubocop/cop/style/trailing_body_on_method_definition.rb +101 -0
  448. data/lib/rubocop/cop/style/trailing_comma_in_arguments.rb +20 -6
  449. data/lib/rubocop/cop/style/trailing_comma_in_literal.rb +22 -7
  450. data/lib/rubocop/cop/style/trailing_method_end_statement.rb +95 -0
  451. data/lib/rubocop/cop/style/trailing_underscore_variable.rb +70 -24
  452. data/lib/rubocop/cop/style/trivial_accessors.rb +72 -65
  453. data/lib/rubocop/cop/style/unless_else.rb +16 -1
  454. data/lib/rubocop/cop/style/unneeded_capital_w.rb +18 -8
  455. data/lib/rubocop/cop/style/unneeded_interpolation.rb +15 -19
  456. data/lib/rubocop/cop/style/unneeded_percent_q.rb +14 -13
  457. data/lib/rubocop/cop/style/variable_interpolation.rb +23 -9
  458. data/lib/rubocop/cop/style/when_then.rb +14 -1
  459. data/lib/rubocop/cop/style/while_until_do.rb +27 -4
  460. data/lib/rubocop/cop/style/while_until_modifier.rb +26 -6
  461. data/lib/rubocop/cop/style/word_array.rb +9 -30
  462. data/lib/rubocop/cop/style/yoda_condition.rb +51 -22
  463. data/lib/rubocop/cop/style/zero_length_predicate.rb +44 -29
  464. data/lib/rubocop/cop/team.rb +16 -8
  465. data/lib/rubocop/cop/util.rb +43 -34
  466. data/lib/rubocop/cop/variable_force.rb +1 -1
  467. data/lib/rubocop/cop/variable_force/assignment.rb +4 -2
  468. data/lib/rubocop/cop/variable_force/scope.rb +1 -5
  469. data/lib/rubocop/cop/variable_force/variable.rb +1 -1
  470. data/lib/rubocop/formatter/disabled_config_formatter.rb +3 -4
  471. data/lib/rubocop/formatter/formatter_set.rb +3 -1
  472. data/lib/rubocop/formatter/html_formatter.rb +1 -1
  473. data/lib/rubocop/formatter/json_formatter.rb +9 -3
  474. data/lib/rubocop/formatter/offense_count_formatter.rb +2 -0
  475. data/lib/rubocop/formatter/quiet_formatter.rb +13 -0
  476. data/lib/rubocop/formatter/simple_text_formatter.rb +3 -3
  477. data/lib/rubocop/formatter/tap_formatter.rb +71 -0
  478. data/lib/rubocop/formatter/worst_offenders_formatter.rb +2 -0
  479. data/lib/rubocop/node_pattern.rb +46 -29
  480. data/lib/rubocop/options.rb +13 -8
  481. data/lib/rubocop/path_util.rb +15 -3
  482. data/lib/rubocop/processed_source.rb +8 -9
  483. data/lib/rubocop/rake_task.rb +16 -23
  484. data/lib/rubocop/remote_config.rb +13 -1
  485. data/lib/rubocop/result_cache.rb +1 -0
  486. data/lib/rubocop/rspec/cop_helper.rb +10 -10
  487. data/lib/rubocop/rspec/expect_offense.rb +6 -8
  488. data/lib/rubocop/rspec/shared_contexts.rb +4 -8
  489. data/lib/rubocop/rspec/shared_examples.rb +8 -8
  490. data/lib/rubocop/rspec/support.rb +5 -5
  491. data/lib/rubocop/runner.rb +1 -1
  492. data/lib/rubocop/string_util.rb +2 -0
  493. data/lib/rubocop/token.rb +74 -0
  494. data/lib/rubocop/version.rb +1 -1
  495. metadata +118 -48
  496. data/lib/rubocop/cop/layout/space_inside_brackets.rb +0 -20
  497. data/lib/rubocop/cop/lint/invalid_character_literal.rb +0 -41
  498. data/lib/rubocop/cop/mixin/access_modifier_node.rb +0 -41
  499. data/lib/rubocop/cop/mixin/on_method_def.rb +0 -44
  500. data/lib/rubocop/cop/mixin/space_inside.rb +0 -76
  501. data/lib/rubocop/cop/style/accessor_method_name.rb +0 -45
  502. data/lib/rubocop/cop/style/class_and_module_camel_case.rb +0 -29
  503. data/lib/rubocop/cop/style/constant_name.rb +0 -29
  504. data/lib/rubocop/cop/style/method_name.rb +0 -34
  505. data/lib/rubocop/cop/style/predicate_name.rb +0 -67
  506. data/lib/rubocop/cop/style/variable_name.rb +0 -39
@@ -5,6 +5,23 @@ module RuboCop
5
5
  module Style
6
6
  # This cop checks for the presence of superfluous parentheses around the
7
7
  # condition of if/unless/while/until.
8
+ #
9
+ # @example
10
+ # # bad
11
+ # x += 1 while (x < 10)
12
+ # foo unless (bar || baz)
13
+ #
14
+ # if (x > 10)
15
+ # elsif (x < 3)
16
+ # end
17
+ #
18
+ # # good
19
+ # x += 1 while x < 10
20
+ # foo unless bar || baz
21
+ #
22
+ # if x > 10
23
+ # elsif x < 3
24
+ # end
8
25
  class ParenthesesAroundCondition < Cop
9
26
  include SafeAssignment
10
27
  include Parentheses
@@ -18,35 +35,35 @@ module RuboCop
18
35
  def on_while(node)
19
36
  process_control_op(node)
20
37
  end
21
-
22
- def on_until(node)
23
- process_control_op(node)
24
- end
38
+ alias on_until on_while
25
39
 
26
40
  private
27
41
 
42
+ def_node_matcher :control_op_condition, <<-PATTERN
43
+ (begin $_ ...)
44
+ PATTERN
45
+
28
46
  def process_control_op(node)
29
47
  cond = node.condition
30
48
 
31
- return unless cond.begin_type?
32
- return if cond.children.empty?
33
- return if modifier_op?(cond.children.first)
34
- return if parens_required?(node.children.first)
35
- return if safe_assignment?(cond) && safe_assignment_allowed?
49
+ control_op_condition(cond) do |first_child|
50
+ return if modifier_op?(first_child)
51
+ return if parens_required?(node.condition)
52
+ return if safe_assignment?(cond) && safe_assignment_allowed?
36
53
 
37
- add_offense(cond, :expression, message(node))
54
+ add_offense(cond)
55
+ end
38
56
  end
39
57
 
40
58
  def modifier_op?(node)
41
59
  return false if node.if_type? && node.ternary?
42
60
  return true if node.rescue_type?
43
61
 
44
- MODIFIER_NODES.include?(node.type) &&
45
- node.modifier_form?
62
+ MODIFIER_NODES.include?(node.type) && node.modifier_form?
46
63
  end
47
64
 
48
65
  def message(node)
49
- kw = node.keyword
66
+ kw = node.parent.keyword
50
67
  article = kw == 'while' ? 'a' : 'an'
51
68
  "Don't use parentheses around the condition of #{article} `#{kw}`."
52
69
  end
@@ -55,8 +55,6 @@ module RuboCop
55
55
  "`#{delimiters[0]}` and `#{delimiters[1]}`."
56
56
  end
57
57
 
58
- private
59
-
60
58
  def autocorrect(node)
61
59
  type = type(node)
62
60
 
@@ -68,12 +66,15 @@ module RuboCop
68
66
  end
69
67
  end
70
68
 
69
+ private
70
+
71
71
  def on_percent_literal(node)
72
72
  type = type(node)
73
73
  return if uses_preferred_delimiter?(node, type) ||
74
- contains_preferred_delimiter?(node, type)
74
+ contains_preferred_delimiter?(node, type) ||
75
+ include_same_character_as_used_for_delimiter?(node, type)
75
76
 
76
- add_offense(node, :expression)
77
+ add_offense(node)
77
78
  end
78
79
 
79
80
  def uses_preferred_delimiter?(node, type)
@@ -87,6 +88,17 @@ module RuboCop
87
88
  .any? { |s| preferred_delimiters.any? { |d| s.include?(d) } }
88
89
  end
89
90
 
91
+ def include_same_character_as_used_for_delimiter?(node, type)
92
+ return false unless %w[%w %i].include?(type)
93
+
94
+ used_delimiters = matchpairs(begin_source(node)[-1])
95
+ escaped_delimiters = used_delimiters.map { |d| "\\#{d}" }.join('|')
96
+
97
+ node
98
+ .children.map { |n| string_source(n) }.compact
99
+ .any? { |s| Regexp.new(escaped_delimiters) =~ s }
100
+ end
101
+
90
102
  def string_source(node)
91
103
  if node.is_a?(String)
92
104
  node
@@ -94,6 +106,15 @@ module RuboCop
94
106
  node.source
95
107
  end
96
108
  end
109
+
110
+ def matchpairs(begin_delimiter)
111
+ {
112
+ '(' => %w[( )],
113
+ '[' => %w[[ ]],
114
+ '{' => %w[{ }],
115
+ '<' => %w[< >]
116
+ }.fetch(begin_delimiter, [begin_delimiter])
117
+ end
97
118
  end
98
119
  end
99
120
  end
@@ -4,6 +4,27 @@ module RuboCop
4
4
  module Cop
5
5
  module Style
6
6
  # This cop checks for usage of the %Q() syntax when %q() would do.
7
+ #
8
+ # @example EnforcedStyle: lower_case_q (default)
9
+ # # The `lower_case_q` style prefers `%q` unless
10
+ # # interpolation is needed.
11
+ # # bad
12
+ # %Q[Mix the foo into the baz.]
13
+ # %Q(They all said: 'Hooray!')
14
+ #
15
+ # # good
16
+ # %q[Mix the foo into the baz]
17
+ # %q(They all said: 'Hooray!')
18
+ #
19
+ # @example EnforcedStyle: upper_case_q
20
+ # # The `upper_case_q` style requires the sole use of `%Q`.
21
+ # # bad
22
+ # %q/Mix the foo into the baz./
23
+ # %q{They all said: 'Hooray!'}
24
+ #
25
+ # # good
26
+ # %Q/Mix the foo into the baz./
27
+ # %Q{They all said: 'Hooray!'}
7
28
  class PercentQLiterals < Cop
8
29
  include PercentLiteral
9
30
  include ConfigurableEnforcedStyle
@@ -16,6 +37,12 @@ module RuboCop
16
37
  process(node, '%Q', '%q')
17
38
  end
18
39
 
40
+ def autocorrect(node)
41
+ lambda do |corrector|
42
+ corrector.replace(node.source_range, corrected(node.source))
43
+ end
44
+ end
45
+
19
46
  private
20
47
 
21
48
  def on_percent_literal(node)
@@ -25,7 +52,7 @@ module RuboCop
25
52
  # i.e., if the string would become dynamic or has special characters.
26
53
  return if node.children != parse(corrected(node.source)).ast.children
27
54
 
28
- add_offense(node, :begin, message)
55
+ add_offense(node, location: :begin)
29
56
  end
30
57
 
31
58
  def correct_literal_style?(node)
@@ -33,16 +60,10 @@ module RuboCop
33
60
  style == :upper_case_q && type(node) == '%Q'
34
61
  end
35
62
 
36
- def message
63
+ def message(_node)
37
64
  style == :lower_case_q ? LOWER_CASE_Q_MSG : UPPER_CASE_Q_MSG
38
65
  end
39
66
 
40
- def autocorrect(node)
41
- lambda do |corrector|
42
- corrector.replace(node.source_range, corrected(node.source))
43
- end
44
- end
45
-
46
67
  def corrected(src)
47
68
  src.sub(src[1], src[1].swapcase)
48
69
  end
@@ -5,11 +5,18 @@ module RuboCop
5
5
  module Style
6
6
  # This cop looks for uses of Perl-style regexp match
7
7
  # backreferences like $1, $2, etc.
8
+ #
9
+ # @example
10
+ # # bad
11
+ # puts $1
12
+ #
13
+ # # good
14
+ # puts Regexp.last_match(1)
8
15
  class PerlBackrefs < Cop
9
16
  MSG = 'Avoid the use of Perl-style backrefs.'.freeze
10
17
 
11
18
  def on_nth_ref(node)
12
- add_offense(node, :expression)
19
+ add_offense(node)
13
20
  end
14
21
 
15
22
  def autocorrect(node)
@@ -8,10 +8,7 @@ module RuboCop
8
8
  # It is configurable to enforce the inverse, using `verbose` method
9
9
  # names also.
10
10
  #
11
- # @example
12
- #
13
- # # EnforcedStyle: short (default)
14
- #
11
+ # @example EnforcedStyle: short (default)
15
12
  # # bad
16
13
  # Hash#has_key?
17
14
  # Hash#has_value?
@@ -20,10 +17,7 @@ module RuboCop
20
17
  # Hash#key?
21
18
  # Hash#value?
22
19
  #
23
- # @example
24
- #
25
- # # EnforcedStyle: verbose
26
- #
20
+ # @example EnforcedStyle: verbose
27
21
  # # bad
28
22
  # Hash#key?
29
23
  # Hash#value?
@@ -34,7 +28,7 @@ module RuboCop
34
28
  class PreferredHashMethods < Cop
35
29
  include ConfigurableEnforcedStyle
36
30
 
37
- MSG = 'Use `Hash#%s` instead of `Hash#%s`.'.freeze
31
+ MSG = 'Use `Hash#%<prefer>s` instead of `Hash#%<current>s`.'.freeze
38
32
 
39
33
  OFFENDING_SELECTORS = {
40
34
  short: %i[has_key? has_value?],
@@ -45,7 +39,7 @@ module RuboCop
45
39
  return unless node.arguments.one? &&
46
40
  offending_selector?(node.method_name)
47
41
 
48
- add_offense(node, :selector)
42
+ add_offense(node, location: :selector)
49
43
  end
50
44
 
51
45
  def autocorrect(node)
@@ -58,7 +52,9 @@ module RuboCop
58
52
  private
59
53
 
60
54
  def message(node)
61
- format(MSG, proper_method_name(node.method_name), node.method_name)
55
+ format(MSG,
56
+ prefer: proper_method_name(node.method_name),
57
+ current: node.method_name)
62
58
  end
63
59
 
64
60
  def proper_method_name(method_name)
@@ -5,15 +5,23 @@ module RuboCop
5
5
  module Style
6
6
  # This cops checks for uses of Proc.new where Kernel#proc
7
7
  # would be more appropriate.
8
+ #
9
+ # @example
10
+ # # bad
11
+ # p = Proc.new { |n| puts n }
12
+ #
13
+ # # good
14
+ # p = proc { |n| puts n }
15
+ #
8
16
  class Proc < Cop
9
17
  MSG = 'Use `proc` instead of `Proc.new`.'.freeze
10
18
 
11
19
  def_node_matcher :proc_new?,
12
- '(block $(send (const nil :Proc) :new) ...)'
20
+ '(block $(send (const nil? :Proc) :new) ...)'
13
21
 
14
22
  def on_block(node)
15
23
  proc_new?(node) do |block_method|
16
- add_offense(block_method, :expression)
24
+ add_offense(block_method)
17
25
  end
18
26
  end
19
27
 
@@ -13,10 +13,7 @@ module RuboCop
13
13
  # will also suggest constructing error objects when the exception is
14
14
  # passed multiple arguments.
15
15
  #
16
- # @example
17
- #
18
- # # EnforcedStyle: exploded
19
- #
16
+ # @example EnforcedStyle: exploded (default)
20
17
  # # bad
21
18
  # raise StandardError.new("message")
22
19
  #
@@ -26,10 +23,7 @@ module RuboCop
26
23
  # raise MyCustomError.new(arg1, arg2, arg3)
27
24
  # raise MyKwArgError.new(key1: val1, key2: val2)
28
25
  #
29
- # @example
30
- #
31
- # # EnforcedStyle: compact
32
- #
26
+ # @example EnforcedStyle: compact
33
27
  # # bad
34
28
  # raise StandardError, "message"
35
29
  # raise RuntimeError, arg1, arg2, arg3
@@ -42,9 +36,9 @@ module RuboCop
42
36
  include ConfigurableEnforcedStyle
43
37
 
44
38
  EXPLODED_MSG = 'Provide an exception class and message ' \
45
- 'as arguments to `%s`.'.freeze
39
+ 'as arguments to `%<method>s`.'.freeze
46
40
  COMPACT_MSG = 'Provide an exception object ' \
47
- 'as an argument to `%s`.'.freeze
41
+ 'as an argument to `%<method>s`.'.freeze
48
42
 
49
43
  def on_send(node)
50
44
  return unless node.command?(:raise) || node.command?(:fail)
@@ -57,41 +51,40 @@ module RuboCop
57
51
  end
58
52
  end
59
53
 
60
- private
61
-
62
54
  def autocorrect(node)
63
- new_exception = if style == :compact
64
- correction_exploded_to_compact(node.arguments)
65
- else
66
- correction_compact_to_exploded(node.first_argument)
67
- end
68
- replacement = "#{node.method_name} #{new_exception}"
55
+ replacement = if style == :compact
56
+ correction_exploded_to_compact(node)
57
+ else
58
+ correction_compact_to_exploded(node)
59
+ end
69
60
 
70
61
  ->(corrector) { corrector.replace(node.source_range, replacement) }
71
62
  end
72
63
 
64
+ private
65
+
73
66
  def correction_compact_to_exploded(node)
74
- exception_node, _new, message_node = *node
67
+ exception_node, _new, message_node = *node.first_argument
75
68
 
76
69
  message = message_node && message_node.source
77
70
 
78
71
  correction = exception_node.const_name.to_s
79
72
  correction = "#{correction}, #{message}" if message
80
73
 
81
- correction
74
+ "#{node.method_name} #{correction}"
82
75
  end
83
76
 
84
77
  def correction_exploded_to_compact(node)
85
- exception_node, *message_nodes = *node
86
-
87
- messages = message_nodes.map(&:source).join(', ')
78
+ exception_node, *message_nodes = *node.arguments
79
+ return node.source if message_nodes.size > 1
88
80
 
89
- "#{exception_node.const_name}.new(#{messages})"
81
+ argument = message_nodes.first.source
82
+ "#{node.method_name} #{exception_node.const_name}.new(#{argument})"
90
83
  end
91
84
 
92
85
  def check_compact(node)
93
86
  if node.arguments.size > 1
94
- add_offense(node, :expression, message(node.method_name)) do
87
+ add_offense(node) do
95
88
  opposite_style_detected
96
89
  end
97
90
  else
@@ -108,7 +101,7 @@ module RuboCop
108
101
 
109
102
  return if acceptable_exploded_args?(first_arg.arguments)
110
103
 
111
- add_offense(node, :expression, message(node.method_name)) do
104
+ add_offense(node) do
112
105
  opposite_style_detected
113
106
  end
114
107
  end
@@ -127,11 +120,11 @@ module RuboCop
127
120
  arg.hash_type? || arg.splat_type?
128
121
  end
129
122
 
130
- def message(method)
123
+ def message(node)
131
124
  if style == :compact
132
- format(COMPACT_MSG, method)
125
+ format(COMPACT_MSG, method: node.method_name)
133
126
  else
134
- format(EXPLODED_MSG, method)
127
+ format(EXPLODED_MSG, method: node.method_name)
135
128
  end
136
129
  end
137
130
  end
@@ -0,0 +1,160 @@
1
+ # frozen_string_literal: true
2
+
3
+ module RuboCop
4
+ module Cop
5
+ module Style
6
+ # This cop checks for the use of randomly generated numbers,
7
+ # added/subtracted with integer literals, as well as those with
8
+ # Integer#succ and Integer#pred methods. Prefer using ranges instead,
9
+ # as it clearly states the intentions.
10
+ #
11
+ # @example
12
+ # # bad
13
+ # rand(6) + 1
14
+ # 1 + rand(6)
15
+ # rand(6) - 1
16
+ # 1 - rand(6)
17
+ # rand(6).succ
18
+ # rand(6).pred
19
+ # Random.rand(6) + 1
20
+ # Kernel.rand(6) + 1
21
+ # rand(0..5) + 1
22
+ #
23
+ # # good
24
+ # rand(1..6)
25
+ # rand(1...7)
26
+ class RandomWithOffset < Cop
27
+ MSG = 'Prefer ranges when generating random numbers instead of ' \
28
+ 'integers with offsets.'.freeze
29
+
30
+ def_node_matcher :integer_op_rand?, <<-PATTERN
31
+ (send
32
+ int {:+ :-}
33
+ (send
34
+ {nil? (const nil? :Random) (const nil? :Kernel)}
35
+ :rand
36
+ {int irange erange}))
37
+ PATTERN
38
+
39
+ def_node_matcher :rand_op_integer?, <<-PATTERN
40
+ (send
41
+ (send
42
+ {nil? (const nil? :Random) (const nil? :Kernel)}
43
+ :rand
44
+ {int irange erange})
45
+ {:+ :-}
46
+ int)
47
+ PATTERN
48
+
49
+ def_node_matcher :rand_modified?, <<-PATTERN
50
+ (send
51
+ (send
52
+ {nil? (const nil? :Random) (const nil? :Kernel)}
53
+ :rand
54
+ {int irange erange})
55
+ {:succ :pred :next})
56
+ PATTERN
57
+
58
+ def on_send(node)
59
+ return unless integer_op_rand?(node) ||
60
+ rand_op_integer?(node) ||
61
+ rand_modified?(node)
62
+ add_offense(node)
63
+ end
64
+
65
+ def autocorrect(node)
66
+ lambda do |corrector|
67
+ if integer_op_rand?(node)
68
+ corrector.replace(node.source_range,
69
+ corrected_integer_op_rand(node))
70
+ elsif rand_op_integer?(node)
71
+ corrector.replace(node.source_range,
72
+ corrected_rand_op_integer(node))
73
+ elsif rand_modified?(node)
74
+ corrector.replace(node.source_range,
75
+ corrected_rand_modified(node))
76
+ end
77
+ end
78
+ end
79
+
80
+ private
81
+
82
+ def corrected_integer_op_rand(node)
83
+ left, operator, right = *node
84
+
85
+ offset = int_from_int_node(left)
86
+
87
+ prefix_node, _, random_node = *right
88
+
89
+ prefix = prefix_from_prefix_node(prefix_node)
90
+ left_int, right_int = boundaries_from_random_node(random_node)
91
+
92
+ if operator == :+
93
+ "#{prefix}(#{offset + left_int}..#{offset + right_int})"
94
+ else
95
+ "#{prefix}(#{offset - right_int}..#{offset - left_int})"
96
+ end
97
+ end
98
+
99
+ def corrected_rand_op_integer(node)
100
+ left, operator, right = *node
101
+
102
+ prefix_node, _, random_node = *left
103
+
104
+ offset = int_from_int_node(right)
105
+
106
+ prefix = prefix_from_prefix_node(prefix_node)
107
+ left_int, right_int = boundaries_from_random_node(random_node)
108
+
109
+ if operator == :+
110
+ "#{prefix}(#{left_int + offset}..#{right_int + offset})"
111
+ else
112
+ "#{prefix}(#{left_int - offset}..#{right_int - offset})"
113
+ end
114
+ end
115
+
116
+ def corrected_rand_modified(node)
117
+ rand, method = *node
118
+ prefix_node, _, random_node = *rand
119
+
120
+ prefix = prefix_from_prefix_node(prefix_node)
121
+ left_int, right_int = boundaries_from_random_node(random_node)
122
+
123
+ if %i[succ next].include?(method)
124
+ "#{prefix}(#{left_int + 1}..#{right_int + 1})"
125
+ elsif method == :pred
126
+ "#{prefix}(#{left_int - 1}..#{right_int - 1})"
127
+ end
128
+ end
129
+
130
+ def prefix_from_prefix_node(node)
131
+ if node.nil?
132
+ 'rand'
133
+ else
134
+ _, prefix = *node
135
+ "#{prefix}.rand"
136
+ end
137
+ end
138
+
139
+ def boundaries_from_random_node(random_node)
140
+ children = random_node.children
141
+
142
+ case random_node.type
143
+ when :int
144
+ [0, int_from_int_node(random_node) - 1]
145
+ when :irange
146
+ [int_from_int_node(children.first),
147
+ int_from_int_node(children[1])]
148
+ when :erange
149
+ [int_from_int_node(children.first),
150
+ int_from_int_node(children[1]) - 1]
151
+ end
152
+ end
153
+
154
+ def int_from_int_node(node)
155
+ node.children.first
156
+ end
157
+ end
158
+ end
159
+ end
160
+ end