rubocop 0.89.1 → 0.93.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 (365) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +2 -2
  3. data/config/default.yml +160 -14
  4. data/lib/rubocop.rb +33 -5
  5. data/lib/rubocop/cached_data.rb +3 -1
  6. data/lib/rubocop/cli/command.rb +1 -0
  7. data/lib/rubocop/cli/command/auto_genenerate_config.rb +1 -0
  8. data/lib/rubocop/cli/command/base.rb +1 -0
  9. data/lib/rubocop/cli/command/execute_runner.rb +9 -0
  10. data/lib/rubocop/cli/command/init_dotfile.rb +1 -0
  11. data/lib/rubocop/cli/command/show_cops.rb +1 -0
  12. data/lib/rubocop/cli/command/version.rb +1 -0
  13. data/lib/rubocop/cli/environment.rb +1 -0
  14. data/lib/rubocop/comment_config.rb +14 -5
  15. data/lib/rubocop/config_loader.rb +20 -9
  16. data/lib/rubocop/config_loader_resolver.rb +1 -0
  17. data/lib/rubocop/config_obsoletion.rb +1 -0
  18. data/lib/rubocop/config_regeneration.rb +33 -0
  19. data/lib/rubocop/config_store.rb +3 -3
  20. data/lib/rubocop/config_validator.rb +3 -0
  21. data/lib/rubocop/cop/base.rb +23 -0
  22. data/lib/rubocop/cop/bundler/duplicated_gem.rb +5 -1
  23. data/lib/rubocop/cop/bundler/gem_comment.rb +8 -3
  24. data/lib/rubocop/cop/bundler/insecure_protocol_source.rb +2 -0
  25. data/lib/rubocop/cop/commissioner.rb +47 -7
  26. data/lib/rubocop/cop/correctors/alignment_corrector.rb +4 -4
  27. data/lib/rubocop/cop/correctors/condition_corrector.rb +3 -5
  28. data/lib/rubocop/cop/correctors/empty_line_corrector.rb +9 -10
  29. data/lib/rubocop/cop/correctors/line_break_corrector.rb +4 -4
  30. data/lib/rubocop/cop/correctors/multiline_literal_brace_corrector.rb +8 -3
  31. data/lib/rubocop/cop/correctors/parentheses_corrector.rb +5 -8
  32. data/lib/rubocop/cop/correctors/percent_literal_corrector.rb +4 -9
  33. data/lib/rubocop/cop/correctors/punctuation_corrector.rb +8 -10
  34. data/lib/rubocop/cop/documentation.rb +22 -0
  35. data/lib/rubocop/cop/gemspec/required_ruby_version.rb +10 -10
  36. data/lib/rubocop/cop/generator.rb +2 -1
  37. data/lib/rubocop/cop/internal_affairs/method_name_equal.rb +1 -0
  38. data/lib/rubocop/cop/internal_affairs/node_type_predicate.rb +1 -0
  39. data/lib/rubocop/cop/internal_affairs/offense_location_keyword.rb +1 -0
  40. data/lib/rubocop/cop/internal_affairs/redundant_location_argument.rb +1 -0
  41. data/lib/rubocop/cop/internal_affairs/redundant_message_argument.rb +1 -0
  42. data/lib/rubocop/cop/layout/array_alignment.rb +1 -0
  43. data/lib/rubocop/cop/layout/begin_end_alignment.rb +77 -0
  44. data/lib/rubocop/cop/layout/block_alignment.rb +23 -19
  45. data/lib/rubocop/cop/layout/case_indentation.rb +4 -7
  46. data/lib/rubocop/cop/layout/class_structure.rb +11 -10
  47. data/lib/rubocop/cop/layout/closing_heredoc_indentation.rb +4 -6
  48. data/lib/rubocop/cop/layout/condition_position.rb +13 -15
  49. data/lib/rubocop/cop/layout/def_end_alignment.rb +8 -5
  50. data/lib/rubocop/cop/layout/dot_position.rb +21 -20
  51. data/lib/rubocop/cop/layout/empty_comment.rb +30 -23
  52. data/lib/rubocop/cop/layout/empty_line_after_guard_clause.rb +21 -18
  53. data/lib/rubocop/cop/layout/empty_line_after_magic_comment.rb +13 -13
  54. data/lib/rubocop/cop/layout/empty_line_after_multiline_condition.rb +136 -0
  55. data/lib/rubocop/cop/layout/empty_line_between_defs.rb +21 -23
  56. data/lib/rubocop/cop/layout/empty_lines.rb +6 -7
  57. data/lib/rubocop/cop/layout/empty_lines_around_access_modifier.rb +17 -14
  58. data/lib/rubocop/cop/layout/empty_lines_around_arguments.rb +7 -8
  59. data/lib/rubocop/cop/layout/empty_lines_around_attribute_accessor.rb +5 -8
  60. data/lib/rubocop/cop/layout/empty_lines_around_begin_body.rb +2 -5
  61. data/lib/rubocop/cop/layout/empty_lines_around_block_body.rb +2 -5
  62. data/lib/rubocop/cop/layout/empty_lines_around_class_body.rb +2 -5
  63. data/lib/rubocop/cop/layout/empty_lines_around_exception_handling_keywords.rb +3 -7
  64. data/lib/rubocop/cop/layout/empty_lines_around_method_body.rb +2 -5
  65. data/lib/rubocop/cop/layout/empty_lines_around_module_body.rb +2 -5
  66. data/lib/rubocop/cop/layout/end_alignment.rb +11 -17
  67. data/lib/rubocop/cop/layout/first_array_element_line_break.rb +2 -5
  68. data/lib/rubocop/cop/layout/first_hash_element_line_break.rb +2 -5
  69. data/lib/rubocop/cop/layout/first_method_argument_line_break.rb +4 -8
  70. data/lib/rubocop/cop/layout/first_method_parameter_line_break.rb +2 -5
  71. data/lib/rubocop/cop/layout/hash_alignment.rb +17 -20
  72. data/lib/rubocop/cop/layout/heredoc_argument_closing_parenthesis.rb +15 -14
  73. data/lib/rubocop/cop/layout/heredoc_indentation.rb +14 -11
  74. data/lib/rubocop/cop/layout/initial_indentation.rb +6 -7
  75. data/lib/rubocop/cop/layout/leading_comment_space.rb +11 -9
  76. data/lib/rubocop/cop/layout/leading_empty_lines.rb +6 -11
  77. data/lib/rubocop/cop/layout/multiline_array_brace_layout.rb +2 -5
  78. data/lib/rubocop/cop/layout/multiline_array_line_breaks.rb +2 -5
  79. data/lib/rubocop/cop/layout/multiline_assignment_layout.rb +10 -14
  80. data/lib/rubocop/cop/layout/multiline_block_layout.rb +21 -19
  81. data/lib/rubocop/cop/layout/multiline_hash_brace_layout.rb +2 -5
  82. data/lib/rubocop/cop/layout/multiline_hash_key_line_breaks.rb +2 -5
  83. data/lib/rubocop/cop/layout/multiline_method_argument_line_breaks.rb +5 -9
  84. data/lib/rubocop/cop/layout/multiline_method_call_brace_layout.rb +2 -5
  85. data/lib/rubocop/cop/layout/multiline_method_definition_brace_layout.rb +2 -5
  86. data/lib/rubocop/cop/layout/rescue_ensure_alignment.rb +41 -22
  87. data/lib/rubocop/cop/layout/space_after_colon.rb +11 -7
  88. data/lib/rubocop/cop/layout/space_after_comma.rb +2 -5
  89. data/lib/rubocop/cop/layout/space_after_method_name.rb +5 -6
  90. data/lib/rubocop/cop/layout/space_after_not.rb +9 -11
  91. data/lib/rubocop/cop/layout/space_after_semicolon.rb +2 -5
  92. data/lib/rubocop/cop/layout/space_around_equals_in_parameter_default.rb +17 -21
  93. data/lib/rubocop/cop/layout/space_around_keyword.rb +17 -18
  94. data/lib/rubocop/cop/layout/space_around_operators.rb +17 -16
  95. data/lib/rubocop/cop/layout/space_before_block_braces.rb +23 -22
  96. data/lib/rubocop/cop/layout/space_before_comma.rb +3 -5
  97. data/lib/rubocop/cop/layout/space_before_comment.rb +10 -7
  98. data/lib/rubocop/cop/layout/space_before_first_arg.rb +7 -7
  99. data/lib/rubocop/cop/layout/space_before_semicolon.rb +2 -5
  100. data/lib/rubocop/cop/layout/space_in_lambda_literal.rb +9 -17
  101. data/lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb +20 -23
  102. data/lib/rubocop/cop/layout/space_inside_array_percent_literal.rb +3 -8
  103. data/lib/rubocop/cop/layout/space_inside_block_braces.rb +13 -16
  104. data/lib/rubocop/cop/layout/space_inside_hash_literal_braces.rb +19 -37
  105. data/lib/rubocop/cop/layout/space_inside_parens.rb +9 -14
  106. data/lib/rubocop/cop/layout/space_inside_percent_literal_delimiters.rb +5 -10
  107. data/lib/rubocop/cop/layout/space_inside_range_literal.rb +8 -17
  108. data/lib/rubocop/cop/layout/space_inside_reference_brackets.rb +16 -24
  109. data/lib/rubocop/cop/layout/space_inside_string_interpolation.rb +12 -13
  110. data/lib/rubocop/cop/layout/trailing_empty_lines.rb +10 -15
  111. data/lib/rubocop/cop/layout/trailing_whitespace.rb +11 -11
  112. data/lib/rubocop/cop/lint/ambiguous_block_association.rb +2 -0
  113. data/lib/rubocop/cop/lint/ambiguous_operator.rb +2 -0
  114. data/lib/rubocop/cop/lint/ambiguous_regexp_literal.rb +15 -1
  115. data/lib/rubocop/cop/lint/big_decimal_new.rb +1 -2
  116. data/lib/rubocop/cop/lint/binary_operator_with_identical_operands.rb +1 -1
  117. data/lib/rubocop/cop/lint/boolean_symbol.rb +3 -0
  118. data/lib/rubocop/cop/lint/constant_definition_in_block.rb +74 -0
  119. data/lib/rubocop/cop/lint/constant_resolution.rb +1 -1
  120. data/lib/rubocop/cop/lint/debugger.rb +2 -3
  121. data/lib/rubocop/cop/lint/deprecated_class_methods.rb +1 -3
  122. data/lib/rubocop/cop/lint/duplicate_methods.rb +2 -4
  123. data/lib/rubocop/cop/lint/duplicate_require.rb +46 -0
  124. data/lib/rubocop/cop/lint/duplicate_rescue_exception.rb +2 -15
  125. data/lib/rubocop/cop/lint/each_with_object_argument.rb +1 -0
  126. data/lib/rubocop/cop/lint/empty_file.rb +50 -0
  127. data/lib/rubocop/cop/lint/erb_new_arguments.rb +2 -0
  128. data/lib/rubocop/cop/lint/float_comparison.rb +2 -2
  129. data/lib/rubocop/cop/lint/format_parameter_mismatch.rb +2 -2
  130. data/lib/rubocop/cop/lint/hash_compare_by_identity.rb +37 -0
  131. data/lib/rubocop/cop/lint/identity_comparison.rb +51 -0
  132. data/lib/rubocop/cop/lint/ineffective_access_modifier.rb +2 -5
  133. data/lib/rubocop/cop/lint/inherit_exception.rb +2 -2
  134. data/lib/rubocop/cop/lint/missing_super.rb +2 -2
  135. data/lib/rubocop/cop/lint/mixed_regexp_capture_types.rb +3 -35
  136. data/lib/rubocop/cop/lint/multiple_comparison.rb +3 -1
  137. data/lib/rubocop/cop/lint/number_conversion.rb +1 -0
  138. data/lib/rubocop/cop/lint/out_of_range_regexp_ref.rb +9 -20
  139. data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb +1 -1
  140. data/lib/rubocop/cop/lint/percent_string_array.rb +8 -12
  141. data/lib/rubocop/cop/lint/raise_exception.rb +1 -0
  142. data/lib/rubocop/cop/lint/rand_one.rb +2 -1
  143. data/lib/rubocop/cop/lint/redundant_cop_disable_directive.rb +22 -12
  144. data/lib/rubocop/cop/lint/redundant_cop_enable_directive.rb +14 -4
  145. data/lib/rubocop/cop/lint/redundant_require_statement.rb +1 -0
  146. data/lib/rubocop/cop/lint/redundant_safe_navigation.rb +45 -0
  147. data/lib/rubocop/cop/lint/rescue_type.rb +0 -1
  148. data/lib/rubocop/cop/lint/send_with_mixin_argument.rb +3 -1
  149. data/lib/rubocop/cop/lint/shadowed_exception.rb +6 -6
  150. data/lib/rubocop/cop/lint/shadowing_outer_local_variable.rb +4 -4
  151. data/lib/rubocop/cop/lint/struct_new_override.rb +1 -0
  152. data/lib/rubocop/cop/lint/to_json.rb +16 -5
  153. data/lib/rubocop/cop/lint/top_level_return_with_argument.rb +1 -1
  154. data/lib/rubocop/cop/lint/trailing_comma_in_attribute_declaration.rb +57 -0
  155. data/lib/rubocop/cop/lint/unreachable_loop.rb +3 -6
  156. data/lib/rubocop/cop/lint/uri_escape_unescape.rb +3 -1
  157. data/lib/rubocop/cop/lint/uri_regexp.rb +2 -1
  158. data/lib/rubocop/cop/lint/useless_access_modifier.rb +3 -9
  159. data/lib/rubocop/cop/lint/useless_method_definition.rb +70 -0
  160. data/lib/rubocop/cop/lint/useless_times.rb +106 -0
  161. data/lib/rubocop/cop/metrics/block_length.rb +3 -1
  162. data/lib/rubocop/cop/metrics/class_length.rb +8 -6
  163. data/lib/rubocop/cop/metrics/utils/abc_size_calculator.rb +27 -16
  164. data/lib/rubocop/cop/metrics/utils/code_length_calculator.rb +1 -0
  165. data/lib/rubocop/cop/mixin/alignment.rb +3 -0
  166. data/lib/rubocop/cop/mixin/allowed_methods.rb +2 -0
  167. data/lib/rubocop/cop/mixin/annotation_comment.rb +5 -0
  168. data/lib/rubocop/cop/mixin/check_line_breakable.rb +16 -7
  169. data/lib/rubocop/cop/mixin/comments_help.rb +48 -0
  170. data/lib/rubocop/cop/mixin/configurable_naming.rb +2 -2
  171. data/lib/rubocop/cop/mixin/configurable_numbering.rb +3 -3
  172. data/lib/rubocop/cop/mixin/empty_lines_around_body.rb +8 -7
  173. data/lib/rubocop/cop/mixin/empty_parameter.rb +3 -1
  174. data/lib/rubocop/cop/mixin/end_keyword_alignment.rb +12 -1
  175. data/lib/rubocop/cop/mixin/first_element_line_break.rb +3 -1
  176. data/lib/rubocop/cop/mixin/hash_transform_method.rb +27 -2
  177. data/lib/rubocop/cop/mixin/multiline_element_line_breaks.rb +3 -1
  178. data/lib/rubocop/cop/mixin/multiline_literal_brace_layout.rb +12 -10
  179. data/lib/rubocop/cop/mixin/negative_conditional.rb +2 -2
  180. data/lib/rubocop/cop/mixin/percent_array.rb +14 -3
  181. data/lib/rubocop/cop/mixin/rescue_node.rb +11 -1
  182. data/lib/rubocop/cop/mixin/space_after_punctuation.rb +4 -3
  183. data/lib/rubocop/cop/mixin/space_before_punctuation.rb +4 -3
  184. data/lib/rubocop/cop/mixin/statement_modifier.rb +9 -3
  185. data/lib/rubocop/cop/mixin/surrounding_space.rb +8 -4
  186. data/lib/rubocop/cop/mixin/trailing_comma.rb +7 -7
  187. data/lib/rubocop/cop/mixin/visibility_help.rb +4 -16
  188. data/lib/rubocop/cop/naming/binary_operator_parameter_name.rb +1 -1
  189. data/lib/rubocop/cop/naming/file_name.rb +1 -1
  190. data/lib/rubocop/cop/offense.rb +16 -2
  191. data/lib/rubocop/cop/security/eval.rb +1 -0
  192. data/lib/rubocop/cop/security/json_load.rb +1 -0
  193. data/lib/rubocop/cop/security/marshal_load.rb +1 -0
  194. data/lib/rubocop/cop/security/open.rb +1 -0
  195. data/lib/rubocop/cop/security/yaml_load.rb +1 -0
  196. data/lib/rubocop/cop/severity.rb +0 -8
  197. data/lib/rubocop/cop/style/access_modifier_declarations.rb +7 -11
  198. data/lib/rubocop/cop/style/accessor_grouping.rb +3 -0
  199. data/lib/rubocop/cop/style/alias.rb +2 -0
  200. data/lib/rubocop/cop/style/array_coercion.rb +4 -0
  201. data/lib/rubocop/cop/style/array_join.rb +1 -0
  202. data/lib/rubocop/cop/style/attr.rb +1 -0
  203. data/lib/rubocop/cop/style/auto_resource_cleanup.rb +2 -0
  204. data/lib/rubocop/cop/style/case_equality.rb +11 -3
  205. data/lib/rubocop/cop/style/case_like_if.rb +40 -8
  206. data/lib/rubocop/cop/style/class_and_module_children.rb +2 -0
  207. data/lib/rubocop/cop/style/class_check.rb +6 -9
  208. data/lib/rubocop/cop/style/class_equality_comparison.rb +49 -0
  209. data/lib/rubocop/cop/style/class_methods_definitions.rb +157 -0
  210. data/lib/rubocop/cop/style/class_vars.rb +1 -2
  211. data/lib/rubocop/cop/style/combinable_loops.rb +91 -0
  212. data/lib/rubocop/cop/style/comment_annotation.rb +6 -0
  213. data/lib/rubocop/cop/style/commented_keyword.rb +7 -8
  214. data/lib/rubocop/cop/style/conditional_assignment.rb +49 -60
  215. data/lib/rubocop/cop/style/date_time.rb +12 -1
  216. data/lib/rubocop/cop/style/dir.rb +1 -0
  217. data/lib/rubocop/cop/style/double_negation.rb +1 -0
  218. data/lib/rubocop/cop/style/empty_block_parameter.rb +9 -10
  219. data/lib/rubocop/cop/style/empty_lambda_parameter.rb +9 -10
  220. data/lib/rubocop/cop/style/empty_literal.rb +3 -1
  221. data/lib/rubocop/cop/style/eval_with_location.rb +1 -3
  222. data/lib/rubocop/cop/style/even_odd.rb +1 -0
  223. data/lib/rubocop/cop/style/expand_path_arguments.rb +2 -2
  224. data/lib/rubocop/cop/style/explicit_block_argument.rb +7 -3
  225. data/lib/rubocop/cop/style/float_division.rb +2 -0
  226. data/lib/rubocop/cop/style/for.rb +0 -4
  227. data/lib/rubocop/cop/style/format_string.rb +1 -4
  228. data/lib/rubocop/cop/style/format_string_token.rb +1 -1
  229. data/lib/rubocop/cop/style/guard_clause.rb +1 -0
  230. data/lib/rubocop/cop/style/hash_as_last_array_item.rb +24 -5
  231. data/lib/rubocop/cop/style/hash_syntax.rb +6 -5
  232. data/lib/rubocop/cop/style/hash_transform_keys.rb +16 -9
  233. data/lib/rubocop/cop/style/hash_transform_values.rb +16 -9
  234. data/lib/rubocop/cop/style/if_unless_modifier.rb +2 -6
  235. data/lib/rubocop/cop/style/implicit_runtime_error.rb +1 -0
  236. data/lib/rubocop/cop/style/keyword_parameters_order.rb +53 -0
  237. data/lib/rubocop/cop/style/lambda_call.rb +3 -1
  238. data/lib/rubocop/cop/style/method_called_on_do_end_block.rb +10 -1
  239. data/lib/rubocop/cop/style/method_def_parentheses.rb +0 -4
  240. data/lib/rubocop/cop/style/mixin_usage.rb +8 -27
  241. data/lib/rubocop/cop/style/multiline_block_chain.rb +2 -2
  242. data/lib/rubocop/cop/style/multiline_ternary_operator.rb +14 -1
  243. data/lib/rubocop/cop/style/multiline_when_then.rb +3 -2
  244. data/lib/rubocop/cop/style/negated_if.rb +6 -6
  245. data/lib/rubocop/cop/style/negated_unless.rb +6 -6
  246. data/lib/rubocop/cop/style/negated_while.rb +7 -15
  247. data/lib/rubocop/cop/style/nested_modifier.rb +10 -13
  248. data/lib/rubocop/cop/style/nested_parenthesized_calls.rb +11 -11
  249. data/lib/rubocop/cop/style/nested_ternary_operator.rb +16 -16
  250. data/lib/rubocop/cop/style/next.rb +10 -14
  251. data/lib/rubocop/cop/style/nil_comparison.rb +13 -11
  252. data/lib/rubocop/cop/style/non_nil_check.rb +34 -26
  253. data/lib/rubocop/cop/style/not.rb +20 -26
  254. data/lib/rubocop/cop/style/numeric_literal_prefix.rb +4 -9
  255. data/lib/rubocop/cop/style/numeric_predicate.rb +5 -14
  256. data/lib/rubocop/cop/style/one_line_conditional.rb +73 -23
  257. data/lib/rubocop/cop/style/option_hash.rb +1 -1
  258. data/lib/rubocop/cop/style/optional_arguments.rb +1 -1
  259. data/lib/rubocop/cop/style/optional_boolean_parameter.rb +12 -1
  260. data/lib/rubocop/cop/style/or_assignment.rb +13 -10
  261. data/lib/rubocop/cop/style/parallel_assignment.rb +14 -14
  262. data/lib/rubocop/cop/style/parentheses_around_condition.rb +6 -6
  263. data/lib/rubocop/cop/style/percent_literal_delimiters.rb +13 -19
  264. data/lib/rubocop/cop/style/percent_q_literals.rb +8 -10
  265. data/lib/rubocop/cop/style/perl_backrefs.rb +8 -10
  266. data/lib/rubocop/cop/style/preferred_hash_methods.rb +11 -14
  267. data/lib/rubocop/cop/style/proc.rb +6 -6
  268. data/lib/rubocop/cop/style/raise_args.rb +12 -24
  269. data/lib/rubocop/cop/style/random_with_offset.rb +19 -19
  270. data/lib/rubocop/cop/style/redundant_assignment.rb +8 -18
  271. data/lib/rubocop/cop/style/redundant_begin.rb +28 -12
  272. data/lib/rubocop/cop/style/redundant_capital_w.rb +6 -9
  273. data/lib/rubocop/cop/style/redundant_condition.rb +10 -7
  274. data/lib/rubocop/cop/style/redundant_conditional.rb +4 -5
  275. data/lib/rubocop/cop/style/redundant_exception.rb +1 -3
  276. data/lib/rubocop/cop/style/redundant_fetch_block.rb +3 -12
  277. data/lib/rubocop/cop/style/redundant_file_extension_in_require.rb +9 -8
  278. data/lib/rubocop/cop/style/redundant_freeze.rb +5 -7
  279. data/lib/rubocop/cop/style/redundant_interpolation.rb +31 -25
  280. data/lib/rubocop/cop/style/redundant_parentheses.rb +21 -15
  281. data/lib/rubocop/cop/style/redundant_percent_q.rb +9 -11
  282. data/lib/rubocop/cop/style/redundant_regexp_character_class.rb +44 -36
  283. data/lib/rubocop/cop/style/redundant_regexp_escape.rb +13 -29
  284. data/lib/rubocop/cop/style/redundant_return.rb +17 -17
  285. data/lib/rubocop/cop/style/redundant_self.rb +9 -11
  286. data/lib/rubocop/cop/style/redundant_self_assignment.rb +116 -0
  287. data/lib/rubocop/cop/style/redundant_sort.rb +12 -29
  288. data/lib/rubocop/cop/style/redundant_sort_by.rb +5 -9
  289. data/lib/rubocop/cop/style/regexp_literal.rb +10 -21
  290. data/lib/rubocop/cop/style/rescue_modifier.rb +29 -9
  291. data/lib/rubocop/cop/style/rescue_standard_error.rb +20 -16
  292. data/lib/rubocop/cop/style/return_nil.rb +5 -5
  293. data/lib/rubocop/cop/style/safe_navigation.rb +18 -12
  294. data/lib/rubocop/cop/style/sample.rb +12 -14
  295. data/lib/rubocop/cop/style/self_assignment.rb +26 -22
  296. data/lib/rubocop/cop/style/semicolon.rb +6 -9
  297. data/lib/rubocop/cop/style/send.rb +4 -5
  298. data/lib/rubocop/cop/style/signal_exception.rb +23 -19
  299. data/lib/rubocop/cop/style/single_argument_dig.rb +1 -0
  300. data/lib/rubocop/cop/style/single_line_block_params.rb +4 -2
  301. data/lib/rubocop/cop/style/single_line_methods.rb +17 -16
  302. data/lib/rubocop/cop/style/slicing_with_range.rb +6 -8
  303. data/lib/rubocop/cop/style/sole_nested_conditional.rb +66 -0
  304. data/lib/rubocop/cop/style/special_global_vars.rb +10 -15
  305. data/lib/rubocop/cop/style/stabby_lambda_parentheses.rb +17 -21
  306. data/lib/rubocop/cop/style/stderr_puts.rb +5 -6
  307. data/lib/rubocop/cop/style/string_concatenation.rb +17 -3
  308. data/lib/rubocop/cop/style/string_hash_keys.rb +6 -7
  309. data/lib/rubocop/cop/style/string_methods.rb +7 -17
  310. data/lib/rubocop/cop/style/strip.rb +9 -14
  311. data/lib/rubocop/cop/style/struct_inheritance.rb +3 -6
  312. data/lib/rubocop/cop/style/symbol_array.rb +5 -16
  313. data/lib/rubocop/cop/style/symbol_literal.rb +4 -6
  314. data/lib/rubocop/cop/style/symbol_proc.rb +14 -18
  315. data/lib/rubocop/cop/style/ternary_parentheses.rb +22 -22
  316. data/lib/rubocop/cop/style/trailing_body_on_class.rb +3 -6
  317. data/lib/rubocop/cop/style/trailing_body_on_method_definition.rb +4 -7
  318. data/lib/rubocop/cop/style/trailing_body_on_module.rb +3 -6
  319. data/lib/rubocop/cop/style/trailing_comma_in_arguments.rb +2 -5
  320. data/lib/rubocop/cop/style/trailing_comma_in_array_literal.rb +2 -5
  321. data/lib/rubocop/cop/style/trailing_comma_in_block_args.rb +11 -9
  322. data/lib/rubocop/cop/style/trailing_comma_in_hash_literal.rb +2 -5
  323. data/lib/rubocop/cop/style/trailing_underscore_variable.rb +8 -17
  324. data/lib/rubocop/cop/style/trivial_accessors.rb +26 -30
  325. data/lib/rubocop/cop/style/unless_else.rb +5 -8
  326. data/lib/rubocop/cop/style/unpack_first.rb +5 -8
  327. data/lib/rubocop/cop/style/variable_interpolation.rb +7 -10
  328. data/lib/rubocop/cop/style/when_then.rb +4 -6
  329. data/lib/rubocop/cop/style/while_until_do.rb +6 -16
  330. data/lib/rubocop/cop/style/while_until_modifier.rb +6 -20
  331. data/lib/rubocop/cop/style/word_array.rb +5 -23
  332. data/lib/rubocop/cop/style/yoda_condition.rb +4 -15
  333. data/lib/rubocop/cop/style/zero_length_predicate.rb +12 -18
  334. data/lib/rubocop/cop/team.rb +1 -0
  335. data/lib/rubocop/cop/util.rb +1 -2
  336. data/lib/rubocop/cop/utils/format_string.rb +3 -5
  337. data/lib/rubocop/cop/variable_force.rb +2 -0
  338. data/lib/rubocop/cop/variable_force/branch.rb +0 -4
  339. data/lib/rubocop/cops_documentation_generator.rb +4 -2
  340. data/lib/rubocop/core_ext/string.rb +2 -2
  341. data/lib/rubocop/directive_comment.rb +32 -0
  342. data/lib/rubocop/ext/regexp_node.rb +62 -0
  343. data/lib/rubocop/file_finder.rb +1 -0
  344. data/lib/rubocop/formatter/auto_gen_config_formatter.rb +2 -1
  345. data/lib/rubocop/formatter/disabled_config_formatter.rb +12 -5
  346. data/lib/rubocop/formatter/html_formatter.rb +2 -0
  347. data/lib/rubocop/formatter/progress_formatter.rb +2 -1
  348. data/lib/rubocop/formatter/quiet_formatter.rb +1 -1
  349. data/lib/rubocop/formatter/simple_text_formatter.rb +36 -6
  350. data/lib/rubocop/name_similarity.rb +1 -0
  351. data/lib/rubocop/options.rb +40 -17
  352. data/lib/rubocop/remote_config.rb +1 -0
  353. data/lib/rubocop/result_cache.rb +39 -15
  354. data/lib/rubocop/rspec/cop_helper.rb +5 -2
  355. data/lib/rubocop/rspec/expect_offense.rb +14 -9
  356. data/lib/rubocop/rspec/shared_contexts.rb +12 -0
  357. data/lib/rubocop/runner.rb +38 -18
  358. data/lib/rubocop/string_interpreter.rb +3 -0
  359. data/lib/rubocop/target_finder.rb +28 -26
  360. data/lib/rubocop/target_ruby.rb +7 -1
  361. data/lib/rubocop/version.rb +7 -1
  362. data/lib/rubocop/yaml_duplication_checker.rb +1 -0
  363. metadata +31 -17
  364. data/lib/rubocop/cop/mixin/regexp_literal_help.rb +0 -43
  365. data/lib/rubocop/cop/tokens_util.rb +0 -84
@@ -49,13 +49,14 @@ module RuboCop
49
49
  # # good
50
50
  # arr.max_by(&:foo)
51
51
  #
52
- class RedundantSort < Cop
52
+ class RedundantSort < Base
53
53
  include RangeHelp
54
+ extend AutoCorrector
54
55
 
55
56
  MSG = 'Use `%<suggestion>s` instead of '\
56
57
  '`%<sorter>s...%<accessor_source>s`.'
57
58
 
58
- SORT_METHODS = %i[sort sort_by].freeze
59
+ RESTRICT_ON_SEND = %i[sort sort_by].freeze
59
60
 
60
61
  def_node_matcher :redundant_sort?, <<~MATCHER
61
62
  {
@@ -74,8 +75,6 @@ module RuboCop
74
75
  MATCHER
75
76
 
76
77
  def on_send(node)
77
- return unless sort_method?(node)
78
-
79
78
  if (sort_node, sorter, accessor = redundant_sort?(node.parent))
80
79
  ancestor = node.parent
81
80
  elsif (sort_node, sorter, accessor = redundant_sort?(node.parent&.parent))
@@ -84,37 +83,21 @@ module RuboCop
84
83
  return
85
84
  end
86
85
 
87
- add_offense(ancestor,
88
- location: offense_range(sort_node, ancestor),
89
- message: message(ancestor,
90
- sorter,
91
- accessor))
92
- end
93
-
94
- def autocorrect(node)
95
- sort_node, sorter, accessor = redundant_sort?(node)
86
+ message = message(ancestor, sorter, accessor)
96
87
 
97
- lambda do |corrector|
98
- # Remove accessor, e.g. `first` or `[-1]`.
99
- corrector.remove(
100
- range_between(
101
- accessor_start(node),
102
- node.loc.expression.end_pos
103
- )
104
- )
105
-
106
- # Replace "sort" or "sort_by" with the appropriate min/max method.
107
- corrector.replace(
108
- sort_node.loc.selector,
109
- suggestion(sorter, accessor, arg_value(node))
110
- )
88
+ add_offense(offense_range(sort_node, ancestor), message: message) do |corrector|
89
+ autocorrect(corrector, ancestor, sort_node, sorter, accessor)
111
90
  end
112
91
  end
113
92
 
114
93
  private
115
94
 
116
- def sort_method?(node)
117
- SORT_METHODS.include?(node.method_name)
95
+ def autocorrect(corrector, node, sort_node, sorter, accessor)
96
+ # Remove accessor, e.g. `first` or `[-1]`.
97
+ corrector.remove(range_between(accessor_start(node), node.loc.expression.end_pos))
98
+
99
+ # Replace "sort" or "sort_by" with the appropriate min/max method.
100
+ corrector.replace(sort_node.loc.selector, suggestion(sorter, accessor, arg_value(node)))
118
101
  end
119
102
 
120
103
  def offense_range(sort_node, ancestor)
@@ -15,8 +15,9 @@ module RuboCop
15
15
  #
16
16
  # # good
17
17
  # array.sort
18
- class RedundantSortBy < Cop
18
+ class RedundantSortBy < Base
19
19
  include RangeHelp
20
+ extend AutoCorrector
20
21
 
21
22
  MSG = 'Use `sort` instead of `sort_by { |%<var>s| %<var>s }`.'
22
23
 
@@ -28,17 +29,12 @@ module RuboCop
28
29
  redundant_sort_by(node) do |send, var_name|
29
30
  range = sort_by_range(send, node)
30
31
 
31
- add_offense(node,
32
- location: range,
33
- message: format(MSG, var: var_name))
32
+ add_offense(range, message: format(MSG, var: var_name)) do |corrector|
33
+ corrector.replace(range, 'sort')
34
+ end
34
35
  end
35
36
  end
36
37
 
37
- def autocorrect(node)
38
- send = node.send_node
39
- ->(corrector) { corrector.replace(sort_by_range(send, node), 'sort') }
40
- end
41
-
42
38
  private
43
39
 
44
40
  def sort_by_range(send, node)
@@ -81,23 +81,24 @@ module RuboCop
81
81
  # @example AllowInnerSlashes: true
82
82
  # # good
83
83
  # x =~ /home\//
84
- class RegexpLiteral < Cop
84
+ class RegexpLiteral < Base
85
85
  include ConfigurableEnforcedStyle
86
86
  include RangeHelp
87
+ extend AutoCorrector
87
88
 
88
89
  MSG_USE_SLASHES = 'Use `//` around regular expression.'
89
90
  MSG_USE_PERCENT_R = 'Use `%r` around regular expression.'
90
91
 
91
92
  def on_regexp(node)
92
- if slash_literal?(node)
93
- check_slash_literal(node)
94
- else
95
- check_percent_r_literal(node)
96
- end
97
- end
93
+ message = if slash_literal?(node)
94
+ MSG_USE_PERCENT_R unless allowed_slash_literal?(node)
95
+ else
96
+ MSG_USE_SLASHES unless allowed_percent_r_literal?(node)
97
+ end
98
+
99
+ return unless message
98
100
 
99
- def autocorrect(node)
100
- lambda do |corrector|
101
+ add_offense(node, message: message) do |corrector|
101
102
  correct_delimiters(node, corrector)
102
103
  correct_inner_slashes(node, corrector)
103
104
  end
@@ -105,18 +106,6 @@ module RuboCop
105
106
 
106
107
  private
107
108
 
108
- def check_slash_literal(node)
109
- return if allowed_slash_literal?(node)
110
-
111
- add_offense(node, message: MSG_USE_PERCENT_R)
112
- end
113
-
114
- def check_percent_r_literal(node)
115
- return if allowed_percent_r_literal?(node)
116
-
117
- add_offense(node, message: MSG_USE_SLASHES)
118
- end
119
-
120
109
  def allowed_slash_literal?(node)
121
110
  style == :slashes && !contains_disallowed_slash?(node) ||
122
111
  allowed_mixed_slash?(node)
@@ -52,20 +52,40 @@ module RuboCop
52
52
  end
53
53
 
54
54
  def autocorrect(node)
55
+ parenthesized = parenthesized?(node)
56
+ lambda do |corrector|
57
+ corrector.replace(node, corrected_block(node, parenthesized))
58
+ ParenthesesCorrector.correct(corrector, node.parent) if parenthesized
59
+ end
60
+ end
61
+
62
+ private
63
+
64
+ def parenthesized?(node)
65
+ node.parent && parentheses?(node.parent)
66
+ end
67
+
68
+ def corrected_block(node, parenthesized)
55
69
  operation, rescue_modifier, = *node
56
70
  *_, rescue_args = *rescue_modifier
57
71
 
58
- indent = indentation(node)
59
- correction =
60
- "begin\n" \
61
- "#{operation.source.gsub(/^/, indent)}" \
62
- "\n#{offset(node)}rescue\n" \
63
- "#{rescue_args.source.gsub(/^/, indent)}" \
64
- "\n#{offset(node)}end"
72
+ node_indentation, node_offset = indentation_and_offset(node, parenthesized)
65
73
 
66
- lambda do |corrector|
67
- corrector.replace(node, correction)
74
+ "begin\n" \
75
+ "#{operation.source.gsub(/^/, node_indentation)}" \
76
+ "\n#{node_offset}rescue\n" \
77
+ "#{rescue_args.source.gsub(/^/, node_indentation)}" \
78
+ "\n#{node_offset}end"
79
+ end
80
+
81
+ def indentation_and_offset(node, parenthesized)
82
+ node_indentation = indentation(node)
83
+ node_offset = offset(node)
84
+ if parenthesized
85
+ node_indentation = node_indentation[0...-1]
86
+ node_offset = node_offset[0...-1]
68
87
  end
88
+ [node_indentation, node_offset]
69
89
  end
70
90
  end
71
91
  end
@@ -70,10 +70,11 @@ module RuboCop
70
70
  # rescue StandardError, SecurityError
71
71
  # bar
72
72
  # end
73
- class RescueStandardError < Cop
73
+ class RescueStandardError < Base
74
74
  include RescueNode
75
75
  include ConfigurableEnforcedStyle
76
76
  include RangeHelp
77
+ extend AutoCorrector
77
78
 
78
79
  MSG_IMPLICIT = 'Omit the error class when rescuing ' \
79
80
  '`StandardError` by itself.'
@@ -94,28 +95,31 @@ module RuboCop
94
95
  case style
95
96
  when :implicit
96
97
  rescue_standard_error?(node) do |error|
97
- add_offense(node,
98
- location: node.loc.keyword.join(error.loc.expression),
99
- message: MSG_IMPLICIT)
98
+ offense_for_implicit_enforced_style(node, error)
100
99
  end
101
100
  when :explicit
102
101
  rescue_without_error_class?(node) do
103
- add_offense(node, location: :keyword, message: MSG_EXPLICIT)
102
+ offense_for_exlicit_enforced_style(node)
104
103
  end
105
104
  end
106
105
  end
107
106
 
108
- def autocorrect(node)
109
- lambda do |corrector|
110
- case style
111
- when :implicit
112
- error = rescue_standard_error?(node)
113
- range = range_between(node.loc.keyword.end_pos,
114
- error.loc.expression.end_pos)
115
- corrector.remove(range)
116
- when :explicit
117
- corrector.insert_after(node.loc.keyword, ' StandardError')
118
- end
107
+ private
108
+
109
+ def offense_for_implicit_enforced_style(node, error)
110
+ range = node.loc.keyword.join(error.loc.expression)
111
+
112
+ add_offense(range, message: MSG_IMPLICIT) do |corrector|
113
+ error = rescue_standard_error?(node)
114
+ range = range_between(node.loc.keyword.end_pos, error.loc.expression.end_pos)
115
+
116
+ corrector.remove(range)
117
+ end
118
+ end
119
+
120
+ def offense_for_exlicit_enforced_style(node)
121
+ add_offense(node.loc.keyword, message: MSG_EXPLICIT) do |corrector|
122
+ corrector.insert_after(node.loc.keyword, ' StandardError')
119
123
  end
120
124
  end
121
125
  end
@@ -28,8 +28,9 @@ module RuboCop
28
28
  # def foo(arg)
29
29
  # return nil if arg
30
30
  # end
31
- class ReturnNil < Cop
31
+ class ReturnNil < Base
32
32
  include ConfigurableEnforcedStyle
33
+ extend AutoCorrector
33
34
 
34
35
  RETURN_MSG = 'Use `return` instead of `return nil`.'
35
36
  RETURN_NIL_MSG = 'Use `return nil` instead of `return`.'
@@ -54,12 +55,11 @@ module RuboCop
54
55
  return nil if chained_send?(send_node)
55
56
  end
56
57
 
57
- add_offense(node) unless correct_style?(node)
58
- end
58
+ return if correct_style?(node)
59
59
 
60
- def autocorrect(node)
61
- lambda do |corrector|
60
+ add_offense(node) do |corrector|
62
61
  corrected = style == :return ? 'return' : 'return nil'
62
+
63
63
  corrector.replace(node, corrected)
64
64
  end
65
65
  end
@@ -49,6 +49,10 @@ module RuboCop
49
49
  # foo && foo < bar
50
50
  # foo < bar if foo
51
51
  #
52
+ # # When checking `foo&.empty?` in a conditional, `foo` being `nil` will actually
53
+ # # do the opposite of what the author intends.
54
+ # foo && foo.empty?
55
+ #
52
56
  # # This could start returning `nil` as well as the return of the method
53
57
  # foo.nil? || foo.bar
54
58
  # !foo || foo.bar
@@ -58,9 +62,10 @@ module RuboCop
58
62
  # foo.baz = bar if foo
59
63
  # foo.baz + bar if foo
60
64
  # foo.bar > 2 if foo
61
- class SafeNavigation < Cop
65
+ class SafeNavigation < Base
62
66
  include NilMethods
63
67
  include RangeHelp
68
+ extend AutoCorrector
64
69
 
65
70
  MSG = 'Use safe navigation (`&.`) instead of checking if an object ' \
66
71
  'exists before calling the method.'
@@ -103,30 +108,31 @@ module RuboCop
103
108
  # chain greater than 2
104
109
  return if chain_size(method_chain, method) > 1
105
110
  return if unsafe_method_used?(method_chain, method)
111
+ return if method_chain.method?(:empty?)
106
112
 
107
- add_offense(node)
113
+ add_offense(node) do |corrector|
114
+ autocorrect(corrector, node)
115
+ end
108
116
  end
109
117
 
110
118
  def use_var_only_in_unless_modifier?(node, variable)
111
119
  node.if_type? && node.unless? && !method_called?(variable)
112
120
  end
113
121
 
114
- def autocorrect(node)
122
+ private
123
+
124
+ def autocorrect(corrector, node)
115
125
  body = node.node_parts[1]
116
126
  method_call = method_call(node)
117
127
 
118
- lambda do |corrector|
119
- corrector.remove(begin_range(node, body))
120
- corrector.remove(end_range(node, body))
121
- corrector.insert_before(method_call.loc.dot, '&')
122
- handle_comments(corrector, node, method_call)
128
+ corrector.remove(begin_range(node, body))
129
+ corrector.remove(end_range(node, body))
130
+ corrector.insert_before(method_call.loc.dot, '&')
131
+ handle_comments(corrector, node, method_call)
123
132
 
124
- add_safe_nav_to_all_methods_in_chain(corrector, method_call, body)
125
- end
133
+ add_safe_nav_to_all_methods_in_chain(corrector, method_call, body)
126
134
  end
127
135
 
128
- private
129
-
130
136
  def handle_comments(corrector, node, method_call)
131
137
  comments = comments(node)
132
138
  return if comments.empty?
@@ -27,30 +27,28 @@ module RuboCop
27
27
  # [1, 2, 3].shuffle[1..3] # sample(3) might return a longer Array
28
28
  # [1, 2, 3].shuffle[foo, bar]
29
29
  # [1, 2, 3].shuffle(random: Random.new)
30
- class Sample < Cop
30
+ class Sample < Base
31
+ extend AutoCorrector
32
+
31
33
  MSG = 'Use `%<correct>s` instead of `%<incorrect>s`.'
34
+ RESTRICT_ON_SEND = %i[first last [] at slice].freeze
32
35
 
33
36
  def_node_matcher :sample_candidate?, <<~PATTERN
34
- (send $(send _ :shuffle $...) ${:first :last :[] :at :slice} $...)
37
+ (send $(send _ :shuffle $...) ${:#{RESTRICT_ON_SEND.join(' :')}} $...)
35
38
  PATTERN
36
39
 
37
40
  def on_send(node)
38
- sample_candidate?(node) do |shuffle, shuffle_arg, method, method_args|
41
+ sample_candidate?(node) do |shuffle_node, shuffle_arg, method, method_args|
39
42
  return unless offensive?(method, method_args)
40
43
 
41
- range = source_range(shuffle, node)
44
+ range = source_range(shuffle_node, node)
42
45
  message = message(shuffle_arg, method, method_args, range)
43
- add_offense(node, location: range, message: message)
44
- end
45
- end
46
-
47
- def autocorrect(node)
48
- shuffle_node, shuffle_arg, method, method_args =
49
- sample_candidate?(node)
50
46
 
51
- lambda do |corrector|
52
- corrector.replace(source_range(shuffle_node, node),
53
- correction(shuffle_arg, method, method_args))
47
+ add_offense(range, message: message) do |corrector|
48
+ corrector.replace(
49
+ source_range(shuffle_node, node), correction(shuffle_arg, method, method_args)
50
+ )
51
+ end
54
52
  end
55
53
  end
56
54
 
@@ -12,7 +12,9 @@ module RuboCop
12
12
  #
13
13
  # # good
14
14
  # x += 1
15
- class SelfAssignment < Cop
15
+ class SelfAssignment < Base
16
+ extend AutoCorrector
17
+
16
18
  MSG = 'Use self-assignment shorthand `%<method>s=`.'
17
19
  OPS = %i[+ - * ** / | &].freeze
18
20
 
@@ -32,16 +34,6 @@ module RuboCop
32
34
  check(node, :cvar)
33
35
  end
34
36
 
35
- def autocorrect(node)
36
- _var_name, rhs = *node
37
-
38
- if rhs.send_type?
39
- autocorrect_send_node(node, rhs)
40
- elsif %i[and or].include?(rhs.type)
41
- autocorrect_boolean_node(node, rhs)
42
- end
43
- end
44
-
45
37
  private
46
38
 
47
39
  def check(node, var_type)
@@ -62,7 +54,9 @@ module RuboCop
62
54
  target_node = s(var_type, var_name)
63
55
  return unless receiver == target_node
64
56
 
65
- add_offense(node, message: format(MSG, method: method_name))
57
+ add_offense(node, message: format(MSG, method: method_name)) do |corrector|
58
+ autocorrect(corrector, node)
59
+ end
66
60
  end
67
61
 
68
62
  def check_boolean_node(node, rhs, var_name, var_type)
@@ -72,24 +66,34 @@ module RuboCop
72
66
  return unless first_operand == target_node
73
67
 
74
68
  operator = rhs.loc.operator.source
75
- add_offense(node, message: format(MSG, method: operator))
69
+ add_offense(node, message: format(MSG, method: operator)) do |corrector|
70
+ autocorrect(corrector, node)
71
+ end
76
72
  end
77
73
 
78
- def autocorrect_send_node(node, rhs)
74
+ def autocorrect(corrector, node)
75
+ _var_name, rhs = *node
76
+
77
+ if rhs.send_type?
78
+ autocorrect_send_node(corrector, node, rhs)
79
+ elsif %i[and or].include?(rhs.type)
80
+ autocorrect_boolean_node(corrector, node, rhs)
81
+ end
82
+ end
83
+
84
+ def autocorrect_send_node(corrector, node, rhs)
79
85
  _receiver, method_name, args = *rhs
80
- apply_autocorrect(node, rhs, method_name.to_s, args)
86
+ apply_autocorrect(corrector, node, rhs, method_name.to_s, args)
81
87
  end
82
88
 
83
- def autocorrect_boolean_node(node, rhs)
89
+ def autocorrect_boolean_node(corrector, node, rhs)
84
90
  _first_operand, second_operand = *rhs
85
- apply_autocorrect(node, rhs, rhs.loc.operator.source, second_operand)
91
+ apply_autocorrect(corrector, node, rhs, rhs.loc.operator.source, second_operand)
86
92
  end
87
93
 
88
- def apply_autocorrect(node, rhs, operator, new_rhs)
89
- lambda do |corrector|
90
- corrector.insert_before(node.loc.operator, operator)
91
- corrector.replace(rhs, new_rhs.source)
92
- end
94
+ def apply_autocorrect(corrector, node, rhs, operator, new_rhs)
95
+ corrector.insert_before(node.loc.operator, operator)
96
+ corrector.replace(rhs, new_rhs.source)
93
97
  end
94
98
  end
95
99
  end