rubocop 1.29.1 → 1.46.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (633) hide show
  1. checksums.yaml +4 -4
  2. data/LICENSE.txt +1 -1
  3. data/README.md +6 -4
  4. data/config/default.yml +335 -52
  5. data/config/obsoletion.yml +25 -1
  6. data/exe/rubocop +15 -7
  7. data/lib/rubocop/arguments_env.rb +17 -0
  8. data/lib/rubocop/arguments_file.rb +17 -0
  9. data/lib/rubocop/cache_config.rb +29 -0
  10. data/lib/rubocop/cli/command/{auto_genenerate_config.rb → auto_generate_config.rb} +20 -5
  11. data/lib/rubocop/cli/command/execute_runner.rb +8 -8
  12. data/lib/rubocop/cli/command/init_dotfile.rb +1 -1
  13. data/lib/rubocop/cli/command/show_cops.rb +1 -1
  14. data/lib/rubocop/cli/command/suggest_extensions.rb +61 -16
  15. data/lib/rubocop/cli.rb +57 -9
  16. data/lib/rubocop/comment_config.rb +58 -1
  17. data/lib/rubocop/config.rb +45 -17
  18. data/lib/rubocop/config_finder.rb +68 -0
  19. data/lib/rubocop/config_loader.rb +41 -61
  20. data/lib/rubocop/config_loader_resolver.rb +11 -12
  21. data/lib/rubocop/config_obsoletion/changed_parameter.rb +5 -0
  22. data/lib/rubocop/config_obsoletion/parameter_rule.rb +4 -0
  23. data/lib/rubocop/config_obsoletion.rb +7 -2
  24. data/lib/rubocop/config_validator.rb +22 -5
  25. data/lib/rubocop/cop/autocorrect_logic.rb +4 -2
  26. data/lib/rubocop/cop/badge.rb +9 -4
  27. data/lib/rubocop/cop/base.rb +114 -82
  28. data/lib/rubocop/cop/bundler/duplicated_gem.rb +1 -1
  29. data/lib/rubocop/cop/bundler/gem_filename.rb +5 -5
  30. data/lib/rubocop/cop/bundler/ordered_gems.rb +2 -2
  31. data/lib/rubocop/cop/commissioner.rb +19 -6
  32. data/lib/rubocop/cop/cop.rb +52 -32
  33. data/lib/rubocop/cop/corrector.rb +32 -12
  34. data/lib/rubocop/cop/correctors/alignment_corrector.rb +1 -1
  35. data/lib/rubocop/cop/correctors/condition_corrector.rb +1 -1
  36. data/lib/rubocop/cop/correctors/each_to_for_corrector.rb +1 -1
  37. data/lib/rubocop/cop/correctors/empty_line_corrector.rb +1 -1
  38. data/lib/rubocop/cop/correctors/for_to_each_corrector.rb +4 -2
  39. data/lib/rubocop/cop/correctors/if_then_corrector.rb +1 -1
  40. data/lib/rubocop/cop/correctors/lambda_literal_to_method_corrector.rb +1 -1
  41. data/lib/rubocop/cop/correctors/line_break_corrector.rb +7 -1
  42. data/lib/rubocop/cop/correctors/multiline_literal_brace_corrector.rb +25 -9
  43. data/lib/rubocop/cop/correctors/ordered_gem_corrector.rb +2 -7
  44. data/lib/rubocop/cop/correctors/parentheses_corrector.rb +59 -1
  45. data/lib/rubocop/cop/correctors/percent_literal_corrector.rb +1 -1
  46. data/lib/rubocop/cop/correctors/punctuation_corrector.rb +1 -1
  47. data/lib/rubocop/cop/correctors/space_corrector.rb +1 -1
  48. data/lib/rubocop/cop/correctors/string_literal_corrector.rb +1 -1
  49. data/lib/rubocop/cop/correctors/unused_arg_corrector.rb +2 -2
  50. data/lib/rubocop/cop/gemspec/dependency_version.rb +16 -18
  51. data/lib/rubocop/cop/gemspec/deprecated_attribute_assignment.rb +92 -0
  52. data/lib/rubocop/cop/gemspec/development_dependencies.rb +107 -0
  53. data/lib/rubocop/cop/gemspec/duplicated_assignment.rb +1 -1
  54. data/lib/rubocop/cop/gemspec/ordered_dependencies.rb +1 -1
  55. data/lib/rubocop/cop/gemspec/require_mfa.rb +21 -21
  56. data/lib/rubocop/cop/generator/require_file_injector.rb +2 -2
  57. data/lib/rubocop/cop/generator.rb +6 -3
  58. data/lib/rubocop/cop/internal_affairs/cop_description.rb +98 -0
  59. data/lib/rubocop/cop/internal_affairs/create_empty_file.rb +37 -0
  60. data/lib/rubocop/cop/internal_affairs/empty_line_between_expect_offense_and_correction.rb +1 -1
  61. data/lib/rubocop/cop/internal_affairs/example_heredoc_delimiter.rb +111 -0
  62. data/lib/rubocop/cop/internal_affairs/lambda_or_proc.rb +46 -0
  63. data/lib/rubocop/cop/internal_affairs/location_line_equality_comparison.rb +1 -1
  64. data/lib/rubocop/cop/internal_affairs/method_name_end_with.rb +1 -1
  65. data/lib/rubocop/cop/internal_affairs/node_matcher_directive.rb +1 -5
  66. data/lib/rubocop/cop/internal_affairs/numblock_handler.rb +69 -0
  67. data/lib/rubocop/cop/internal_affairs/processed_source_buffer_name.rb +42 -0
  68. data/lib/rubocop/cop/internal_affairs/redundant_described_class_as_subject.rb +1 -1
  69. data/lib/rubocop/cop/internal_affairs/redundant_let_rubocop_config_new.rb +12 -4
  70. data/lib/rubocop/cop/internal_affairs/redundant_location_argument.rb +1 -1
  71. data/lib/rubocop/cop/internal_affairs/redundant_message_argument.rb +1 -1
  72. data/lib/rubocop/cop/internal_affairs/single_line_comparison.rb +62 -0
  73. data/lib/rubocop/cop/internal_affairs/useless_restrict_on_send.rb +60 -0
  74. data/lib/rubocop/cop/internal_affairs.rb +8 -0
  75. data/lib/rubocop/cop/layout/argument_alignment.rb +22 -1
  76. data/lib/rubocop/cop/layout/array_alignment.rb +1 -1
  77. data/lib/rubocop/cop/layout/assignment_indentation.rb +1 -1
  78. data/lib/rubocop/cop/layout/begin_end_alignment.rb +1 -1
  79. data/lib/rubocop/cop/layout/block_alignment.rb +17 -13
  80. data/lib/rubocop/cop/layout/block_end_newline.rb +42 -6
  81. data/lib/rubocop/cop/layout/case_indentation.rb +1 -1
  82. data/lib/rubocop/cop/layout/class_structure.rb +31 -24
  83. data/lib/rubocop/cop/layout/closing_parenthesis_indentation.rb +3 -7
  84. data/lib/rubocop/cop/layout/comment_indentation.rb +4 -2
  85. data/lib/rubocop/cop/layout/condition_position.rb +1 -1
  86. data/lib/rubocop/cop/layout/def_end_alignment.rb +1 -1
  87. data/lib/rubocop/cop/layout/dot_position.rb +1 -1
  88. data/lib/rubocop/cop/layout/else_alignment.rb +1 -1
  89. data/lib/rubocop/cop/layout/empty_comment.rb +2 -2
  90. data/lib/rubocop/cop/layout/empty_line_after_guard_clause.rb +1 -1
  91. data/lib/rubocop/cop/layout/empty_line_after_multiline_condition.rb +1 -1
  92. data/lib/rubocop/cop/layout/empty_line_between_defs.rb +1 -1
  93. data/lib/rubocop/cop/layout/empty_lines.rb +3 -1
  94. data/lib/rubocop/cop/layout/empty_lines_around_access_modifier.rb +5 -2
  95. data/lib/rubocop/cop/layout/empty_lines_around_arguments.rb +1 -1
  96. data/lib/rubocop/cop/layout/empty_lines_around_attribute_accessor.rb +25 -4
  97. data/lib/rubocop/cop/layout/empty_lines_around_begin_body.rb +1 -1
  98. data/lib/rubocop/cop/layout/empty_lines_around_block_body.rb +7 -5
  99. data/lib/rubocop/cop/layout/empty_lines_around_class_body.rb +10 -10
  100. data/lib/rubocop/cop/layout/empty_lines_around_exception_handling_keywords.rb +1 -1
  101. data/lib/rubocop/cop/layout/empty_lines_around_method_body.rb +1 -1
  102. data/lib/rubocop/cop/layout/empty_lines_around_module_body.rb +10 -10
  103. data/lib/rubocop/cop/layout/end_alignment.rb +5 -1
  104. data/lib/rubocop/cop/layout/end_of_line.rb +5 -5
  105. data/lib/rubocop/cop/layout/extra_spacing.rb +10 -6
  106. data/lib/rubocop/cop/layout/first_argument_indentation.rb +36 -30
  107. data/lib/rubocop/cop/layout/first_array_element_indentation.rb +21 -14
  108. data/lib/rubocop/cop/layout/first_array_element_line_break.rb +39 -3
  109. data/lib/rubocop/cop/layout/first_hash_element_indentation.rb +52 -13
  110. data/lib/rubocop/cop/layout/first_hash_element_line_break.rb +50 -3
  111. data/lib/rubocop/cop/layout/first_method_argument_line_break.rb +62 -3
  112. data/lib/rubocop/cop/layout/first_method_parameter_line_break.rb +53 -3
  113. data/lib/rubocop/cop/layout/first_parameter_indentation.rb +1 -1
  114. data/lib/rubocop/cop/layout/hash_alignment.rb +2 -0
  115. data/lib/rubocop/cop/layout/heredoc_argument_closing_parenthesis.rb +9 -3
  116. data/lib/rubocop/cop/layout/heredoc_indentation.rb +7 -10
  117. data/lib/rubocop/cop/layout/indentation_consistency.rb +1 -1
  118. data/lib/rubocop/cop/layout/indentation_style.rb +8 -3
  119. data/lib/rubocop/cop/layout/indentation_width.rb +14 -7
  120. data/lib/rubocop/cop/layout/initial_indentation.rb +2 -2
  121. data/lib/rubocop/cop/layout/leading_comment_space.rb +1 -1
  122. data/lib/rubocop/cop/layout/leading_empty_lines.rb +1 -1
  123. data/lib/rubocop/cop/layout/line_continuation_leading_space.rb +138 -0
  124. data/lib/rubocop/cop/layout/line_continuation_spacing.rb +140 -0
  125. data/lib/rubocop/cop/layout/line_end_string_concatenation_indentation.rb +1 -1
  126. data/lib/rubocop/cop/layout/line_length.rb +9 -2
  127. data/lib/rubocop/cop/layout/multiline_array_brace_layout.rb +1 -1
  128. data/lib/rubocop/cop/layout/multiline_array_line_breaks.rb +52 -3
  129. data/lib/rubocop/cop/layout/multiline_assignment_layout.rb +2 -2
  130. data/lib/rubocop/cop/layout/multiline_block_layout.rb +5 -3
  131. data/lib/rubocop/cop/layout/multiline_hash_brace_layout.rb +1 -1
  132. data/lib/rubocop/cop/layout/multiline_hash_key_line_breaks.rb +50 -3
  133. data/lib/rubocop/cop/layout/multiline_method_argument_line_breaks.rb +58 -4
  134. data/lib/rubocop/cop/layout/multiline_method_call_brace_layout.rb +1 -1
  135. data/lib/rubocop/cop/layout/multiline_method_call_indentation.rb +3 -3
  136. data/lib/rubocop/cop/layout/multiline_method_definition_brace_layout.rb +1 -1
  137. data/lib/rubocop/cop/layout/multiline_method_parameter_line_breaks.rb +101 -0
  138. data/lib/rubocop/cop/layout/multiline_operation_indentation.rb +3 -3
  139. data/lib/rubocop/cop/layout/redundant_line_break.rb +4 -4
  140. data/lib/rubocop/cop/layout/rescue_ensure_alignment.rb +1 -1
  141. data/lib/rubocop/cop/layout/single_line_block_chain.rb +1 -1
  142. data/lib/rubocop/cop/layout/space_after_not.rb +1 -1
  143. data/lib/rubocop/cop/layout/space_around_block_parameters.rb +2 -2
  144. data/lib/rubocop/cop/layout/space_around_keyword.rb +3 -3
  145. data/lib/rubocop/cop/layout/space_around_operators.rb +2 -2
  146. data/lib/rubocop/cop/layout/space_before_block_braces.rb +5 -3
  147. data/lib/rubocop/cop/layout/space_before_comment.rb +1 -1
  148. data/lib/rubocop/cop/layout/space_before_first_arg.rb +1 -1
  149. data/lib/rubocop/cop/layout/space_in_lambda_literal.rb +1 -1
  150. data/lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb +32 -30
  151. data/lib/rubocop/cop/layout/space_inside_array_percent_literal.rb +3 -0
  152. data/lib/rubocop/cop/layout/space_inside_block_braces.rb +33 -15
  153. data/lib/rubocop/cop/layout/space_inside_hash_literal_braces.rb +30 -3
  154. data/lib/rubocop/cop/layout/space_inside_percent_literal_delimiters.rb +34 -0
  155. data/lib/rubocop/cop/layout/space_inside_reference_brackets.rb +10 -6
  156. data/lib/rubocop/cop/layout/space_inside_string_interpolation.rb +6 -5
  157. data/lib/rubocop/cop/layout/trailing_empty_lines.rb +9 -9
  158. data/lib/rubocop/cop/layout/trailing_whitespace.rb +13 -6
  159. data/lib/rubocop/cop/legacy/corrections_proxy.rb +1 -1
  160. data/lib/rubocop/cop/legacy/corrector.rb +1 -1
  161. data/lib/rubocop/cop/lint/ambiguous_assignment.rb +1 -1
  162. data/lib/rubocop/cop/lint/ambiguous_block_association.rb +28 -8
  163. data/lib/rubocop/cop/lint/ambiguous_operator.rb +5 -1
  164. data/lib/rubocop/cop/lint/ambiguous_operator_precedence.rb +1 -1
  165. data/lib/rubocop/cop/lint/ambiguous_range.rb +3 -3
  166. data/lib/rubocop/cop/lint/ambiguous_regexp_literal.rb +1 -1
  167. data/lib/rubocop/cop/lint/assignment_in_condition.rb +12 -2
  168. data/lib/rubocop/cop/lint/binary_operator_with_identical_operands.rb +1 -1
  169. data/lib/rubocop/cop/lint/boolean_symbol.rb +1 -1
  170. data/lib/rubocop/cop/lint/circular_argument_reference.rb +1 -1
  171. data/lib/rubocop/cop/lint/constant_overwritten_in_rescue.rb +51 -0
  172. data/lib/rubocop/cop/lint/constant_resolution.rb +4 -0
  173. data/lib/rubocop/cop/lint/debugger.rb +28 -32
  174. data/lib/rubocop/cop/lint/deprecated_class_methods.rb +67 -111
  175. data/lib/rubocop/cop/lint/deprecated_constants.rb +9 -2
  176. data/lib/rubocop/cop/lint/disjunctive_assignment_in_constructor.rb +1 -1
  177. data/lib/rubocop/cop/lint/duplicate_branch.rb +1 -3
  178. data/lib/rubocop/cop/lint/duplicate_case_condition.rb +1 -1
  179. data/lib/rubocop/cop/lint/duplicate_elsif_condition.rb +1 -1
  180. data/lib/rubocop/cop/lint/duplicate_hash_key.rb +1 -1
  181. data/lib/rubocop/cop/lint/duplicate_magic_comment.rb +73 -0
  182. data/lib/rubocop/cop/lint/duplicate_methods.rb +48 -18
  183. data/lib/rubocop/cop/lint/duplicate_regexp_character_class_element.rb +26 -7
  184. data/lib/rubocop/cop/lint/duplicate_require.rb +1 -1
  185. data/lib/rubocop/cop/lint/duplicate_rescue_exception.rb +1 -1
  186. data/lib/rubocop/cop/lint/each_with_object_argument.rb +1 -1
  187. data/lib/rubocop/cop/lint/else_layout.rb +5 -9
  188. data/lib/rubocop/cop/lint/empty_block.rb +3 -7
  189. data/lib/rubocop/cop/lint/empty_class.rb +4 -2
  190. data/lib/rubocop/cop/lint/empty_conditional_body.rb +109 -3
  191. data/lib/rubocop/cop/lint/empty_ensure.rb +1 -1
  192. data/lib/rubocop/cop/lint/empty_expression.rb +1 -1
  193. data/lib/rubocop/cop/lint/empty_file.rb +1 -1
  194. data/lib/rubocop/cop/lint/empty_in_pattern.rb +1 -1
  195. data/lib/rubocop/cop/lint/empty_interpolation.rb +1 -1
  196. data/lib/rubocop/cop/lint/empty_when.rb +1 -1
  197. data/lib/rubocop/cop/lint/ensure_return.rb +1 -1
  198. data/lib/rubocop/cop/lint/erb_new_arguments.rb +9 -9
  199. data/lib/rubocop/cop/lint/flip_flop.rb +1 -1
  200. data/lib/rubocop/cop/lint/float_comparison.rb +1 -1
  201. data/lib/rubocop/cop/lint/float_out_of_range.rb +1 -1
  202. data/lib/rubocop/cop/lint/format_parameter_mismatch.rb +14 -7
  203. data/lib/rubocop/cop/lint/heredoc_method_call_position.rb +16 -18
  204. data/lib/rubocop/cop/lint/implicit_string_concatenation.rb +2 -2
  205. data/lib/rubocop/cop/lint/incompatible_io_select_with_fiber_scheduler.rb +1 -1
  206. data/lib/rubocop/cop/lint/ineffective_access_modifier.rb +1 -1
  207. data/lib/rubocop/cop/lint/inherit_exception.rb +1 -1
  208. data/lib/rubocop/cop/lint/interpolation_check.rb +6 -5
  209. data/lib/rubocop/cop/lint/lambda_without_literal_block.rb +2 -2
  210. data/lib/rubocop/cop/lint/literal_as_condition.rb +6 -1
  211. data/lib/rubocop/cop/lint/literal_in_interpolation.rb +5 -1
  212. data/lib/rubocop/cop/lint/loop.rb +1 -1
  213. data/lib/rubocop/cop/lint/missing_cop_enable_directive.rb +19 -4
  214. data/lib/rubocop/cop/lint/missing_super.rb +1 -1
  215. data/lib/rubocop/cop/lint/mixed_regexp_capture_types.rb +1 -0
  216. data/lib/rubocop/cop/lint/nested_method_definition.rb +52 -8
  217. data/lib/rubocop/cop/lint/nested_percent_literal.rb +1 -1
  218. data/lib/rubocop/cop/lint/next_without_accumulator.rb +25 -6
  219. data/lib/rubocop/cop/lint/non_atomic_file_operation.rb +162 -0
  220. data/lib/rubocop/cop/lint/non_deterministic_require_order.rb +12 -0
  221. data/lib/rubocop/cop/lint/non_local_exit_from_iterator.rb +1 -1
  222. data/lib/rubocop/cop/lint/number_conversion.rb +32 -10
  223. data/lib/rubocop/cop/lint/numbered_parameter_assignment.rb +1 -1
  224. data/lib/rubocop/cop/lint/or_assignment_to_constant.rb +2 -3
  225. data/lib/rubocop/cop/lint/ordered_magic_comments.rb +4 -5
  226. data/lib/rubocop/cop/lint/out_of_range_regexp_ref.rb +16 -1
  227. data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb +6 -1
  228. data/lib/rubocop/cop/lint/percent_string_array.rb +1 -1
  229. data/lib/rubocop/cop/lint/percent_symbol_array.rb +1 -1
  230. data/lib/rubocop/cop/lint/raise_exception.rb +1 -1
  231. data/lib/rubocop/cop/lint/rand_one.rb +1 -1
  232. data/lib/rubocop/cop/lint/redundant_cop_disable_directive.rb +51 -11
  233. data/lib/rubocop/cop/lint/redundant_cop_enable_directive.rb +3 -3
  234. data/lib/rubocop/cop/lint/redundant_dir_glob_sort.rb +7 -0
  235. data/lib/rubocop/cop/lint/redundant_require_statement.rb +48 -7
  236. data/lib/rubocop/cop/lint/redundant_safe_navigation.rb +16 -3
  237. data/lib/rubocop/cop/lint/redundant_splat_expansion.rb +1 -1
  238. data/lib/rubocop/cop/lint/redundant_string_coercion.rb +1 -1
  239. data/lib/rubocop/cop/lint/redundant_with_index.rb +14 -11
  240. data/lib/rubocop/cop/lint/redundant_with_object.rb +13 -12
  241. data/lib/rubocop/cop/lint/refinement_import_methods.rb +3 -2
  242. data/lib/rubocop/cop/lint/regexp_as_condition.rb +9 -3
  243. data/lib/rubocop/cop/lint/require_parentheses.rb +4 -2
  244. data/lib/rubocop/cop/lint/require_range_parentheses.rb +57 -0
  245. data/lib/rubocop/cop/lint/rescue_exception.rb +1 -1
  246. data/lib/rubocop/cop/lint/return_in_void_context.rb +1 -1
  247. data/lib/rubocop/cop/lint/safe_navigation_chain.rb +44 -8
  248. data/lib/rubocop/cop/lint/safe_navigation_consistency.rb +1 -1
  249. data/lib/rubocop/cop/lint/safe_navigation_with_empty.rb +1 -1
  250. data/lib/rubocop/cop/lint/script_permission.rb +1 -1
  251. data/lib/rubocop/cop/lint/self_assignment.rb +1 -1
  252. data/lib/rubocop/cop/lint/send_with_mixin_argument.rb +5 -4
  253. data/lib/rubocop/cop/lint/shadowed_argument.rb +1 -1
  254. data/lib/rubocop/cop/lint/shadowed_exception.rb +16 -11
  255. data/lib/rubocop/cop/lint/shadowing_outer_local_variable.rb +29 -4
  256. data/lib/rubocop/cop/lint/struct_new_override.rb +3 -3
  257. data/lib/rubocop/cop/lint/suppressed_exception.rb +2 -2
  258. data/lib/rubocop/cop/lint/symbol_conversion.rb +1 -1
  259. data/lib/rubocop/cop/lint/syntax.rb +1 -1
  260. data/lib/rubocop/cop/lint/to_enum_arguments.rb +7 -3
  261. data/lib/rubocop/cop/lint/to_json.rb +1 -1
  262. data/lib/rubocop/cop/lint/top_level_return_with_argument.rb +1 -1
  263. data/lib/rubocop/cop/lint/trailing_comma_in_attribute_declaration.rb +2 -2
  264. data/lib/rubocop/cop/lint/triple_quotes.rb +1 -1
  265. data/lib/rubocop/cop/lint/underscore_prefixed_variable_name.rb +1 -1
  266. data/lib/rubocop/cop/lint/unexpected_block_arity.rb +1 -1
  267. data/lib/rubocop/cop/lint/unified_integer.rb +3 -1
  268. data/lib/rubocop/cop/lint/unreachable_code.rb +1 -1
  269. data/lib/rubocop/cop/lint/unreachable_loop.rb +10 -4
  270. data/lib/rubocop/cop/lint/unused_block_argument.rb +1 -1
  271. data/lib/rubocop/cop/lint/unused_method_argument.rb +7 -2
  272. data/lib/rubocop/cop/lint/uri_escape_unescape.rb +1 -1
  273. data/lib/rubocop/cop/lint/uri_regexp.rb +1 -1
  274. data/lib/rubocop/cop/lint/useless_access_modifier.rb +9 -12
  275. data/lib/rubocop/cop/lint/useless_assignment.rb +1 -1
  276. data/lib/rubocop/cop/lint/useless_else_without_rescue.rb +44 -0
  277. data/lib/rubocop/cop/lint/useless_method_definition.rb +4 -4
  278. data/lib/rubocop/cop/lint/useless_rescue.rb +86 -0
  279. data/lib/rubocop/cop/lint/useless_ruby2_keywords.rb +16 -6
  280. data/lib/rubocop/cop/lint/useless_setter_call.rb +2 -2
  281. data/lib/rubocop/cop/lint/useless_times.rb +1 -1
  282. data/lib/rubocop/cop/lint/void.rb +27 -16
  283. data/lib/rubocop/cop/metrics/abc_size.rb +5 -3
  284. data/lib/rubocop/cop/metrics/block_length.rb +17 -12
  285. data/lib/rubocop/cop/metrics/block_nesting.rb +2 -2
  286. data/lib/rubocop/cop/metrics/class_length.rb +10 -5
  287. data/lib/rubocop/cop/metrics/cyclomatic_complexity.rb +2 -2
  288. data/lib/rubocop/cop/metrics/method_length.rb +18 -12
  289. data/lib/rubocop/cop/metrics/module_length.rb +10 -5
  290. data/lib/rubocop/cop/metrics/parameter_lists.rb +28 -1
  291. data/lib/rubocop/cop/metrics/perceived_complexity.rb +2 -2
  292. data/lib/rubocop/cop/metrics/utils/abc_size_calculator.rb +3 -6
  293. data/lib/rubocop/cop/metrics/utils/code_length_calculator.rb +7 -4
  294. data/lib/rubocop/cop/mixin/alignment.rb +2 -2
  295. data/lib/rubocop/cop/mixin/allowed_identifiers.rb +2 -2
  296. data/lib/rubocop/cop/mixin/allowed_methods.rb +23 -2
  297. data/lib/rubocop/cop/mixin/allowed_pattern.rb +17 -1
  298. data/lib/rubocop/cop/mixin/annotation_comment.rb +13 -6
  299. data/lib/rubocop/cop/mixin/check_line_breakable.rb +5 -1
  300. data/lib/rubocop/cop/mixin/comments_help.rb +22 -4
  301. data/lib/rubocop/cop/mixin/configurable_enforced_style.rb +21 -9
  302. data/lib/rubocop/cop/mixin/def_node.rb +2 -7
  303. data/lib/rubocop/cop/mixin/enforce_superclass.rb +2 -1
  304. data/lib/rubocop/cop/mixin/first_element_line_break.rb +11 -7
  305. data/lib/rubocop/cop/mixin/frozen_string_literal.rb +4 -0
  306. data/lib/rubocop/cop/mixin/hash_shorthand_syntax.rb +155 -12
  307. data/lib/rubocop/cop/mixin/hash_transform_method.rb +10 -6
  308. data/lib/rubocop/cop/mixin/line_length_help.rb +11 -2
  309. data/lib/rubocop/cop/mixin/method_complexity.rb +13 -16
  310. data/lib/rubocop/cop/mixin/multiline_element_indentation.rb +34 -12
  311. data/lib/rubocop/cop/mixin/multiline_element_line_breaks.rb +5 -6
  312. data/lib/rubocop/cop/mixin/percent_array.rb +58 -1
  313. data/lib/rubocop/cop/mixin/preceding_following_alignment.rb +1 -1
  314. data/lib/rubocop/cop/mixin/range_help.rb +33 -7
  315. data/lib/rubocop/cop/mixin/require_library.rb +2 -0
  316. data/lib/rubocop/cop/mixin/rescue_node.rb +5 -3
  317. data/lib/rubocop/cop/mixin/statement_modifier.rb +16 -1
  318. data/lib/rubocop/cop/mixin/string_help.rb +1 -1
  319. data/lib/rubocop/cop/mixin/surrounding_space.rb +13 -11
  320. data/lib/rubocop/cop/mixin/trailing_comma.rb +1 -1
  321. data/lib/rubocop/cop/mixin/visibility_help.rb +40 -5
  322. data/lib/rubocop/cop/naming/accessor_method_name.rb +4 -2
  323. data/lib/rubocop/cop/naming/ascii_identifiers.rb +1 -1
  324. data/lib/rubocop/cop/naming/binary_operator_parameter_name.rb +1 -1
  325. data/lib/rubocop/cop/naming/block_forwarding.rb +7 -3
  326. data/lib/rubocop/cop/naming/block_parameter_name.rb +2 -2
  327. data/lib/rubocop/cop/naming/class_and_module_camel_case.rb +4 -2
  328. data/lib/rubocop/cop/naming/constant_name.rb +3 -3
  329. data/lib/rubocop/cop/naming/file_name.rb +1 -1
  330. data/lib/rubocop/cop/naming/heredoc_delimiter_case.rb +1 -1
  331. data/lib/rubocop/cop/naming/heredoc_delimiter_naming.rb +1 -1
  332. data/lib/rubocop/cop/naming/inclusive_language.rb +5 -2
  333. data/lib/rubocop/cop/naming/memoized_instance_variable_name.rb +1 -1
  334. data/lib/rubocop/cop/naming/method_name.rb +1 -1
  335. data/lib/rubocop/cop/naming/method_parameter_name.rb +1 -1
  336. data/lib/rubocop/cop/naming/predicate_name.rb +30 -1
  337. data/lib/rubocop/cop/naming/rescued_exceptions_variable_name.rb +1 -1
  338. data/lib/rubocop/cop/naming/variable_name.rb +1 -1
  339. data/lib/rubocop/cop/naming/variable_number.rb +18 -18
  340. data/lib/rubocop/cop/registry.rb +70 -44
  341. data/lib/rubocop/cop/security/compound_hash.rb +3 -2
  342. data/lib/rubocop/cop/security/eval.rb +1 -1
  343. data/lib/rubocop/cop/security/json_load.rb +1 -1
  344. data/lib/rubocop/cop/security/marshal_load.rb +1 -1
  345. data/lib/rubocop/cop/security/open.rb +1 -1
  346. data/lib/rubocop/cop/security/yaml_load.rb +1 -1
  347. data/lib/rubocop/cop/style/access_modifier_declarations.rb +92 -3
  348. data/lib/rubocop/cop/style/accessor_grouping.rb +23 -18
  349. data/lib/rubocop/cop/style/alias.rb +10 -2
  350. data/lib/rubocop/cop/style/and_or.rb +11 -11
  351. data/lib/rubocop/cop/style/arguments_forwarding.rb +4 -3
  352. data/lib/rubocop/cop/style/array_coercion.rb +1 -1
  353. data/lib/rubocop/cop/style/array_intersect.rb +111 -0
  354. data/lib/rubocop/cop/style/array_join.rb +1 -1
  355. data/lib/rubocop/cop/style/ascii_comments.rb +1 -1
  356. data/lib/rubocop/cop/style/attr.rb +1 -1
  357. data/lib/rubocop/cop/style/auto_resource_cleanup.rb +1 -1
  358. data/lib/rubocop/cop/style/bare_percent_literals.rb +1 -1
  359. data/lib/rubocop/cop/style/bisected_attr_accessor.rb +1 -1
  360. data/lib/rubocop/cop/style/block_comments.rb +2 -2
  361. data/lib/rubocop/cop/style/block_delimiters.rb +38 -11
  362. data/lib/rubocop/cop/style/case_equality.rb +41 -11
  363. data/lib/rubocop/cop/style/case_like_if.rb +1 -1
  364. data/lib/rubocop/cop/style/character_literal.rb +1 -1
  365. data/lib/rubocop/cop/style/class_and_module_children.rb +8 -15
  366. data/lib/rubocop/cop/style/class_check.rb +1 -1
  367. data/lib/rubocop/cop/style/class_equality_comparison.rb +55 -6
  368. data/lib/rubocop/cop/style/class_methods.rb +1 -1
  369. data/lib/rubocop/cop/style/class_methods_definitions.rb +3 -2
  370. data/lib/rubocop/cop/style/class_vars.rb +1 -1
  371. data/lib/rubocop/cop/style/collection_compact.rb +13 -4
  372. data/lib/rubocop/cop/style/collection_methods.rb +3 -1
  373. data/lib/rubocop/cop/style/colon_method_call.rb +1 -1
  374. data/lib/rubocop/cop/style/colon_method_definition.rb +1 -1
  375. data/lib/rubocop/cop/style/combinable_loops.rb +4 -2
  376. data/lib/rubocop/cop/style/command_literal.rb +2 -2
  377. data/lib/rubocop/cop/style/comment_annotation.rb +1 -1
  378. data/lib/rubocop/cop/style/commented_keyword.rb +4 -4
  379. data/lib/rubocop/cop/style/comparable_clamp.rb +125 -0
  380. data/lib/rubocop/cop/style/concat_array_literals.rb +86 -0
  381. data/lib/rubocop/cop/style/conditional_assignment.rb +2 -7
  382. data/lib/rubocop/cop/style/constant_visibility.rb +1 -1
  383. data/lib/rubocop/cop/style/date_time.rb +1 -1
  384. data/lib/rubocop/cop/style/def_with_parentheses.rb +1 -1
  385. data/lib/rubocop/cop/style/dir.rb +4 -1
  386. data/lib/rubocop/cop/style/documentation.rb +13 -7
  387. data/lib/rubocop/cop/style/documentation_method.rb +11 -5
  388. data/lib/rubocop/cop/style/double_negation.rb +3 -1
  389. data/lib/rubocop/cop/style/each_for_simple_loop.rb +42 -7
  390. data/lib/rubocop/cop/style/each_with_object.rb +40 -9
  391. data/lib/rubocop/cop/style/empty_block_parameter.rb +2 -2
  392. data/lib/rubocop/cop/style/empty_case_condition.rb +1 -1
  393. data/lib/rubocop/cop/style/empty_else.rb +40 -3
  394. data/lib/rubocop/cop/style/empty_heredoc.rb +73 -0
  395. data/lib/rubocop/cop/style/empty_lambda_parameter.rb +2 -2
  396. data/lib/rubocop/cop/style/empty_literal.rb +1 -1
  397. data/lib/rubocop/cop/style/empty_method.rb +18 -3
  398. data/lib/rubocop/cop/style/encoding.rb +2 -2
  399. data/lib/rubocop/cop/style/end_block.rb +1 -1
  400. data/lib/rubocop/cop/style/endless_method.rb +2 -2
  401. data/lib/rubocop/cop/style/env_home.rb +1 -1
  402. data/lib/rubocop/cop/style/eval_with_location.rb +1 -1
  403. data/lib/rubocop/cop/style/even_odd.rb +1 -1
  404. data/lib/rubocop/cop/style/expand_path_arguments.rb +1 -1
  405. data/lib/rubocop/cop/style/explicit_block_argument.rb +6 -2
  406. data/lib/rubocop/cop/style/exponential_notation.rb +1 -1
  407. data/lib/rubocop/cop/style/fetch_env_var.rb +37 -224
  408. data/lib/rubocop/cop/style/float_division.rb +1 -1
  409. data/lib/rubocop/cop/style/for.rb +3 -1
  410. data/lib/rubocop/cop/style/format_string.rb +1 -1
  411. data/lib/rubocop/cop/style/format_string_token.rb +73 -23
  412. data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +6 -3
  413. data/lib/rubocop/cop/style/global_std_stream.rb +1 -1
  414. data/lib/rubocop/cop/style/global_vars.rb +1 -1
  415. data/lib/rubocop/cop/style/guard_clause.rb +132 -43
  416. data/lib/rubocop/cop/style/hash_as_last_array_item.rb +2 -1
  417. data/lib/rubocop/cop/style/hash_conversion.rb +1 -1
  418. data/lib/rubocop/cop/style/hash_each_methods.rb +49 -13
  419. data/lib/rubocop/cop/style/hash_except.rb +89 -9
  420. data/lib/rubocop/cop/style/hash_like_case.rb +1 -1
  421. data/lib/rubocop/cop/style/hash_syntax.rb +24 -3
  422. data/lib/rubocop/cop/style/hash_transform_keys.rb +6 -1
  423. data/lib/rubocop/cop/style/hash_transform_values.rb +4 -1
  424. data/lib/rubocop/cop/style/identical_conditional_branches.rb +17 -2
  425. data/lib/rubocop/cop/style/if_unless_modifier.rb +1 -1
  426. data/lib/rubocop/cop/style/if_with_boolean_literal_branches.rb +29 -4
  427. data/lib/rubocop/cop/style/if_with_semicolon.rb +4 -4
  428. data/lib/rubocop/cop/style/implicit_runtime_error.rb +3 -3
  429. data/lib/rubocop/cop/style/in_pattern_then.rb +1 -1
  430. data/lib/rubocop/cop/style/infinite_loop.rb +2 -5
  431. data/lib/rubocop/cop/style/inline_comment.rb +1 -1
  432. data/lib/rubocop/cop/style/inverse_methods.rb +12 -8
  433. data/lib/rubocop/cop/style/invertible_unless_condition.rb +114 -0
  434. data/lib/rubocop/cop/style/ip_addresses.rb +1 -1
  435. data/lib/rubocop/cop/style/keyword_parameters_order.rb +2 -2
  436. data/lib/rubocop/cop/style/lambda.rb +1 -1
  437. data/lib/rubocop/cop/style/lambda_call.rb +1 -1
  438. data/lib/rubocop/cop/style/line_end_concatenation.rb +6 -3
  439. data/lib/rubocop/cop/style/magic_comment_format.rb +307 -0
  440. data/lib/rubocop/cop/style/map_compact_with_conditional_block.rb +136 -0
  441. data/lib/rubocop/cop/style/map_to_hash.rb +3 -3
  442. data/lib/rubocop/cop/style/map_to_set.rb +61 -0
  443. data/lib/rubocop/cop/style/method_call_with_args_parentheses/omit_parentheses.rb +39 -19
  444. data/lib/rubocop/cop/style/method_call_with_args_parentheses/require_parentheses.rb +5 -1
  445. data/lib/rubocop/cop/style/method_call_with_args_parentheses.rb +8 -8
  446. data/lib/rubocop/cop/style/method_call_without_args_parentheses.rb +22 -3
  447. data/lib/rubocop/cop/style/method_called_on_do_end_block.rb +5 -2
  448. data/lib/rubocop/cop/style/method_def_parentheses.rb +12 -5
  449. data/lib/rubocop/cop/style/min_max.rb +1 -1
  450. data/lib/rubocop/cop/style/min_max_comparison.rb +83 -0
  451. data/lib/rubocop/cop/style/missing_else.rb +37 -25
  452. data/lib/rubocop/cop/style/missing_respond_to_missing.rb +1 -1
  453. data/lib/rubocop/cop/style/mixin_grouping.rb +1 -1
  454. data/lib/rubocop/cop/style/mixin_usage.rb +1 -1
  455. data/lib/rubocop/cop/style/module_function.rb +30 -8
  456. data/lib/rubocop/cop/style/multiline_block_chain.rb +4 -2
  457. data/lib/rubocop/cop/style/multiline_if_modifier.rb +2 -6
  458. data/lib/rubocop/cop/style/multiline_if_then.rb +1 -1
  459. data/lib/rubocop/cop/style/multiline_in_pattern_then.rb +3 -5
  460. data/lib/rubocop/cop/style/multiline_memoization.rb +3 -3
  461. data/lib/rubocop/cop/style/multiline_method_signature.rb +2 -2
  462. data/lib/rubocop/cop/style/multiline_ternary_operator.rb +21 -6
  463. data/lib/rubocop/cop/style/multiline_when_then.rb +2 -4
  464. data/lib/rubocop/cop/style/multiple_comparison.rb +1 -1
  465. data/lib/rubocop/cop/style/mutable_constant.rb +1 -1
  466. data/lib/rubocop/cop/style/negated_if_else_condition.rb +9 -7
  467. data/lib/rubocop/cop/style/nested_file_dirname.rb +1 -1
  468. data/lib/rubocop/cop/style/nested_modifier.rb +1 -1
  469. data/lib/rubocop/cop/style/nested_parenthesized_calls.rb +11 -2
  470. data/lib/rubocop/cop/style/nested_ternary_operator.rb +20 -8
  471. data/lib/rubocop/cop/style/next.rb +3 -5
  472. data/lib/rubocop/cop/style/nil_comparison.rb +1 -1
  473. data/lib/rubocop/cop/style/nil_lambda.rb +4 -4
  474. data/lib/rubocop/cop/style/non_nil_check.rb +1 -1
  475. data/lib/rubocop/cop/style/not.rb +2 -2
  476. data/lib/rubocop/cop/style/numbered_parameters.rb +1 -1
  477. data/lib/rubocop/cop/style/numbered_parameters_limit.rb +12 -4
  478. data/lib/rubocop/cop/style/numeric_literal_prefix.rb +1 -1
  479. data/lib/rubocop/cop/style/numeric_literals.rb +16 -1
  480. data/lib/rubocop/cop/style/numeric_predicate.rb +53 -11
  481. data/lib/rubocop/cop/style/object_then.rb +6 -1
  482. data/lib/rubocop/cop/style/one_line_conditional.rb +4 -7
  483. data/lib/rubocop/cop/style/open_struct_use.rb +1 -1
  484. data/lib/rubocop/cop/style/operator_method_call.rb +67 -0
  485. data/lib/rubocop/cop/style/option_hash.rb +1 -1
  486. data/lib/rubocop/cop/style/optional_arguments.rb +1 -1
  487. data/lib/rubocop/cop/style/optional_boolean_parameter.rb +1 -1
  488. data/lib/rubocop/cop/style/or_assignment.rb +1 -1
  489. data/lib/rubocop/cop/style/parallel_assignment.rb +3 -1
  490. data/lib/rubocop/cop/style/parentheses_around_condition.rb +1 -1
  491. data/lib/rubocop/cop/style/percent_literal_delimiters.rb +1 -1
  492. data/lib/rubocop/cop/style/percent_q_literals.rb +1 -1
  493. data/lib/rubocop/cop/style/perl_backrefs.rb +23 -2
  494. data/lib/rubocop/cop/style/preferred_hash_methods.rb +1 -1
  495. data/lib/rubocop/cop/style/proc.rb +5 -2
  496. data/lib/rubocop/cop/style/quoted_symbols.rb +1 -1
  497. data/lib/rubocop/cop/style/raise_args.rb +1 -1
  498. data/lib/rubocop/cop/style/random_with_offset.rb +1 -1
  499. data/lib/rubocop/cop/style/redundant_argument.rb +5 -2
  500. data/lib/rubocop/cop/style/redundant_assignment.rb +1 -1
  501. data/lib/rubocop/cop/style/redundant_begin.rb +20 -6
  502. data/lib/rubocop/cop/style/redundant_capital_w.rb +1 -1
  503. data/lib/rubocop/cop/style/redundant_condition.rb +48 -11
  504. data/lib/rubocop/cop/style/redundant_conditional.rb +1 -5
  505. data/lib/rubocop/cop/style/redundant_constant_base.rb +85 -0
  506. data/lib/rubocop/cop/style/redundant_double_splat_hash_braces.rb +45 -0
  507. data/lib/rubocop/cop/style/redundant_each.rb +116 -0
  508. data/lib/rubocop/cop/style/redundant_exception.rb +1 -1
  509. data/lib/rubocop/cop/style/redundant_fetch_block.rb +2 -2
  510. data/lib/rubocop/cop/style/redundant_file_extension_in_require.rb +1 -1
  511. data/lib/rubocop/cop/style/redundant_freeze.rb +1 -1
  512. data/lib/rubocop/cop/style/redundant_heredoc_delimiter_quotes.rb +58 -0
  513. data/lib/rubocop/cop/style/redundant_initialize.rb +3 -1
  514. data/lib/rubocop/cop/style/redundant_interpolation.rb +22 -1
  515. data/lib/rubocop/cop/style/redundant_parentheses.rb +23 -25
  516. data/lib/rubocop/cop/style/redundant_percent_q.rb +1 -1
  517. data/lib/rubocop/cop/style/redundant_regexp_character_class.rb +9 -3
  518. data/lib/rubocop/cop/style/redundant_regexp_escape.rb +14 -4
  519. data/lib/rubocop/cop/style/redundant_return.rb +9 -2
  520. data/lib/rubocop/cop/style/redundant_self.rb +3 -1
  521. data/lib/rubocop/cop/style/redundant_self_assignment.rb +2 -2
  522. data/lib/rubocop/cop/style/redundant_self_assignment_branch.rb +1 -1
  523. data/lib/rubocop/cop/style/redundant_sort.rb +23 -8
  524. data/lib/rubocop/cop/style/redundant_sort_by.rb +25 -9
  525. data/lib/rubocop/cop/style/redundant_string_escape.rb +184 -0
  526. data/lib/rubocop/cop/style/regexp_literal.rb +1 -1
  527. data/lib/rubocop/cop/style/require_order.rb +135 -0
  528. data/lib/rubocop/cop/style/rescue_modifier.rb +2 -2
  529. data/lib/rubocop/cop/style/rescue_standard_error.rb +13 -13
  530. data/lib/rubocop/cop/style/return_nil.rb +1 -1
  531. data/lib/rubocop/cop/style/safe_navigation.rb +43 -9
  532. data/lib/rubocop/cop/style/sample.rb +1 -1
  533. data/lib/rubocop/cop/style/select_by_regexp.rb +14 -6
  534. data/lib/rubocop/cop/style/self_assignment.rb +3 -3
  535. data/lib/rubocop/cop/style/semicolon.rb +53 -6
  536. data/lib/rubocop/cop/style/send.rb +1 -1
  537. data/lib/rubocop/cop/style/signal_exception.rb +9 -7
  538. data/lib/rubocop/cop/style/single_line_block_params.rb +2 -2
  539. data/lib/rubocop/cop/style/single_line_methods.rb +2 -2
  540. data/lib/rubocop/cop/style/slicing_with_range.rb +2 -2
  541. data/lib/rubocop/cop/style/sole_nested_conditional.rb +42 -14
  542. data/lib/rubocop/cop/style/static_class.rb +33 -2
  543. data/lib/rubocop/cop/style/stderr_puts.rb +1 -1
  544. data/lib/rubocop/cop/style/string_concatenation.rb +6 -7
  545. data/lib/rubocop/cop/style/string_hash_keys.rb +5 -2
  546. data/lib/rubocop/cop/style/string_literals.rb +1 -5
  547. data/lib/rubocop/cop/style/string_literals_in_interpolation.rb +1 -1
  548. data/lib/rubocop/cop/style/string_methods.rb +1 -1
  549. data/lib/rubocop/cop/style/strip.rb +1 -1
  550. data/lib/rubocop/cop/style/struct_inheritance.rb +4 -4
  551. data/lib/rubocop/cop/style/swap_values.rb +2 -2
  552. data/lib/rubocop/cop/style/symbol_array.rb +12 -7
  553. data/lib/rubocop/cop/style/symbol_literal.rb +1 -1
  554. data/lib/rubocop/cop/style/symbol_proc.rb +46 -14
  555. data/lib/rubocop/cop/style/ternary_parentheses.rb +2 -14
  556. data/lib/rubocop/cop/style/top_level_method_definition.rb +3 -1
  557. data/lib/rubocop/cop/style/trailing_body_on_class.rb +1 -1
  558. data/lib/rubocop/cop/style/trailing_body_on_method_definition.rb +1 -1
  559. data/lib/rubocop/cop/style/trailing_body_on_module.rb +1 -1
  560. data/lib/rubocop/cop/style/trailing_comma_in_arguments.rb +5 -5
  561. data/lib/rubocop/cop/style/trailing_comma_in_array_literal.rb +1 -1
  562. data/lib/rubocop/cop/style/trailing_comma_in_block_args.rb +2 -2
  563. data/lib/rubocop/cop/style/trailing_comma_in_hash_literal.rb +1 -1
  564. data/lib/rubocop/cop/style/trailing_method_end_statement.rb +1 -1
  565. data/lib/rubocop/cop/style/trailing_underscore_variable.rb +1 -1
  566. data/lib/rubocop/cop/style/trivial_accessors.rb +4 -1
  567. data/lib/rubocop/cop/style/unless_else.rb +1 -1
  568. data/lib/rubocop/cop/style/unless_logical_operators.rb +1 -1
  569. data/lib/rubocop/cop/style/unpack_first.rb +5 -2
  570. data/lib/rubocop/cop/style/variable_interpolation.rb +1 -1
  571. data/lib/rubocop/cop/style/when_then.rb +1 -1
  572. data/lib/rubocop/cop/style/word_array.rb +60 -6
  573. data/lib/rubocop/cop/style/yoda_condition.rb +13 -6
  574. data/lib/rubocop/cop/style/yoda_expression.rb +90 -0
  575. data/lib/rubocop/cop/style/zero_length_predicate.rb +32 -15
  576. data/lib/rubocop/cop/team.rb +64 -57
  577. data/lib/rubocop/cop/util.rb +43 -7
  578. data/lib/rubocop/cop/variable_force/assignment.rb +1 -1
  579. data/lib/rubocop/cop/variable_force/scope.rb +3 -3
  580. data/lib/rubocop/cop/variable_force/variable_table.rb +4 -2
  581. data/lib/rubocop/cop/variable_force.rb +18 -30
  582. data/lib/rubocop/cops_documentation_generator.rb +53 -13
  583. data/lib/rubocop/directive_comment.rb +1 -1
  584. data/lib/rubocop/ext/processed_source.rb +2 -0
  585. data/lib/rubocop/ext/range.rb +15 -0
  586. data/lib/rubocop/feature_loader.rb +94 -0
  587. data/lib/rubocop/file_patterns.rb +43 -0
  588. data/lib/rubocop/formatter/clang_style_formatter.rb +1 -1
  589. data/lib/rubocop/formatter/disabled_config_formatter.rb +36 -16
  590. data/lib/rubocop/formatter/formatter_set.rb +20 -19
  591. data/lib/rubocop/formatter/git_hub_actions_formatter.rb +15 -2
  592. data/lib/rubocop/formatter/html_formatter.rb +4 -5
  593. data/lib/rubocop/formatter/markdown_formatter.rb +3 -1
  594. data/lib/rubocop/formatter/offense_count_formatter.rb +10 -5
  595. data/lib/rubocop/formatter/simple_text_formatter.rb +9 -8
  596. data/lib/rubocop/formatter/tap_formatter.rb +1 -1
  597. data/lib/rubocop/formatter/worst_offenders_formatter.rb +6 -3
  598. data/lib/rubocop/formatter.rb +34 -0
  599. data/lib/rubocop/magic_comment.rb +27 -2
  600. data/lib/rubocop/options.rb +128 -53
  601. data/lib/rubocop/path_util.rb +50 -22
  602. data/lib/rubocop/rake_task.rb +34 -9
  603. data/lib/rubocop/result_cache.rb +26 -23
  604. data/lib/rubocop/rspec/cop_helper.rb +26 -3
  605. data/lib/rubocop/rspec/expect_offense.rb +9 -7
  606. data/lib/rubocop/rspec/shared_contexts.rb +46 -9
  607. data/lib/rubocop/rspec/support.rb +16 -2
  608. data/lib/rubocop/runner.rb +78 -23
  609. data/lib/rubocop/server/cache.rb +155 -0
  610. data/lib/rubocop/server/cli.rb +147 -0
  611. data/lib/rubocop/server/client_command/base.rb +44 -0
  612. data/lib/rubocop/server/client_command/exec.rb +64 -0
  613. data/lib/rubocop/server/client_command/restart.rb +25 -0
  614. data/lib/rubocop/server/client_command/start.rb +48 -0
  615. data/lib/rubocop/server/client_command/status.rb +28 -0
  616. data/lib/rubocop/server/client_command/stop.rb +31 -0
  617. data/lib/rubocop/server/client_command.rb +26 -0
  618. data/lib/rubocop/server/core.rb +111 -0
  619. data/lib/rubocop/server/errors.rb +23 -0
  620. data/lib/rubocop/server/helper.rb +34 -0
  621. data/lib/rubocop/server/server_command/base.rb +50 -0
  622. data/lib/rubocop/server/server_command/exec.rb +34 -0
  623. data/lib/rubocop/server/server_command/stop.rb +24 -0
  624. data/lib/rubocop/server/server_command.rb +21 -0
  625. data/lib/rubocop/server/socket_reader.rb +69 -0
  626. data/lib/rubocop/server.rb +53 -0
  627. data/lib/rubocop/target_finder.rb +1 -1
  628. data/lib/rubocop/target_ruby.rb +8 -7
  629. data/lib/rubocop/version.rb +22 -9
  630. data/lib/rubocop.rb +45 -35
  631. metadata +90 -36
  632. data/lib/rubocop/cop/gemspec/date_assignment.rb +0 -49
  633. data/lib/rubocop/cop/mixin/ignored_methods.rb +0 -52
@@ -3,158 +3,114 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Lint
6
- # This cop checks for uses of the deprecated class method usages.
6
+ # Checks for uses of the deprecated class method usages.
7
7
  #
8
8
  # @example
9
9
  #
10
10
  # # bad
11
- #
12
11
  # File.exists?(some_path)
13
12
  # Dir.exists?(some_path)
14
13
  # iterator?
14
+ # attr :name, true
15
+ # attr :name, false
15
16
  # ENV.freeze # Calling `Env.freeze` raises `TypeError` since Ruby 2.7.
17
+ # ENV.clone
18
+ # ENV.dup # Calling `Env.dup` raises `TypeError` since Ruby 3.1.
16
19
  # Socket.gethostbyname(host)
17
20
  # Socket.gethostbyaddr(host)
18
21
  #
19
- # @example
20
- #
21
22
  # # good
22
- #
23
23
  # File.exist?(some_path)
24
24
  # Dir.exist?(some_path)
25
25
  # block_given?
26
+ # attr_accessor :name
27
+ # attr_reader :name
26
28
  # ENV # `ENV.freeze` cannot prohibit changes to environment variables.
29
+ # ENV.to_h
30
+ # ENV.to_h # `ENV.dup` cannot dup `ENV`, use `ENV.to_h` to get a copy of `ENV` as a hash.
27
31
  # Addrinfo.getaddrinfo(nodename, service)
28
32
  # Addrinfo.tcp(host, port).getnameinfo
29
33
  class DeprecatedClassMethods < Base
30
34
  extend AutoCorrector
31
35
 
32
- # Inner class to DeprecatedClassMethods.
33
- # This class exists to add abstraction and clean naming
34
- # to the deprecated objects
35
- class DeprecatedClassMethod
36
- include RuboCop::AST::Sexp
37
-
38
- attr_reader :method, :class_constant
36
+ MSG = '`%<current>s` is deprecated in favor of `%<prefer>s`.'
37
+ RESTRICT_ON_SEND = %i[
38
+ attr clone dup exists? freeze gethostbyaddr gethostbyname iterator?
39
+ ].freeze
40
+
41
+ PREFERRED_METHDOS = {
42
+ clone: 'to_h',
43
+ dup: 'to_h',
44
+ exists?: 'exist?',
45
+ gethostbyaddr: 'Addrinfo#getnameinfo',
46
+ gethostbyname: 'Addrinfo#getaddrinfo',
47
+ iterator?: 'block_given?'
48
+ }.freeze
39
49
 
40
- def initialize(method, class_constant: nil, correctable: true)
41
- @method = method
42
- @class_constant = class_constant
43
- @correctable = correctable
44
- end
50
+ DIR_ENV_FILE_CONSTANTS = %i[Dir ENV File].freeze
45
51
 
46
- def class_nodes
47
- @class_nodes ||=
48
- if class_constant
49
- [
50
- s(:const, nil, class_constant),
51
- s(:const, s(:cbase), class_constant)
52
- ]
53
- else
54
- [nil]
55
- end
56
- end
52
+ # @!method deprecated_class_method?(node)
53
+ def_node_matcher :deprecated_class_method?, <<~PATTERN
54
+ {
55
+ (send (const {cbase nil?} {:ENV}) {:clone :dup :freeze})
56
+ (send (const {cbase nil?} {:File :Dir}) :exists? _)
57
+ (send (const {cbase nil?} :Socket) {:gethostbyaddr :gethostbyname} ...)
58
+ (send nil? :attr _ boolean)
59
+ (send nil? :iterator?)
60
+ }
61
+ PATTERN
57
62
 
58
- def correctable?
59
- @correctable
60
- end
63
+ def on_send(node)
64
+ return unless deprecated_class_method?(node)
61
65
 
62
- def to_s
63
- [class_constant, method].compact.join(delimiter)
64
- end
66
+ offense_range = offense_range(node)
67
+ prefer = preferred_method(node)
68
+ message = format(MSG, current: offense_range.source, prefer: prefer)
65
69
 
66
- private
70
+ add_offense(offense_range, message: message) do |corrector|
71
+ next if socket_const?(node.receiver)
67
72
 
68
- def delimiter
69
- CLASS_METHOD_DELIMETER
73
+ if node.method?(:freeze)
74
+ corrector.replace(node, 'ENV')
75
+ else
76
+ corrector.replace(offense_range, prefer)
77
+ end
70
78
  end
71
79
  end
72
80
 
73
- # Inner class to DeprecatedClassMethods.
74
- # This class exists to add abstraction and clean naming
75
- # to the replacements for deprecated objects
76
- class Replacement
77
- attr_reader :method, :class_constant
78
-
79
- def initialize(method, class_constant: nil, instance_method: false)
80
- @method = method
81
- @class_constant = class_constant
82
- @instance_method = instance_method
83
- end
84
-
85
- def to_s
86
- [class_constant, method].compact.join(delimiter)
87
- end
88
-
89
- private
90
-
91
- def delimiter
92
- instance_method? ? INSTANCE_METHOD_DELIMETER : CLASS_METHOD_DELIMETER
93
- end
81
+ private
94
82
 
95
- def instance_method?
96
- @instance_method
83
+ def offense_range(node)
84
+ if socket_const?(node.receiver) || dir_env_file_const?(node.receiver)
85
+ node.loc.expression.begin.join(node.loc.selector.end)
86
+ elsif node.method?(:attr)
87
+ node
88
+ else
89
+ node.loc.selector
97
90
  end
98
91
  end
99
92
 
100
- MSG = '`%<current>s` is deprecated in favor of `%<prefer>s`.'
101
-
102
- DEPRECATED_METHODS_OBJECT = {
103
- DeprecatedClassMethod.new(:exists?, class_constant: :File) =>
104
- Replacement.new(:exist?, class_constant: :File),
105
-
106
- DeprecatedClassMethod.new(:exists?, class_constant: :Dir) =>
107
- Replacement.new(:exist?, class_constant: :Dir),
108
-
109
- DeprecatedClassMethod.new(:iterator?) => Replacement.new(:block_given?),
110
-
111
- DeprecatedClassMethod.new(:freeze, class_constant: :ENV) =>
112
- Replacement.new(nil, class_constant: :ENV),
113
-
114
- DeprecatedClassMethod.new(:gethostbyaddr, class_constant: :Socket, correctable: false) =>
115
- Replacement.new(:getnameinfo, class_constant: :Addrinfo, instance_method: true),
93
+ def preferred_method(node)
94
+ if node.method?(:attr)
95
+ boolean_argument = node.arguments[1].source
96
+ preferred_attr_method = boolean_argument == 'true' ? 'attr_accessor' : 'attr_reader'
116
97
 
117
- DeprecatedClassMethod.new(:gethostbyname, class_constant: :Socket, correctable: false) =>
118
- Replacement.new(:getaddrinfo, class_constant: :Addrinfo, instance_method: true)
119
- }.freeze
120
-
121
- RESTRICT_ON_SEND = DEPRECATED_METHODS_OBJECT.keys.map(&:method).freeze
122
-
123
- CLASS_METHOD_DELIMETER = '.'
124
- INSTANCE_METHOD_DELIMETER = '#'
98
+ "#{preferred_attr_method} #{node.first_argument.source}"
99
+ elsif dir_env_file_const?(node.receiver)
100
+ prefer = PREFERRED_METHDOS[node.method_name]
125
101
 
126
- def on_send(node)
127
- check(node) do |deprecated|
128
- prefer = replacement(deprecated)
129
- message = format(MSG, current: deprecated, prefer: prefer)
130
- current_method = node.loc.selector
131
-
132
- add_offense(current_method, message: message) do |corrector|
133
- next unless deprecated.correctable?
134
-
135
- if (preferred_method = prefer.method)
136
- corrector.replace(current_method, preferred_method)
137
- else
138
- corrector.remove(node.loc.dot)
139
- corrector.remove(current_method)
140
- end
141
- end
102
+ prefer ? "#{node.receiver.source}.#{prefer}" : 'ENV'
103
+ else
104
+ PREFERRED_METHDOS[node.method_name]
142
105
  end
143
106
  end
144
107
 
145
- private
146
-
147
- def check(node)
148
- DEPRECATED_METHODS_OBJECT.each_key do |deprecated|
149
- next unless deprecated.class_nodes.include?(node.receiver)
150
- next unless node.method?(deprecated.method)
151
-
152
- yield deprecated
153
- end
108
+ def socket_const?(node)
109
+ node&.short_name == :Socket
154
110
  end
155
111
 
156
- def replacement(deprecated)
157
- DEPRECATED_METHODS_OBJECT[deprecated]
112
+ def dir_env_file_const?(node)
113
+ DIR_ENV_FILE_CONSTANTS.include?(node&.short_name)
158
114
  end
159
115
  end
160
116
  end
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Lint
6
- # This cop checks for deprecated constants.
6
+ # Checks for deprecated constants.
7
7
  #
8
8
  # It has `DeprecatedConstants` config. If there is an alternative method, you can set
9
9
  # alternative value as `Alternative`. And you can set the deprecated version as
@@ -14,7 +14,8 @@ module RuboCop
14
14
  # Alternative: 'alternative_value'
15
15
  # DeprecatedVersion: 'deprecated_version'
16
16
  #
17
- # By default, `NIL`, `TRUE`, `FALSE` and `Random::DEFAULT` are configured.
17
+ # By default, `NIL`, `TRUE`, `FALSE`, `Net::HTTPServerException, `Random::DEFAULT`,
18
+ # `Struct::Group`, and `Struct::Passwd` are configured.
18
19
  #
19
20
  # @example
20
21
  #
@@ -22,13 +23,19 @@ module RuboCop
22
23
  # NIL
23
24
  # TRUE
24
25
  # FALSE
26
+ # Net::HTTPServerException
25
27
  # Random::DEFAULT # Return value of Ruby 2 is `Random` instance, Ruby 3.0 is `Random` class.
28
+ # Struct::Group
29
+ # Struct::Passwd
26
30
  #
27
31
  # # good
28
32
  # nil
29
33
  # true
30
34
  # false
35
+ # Net::HTTPClientException
31
36
  # Random.new # `::DEFAULT` has been deprecated in Ruby 3, `.new` is compatible with Ruby 2.
37
+ # Etc::Group
38
+ # Etc::Passwd
32
39
  #
33
40
  class DeprecatedConstants < Base
34
41
  extend AutoCorrector
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Lint
6
- # This cop checks constructors for disjunctive assignments (`||=`) that should
6
+ # Checks constructors for disjunctive assignments (`||=`) that should
7
7
  # be plain assignments.
8
8
  #
9
9
  # So far, this cop is only concerned with disjunctive assignment of
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Lint
6
- # This cop checks that there are no repeated bodies
6
+ # Checks that there are no repeated bodies
7
7
  # within `if/unless`, `case-when`, `case-in` and `rescue` constructs.
8
8
  #
9
9
  # With `IgnoreLiteralBranches: true`, branches are not registered
@@ -84,8 +84,6 @@ module RuboCop
84
84
  # end
85
85
  #
86
86
  class DuplicateBranch < Base
87
- include RescueNode
88
-
89
87
  MSG = 'Duplicate branch body detected.'
90
88
 
91
89
  def on_branching_statement(node)
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Lint
6
- # This cop checks that there are no repeated conditions
6
+ # Checks that there are no repeated conditions
7
7
  # used in case 'when' expressions.
8
8
  #
9
9
  # @example
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Lint
6
- # This cop checks that there are no repeated conditions used in if 'elsif'.
6
+ # Checks that there are no repeated conditions used in if 'elsif'.
7
7
  #
8
8
  # @example
9
9
  # # bad
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Lint
6
- # This cop checks for duplicated keys in hash literals.
6
+ # Checks for duplicated keys in hash literals.
7
7
  #
8
8
  # This cop mirrors a warning in Ruby 2.2.
9
9
  #
@@ -0,0 +1,73 @@
1
+ # frozen_string_literal: true
2
+
3
+ module RuboCop
4
+ module Cop
5
+ module Lint
6
+ # Checks for duplicated magic comments.
7
+ #
8
+ # @example
9
+ #
10
+ # # bad
11
+ #
12
+ # # encoding: ascii
13
+ # # encoding: ascii
14
+ #
15
+ # # good
16
+ #
17
+ # # encoding: ascii
18
+ #
19
+ # # bad
20
+ #
21
+ # # frozen_string_literal: true
22
+ # # frozen_string_literal: true
23
+ #
24
+ # # good
25
+ #
26
+ # # frozen_string_literal: true
27
+ #
28
+ class DuplicateMagicComment < Base
29
+ include FrozenStringLiteral
30
+ include RangeHelp
31
+ extend AutoCorrector
32
+
33
+ MSG = 'Duplicate magic comment detected.'
34
+
35
+ def on_new_investigation
36
+ return if processed_source.buffer.source.empty?
37
+
38
+ magic_comment_lines.each_value do |comment_lines|
39
+ next if comment_lines.count <= 1
40
+
41
+ comment_lines[1..].each do |comment_line|
42
+ range = processed_source.buffer.line_range(comment_line + 1)
43
+
44
+ register_offense(range)
45
+ end
46
+ end
47
+ end
48
+
49
+ private
50
+
51
+ def magic_comment_lines
52
+ comment_lines = { encoding_magic_comments: [], frozen_string_literal_magic_comments: [] }
53
+
54
+ leading_magic_comments.each.with_index do |magic_comment, index|
55
+ if magic_comment.encoding_specified?
56
+ comment_lines[:encoding_magic_comments] << index
57
+ elsif magic_comment.frozen_string_literal_specified?
58
+ comment_lines[:frozen_string_literal_magic_comments] << index
59
+ end
60
+ end
61
+
62
+ comment_lines
63
+ end
64
+
65
+ def register_offense(range)
66
+ add_offense(range) do |corrector|
67
+ corrector.remove(range_by_whole_lines(range, include_final_newline: true))
68
+ end
69
+ end
70
+ end
71
+ end
72
+ end
73
+ end
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Lint
6
- # This cop checks for duplicated instance (or singleton) method
6
+ # Checks for duplicated instance (or singleton) method
7
7
  # definitions.
8
8
  #
9
9
  # @example
@@ -51,25 +51,26 @@ module RuboCop
51
51
  # alias bar foo
52
52
  class DuplicateMethods < Base
53
53
  MSG = 'Method `%<method>s` is defined at both %<defined>s and %<current>s.'
54
-
55
54
  RESTRICT_ON_SEND = %i[alias_method attr_reader attr_writer attr_accessor attr].freeze
55
+ DEF_TYPES = %i[def defs].freeze
56
56
 
57
57
  def initialize(config = nil, options = nil)
58
58
  super
59
59
  @definitions = {}
60
+ @scopes = Hash.new { |hash, key| hash[key] = [] }
60
61
  end
61
62
 
62
63
  def on_def(node)
63
64
  # if a method definition is inside an if, it is very likely
64
65
  # that a different definition is used depending on platform, etc.
65
- return if node.ancestors.any?(&:if_type?)
66
+ return if node.each_ancestor.any?(&:if_type?)
66
67
  return if possible_dsl?(node)
67
68
 
68
69
  found_instance_method(node, node.method_name)
69
70
  end
70
71
 
71
72
  def on_defs(node)
72
- return if node.ancestors.any?(&:if_type?)
73
+ return if node.each_ancestor.any?(&:if_type?)
73
74
  return if possible_dsl?(node)
74
75
 
75
76
  if node.receiver.const_type?
@@ -127,13 +128,13 @@ module RuboCop
127
128
  found_method(node, "#{enclosing}.#{name}")
128
129
  end
129
130
 
130
- def message_for_dup(node, method_name)
131
- format(MSG, method: method_name, defined: source_location(@definitions[method_name]),
131
+ def message_for_dup(node, method_name, key)
132
+ format(MSG, method: method_name, defined: source_location(@definitions[key]),
132
133
  current: source_location(node))
133
134
  end
134
135
 
135
136
  def found_instance_method(node, name)
136
- return unless (scope = node.parent_module_name)
137
+ return found_sclass_method(node, name) unless (scope = node.parent_module_name)
137
138
 
138
139
  # Humanize the scope
139
140
  scope = scope.sub(
@@ -145,19 +146,48 @@ module RuboCop
145
146
  found_method(node, "#{scope}#{name}")
146
147
  end
147
148
 
149
+ def found_sclass_method(node, name)
150
+ singleton_ancestor = node.each_ancestor.find(&:sclass_type?)
151
+ return unless singleton_ancestor
152
+
153
+ singleton_receiver_node = singleton_ancestor.children[0]
154
+ return unless singleton_receiver_node.send_type?
155
+
156
+ found_method(node, "#{singleton_receiver_node.method_name}.#{name}")
157
+ end
158
+
148
159
  def found_method(node, method_name)
149
- if @definitions.key?(method_name)
150
- loc = case node.type
151
- when :def, :defs
152
- node.loc.keyword.join(node.loc.name)
153
- else
154
- node.loc.expression
155
- end
156
- message = message_for_dup(node, method_name)
157
-
158
- add_offense(loc, message: message)
160
+ key = method_key(node, method_name)
161
+ scope = node.each_ancestor(:rescue, :ensure).first&.type
162
+
163
+ if @definitions.key?(key)
164
+ if scope && !@scopes[scope].include?(key)
165
+ @definitions[key] = node
166
+ @scopes[scope] << key
167
+ return
168
+ end
169
+
170
+ message = message_for_dup(node, method_name, key)
171
+
172
+ add_offense(location(node), message: message)
173
+ else
174
+ @definitions[key] = node
175
+ end
176
+ end
177
+
178
+ def method_key(node, method_name)
179
+ if (ancestor_def = node.each_ancestor(*DEF_TYPES).first)
180
+ "#{ancestor_def.method_name}.#{method_name}"
181
+ else
182
+ method_name
183
+ end
184
+ end
185
+
186
+ def location(node)
187
+ if DEF_TYPES.include?(node.type)
188
+ node.loc.keyword.join(node.loc.name)
159
189
  else
160
- @definitions[method_name] = node
190
+ node.loc.expression
161
191
  end
162
192
  end
163
193
 
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Lint
6
- # This cop checks for duplicate elements in Regexp character classes.
6
+ # Checks for duplicate elements in Regexp character classes.
7
7
  #
8
8
  # @example
9
9
  #
@@ -32,26 +32,40 @@ module RuboCop
32
32
  end
33
33
  end
34
34
 
35
+ # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
35
36
  def each_repeated_character_class_element_loc(node)
36
37
  node.parsed_tree&.each_expression do |expr|
37
- next if expr.type != :set || expr.token == :intersection
38
+ next if skip_expression?(expr)
38
39
 
39
40
  seen = Set.new
41
+ enum = expr.expressions.to_enum
42
+ expression_count = expr.expressions.count
40
43
 
41
- expr.expressions.each do |child|
42
- next if within_interpolation?(node, child)
44
+ expression_count.times do |current_number|
45
+ current_child = enum.next
46
+ next if within_interpolation?(node, current_child)
43
47
 
44
- child_source = child.to_s
48
+ current_child_source = current_child.to_s
49
+ next_child = enum.peek if current_number + 1 < expression_count
45
50
 
46
- yield child.expression if seen.include?(child_source)
51
+ if seen.include?(current_child_source)
52
+ next if start_with_escaped_zero_number?(current_child_source, next_child.to_s)
47
53
 
48
- seen << child_source
54
+ yield current_child.expression
55
+ end
56
+
57
+ seen << current_child_source
49
58
  end
50
59
  end
51
60
  end
61
+ # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
52
62
 
53
63
  private
54
64
 
65
+ def skip_expression?(expr)
66
+ expr.type != :set || expr.token == :intersection
67
+ end
68
+
55
69
  # Since we blank interpolations with a space for every char of the interpolation, we would
56
70
  # mark every space (except the first) as duplicate if we do not skip regexp_parser nodes
57
71
  # that are within an interpolation.
@@ -61,6 +75,11 @@ module RuboCop
61
75
  interpolation_locs(node).any? { |il| il.overlaps?(parse_tree_child_loc) }
62
76
  end
63
77
 
78
+ def start_with_escaped_zero_number?(current_child, next_child)
79
+ # Represents escaped code from `"\00"` (`"\u0000"`) to `"\07"` (`"\a"`).
80
+ current_child == '\\0' && next_child.match?(/[0-7]/)
81
+ end
82
+
64
83
  def interpolation_locs(node)
65
84
  @interpolation_locs ||= {}
66
85
 
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Lint
6
- # This cop checks for duplicate `require`s and `require_relative`s.
6
+ # Checks for duplicate ``require``s and ``require_relative``s.
7
7
  #
8
8
  # @safety
9
9
  # This cop's autocorrection is unsafe because it may break the dependency order
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Lint
6
- # This cop checks that there are no repeated exceptions
6
+ # Checks that there are no repeated exceptions
7
7
  # used in 'rescue' expressions.
8
8
  #
9
9
  # @example
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Lint
6
- # This cop checks if each_with_object is called with an immutable
6
+ # Checks if each_with_object is called with an immutable
7
7
  # argument. Since the argument is the object that the given block shall
8
8
  # make calls on to build something based on the enumerable that
9
9
  # each_with_object iterates over, an immutable argument makes no sense.
@@ -3,11 +3,11 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Lint
6
- # This cop checks for odd `else` block layout - like
6
+ # Checks for odd `else` block layout - like
7
7
  # having an expression on the same line as the `else` keyword,
8
8
  # which is usually a mistake.
9
9
  #
10
- # Its auto-correction tweaks layout to keep the syntax. So, this auto-correction
10
+ # Its autocorrection tweaks layout to keep the syntax. So, this autocorrection
11
11
  # is compatible correction for bad case syntax, but if your code makes a mistake
12
12
  # with `elsif` and `else`, you will have to correct it manually.
13
13
  #
@@ -25,7 +25,7 @@ module RuboCop
25
25
  #
26
26
  # # good
27
27
  #
28
- # # This code is compatible with the bad case. It will be auto-corrected like this.
28
+ # # This code is compatible with the bad case. It will be autocorrected like this.
29
29
  # if something
30
30
  # # ...
31
31
  # else
@@ -41,6 +41,7 @@ module RuboCop
41
41
  # do_that
42
42
  # end
43
43
  class ElseLayout < Base
44
+ include Alignment
44
45
  include RangeHelp
45
46
  extend AutoCorrector
46
47
 
@@ -81,12 +82,7 @@ module RuboCop
81
82
  corrector.insert_after(node.loc.else, "\n")
82
83
 
83
84
  blank_range = range_between(node.loc.else.end_pos, first_else.loc.expression.begin_pos)
84
- indentation = indent(node, offset: indentation_width)
85
- corrector.replace(blank_range, indentation)
86
- end
87
-
88
- def indentation_width
89
- @config.for_cop('Layout/IndentationWidth')['Width'] || 2
85
+ corrector.replace(blank_range, indentation(node))
90
86
  end
91
87
  end
92
88
  end