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
@@ -0,0 +1,54 @@
1
+ # frozen_string_literal: true
2
+
3
+ module RuboCop
4
+ module Cop
5
+ module Style
6
+ # This cop identifies places where `$stderr.puts` can be replaced by
7
+ # `warn`. The latter has the advantage of easily being disabled by,
8
+ # e.g. the -W0 interpreter flag, or setting $VERBOSE to nil.
9
+ #
10
+ # @example
11
+ # # bad
12
+ # $stderr.puts('hello')
13
+ #
14
+ # # good
15
+ # warn('hello')
16
+ #
17
+ class StderrPuts < Cop
18
+ MSG = 'Use `warn` instead of `$stderr.puts` to allow such output ' \
19
+ 'to be disabled.'.freeze
20
+
21
+ def_node_matcher :stderr_puts?, <<-PATTERN
22
+ (send
23
+ (gvar #stderr_gvar?) :puts
24
+ ...)
25
+ PATTERN
26
+
27
+ def on_send(node)
28
+ return unless stderr_puts?(node)
29
+
30
+ add_offense(node, location: stderr_puts_range(node))
31
+ end
32
+
33
+ def autocorrect(node)
34
+ lambda do |corrector|
35
+ corrector.replace(stderr_puts_range(node), 'warn')
36
+ end
37
+ end
38
+
39
+ private
40
+
41
+ def stderr_gvar?(sym)
42
+ sym == :$stderr
43
+ end
44
+
45
+ def stderr_puts_range(send)
46
+ range_between(
47
+ send.loc.expression.begin_pos,
48
+ send.loc.selector.end_pos
49
+ )
50
+ end
51
+ end
52
+ end
53
+ end
54
+ end
@@ -0,0 +1,36 @@
1
+ # frozen_string_literal: true
2
+
3
+ module RuboCop
4
+ module Cop
5
+ module Style
6
+ # This cop checks for the use of strings as keys in hashes. The use of
7
+ # symbols is preferred instead.
8
+ #
9
+ # @example
10
+ # # bad
11
+ # { 'one' => 1, 'two' => 2, 'three' => 3 }
12
+ #
13
+ # # good
14
+ # { one: 1, two: 2, three: 3 }
15
+ class StringHashKeys < Cop
16
+ MSG = 'Prefer symbols instead of strings as hash keys.'.freeze
17
+
18
+ def_node_matcher :string_hash_key?, <<-PATTERN
19
+ (pair (str _) _)
20
+ PATTERN
21
+
22
+ def on_pair(node)
23
+ return unless string_hash_key?(node)
24
+ add_offense(node.key)
25
+ end
26
+
27
+ def autocorrect(node)
28
+ lambda do |corrector|
29
+ symbol_content = node.str_content.to_sym.inspect
30
+ corrector.replace(node.source_range, symbol_content)
31
+ end
32
+ end
33
+ end
34
+ end
35
+ end
36
+ end
@@ -4,6 +4,28 @@ module RuboCop
4
4
  module Cop
5
5
  module Style
6
6
  # Checks if uses of quotes match the configured preference.
7
+ #
8
+ # @example EnforcedStyle: single_quotes (default)
9
+ # # bad
10
+ # "No special symbols"
11
+ # "No string interpolation"
12
+ # "Just text"
13
+ #
14
+ # # good
15
+ # 'No special symbols'
16
+ # 'No string interpolation'
17
+ # 'Just text'
18
+ # "Wait! What's #{this}!"
19
+ #
20
+ # @example EnforcedStyle: double_quotes
21
+ # # bad
22
+ # 'Just some text'
23
+ # 'No special chars or interpolation'
24
+ #
25
+ # # good
26
+ # "Just some text"
27
+ # "No special chars or interpolation"
28
+ # "Every string in #{project} uses double_quotes"
7
29
  class StringLiterals < Cop
8
30
  include ConfigurableEnforcedStyle
9
31
  include StringLiteralsHelp
@@ -24,7 +46,7 @@ module RuboCop
24
46
  quote_styles = detect_quote_styles(node)
25
47
 
26
48
  if quote_styles.size > 1
27
- add_offense(node, :expression, MSG_INCONSISTENT)
49
+ add_offense(node, message: MSG_INCONSISTENT)
28
50
  else
29
51
  check_multiline_quote_style(node, quote_styles[0])
30
52
  end
@@ -76,10 +98,11 @@ module RuboCop
76
98
  range = node.source_range
77
99
  children = node.children
78
100
  if unexpected_single_quotes?(quote)
79
- add_offense(node, range) if children.all? { |c| wrong_quotes?(c) }
101
+ all_children_with_quotes = children.all? { |c| wrong_quotes?(c) }
102
+ add_offense(node, location: range) if all_children_with_quotes
80
103
  elsif unexpected_double_quotes?(quote) &&
81
104
  !accept_child_double_quotes?(children)
82
- add_offense(node, range)
105
+ add_offense(node, location: range)
83
106
  end
84
107
  end
85
108
 
@@ -3,7 +3,22 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Style
6
- # Checks if uses of quotes match the configured preference.
6
+ # This cop checks that quotes inside the string interpolation
7
+ # match the configured preference.
8
+ #
9
+ # @example EnforcedStyle: single_quotes (default)
10
+ # # bad
11
+ # result = "Tests #{success ? "PASS" : "FAIL"}"
12
+ #
13
+ # # good
14
+ # result = "Tests #{success ? 'PASS' : 'FAIL'}"
15
+ #
16
+ # @example EnforcedStyle: double_quotes
17
+ # # bad
18
+ # result = "Tests #{success ? 'PASS' : 'FAIL'}"
19
+ #
20
+ # # good
21
+ # result = "Tests #{success ? "PASS" : "FAIL"}"
7
22
  class StringLiteralsInInterpolation < Cop
8
23
  include ConfigurableEnforcedStyle
9
24
  include StringLiteralsHelp
@@ -5,21 +5,24 @@ module RuboCop
5
5
  module Style
6
6
  # This cop enforces the use of consistent method names
7
7
  # from the String class.
8
+ #
9
+ # @example
10
+ # # bad
11
+ # 'name'.intern
12
+ # 'var'.unfavored_method
13
+ #
14
+ # # good
15
+ # 'name'.to_sym
16
+ # 'var'.preferred_method
8
17
  class StringMethods < Cop
9
18
  include MethodPreference
10
19
 
11
- MSG = 'Prefer `%s` over `%s`.'.freeze
20
+ MSG = 'Prefer `%<prefer>s` over `%<current>s`.'.freeze
12
21
 
13
22
  def on_send(node)
14
23
  return unless preferred_method(node.method_name)
15
24
 
16
- add_offense(node, :selector)
17
- end
18
-
19
- private
20
-
21
- def message(node)
22
- format(MSG, preferred_method(node.method_name), node.method_name)
25
+ add_offense(node, location: :selector)
23
26
  end
24
27
 
25
28
  def autocorrect(node)
@@ -28,6 +31,14 @@ module RuboCop
28
31
  preferred_method(node.method_name))
29
32
  end
30
33
  end
34
+
35
+ private
36
+
37
+ def message(node)
38
+ format(MSG,
39
+ prefer: preferred_method(node.method_name),
40
+ current: node.method_name)
41
+ end
31
42
  end
32
43
  end
33
44
  end
@@ -19,12 +19,12 @@ module RuboCop
19
19
  _name, superclass, _body = *node
20
20
  return unless struct_constructor?(superclass)
21
21
 
22
- add_offense(node, superclass.source_range, MSG)
22
+ add_offense(node, location: superclass.source_range)
23
23
  end
24
24
 
25
25
  def_node_matcher :struct_constructor?, <<-PATTERN
26
- {(send (const nil :Struct) :new ...)
27
- (block (send (const nil :Struct) :new ...) ...)}
26
+ {(send (const nil? :Struct) :new ...)
27
+ (block (send (const nil? :Struct) :new ...) ...)}
28
28
  PATTERN
29
29
  end
30
30
  end
@@ -7,26 +7,21 @@ module RuboCop
7
7
  # using the %i() syntax.
8
8
  #
9
9
  # Alternatively, it checks for symbol arrays using the %i() syntax on
10
- # projects which do not want to use that syntax, perhaps because they
11
- # support a version of Ruby lower than 2.0.
10
+ # projects which do not want to use that syntax.
12
11
  #
13
12
  # Configuration option: MinSize
14
13
  # If set, arrays with fewer elements than this value will not trigger the
15
14
  # cop. For example, a `MinSize of `3` will not enforce a style on an array
16
15
  # of 2 or fewer elements.
17
16
  #
18
- # @example
19
- # EnforcedStyle: percent (default)
20
- #
17
+ # @example EnforcedStyle: percent (default)
21
18
  # # good
22
19
  # %i[foo bar baz]
23
20
  #
24
21
  # # bad
25
22
  # [:foo, :bar, :baz]
26
23
  #
27
- # @example
28
- # EnforcedStyle: brackets
29
- #
24
+ # @example EnforcedStyle: brackets
30
25
  # # good
31
26
  # [:foo, :bar, :baz]
32
27
  #
@@ -37,9 +32,7 @@ module RuboCop
37
32
  include ArraySyntax
38
33
  include ConfigurableEnforcedStyle
39
34
  include PercentLiteral
40
- extend TargetRubyVersion
41
-
42
- minimum_target_ruby_version 2.0
35
+ include PercentArray
43
36
 
44
37
  PERCENT_MSG = 'Use `%i` or `%I` for an array of symbols.'.freeze
45
38
  ARRAY_MSG = 'Use `[]` for an array of symbols.'.freeze
@@ -50,6 +43,8 @@ module RuboCop
50
43
 
51
44
  def on_array(node)
52
45
  if bracketed_array_of?(:sym, node)
46
+ return if symbols_contain_spaces?(node)
47
+
53
48
  check_bracketed_array(node)
54
49
  elsif node.percent_literal?(:symbol)
55
50
  check_percent_array(node)
@@ -66,29 +61,6 @@ module RuboCop
66
61
 
67
62
  private
68
63
 
69
- def check_bracketed_array(node)
70
- return if comments_in_array?(node) ||
71
- symbols_contain_spaces?(node) ||
72
- below_array_length?(node)
73
-
74
- array_style_detected(:brackets, node.values.size)
75
- add_offense(node, :expression, PERCENT_MSG) if style == :percent
76
- end
77
-
78
- def check_percent_array(node)
79
- array_style_detected(:percent, node.values.size)
80
- add_offense(node, :expression, ARRAY_MSG) if style == :brackets
81
- end
82
-
83
- def comments_in_array?(node)
84
- comments = processed_source.comments
85
- array_range = node.source_range.to_a
86
-
87
- comments.any? do |comment|
88
- !(comment.loc.expression.to_a & array_range).empty?
89
- end
90
- end
91
-
92
64
  def symbols_contain_spaces?(node)
93
65
  node.children.any? do |sym|
94
66
  content, = *sym
@@ -97,7 +69,7 @@ module RuboCop
97
69
  end
98
70
 
99
71
  def correct_bracketed(node)
100
- syms = node.children.map { |c| to_symbol_literal(c.children[0].to_s) }
72
+ syms = node.children.map { |c| to_symbol_literal(c.value.to_s) }
101
73
 
102
74
  lambda do |corrector|
103
75
  corrector.replace(node.source_range, "[#{syms.join(', ')}]")
@@ -18,7 +18,7 @@ module RuboCop
18
18
  def on_sym(node)
19
19
  return unless node.source =~ /\A:["'][A-Za-z_]\w*["']\z/
20
20
 
21
- add_offense(node, :expression)
21
+ add_offense(node)
22
22
  end
23
23
 
24
24
  def autocorrect(node)
@@ -12,15 +12,16 @@ module RuboCop
12
12
  # # good
13
13
  # something.map(&:upcase)
14
14
  class SymbolProc < Cop
15
- MSG = 'Pass `&:%s` as an argument to `%s` instead of a block.'.freeze
15
+ MSG = 'Pass `&:%<method>s` as an argument to `%<block_method>s` ' \
16
+ 'instead of a block.'.freeze
16
17
  SUPER_TYPES = %i[super zsuper].freeze
17
18
 
18
- def_node_matcher :proc_node?, '(send (const nil :Proc) :new)'
19
+ def_node_matcher :proc_node?, '(send (const nil? :Proc) :new)'
19
20
  def_node_matcher :symbol_proc?, <<-PATTERN
20
21
  (block
21
22
  ${(send ...) (super ...) zsuper}
22
- $(args (arg _))
23
- $(send lvar $_))
23
+ (args (arg _var))
24
+ (send (lvar _var) $_))
24
25
  PATTERN
25
26
 
26
27
  def self.autocorrect_incompatible_with
@@ -28,7 +29,7 @@ module RuboCop
28
29
  end
29
30
 
30
31
  def on_block(node)
31
- symbol_proc?(node) do |send_or_super, block_args, block_body, method|
32
+ symbol_proc?(node) do |send_or_super, method|
32
33
  block_method_name = resolve_block_method_name(send_or_super)
33
34
 
34
35
  # TODO: Rails-specific handling that we should probably make
@@ -37,7 +38,6 @@ module RuboCop
37
38
  return if proc_node?(send_or_super)
38
39
  return if %i[lambda proc].include?(block_method_name)
39
40
  return if ignored_method?(block_method_name)
40
- return unless can_shorten?(block_args, block_body)
41
41
 
42
42
  offense(node, method, block_method_name)
43
43
  end
@@ -72,10 +72,10 @@ module RuboCop
72
72
  range = range_between(block_start, block_end)
73
73
 
74
74
  add_offense(node,
75
- range,
76
- format(MSG,
77
- method_name,
78
- block_method_name))
75
+ location: range,
76
+ message: format(MSG,
77
+ method: method_name,
78
+ block_method: block_method_name))
79
79
  end
80
80
 
81
81
  def autocorrect_method(corrector, node, args, method_name)
@@ -102,7 +102,7 @@ module RuboCop
102
102
  def block_range_with_space(node)
103
103
  block_range = range_between(begin_pos_for_replacement(node),
104
104
  node.loc.end.end_pos)
105
- range_with_surrounding_space(block_range, :left)
105
+ range_with_surrounding_space(range: block_range, side: :left)
106
106
  end
107
107
 
108
108
  def begin_pos_for_replacement(node)
@@ -124,20 +124,6 @@ module RuboCop
124
124
  ignored_methods.include?(name.to_s)
125
125
  end
126
126
 
127
- def can_shorten?(block_args, block_body)
128
- argument_matches_receiver?(block_args, block_body)
129
- end
130
-
131
- # TODO: This might be clearer as a node matcher with unification
132
- def argument_matches_receiver?(block_args, block_body)
133
- receiver, = *block_body
134
-
135
- block_arg_name, = *block_args.children.first
136
- receiver_name, = *receiver
137
-
138
- block_arg_name == receiver_name
139
- end
140
-
141
127
  def super?(node)
142
128
  SUPER_TYPES.include?(node.type)
143
129
  end
@@ -8,44 +8,35 @@ module RuboCop
8
8
  # parentheses using `EnforcedStyle`. Omission is only enforced when
9
9
  # removing the parentheses won't cause a different behavior.
10
10
  #
11
- # @example
12
- #
13
- # EnforcedStyle: require_no_parentheses (default)
14
- #
15
- # @bad
11
+ # @example EnforcedStyle: require_no_parentheses (default)
12
+ # # bad
16
13
  # foo = (bar?) ? a : b
17
14
  # foo = (bar.baz?) ? a : b
18
15
  # foo = (bar && baz) ? a : b
19
16
  #
20
- # @good
17
+ # # good
21
18
  # foo = bar? ? a : b
22
19
  # foo = bar.baz? ? a : b
23
20
  # foo = bar && baz ? a : b
24
21
  #
25
- # @example
26
- #
27
- # EnforcedStyle: require_parentheses
28
- #
29
- # @bad
22
+ # @example EnforcedStyle: require_parentheses
23
+ # # bad
30
24
  # foo = bar? ? a : b
31
25
  # foo = bar.baz? ? a : b
32
26
  # foo = bar && baz ? a : b
33
27
  #
34
- # @good
28
+ # # good
35
29
  # foo = (bar?) ? a : b
36
30
  # foo = (bar.baz?) ? a : b
37
31
  # foo = (bar && baz) ? a : b
38
32
  #
39
- # @example
40
- #
41
- # EnforcedStyle: require_parentheses_when_complex
42
- #
43
- # @bad
33
+ # @example EnforcedStyle: require_parentheses_when_complex
34
+ # # bad
44
35
  # foo = (bar?) ? a : b
45
36
  # foo = (bar.baz?) ? a : b
46
37
  # foo = bar && baz ? a : b
47
38
  #
48
- # @good
39
+ # # good
49
40
  # foo = bar? ? a : b
50
41
  # foo = bar.baz? ? a : b
51
42
  # foo = (bar && baz) ? a : b
@@ -54,14 +45,31 @@ module RuboCop
54
45
  include ConfigurableEnforcedStyle
55
46
  include SurroundingSpace
56
47
 
57
- MSG = '%s parentheses for ternary conditions.'.freeze
58
- MSG_COMPLEX = '%s parentheses for ternary expressions with' \
48
+ VARIABLE_TYPES = AST::Node::VARIABLES
49
+ NON_COMPLEX_TYPES = [*VARIABLE_TYPES, :const, :defined?, :yield].freeze
50
+
51
+ MSG = '%<command>s parentheses for ternary conditions.'.freeze
52
+ MSG_COMPLEX = '%<command>s parentheses for ternary expressions with' \
59
53
  ' complex conditions.'.freeze
60
54
 
61
55
  def on_if(node)
62
56
  return unless node.ternary? && !infinite_loop? && offense?(node)
63
57
 
64
- add_offense(node, node.source_range, message(node))
58
+ add_offense(node, location: node.source_range)
59
+ end
60
+
61
+ def autocorrect(node)
62
+ condition = node.condition
63
+
64
+ return nil if parenthesized?(condition) &&
65
+ (safe_assignment?(condition) ||
66
+ unsafe_autocorrect?(condition))
67
+
68
+ if parenthesized?(condition)
69
+ correct_parenthesized(condition)
70
+ else
71
+ correct_unparenthesized(condition)
72
+ end
65
73
  end
66
74
 
67
75
  private
@@ -82,46 +90,36 @@ module RuboCop
82
90
  end
83
91
  end
84
92
 
85
- def autocorrect(node)
86
- condition = node.condition
87
-
88
- return nil if parenthesized?(condition) &&
89
- (safe_assignment?(condition) ||
90
- unsafe_autocorrect?(condition))
91
-
92
- if parenthesized?(condition)
93
- correct_parenthesized(condition)
94
- else
95
- correct_unparenthesized(condition)
96
- end
97
- end
98
-
99
93
  # If the condition is parenthesized we recurse and check for any
100
94
  # complex expressions within it.
101
95
  def complex_condition?(condition)
102
96
  if condition.begin_type?
103
97
  condition.to_a.any? { |x| complex_condition?(x) }
104
98
  else
105
- non_complex_type?(condition) ? false : true
99
+ non_complex_expression?(condition) ? false : true
106
100
  end
107
101
  end
108
102
 
109
103
  # Anything that is not a variable, constant, or method/.method call
110
104
  # will be counted as a complex expression.
111
- def non_complex_type?(condition)
112
- condition.variable? || condition.const_type? ||
113
- (condition.send_type? && !operator?(condition.method_name)) ||
114
- condition.defined_type? || condition.yield_type? ||
115
- square_brackets?(condition)
105
+ def non_complex_expression?(condition)
106
+ NON_COMPLEX_TYPES.include?(condition.type) ||
107
+ non_complex_send?(condition)
108
+ end
109
+
110
+ def non_complex_send?(node)
111
+ return false unless node.send_type?
112
+
113
+ !node.operator_method? || node.method?(:[])
116
114
  end
117
115
 
118
116
  def message(node)
119
117
  if require_parentheses_when_complex?
120
- omit = parenthesized?(node.condition) ? 'Only use' : 'Use'
121
- format(MSG_COMPLEX, omit)
118
+ command = parenthesized?(node.condition) ? 'Only use' : 'Use'
119
+ format(MSG_COMPLEX, command: command)
122
120
  else
123
- verb = require_parentheses? ? 'Use' : 'Omit'
124
- format(MSG, verb)
121
+ command = require_parentheses? ? 'Use' : 'Omit'
122
+ format(MSG, command: command)
125
123
  end
126
124
  end
127
125
 
@@ -162,12 +160,9 @@ module RuboCop
162
160
 
163
161
  def_node_matcher :method_call_argument, <<-PATTERN
164
162
  {(:defined? $...)
165
- (send {_ nil} _ $(send nil _)...)}
163
+ (send {_ nil?} _ $(send nil? _)...)}
166
164
  PATTERN
167
165
 
168
- def_node_matcher :square_brackets?,
169
- '(send {(send _recv _msg) str array hash} :[] ...)'
170
-
171
166
  def correct_parenthesized(condition)
172
167
  lambda do |corrector|
173
168
  corrector.remove(condition.loc.begin)
@@ -191,8 +186,8 @@ module RuboCop
191
186
 
192
187
  def whitespace_after?(node)
193
188
  index = index_of_last_token(node)
194
- last_token, next_token = processed_source.tokens[index, 2]
195
- space_between?(last_token, next_token)
189
+ last_token = processed_source.tokens[index]
190
+ last_token.space_after?
196
191
  end
197
192
  end
198
193
  end