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,16 @@ module RuboCop
5
5
  module Style
6
6
  # This cop checks for multiple expressions placed on the same line.
7
7
  # It also checks for lines terminated with a semicolon.
8
+ #
9
+ # @example
10
+ # # bad
11
+ # foo = 1; bar = 2;
12
+ # baz = 3;
13
+ #
14
+ # # good
15
+ # foo = 1
16
+ # bar = 2
17
+ # baz = 3
8
18
  class Semicolon < Cop
9
19
  MSG = 'Do not use semicolons to terminate expressions.'.freeze
10
20
 
@@ -36,6 +46,11 @@ module RuboCop
36
46
  end
37
47
  end
38
48
 
49
+ def autocorrect(range)
50
+ return unless range
51
+ ->(corrector) { corrector.remove(range) }
52
+ end
53
+
39
54
  private
40
55
 
41
56
  def check_for_line_terminator_or_opener
@@ -44,25 +59,20 @@ module RuboCop
44
59
 
45
60
  def each_semicolon
46
61
  tokens_for_lines.each do |line, tokens|
47
- yield line, tokens.last.pos.column if tokens.last.type == :tSEMI
48
- yield line, tokens.first.pos.column if tokens.first.type == :tSEMI
62
+ yield line, tokens.last.column if tokens.last.semicolon?
63
+ yield line, tokens.first.column if tokens.first.semicolon?
49
64
  end
50
65
  end
51
66
 
52
67
  def tokens_for_lines
53
- @processed_source.tokens.group_by { |token| token.pos.line }
68
+ @processed_source.tokens.group_by(&:line)
54
69
  end
55
70
 
56
71
  def convention_on(line, column, autocorrect)
57
72
  range = source_range(@processed_source.buffer, line, column)
58
73
  # Don't attempt to autocorrect if semicolon is separating statements
59
74
  # on the same line
60
- add_offense(autocorrect ? range : nil, range)
61
- end
62
-
63
- def autocorrect(range)
64
- return unless range
65
- ->(corrector) { corrector.remove(range) }
75
+ add_offense(autocorrect ? range : nil, location: range)
66
76
  end
67
77
  end
68
78
  end
@@ -4,6 +4,15 @@ module RuboCop
4
4
  module Cop
5
5
  module Style
6
6
  # This cop checks for the use of the send method.
7
+ #
8
+ # @example
9
+ # # bad
10
+ # Foo.send(:bar)
11
+ # quuz.send(:fred)
12
+ #
13
+ # # good
14
+ # Foo.__send__(:bar)
15
+ # quuz.public_send(:fred)
7
16
  class Send < Cop
8
17
  MSG = 'Prefer `Object#__send__` or `Object#public_send` to ' \
9
18
  '`send`.'.freeze
@@ -13,7 +22,7 @@ module RuboCop
13
22
  def on_send(node)
14
23
  return unless sending?(node) && node.arguments?
15
24
 
16
- add_offense(node, :selector)
25
+ add_offense(node, location: :selector)
17
26
  end
18
27
  end
19
28
  end
@@ -4,6 +4,106 @@ module RuboCop
4
4
  module Cop
5
5
  module Style
6
6
  # This cop checks for uses of `fail` and `raise`.
7
+ #
8
+ # @example EnforcedStyle: only_raise (default)
9
+ # # The `only_raise` style enforces the sole use of `raise`.
10
+ # # bad
11
+ # begin
12
+ # fail
13
+ # rescue Exception
14
+ # # handle it
15
+ # end
16
+ #
17
+ # def watch_out
18
+ # fail
19
+ # rescue Exception
20
+ # # handle it
21
+ # end
22
+ #
23
+ # Kernel.fail
24
+ #
25
+ # # good
26
+ # begin
27
+ # raise
28
+ # rescue Exception
29
+ # # handle it
30
+ # end
31
+ #
32
+ # def watch_out
33
+ # raise
34
+ # rescue Exception
35
+ # # handle it
36
+ # end
37
+ #
38
+ # Kernel.raise
39
+ #
40
+ # @example EnforcedStyle: only_fail
41
+ # # The `only_fail` style enforces the sole use of `fail`.
42
+ # # bad
43
+ # begin
44
+ # raise
45
+ # rescue Exception
46
+ # # handle it
47
+ # end
48
+ #
49
+ # def watch_out
50
+ # raise
51
+ # rescue Exception
52
+ # # handle it
53
+ # end
54
+ #
55
+ # Kernel.raise
56
+ #
57
+ # # good
58
+ # begin
59
+ # fail
60
+ # rescue Exception
61
+ # # handle it
62
+ # end
63
+ #
64
+ # def watch_out
65
+ # fail
66
+ # rescue Exception
67
+ # # handle it
68
+ # end
69
+ #
70
+ # Kernel.fail
71
+ #
72
+ # @example EnforcedStyle: semantic
73
+ # # The `semantic` style enforces the use of `fail` to signal an
74
+ # # exception, then will use `raise` to trigger an offense after
75
+ # # it has been rescued.
76
+ # # bad
77
+ # begin
78
+ # raise
79
+ # rescue Exception
80
+ # # handle it
81
+ # end
82
+ #
83
+ # def watch_out
84
+ # # Error thrown
85
+ # rescue Exception
86
+ # fail
87
+ # end
88
+ #
89
+ # Kernel.fail
90
+ # Kernel.raise
91
+ #
92
+ # # good
93
+ # begin
94
+ # fail
95
+ # rescue Exception
96
+ # # handle it
97
+ # end
98
+ #
99
+ # def watch_out
100
+ # fail
101
+ # rescue Exception
102
+ # raise 'Preferably with descriptive message'
103
+ # end
104
+ #
105
+ # explicit_receiver.fail
106
+ # explicit_receiver.raise
7
107
  class SignalException < Cop
8
108
  include ConfigurableEnforcedStyle
9
109
 
@@ -11,7 +111,7 @@ module RuboCop
11
111
  RAISE_MSG = 'Use `raise` instead of `fail` to ' \
12
112
  'rethrow exceptions.'.freeze
13
113
 
14
- def_node_matcher :kernel_call?, '(send (const nil :Kernel) %1 ...)'
114
+ def_node_matcher :kernel_call?, '(send (const nil? :Kernel) %1 ...)'
15
115
  def_node_search :custom_fail_methods,
16
116
  '{(def :fail ...) (defs _ :fail ...)}'
17
117
 
@@ -77,7 +177,8 @@ module RuboCop
77
177
  each_command_or_kernel_call(method_name, node) do |send_node|
78
178
  next if ignored_node?(send_node)
79
179
 
80
- add_offense(send_node, :selector, message(method_name))
180
+ add_offense(send_node,
181
+ location: :selector, message: message(method_name))
81
182
  ignore_node(send_node)
82
183
  end
83
184
  end
@@ -85,7 +186,7 @@ module RuboCop
85
186
  def check_send(method_name, node)
86
187
  return unless node && command_or_kernel_call?(method_name, node)
87
188
 
88
- add_offense(node, :selector, message(method_name))
189
+ add_offense(node, location: :selector, message: message(method_name))
89
190
  end
90
191
 
91
192
  def command_or_kernel_call?(name, node)
@@ -9,25 +9,17 @@ module RuboCop
9
9
  # For instance one can configure `reduce`(`inject`) to use |a, e| as
10
10
  # parameters.
11
11
  class SingleLineBlockParams < Cop
12
- MSG = 'Name `%s` block params `|%s|`.'.freeze
12
+ MSG = 'Name `%<method>s` block params `|%<params>s|`.'.freeze
13
13
 
14
14
  def on_block(node)
15
15
  return unless node.single_line?
16
16
 
17
- send_node = node.send_node
17
+ return unless eligible_method?(node)
18
+ return unless eligible_arguments?(node)
18
19
 
19
- return unless send_node.receiver
20
- return unless method_names.include?(send_node.method_name)
20
+ return if args_match?(node.send_node.method_name, node.arguments)
21
21
 
22
- return unless node.arguments?
23
-
24
- arguments = node.arguments.to_a
25
-
26
- # discard cases with argument destructuring
27
- return true unless arguments.all?(&:arg_type?)
28
- return if args_match?(send_node.method_name, arguments)
29
-
30
- add_offense(node.arguments, :expression)
22
+ add_offense(node.arguments)
31
23
  end
32
24
 
33
25
  private
@@ -36,7 +28,16 @@ module RuboCop
36
28
  method_name = node.parent.send_node.method_name
37
29
  arguments = target_args(method_name).join(', ')
38
30
 
39
- format(MSG, method_name, arguments)
31
+ format(MSG, method: method_name, params: arguments)
32
+ end
33
+
34
+ def eligible_arguments?(node)
35
+ node.arguments? && node.arguments.to_a.all?(&:arg_type?)
36
+ end
37
+
38
+ def eligible_method?(node)
39
+ node.send_node.receiver &&
40
+ method_names.include?(node.send_node.method_name)
40
41
  end
41
42
 
42
43
  def methods
@@ -58,7 +59,7 @@ module RuboCop
58
59
  end
59
60
 
60
61
  def args_match?(method_name, args)
61
- actual_args = args.flat_map(&:to_a)
62
+ actual_args = args.to_a.flat_map(&:to_a)
62
63
 
63
64
  # Prepending an underscore to mark an unused parameter is allowed, so
64
65
  # we remove any leading underscores before comparing.
@@ -3,33 +3,35 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Style
6
- # This cop checks for single-line method definitions.
7
- # It can optionally accept single-line methods with no body.
6
+ # This cop checks for single-line method definitions that contain a body.
7
+ # It will accept single-line methods with no body.
8
+ #
9
+ # @example
10
+ # # bad
11
+ # def some_method; body end
12
+ # def link_to(url); {:name => url}; end
13
+ # def @table.columns; super; end
14
+ #
15
+ # # good
16
+ # def no_op; end
17
+ # def self.resource_class=(klass); end
18
+ # def @table.columns; end
19
+ #
8
20
  class SingleLineMethods < Cop
9
21
  include AutocorrectAlignment
10
- include OnMethodDef
11
22
 
12
23
  MSG = 'Avoid single-line method definitions.'.freeze
13
24
 
14
- def allow_empty?
15
- cop_config['AllowIfMethodIsEmpty']
16
- end
17
-
18
- private
19
-
20
- def on_method_def(node, _method_name, _args, body)
21
- start_line = node.loc.keyword.line
22
- end_line = node.loc.end.line
23
-
24
- empty_body = body.nil?
25
- return unless start_line == end_line && !(allow_empty? && empty_body)
25
+ def on_def(node)
26
+ return unless node.single_line?
27
+ return if allow_empty? && !node.body
26
28
 
27
- @body = body
28
- add_offense(node, :expression)
29
+ add_offense(node)
29
30
  end
31
+ alias on_defs on_def
30
32
 
31
33
  def autocorrect(node)
32
- body = @body
34
+ body = node.body
33
35
 
34
36
  lambda do |corrector|
35
37
  each_part(body) do |part|
@@ -43,6 +45,12 @@ module RuboCop
43
45
  end
44
46
  end
45
47
 
48
+ private
49
+
50
+ def allow_empty?
51
+ cop_config['AllowIfMethodIsEmpty']
52
+ end
53
+
46
54
  def end_of_line_comment(line)
47
55
  processed_source.comments.find { |c| c.loc.line == line }
48
56
  end
@@ -7,11 +7,12 @@ module RuboCop
7
7
  class SpecialGlobalVars < Cop
8
8
  include ConfigurableEnforcedStyle
9
9
 
10
- MSG_BOTH = 'Prefer `%s` from the stdlib \'English\' module ' \
11
- '(don\'t forget to require it), or `%s` over `%s`.'.freeze
12
- MSG_ENGLISH = 'Prefer `%s` from the stdlib \'English\' module ' \
13
- '(don\'t forget to require it) over `%s`.'.freeze
14
- MSG_REGULAR = 'Prefer `%s` over `%s`.'.freeze
10
+ MSG_BOTH = 'Prefer `%<prefer>s` from the stdlib \'English\' ' \
11
+ 'module (don\'t forget to require it), or `%<regular>s` over ' \
12
+ '`%<global>s`.'.freeze
13
+ MSG_ENGLISH = 'Prefer `%<prefer>s` from the stdlib \'English\' ' \
14
+ 'module (don\'t forget to require it) over `%<global>s`.'.freeze
15
+ MSG_REGULAR = 'Prefer `%<prefer>s` over `%<global>s`.'.freeze
15
16
 
16
17
  ENGLISH_VARS = { # rubocop:disable Style/MutableConstant
17
18
  :$: => [:$LOAD_PATH],
@@ -47,8 +48,8 @@ module RuboCop
47
48
  PERL_VARS.merge!(
48
49
  Hash[PERL_VARS.flat_map { |_, vs| vs.map { |v| [v, [v]] } }]
49
50
  )
50
- ENGLISH_VARS.each { |_, v| v.freeze }.freeze
51
- PERL_VARS.each { |_, v| v.freeze }.freeze
51
+ ENGLISH_VARS.each_value(&:freeze).freeze
52
+ PERL_VARS.each_value(&:freeze).freeze
52
53
 
53
54
  # Anything *not* in this set is provided by the English library.
54
55
  NON_ENGLISH_VARS = Set.new(%i[
@@ -67,7 +68,7 @@ module RuboCop
67
68
  correct_style_detected
68
69
  else
69
70
  opposite_style_detected
70
- add_offense(node, :expression)
71
+ add_offense(node)
71
72
  end
72
73
  end
73
74
 
@@ -77,7 +78,9 @@ module RuboCop
77
78
  if style == :use_english_names
78
79
  format_english_message(global_var)
79
80
  else
80
- format(MSG_REGULAR, preferred_names(global_var).first, global_var)
81
+ format(MSG_REGULAR,
82
+ prefer: preferred_names(global_var).first,
83
+ global: global_var)
81
84
  end
82
85
  end
83
86
 
@@ -104,14 +107,16 @@ module RuboCop
104
107
  format_message(english, regular, global_var)
105
108
  end
106
109
 
107
- def format_message(english, regular, global_var)
110
+ def format_message(english, regular, global)
108
111
  if !regular.empty? && !english.empty?
109
- format(MSG_BOTH, format_list(english), format_list(regular),
110
- global_var)
112
+ format(MSG_BOTH,
113
+ prefer: format_list(english),
114
+ regular: format_list(regular),
115
+ global: global)
111
116
  elsif !regular.empty?
112
- format(MSG_REGULAR, format_list(regular), global_var)
117
+ format(MSG_REGULAR, prefer: format_list(regular), global: global)
113
118
  elsif !english.empty?
114
- format(MSG_ENGLISH, format_list(english), global_var)
119
+ format(MSG_ENGLISH, prefer: format_list(english), global: global)
115
120
  else
116
121
  raise 'Bug in SpecialGlobalVars - global var w/o preferred vars!'
117
122
  end
@@ -6,17 +6,18 @@ module RuboCop
6
6
  # Check for parentheses around stabby lambda arguments.
7
7
  # There are two different styles. Defaults to `require_parentheses`.
8
8
  #
9
- # @example
10
- # # require_parentheses - bad
9
+ # @example EnforcedStyle: require_parentheses (default)
10
+ # # bad
11
11
  # ->a,b,c { a + b + c }
12
12
  #
13
- # # require_parentheses - good
13
+ # # good
14
14
  # ->(a,b,c) { a + b + c}
15
15
  #
16
- # # require_no_parentheses - bad
16
+ # @example EnforcedStyle: require_no_parentheses
17
+ # # bad
17
18
  # ->(a,b,c) { a + b + c }
18
19
  #
19
- # # require_no_parentheses - good
20
+ # # good
20
21
  # ->a,b,c { a + b + c}
21
22
  class StabbyLambdaParentheses < Cop
22
23
  include ConfigurableEnforcedStyle
@@ -24,22 +25,12 @@ module RuboCop
24
25
  MSG_REQUIRE = 'Wrap stabby lambda arguments with parentheses.'.freeze
25
26
  MSG_NO_REQUIRE = 'Do not wrap stabby lambda arguments ' \
26
27
  'with parentheses.'.freeze
27
- ARROW = '->'.freeze
28
-
29
28
  def on_send(node)
30
- return unless arrow_lambda_with_args?(node)
29
+ return unless stabby_lambda_with_args?(node)
30
+ return unless redundant_parentheses?(node) ||
31
+ missing_parentheses?(node)
31
32
 
32
- if style == :require_parentheses
33
- if parentheses?(node)
34
- correct_style_detected
35
- else
36
- missing_parentheses(node)
37
- end
38
- elsif parentheses?(node)
39
- unwanted_parentheses(node)
40
- else
41
- correct_style_detected
42
- end
33
+ add_offense(node.parent.arguments)
43
34
  end
44
35
 
45
36
  def autocorrect(node)
@@ -52,21 +43,21 @@ module RuboCop
52
43
 
53
44
  private
54
45
 
55
- def missing_parentheses(node)
56
- add_offense(node_args(node), :expression, MSG_REQUIRE) do
57
- opposite_style_detected
58
- end
46
+ def missing_parentheses?(node)
47
+ style == :require_parentheses && !parentheses?(node)
59
48
  end
60
49
 
61
- def unwanted_parentheses(node)
62
- add_offense(node_args(node), :expression, MSG_NO_REQUIRE) do
63
- opposite_style_detected
64
- end
50
+ def redundant_parentheses?(node)
51
+ style == :require_no_parentheses && parentheses?(node)
52
+ end
53
+
54
+ def message(_node)
55
+ style == :require_parentheses ? MSG_REQUIRE : MSG_NO_REQUIRE
65
56
  end
66
57
 
67
58
  def missing_parentheses_corrector(node)
68
59
  lambda do |corrector|
69
- args_loc = node_args(node).source_range
60
+ args_loc = node.parent.arguments.source_range
70
61
 
71
62
  corrector.insert_before(args_loc, '(')
72
63
  corrector.insert_after(args_loc, ')')
@@ -75,37 +66,19 @@ module RuboCop
75
66
 
76
67
  def unwanted_parentheses_corrector(node)
77
68
  lambda do |corrector|
78
- args_loc = node_args(node).loc
69
+ args_loc = node.parent.arguments.loc
79
70
 
80
71
  corrector.replace(args_loc.begin, '')
81
72
  corrector.remove(args_loc.end)
82
73
  end
83
74
  end
84
75
 
85
- def arrow_lambda_with_args?(node)
86
- lambda_node?(node) && arrow_form?(node) && args?(node)
87
- end
88
-
89
- def lambda_node?(node)
90
- receiver, call = *node
91
- !receiver && call == :lambda
92
- end
93
-
94
- def arrow_form?(node)
95
- node.loc.selector.source == ARROW
96
- end
97
-
98
- def node_args(node)
99
- _call, args, _body = *node.parent
100
- args
101
- end
102
-
103
- def args?(node)
104
- !node_args(node).children.empty?
76
+ def stabby_lambda_with_args?(node)
77
+ node.stabby_lambda? && node.parent.arguments?
105
78
  end
106
79
 
107
80
  def parentheses?(node)
108
- node_args(node).loc.begin
81
+ node.parent.arguments.loc.begin
109
82
  end
110
83
  end
111
84
  end