rubocop 1.29.1 → 1.48.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (655) hide show
  1. checksums.yaml +4 -4
  2. data/LICENSE.txt +1 -1
  3. data/README.md +6 -4
  4. data/config/default.yml +359 -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} +27 -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 +60 -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 +5 -3
  26. data/lib/rubocop/cop/badge.rb +9 -4
  27. data/lib/rubocop/cop/base.rb +115 -83
  28. data/lib/rubocop/cop/bundler/duplicated_gem.rb +1 -1
  29. data/lib/rubocop/cop/bundler/gem_comment.rb +1 -1
  30. data/lib/rubocop/cop/bundler/gem_filename.rb +5 -5
  31. data/lib/rubocop/cop/bundler/ordered_gems.rb +2 -2
  32. data/lib/rubocop/cop/commissioner.rb +19 -6
  33. data/lib/rubocop/cop/cop.rb +52 -32
  34. data/lib/rubocop/cop/corrector.rb +33 -13
  35. data/lib/rubocop/cop/correctors/alignment_corrector.rb +3 -3
  36. data/lib/rubocop/cop/correctors/condition_corrector.rb +1 -1
  37. data/lib/rubocop/cop/correctors/each_to_for_corrector.rb +4 -4
  38. data/lib/rubocop/cop/correctors/empty_line_corrector.rb +1 -1
  39. data/lib/rubocop/cop/correctors/for_to_each_corrector.rb +7 -5
  40. data/lib/rubocop/cop/correctors/if_then_corrector.rb +1 -1
  41. data/lib/rubocop/cop/correctors/lambda_literal_to_method_corrector.rb +1 -1
  42. data/lib/rubocop/cop/correctors/line_break_corrector.rb +8 -2
  43. data/lib/rubocop/cop/correctors/multiline_literal_brace_corrector.rb +26 -10
  44. data/lib/rubocop/cop/correctors/ordered_gem_corrector.rb +3 -8
  45. data/lib/rubocop/cop/correctors/parentheses_corrector.rb +59 -1
  46. data/lib/rubocop/cop/correctors/percent_literal_corrector.rb +1 -1
  47. data/lib/rubocop/cop/correctors/punctuation_corrector.rb +1 -1
  48. data/lib/rubocop/cop/correctors/space_corrector.rb +1 -1
  49. data/lib/rubocop/cop/correctors/string_literal_corrector.rb +1 -1
  50. data/lib/rubocop/cop/correctors/unused_arg_corrector.rb +2 -2
  51. data/lib/rubocop/cop/gemspec/dependency_version.rb +16 -18
  52. data/lib/rubocop/cop/gemspec/deprecated_attribute_assignment.rb +92 -0
  53. data/lib/rubocop/cop/gemspec/development_dependencies.rb +107 -0
  54. data/lib/rubocop/cop/gemspec/duplicated_assignment.rb +1 -1
  55. data/lib/rubocop/cop/gemspec/ordered_dependencies.rb +1 -1
  56. data/lib/rubocop/cop/gemspec/require_mfa.rb +21 -21
  57. data/lib/rubocop/cop/generator/require_file_injector.rb +2 -2
  58. data/lib/rubocop/cop/generator.rb +6 -3
  59. data/lib/rubocop/cop/internal_affairs/cop_description.rb +98 -0
  60. data/lib/rubocop/cop/internal_affairs/create_empty_file.rb +37 -0
  61. data/lib/rubocop/cop/internal_affairs/empty_line_between_expect_offense_and_correction.rb +1 -1
  62. data/lib/rubocop/cop/internal_affairs/example_heredoc_delimiter.rb +111 -0
  63. data/lib/rubocop/cop/internal_affairs/lambda_or_proc.rb +46 -0
  64. data/lib/rubocop/cop/internal_affairs/location_expression.rb +37 -0
  65. data/lib/rubocop/cop/internal_affairs/location_line_equality_comparison.rb +1 -1
  66. data/lib/rubocop/cop/internal_affairs/method_name_end_with.rb +1 -1
  67. data/lib/rubocop/cop/internal_affairs/node_matcher_directive.rb +1 -5
  68. data/lib/rubocop/cop/internal_affairs/node_type_predicate.rb +1 -1
  69. data/lib/rubocop/cop/internal_affairs/numblock_handler.rb +69 -0
  70. data/lib/rubocop/cop/internal_affairs/processed_source_buffer_name.rb +42 -0
  71. data/lib/rubocop/cop/internal_affairs/redundant_described_class_as_subject.rb +1 -1
  72. data/lib/rubocop/cop/internal_affairs/redundant_let_rubocop_config_new.rb +12 -4
  73. data/lib/rubocop/cop/internal_affairs/redundant_location_argument.rb +1 -1
  74. data/lib/rubocop/cop/internal_affairs/redundant_message_argument.rb +1 -1
  75. data/lib/rubocop/cop/internal_affairs/redundant_source_range.rb +39 -0
  76. data/lib/rubocop/cop/internal_affairs/single_line_comparison.rb +62 -0
  77. data/lib/rubocop/cop/internal_affairs/useless_restrict_on_send.rb +60 -0
  78. data/lib/rubocop/cop/internal_affairs.rb +10 -0
  79. data/lib/rubocop/cop/layout/argument_alignment.rb +22 -1
  80. data/lib/rubocop/cop/layout/array_alignment.rb +1 -1
  81. data/lib/rubocop/cop/layout/assignment_indentation.rb +1 -1
  82. data/lib/rubocop/cop/layout/begin_end_alignment.rb +1 -1
  83. data/lib/rubocop/cop/layout/block_alignment.rb +17 -13
  84. data/lib/rubocop/cop/layout/block_end_newline.rb +44 -8
  85. data/lib/rubocop/cop/layout/case_indentation.rb +1 -1
  86. data/lib/rubocop/cop/layout/class_structure.rb +36 -27
  87. data/lib/rubocop/cop/layout/closing_heredoc_indentation.rb +1 -1
  88. data/lib/rubocop/cop/layout/closing_parenthesis_indentation.rb +3 -7
  89. data/lib/rubocop/cop/layout/comment_indentation.rb +4 -2
  90. data/lib/rubocop/cop/layout/condition_position.rb +1 -1
  91. data/lib/rubocop/cop/layout/def_end_alignment.rb +1 -1
  92. data/lib/rubocop/cop/layout/dot_position.rb +1 -1
  93. data/lib/rubocop/cop/layout/else_alignment.rb +1 -1
  94. data/lib/rubocop/cop/layout/empty_comment.rb +4 -4
  95. data/lib/rubocop/cop/layout/empty_line_after_guard_clause.rb +1 -1
  96. data/lib/rubocop/cop/layout/empty_line_after_multiline_condition.rb +1 -1
  97. data/lib/rubocop/cop/layout/empty_line_between_defs.rb +2 -2
  98. data/lib/rubocop/cop/layout/empty_lines.rb +3 -1
  99. data/lib/rubocop/cop/layout/empty_lines_around_access_modifier.rb +5 -2
  100. data/lib/rubocop/cop/layout/empty_lines_around_arguments.rb +1 -1
  101. data/lib/rubocop/cop/layout/empty_lines_around_attribute_accessor.rb +25 -4
  102. data/lib/rubocop/cop/layout/empty_lines_around_begin_body.rb +1 -1
  103. data/lib/rubocop/cop/layout/empty_lines_around_block_body.rb +7 -5
  104. data/lib/rubocop/cop/layout/empty_lines_around_class_body.rb +10 -10
  105. data/lib/rubocop/cop/layout/empty_lines_around_exception_handling_keywords.rb +1 -1
  106. data/lib/rubocop/cop/layout/empty_lines_around_method_body.rb +1 -1
  107. data/lib/rubocop/cop/layout/empty_lines_around_module_body.rb +10 -10
  108. data/lib/rubocop/cop/layout/end_alignment.rb +5 -1
  109. data/lib/rubocop/cop/layout/end_of_line.rb +5 -5
  110. data/lib/rubocop/cop/layout/extra_spacing.rb +10 -6
  111. data/lib/rubocop/cop/layout/first_argument_indentation.rb +37 -31
  112. data/lib/rubocop/cop/layout/first_array_element_indentation.rb +21 -14
  113. data/lib/rubocop/cop/layout/first_array_element_line_break.rb +39 -3
  114. data/lib/rubocop/cop/layout/first_hash_element_indentation.rb +52 -13
  115. data/lib/rubocop/cop/layout/first_hash_element_line_break.rb +50 -3
  116. data/lib/rubocop/cop/layout/first_method_argument_line_break.rb +62 -3
  117. data/lib/rubocop/cop/layout/first_method_parameter_line_break.rb +53 -3
  118. data/lib/rubocop/cop/layout/first_parameter_indentation.rb +1 -1
  119. data/lib/rubocop/cop/layout/hash_alignment.rb +2 -0
  120. data/lib/rubocop/cop/layout/heredoc_argument_closing_parenthesis.rb +9 -3
  121. data/lib/rubocop/cop/layout/heredoc_indentation.rb +9 -12
  122. data/lib/rubocop/cop/layout/indentation_consistency.rb +1 -1
  123. data/lib/rubocop/cop/layout/indentation_style.rb +8 -3
  124. data/lib/rubocop/cop/layout/indentation_width.rb +14 -7
  125. data/lib/rubocop/cop/layout/initial_indentation.rb +2 -2
  126. data/lib/rubocop/cop/layout/leading_comment_space.rb +2 -2
  127. data/lib/rubocop/cop/layout/leading_empty_lines.rb +1 -1
  128. data/lib/rubocop/cop/layout/line_continuation_leading_space.rb +136 -0
  129. data/lib/rubocop/cop/layout/line_continuation_spacing.rb +140 -0
  130. data/lib/rubocop/cop/layout/line_end_string_concatenation_indentation.rb +1 -1
  131. data/lib/rubocop/cop/layout/line_length.rb +9 -2
  132. data/lib/rubocop/cop/layout/multiline_array_brace_layout.rb +1 -1
  133. data/lib/rubocop/cop/layout/multiline_array_line_breaks.rb +52 -3
  134. data/lib/rubocop/cop/layout/multiline_assignment_layout.rb +2 -2
  135. data/lib/rubocop/cop/layout/multiline_block_layout.rb +5 -3
  136. data/lib/rubocop/cop/layout/multiline_hash_brace_layout.rb +1 -1
  137. data/lib/rubocop/cop/layout/multiline_hash_key_line_breaks.rb +50 -3
  138. data/lib/rubocop/cop/layout/multiline_method_argument_line_breaks.rb +58 -4
  139. data/lib/rubocop/cop/layout/multiline_method_call_brace_layout.rb +1 -1
  140. data/lib/rubocop/cop/layout/multiline_method_call_indentation.rb +3 -3
  141. data/lib/rubocop/cop/layout/multiline_method_definition_brace_layout.rb +1 -1
  142. data/lib/rubocop/cop/layout/multiline_method_parameter_line_breaks.rb +101 -0
  143. data/lib/rubocop/cop/layout/multiline_operation_indentation.rb +3 -3
  144. data/lib/rubocop/cop/layout/redundant_line_break.rb +4 -4
  145. data/lib/rubocop/cop/layout/rescue_ensure_alignment.rb +3 -3
  146. data/lib/rubocop/cop/layout/single_line_block_chain.rb +1 -1
  147. data/lib/rubocop/cop/layout/space_after_not.rb +1 -1
  148. data/lib/rubocop/cop/layout/space_around_block_parameters.rb +2 -2
  149. data/lib/rubocop/cop/layout/space_around_keyword.rb +3 -3
  150. data/lib/rubocop/cop/layout/space_around_operators.rb +2 -2
  151. data/lib/rubocop/cop/layout/space_before_block_braces.rb +5 -3
  152. data/lib/rubocop/cop/layout/space_before_comment.rb +1 -1
  153. data/lib/rubocop/cop/layout/space_before_first_arg.rb +1 -1
  154. data/lib/rubocop/cop/layout/space_in_lambda_literal.rb +3 -3
  155. data/lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb +32 -30
  156. data/lib/rubocop/cop/layout/space_inside_array_percent_literal.rb +3 -0
  157. data/lib/rubocop/cop/layout/space_inside_block_braces.rb +33 -15
  158. data/lib/rubocop/cop/layout/space_inside_hash_literal_braces.rb +30 -3
  159. data/lib/rubocop/cop/layout/space_inside_percent_literal_delimiters.rb +34 -0
  160. data/lib/rubocop/cop/layout/space_inside_reference_brackets.rb +10 -6
  161. data/lib/rubocop/cop/layout/space_inside_string_interpolation.rb +6 -5
  162. data/lib/rubocop/cop/layout/trailing_empty_lines.rb +9 -9
  163. data/lib/rubocop/cop/layout/trailing_whitespace.rb +14 -7
  164. data/lib/rubocop/cop/legacy/corrections_proxy.rb +1 -1
  165. data/lib/rubocop/cop/legacy/corrector.rb +1 -1
  166. data/lib/rubocop/cop/lint/ambiguous_assignment.rb +1 -1
  167. data/lib/rubocop/cop/lint/ambiguous_block_association.rb +28 -8
  168. data/lib/rubocop/cop/lint/ambiguous_operator.rb +5 -1
  169. data/lib/rubocop/cop/lint/ambiguous_operator_precedence.rb +1 -1
  170. data/lib/rubocop/cop/lint/ambiguous_range.rb +3 -3
  171. data/lib/rubocop/cop/lint/ambiguous_regexp_literal.rb +1 -1
  172. data/lib/rubocop/cop/lint/assignment_in_condition.rb +12 -2
  173. data/lib/rubocop/cop/lint/binary_operator_with_identical_operands.rb +1 -1
  174. data/lib/rubocop/cop/lint/boolean_symbol.rb +1 -1
  175. data/lib/rubocop/cop/lint/circular_argument_reference.rb +1 -1
  176. data/lib/rubocop/cop/lint/constant_overwritten_in_rescue.rb +51 -0
  177. data/lib/rubocop/cop/lint/constant_resolution.rb +5 -1
  178. data/lib/rubocop/cop/lint/debugger.rb +28 -32
  179. data/lib/rubocop/cop/lint/deprecated_class_methods.rb +67 -111
  180. data/lib/rubocop/cop/lint/deprecated_constants.rb +9 -2
  181. data/lib/rubocop/cop/lint/deprecated_open_ssl_constant.rb +1 -1
  182. data/lib/rubocop/cop/lint/disjunctive_assignment_in_constructor.rb +1 -1
  183. data/lib/rubocop/cop/lint/duplicate_branch.rb +1 -3
  184. data/lib/rubocop/cop/lint/duplicate_case_condition.rb +1 -1
  185. data/lib/rubocop/cop/lint/duplicate_elsif_condition.rb +1 -1
  186. data/lib/rubocop/cop/lint/duplicate_hash_key.rb +1 -1
  187. data/lib/rubocop/cop/lint/duplicate_magic_comment.rb +73 -0
  188. data/lib/rubocop/cop/lint/duplicate_methods.rb +49 -19
  189. data/lib/rubocop/cop/lint/duplicate_regexp_character_class_element.rb +27 -10
  190. data/lib/rubocop/cop/lint/duplicate_require.rb +1 -1
  191. data/lib/rubocop/cop/lint/duplicate_rescue_exception.rb +1 -1
  192. data/lib/rubocop/cop/lint/each_with_object_argument.rb +1 -1
  193. data/lib/rubocop/cop/lint/else_layout.rb +6 -10
  194. data/lib/rubocop/cop/lint/empty_block.rb +4 -8
  195. data/lib/rubocop/cop/lint/empty_class.rb +4 -2
  196. data/lib/rubocop/cop/lint/empty_conditional_body.rb +111 -3
  197. data/lib/rubocop/cop/lint/empty_ensure.rb +1 -1
  198. data/lib/rubocop/cop/lint/empty_expression.rb +1 -1
  199. data/lib/rubocop/cop/lint/empty_file.rb +1 -1
  200. data/lib/rubocop/cop/lint/empty_in_pattern.rb +1 -1
  201. data/lib/rubocop/cop/lint/empty_interpolation.rb +2 -2
  202. data/lib/rubocop/cop/lint/empty_when.rb +1 -1
  203. data/lib/rubocop/cop/lint/ensure_return.rb +1 -1
  204. data/lib/rubocop/cop/lint/erb_new_arguments.rb +9 -9
  205. data/lib/rubocop/cop/lint/flip_flop.rb +1 -1
  206. data/lib/rubocop/cop/lint/float_comparison.rb +1 -1
  207. data/lib/rubocop/cop/lint/float_out_of_range.rb +1 -1
  208. data/lib/rubocop/cop/lint/format_parameter_mismatch.rb +14 -7
  209. data/lib/rubocop/cop/lint/heredoc_method_call_position.rb +16 -18
  210. data/lib/rubocop/cop/lint/implicit_string_concatenation.rb +2 -2
  211. data/lib/rubocop/cop/lint/incompatible_io_select_with_fiber_scheduler.rb +1 -1
  212. data/lib/rubocop/cop/lint/ineffective_access_modifier.rb +2 -2
  213. data/lib/rubocop/cop/lint/inherit_exception.rb +1 -1
  214. data/lib/rubocop/cop/lint/interpolation_check.rb +6 -5
  215. data/lib/rubocop/cop/lint/lambda_without_literal_block.rb +2 -2
  216. data/lib/rubocop/cop/lint/literal_as_condition.rb +6 -1
  217. data/lib/rubocop/cop/lint/literal_in_interpolation.rb +49 -3
  218. data/lib/rubocop/cop/lint/loop.rb +1 -1
  219. data/lib/rubocop/cop/lint/missing_cop_enable_directive.rb +19 -4
  220. data/lib/rubocop/cop/lint/missing_super.rb +32 -3
  221. data/lib/rubocop/cop/lint/mixed_regexp_capture_types.rb +1 -0
  222. data/lib/rubocop/cop/lint/nested_method_definition.rb +52 -8
  223. data/lib/rubocop/cop/lint/nested_percent_literal.rb +1 -1
  224. data/lib/rubocop/cop/lint/next_without_accumulator.rb +25 -6
  225. data/lib/rubocop/cop/lint/non_atomic_file_operation.rb +162 -0
  226. data/lib/rubocop/cop/lint/non_deterministic_require_order.rb +12 -0
  227. data/lib/rubocop/cop/lint/non_local_exit_from_iterator.rb +1 -1
  228. data/lib/rubocop/cop/lint/number_conversion.rb +32 -10
  229. data/lib/rubocop/cop/lint/numbered_parameter_assignment.rb +1 -1
  230. data/lib/rubocop/cop/lint/or_assignment_to_constant.rb +4 -3
  231. data/lib/rubocop/cop/lint/ordered_magic_comments.rb +4 -5
  232. data/lib/rubocop/cop/lint/out_of_range_regexp_ref.rb +16 -1
  233. data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb +6 -1
  234. data/lib/rubocop/cop/lint/percent_string_array.rb +2 -2
  235. data/lib/rubocop/cop/lint/percent_symbol_array.rb +2 -2
  236. data/lib/rubocop/cop/lint/raise_exception.rb +1 -1
  237. data/lib/rubocop/cop/lint/rand_one.rb +1 -1
  238. data/lib/rubocop/cop/lint/redundant_cop_disable_directive.rb +54 -14
  239. data/lib/rubocop/cop/lint/redundant_cop_enable_directive.rb +8 -8
  240. data/lib/rubocop/cop/lint/redundant_dir_glob_sort.rb +7 -0
  241. data/lib/rubocop/cop/lint/redundant_require_statement.rb +48 -7
  242. data/lib/rubocop/cop/lint/redundant_safe_navigation.rb +16 -3
  243. data/lib/rubocop/cop/lint/redundant_splat_expansion.rb +2 -2
  244. data/lib/rubocop/cop/lint/redundant_string_coercion.rb +1 -1
  245. data/lib/rubocop/cop/lint/redundant_with_index.rb +15 -12
  246. data/lib/rubocop/cop/lint/redundant_with_object.rb +14 -13
  247. data/lib/rubocop/cop/lint/refinement_import_methods.rb +3 -2
  248. data/lib/rubocop/cop/lint/regexp_as_condition.rb +9 -3
  249. data/lib/rubocop/cop/lint/require_parentheses.rb +4 -2
  250. data/lib/rubocop/cop/lint/require_range_parentheses.rb +57 -0
  251. data/lib/rubocop/cop/lint/rescue_exception.rb +1 -1
  252. data/lib/rubocop/cop/lint/rescue_type.rb +3 -3
  253. data/lib/rubocop/cop/lint/return_in_void_context.rb +1 -1
  254. data/lib/rubocop/cop/lint/safe_navigation_chain.rb +44 -8
  255. data/lib/rubocop/cop/lint/safe_navigation_consistency.rb +2 -2
  256. data/lib/rubocop/cop/lint/safe_navigation_with_empty.rb +1 -1
  257. data/lib/rubocop/cop/lint/script_permission.rb +2 -2
  258. data/lib/rubocop/cop/lint/self_assignment.rb +1 -1
  259. data/lib/rubocop/cop/lint/send_with_mixin_argument.rb +5 -4
  260. data/lib/rubocop/cop/lint/shadowed_argument.rb +1 -1
  261. data/lib/rubocop/cop/lint/shadowed_exception.rb +17 -12
  262. data/lib/rubocop/cop/lint/shadowing_outer_local_variable.rb +29 -4
  263. data/lib/rubocop/cop/lint/struct_new_override.rb +3 -3
  264. data/lib/rubocop/cop/lint/suppressed_exception.rb +2 -2
  265. data/lib/rubocop/cop/lint/symbol_conversion.rb +1 -1
  266. data/lib/rubocop/cop/lint/syntax.rb +1 -1
  267. data/lib/rubocop/cop/lint/to_enum_arguments.rb +7 -3
  268. data/lib/rubocop/cop/lint/to_json.rb +1 -1
  269. data/lib/rubocop/cop/lint/top_level_return_with_argument.rb +1 -1
  270. data/lib/rubocop/cop/lint/trailing_comma_in_attribute_declaration.rb +2 -2
  271. data/lib/rubocop/cop/lint/triple_quotes.rb +1 -1
  272. data/lib/rubocop/cop/lint/underscore_prefixed_variable_name.rb +1 -1
  273. data/lib/rubocop/cop/lint/unexpected_block_arity.rb +1 -1
  274. data/lib/rubocop/cop/lint/unified_integer.rb +3 -1
  275. data/lib/rubocop/cop/lint/unreachable_code.rb +1 -1
  276. data/lib/rubocop/cop/lint/unreachable_loop.rb +10 -4
  277. data/lib/rubocop/cop/lint/unused_block_argument.rb +1 -1
  278. data/lib/rubocop/cop/lint/unused_method_argument.rb +7 -2
  279. data/lib/rubocop/cop/lint/uri_escape_unescape.rb +1 -1
  280. data/lib/rubocop/cop/lint/uri_regexp.rb +1 -1
  281. data/lib/rubocop/cop/lint/useless_access_modifier.rb +18 -13
  282. data/lib/rubocop/cop/lint/useless_assignment.rb +1 -1
  283. data/lib/rubocop/cop/lint/useless_else_without_rescue.rb +44 -0
  284. data/lib/rubocop/cop/lint/useless_method_definition.rb +4 -4
  285. data/lib/rubocop/cop/lint/useless_rescue.rb +86 -0
  286. data/lib/rubocop/cop/lint/useless_ruby2_keywords.rb +16 -6
  287. data/lib/rubocop/cop/lint/useless_setter_call.rb +2 -2
  288. data/lib/rubocop/cop/lint/useless_times.rb +2 -2
  289. data/lib/rubocop/cop/lint/void.rb +27 -16
  290. data/lib/rubocop/cop/metrics/abc_size.rb +5 -3
  291. data/lib/rubocop/cop/metrics/block_length.rb +17 -12
  292. data/lib/rubocop/cop/metrics/block_nesting.rb +2 -2
  293. data/lib/rubocop/cop/metrics/class_length.rb +10 -5
  294. data/lib/rubocop/cop/metrics/collection_literal_length.rb +76 -0
  295. data/lib/rubocop/cop/metrics/cyclomatic_complexity.rb +2 -2
  296. data/lib/rubocop/cop/metrics/method_length.rb +18 -12
  297. data/lib/rubocop/cop/metrics/module_length.rb +10 -5
  298. data/lib/rubocop/cop/metrics/parameter_lists.rb +28 -1
  299. data/lib/rubocop/cop/metrics/perceived_complexity.rb +2 -2
  300. data/lib/rubocop/cop/metrics/utils/abc_size_calculator.rb +3 -6
  301. data/lib/rubocop/cop/metrics/utils/code_length_calculator.rb +9 -6
  302. data/lib/rubocop/cop/migration/department_name.rb +1 -1
  303. data/lib/rubocop/cop/mixin/alignment.rb +2 -2
  304. data/lib/rubocop/cop/mixin/allowed_identifiers.rb +2 -2
  305. data/lib/rubocop/cop/mixin/allowed_methods.rb +23 -2
  306. data/lib/rubocop/cop/mixin/allowed_pattern.rb +17 -1
  307. data/lib/rubocop/cop/mixin/annotation_comment.rb +14 -7
  308. data/lib/rubocop/cop/mixin/check_line_breakable.rb +5 -1
  309. data/lib/rubocop/cop/mixin/code_length.rb +1 -1
  310. data/lib/rubocop/cop/mixin/comments_help.rb +24 -6
  311. data/lib/rubocop/cop/mixin/configurable_enforced_style.rb +21 -9
  312. data/lib/rubocop/cop/mixin/def_node.rb +2 -7
  313. data/lib/rubocop/cop/mixin/documentation_comment.rb +1 -1
  314. data/lib/rubocop/cop/mixin/enforce_superclass.rb +2 -1
  315. data/lib/rubocop/cop/mixin/first_element_line_break.rb +11 -7
  316. data/lib/rubocop/cop/mixin/frozen_string_literal.rb +4 -0
  317. data/lib/rubocop/cop/mixin/hash_alignment_styles.rb +1 -1
  318. data/lib/rubocop/cop/mixin/hash_shorthand_syntax.rb +156 -12
  319. data/lib/rubocop/cop/mixin/hash_transform_method.rb +13 -9
  320. data/lib/rubocop/cop/mixin/line_length_help.rb +11 -2
  321. data/lib/rubocop/cop/mixin/method_complexity.rb +13 -16
  322. data/lib/rubocop/cop/mixin/min_branches_count.rb +40 -0
  323. data/lib/rubocop/cop/mixin/multiline_element_indentation.rb +34 -12
  324. data/lib/rubocop/cop/mixin/multiline_element_line_breaks.rb +5 -6
  325. data/lib/rubocop/cop/mixin/ordered_gem_node.rb +1 -1
  326. data/lib/rubocop/cop/mixin/percent_array.rb +58 -1
  327. data/lib/rubocop/cop/mixin/preceding_following_alignment.rb +1 -1
  328. data/lib/rubocop/cop/mixin/range_help.rb +28 -7
  329. data/lib/rubocop/cop/mixin/require_library.rb +2 -0
  330. data/lib/rubocop/cop/mixin/rescue_node.rb +5 -3
  331. data/lib/rubocop/cop/mixin/statement_modifier.rb +17 -2
  332. data/lib/rubocop/cop/mixin/string_help.rb +1 -1
  333. data/lib/rubocop/cop/mixin/surrounding_space.rb +13 -11
  334. data/lib/rubocop/cop/mixin/trailing_comma.rb +2 -2
  335. data/lib/rubocop/cop/mixin/visibility_help.rb +40 -5
  336. data/lib/rubocop/cop/naming/accessor_method_name.rb +4 -2
  337. data/lib/rubocop/cop/naming/ascii_identifiers.rb +1 -1
  338. data/lib/rubocop/cop/naming/binary_operator_parameter_name.rb +1 -1
  339. data/lib/rubocop/cop/naming/block_forwarding.rb +7 -3
  340. data/lib/rubocop/cop/naming/block_parameter_name.rb +2 -2
  341. data/lib/rubocop/cop/naming/class_and_module_camel_case.rb +4 -2
  342. data/lib/rubocop/cop/naming/constant_name.rb +3 -3
  343. data/lib/rubocop/cop/naming/file_name.rb +1 -1
  344. data/lib/rubocop/cop/naming/heredoc_delimiter_case.rb +2 -2
  345. data/lib/rubocop/cop/naming/heredoc_delimiter_naming.rb +1 -1
  346. data/lib/rubocop/cop/naming/inclusive_language.rb +5 -2
  347. data/lib/rubocop/cop/naming/memoized_instance_variable_name.rb +1 -1
  348. data/lib/rubocop/cop/naming/method_name.rb +2 -2
  349. data/lib/rubocop/cop/naming/method_parameter_name.rb +1 -1
  350. data/lib/rubocop/cop/naming/predicate_name.rb +31 -2
  351. data/lib/rubocop/cop/naming/rescued_exceptions_variable_name.rb +2 -2
  352. data/lib/rubocop/cop/naming/variable_name.rb +1 -1
  353. data/lib/rubocop/cop/naming/variable_number.rb +18 -18
  354. data/lib/rubocop/cop/registry.rb +73 -45
  355. data/lib/rubocop/cop/security/compound_hash.rb +3 -2
  356. data/lib/rubocop/cop/security/eval.rb +1 -1
  357. data/lib/rubocop/cop/security/json_load.rb +1 -1
  358. data/lib/rubocop/cop/security/marshal_load.rb +1 -1
  359. data/lib/rubocop/cop/security/open.rb +1 -1
  360. data/lib/rubocop/cop/security/yaml_load.rb +1 -1
  361. data/lib/rubocop/cop/style/access_modifier_declarations.rb +92 -3
  362. data/lib/rubocop/cop/style/accessor_grouping.rb +45 -19
  363. data/lib/rubocop/cop/style/alias.rb +10 -2
  364. data/lib/rubocop/cop/style/and_or.rb +11 -11
  365. data/lib/rubocop/cop/style/arguments_forwarding.rb +7 -6
  366. data/lib/rubocop/cop/style/array_coercion.rb +1 -1
  367. data/lib/rubocop/cop/style/array_intersect.rb +111 -0
  368. data/lib/rubocop/cop/style/array_join.rb +1 -1
  369. data/lib/rubocop/cop/style/ascii_comments.rb +2 -2
  370. data/lib/rubocop/cop/style/attr.rb +1 -1
  371. data/lib/rubocop/cop/style/auto_resource_cleanup.rb +1 -1
  372. data/lib/rubocop/cop/style/bare_percent_literals.rb +1 -1
  373. data/lib/rubocop/cop/style/bisected_attr_accessor.rb +2 -2
  374. data/lib/rubocop/cop/style/block_comments.rb +3 -3
  375. data/lib/rubocop/cop/style/block_delimiters.rb +47 -11
  376. data/lib/rubocop/cop/style/case_equality.rb +41 -11
  377. data/lib/rubocop/cop/style/case_like_if.rb +21 -4
  378. data/lib/rubocop/cop/style/character_literal.rb +1 -1
  379. data/lib/rubocop/cop/style/class_and_module_children.rb +8 -15
  380. data/lib/rubocop/cop/style/class_check.rb +1 -1
  381. data/lib/rubocop/cop/style/class_equality_comparison.rb +55 -6
  382. data/lib/rubocop/cop/style/class_methods.rb +1 -1
  383. data/lib/rubocop/cop/style/class_methods_definitions.rb +3 -2
  384. data/lib/rubocop/cop/style/class_vars.rb +1 -1
  385. data/lib/rubocop/cop/style/collection_compact.rb +13 -4
  386. data/lib/rubocop/cop/style/collection_methods.rb +3 -1
  387. data/lib/rubocop/cop/style/colon_method_call.rb +1 -1
  388. data/lib/rubocop/cop/style/colon_method_definition.rb +1 -1
  389. data/lib/rubocop/cop/style/combinable_loops.rb +4 -2
  390. data/lib/rubocop/cop/style/command_literal.rb +2 -2
  391. data/lib/rubocop/cop/style/comment_annotation.rb +2 -2
  392. data/lib/rubocop/cop/style/commented_keyword.rb +5 -5
  393. data/lib/rubocop/cop/style/comparable_clamp.rb +125 -0
  394. data/lib/rubocop/cop/style/concat_array_literals.rb +94 -0
  395. data/lib/rubocop/cop/style/conditional_assignment.rb +8 -13
  396. data/lib/rubocop/cop/style/constant_visibility.rb +1 -1
  397. data/lib/rubocop/cop/style/date_time.rb +1 -1
  398. data/lib/rubocop/cop/style/def_with_parentheses.rb +1 -1
  399. data/lib/rubocop/cop/style/dir.rb +4 -1
  400. data/lib/rubocop/cop/style/dir_empty.rb +60 -0
  401. data/lib/rubocop/cop/style/document_dynamic_eval_definition.rb +1 -1
  402. data/lib/rubocop/cop/style/documentation.rb +22 -10
  403. data/lib/rubocop/cop/style/documentation_method.rb +11 -5
  404. data/lib/rubocop/cop/style/double_negation.rb +3 -1
  405. data/lib/rubocop/cop/style/each_for_simple_loop.rb +42 -7
  406. data/lib/rubocop/cop/style/each_with_object.rb +41 -10
  407. data/lib/rubocop/cop/style/empty_block_parameter.rb +3 -3
  408. data/lib/rubocop/cop/style/empty_case_condition.rb +1 -1
  409. data/lib/rubocop/cop/style/empty_else.rb +40 -3
  410. data/lib/rubocop/cop/style/empty_heredoc.rb +73 -0
  411. data/lib/rubocop/cop/style/empty_lambda_parameter.rb +3 -3
  412. data/lib/rubocop/cop/style/empty_literal.rb +1 -1
  413. data/lib/rubocop/cop/style/empty_method.rb +18 -3
  414. data/lib/rubocop/cop/style/encoding.rb +2 -2
  415. data/lib/rubocop/cop/style/end_block.rb +1 -1
  416. data/lib/rubocop/cop/style/endless_method.rb +2 -2
  417. data/lib/rubocop/cop/style/env_home.rb +1 -1
  418. data/lib/rubocop/cop/style/eval_with_location.rb +5 -5
  419. data/lib/rubocop/cop/style/even_odd.rb +1 -1
  420. data/lib/rubocop/cop/style/expand_path_arguments.rb +1 -1
  421. data/lib/rubocop/cop/style/explicit_block_argument.rb +7 -3
  422. data/lib/rubocop/cop/style/exponential_notation.rb +1 -1
  423. data/lib/rubocop/cop/style/fetch_env_var.rb +37 -224
  424. data/lib/rubocop/cop/style/file_empty.rb +71 -0
  425. data/lib/rubocop/cop/style/file_read.rb +1 -1
  426. data/lib/rubocop/cop/style/file_write.rb +1 -1
  427. data/lib/rubocop/cop/style/float_division.rb +1 -1
  428. data/lib/rubocop/cop/style/for.rb +3 -1
  429. data/lib/rubocop/cop/style/format_string.rb +1 -1
  430. data/lib/rubocop/cop/style/format_string_token.rb +73 -23
  431. data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +6 -3
  432. data/lib/rubocop/cop/style/global_std_stream.rb +1 -1
  433. data/lib/rubocop/cop/style/global_vars.rb +1 -1
  434. data/lib/rubocop/cop/style/guard_clause.rb +132 -43
  435. data/lib/rubocop/cop/style/hash_as_last_array_item.rb +2 -1
  436. data/lib/rubocop/cop/style/hash_conversion.rb +1 -1
  437. data/lib/rubocop/cop/style/hash_each_methods.rb +49 -13
  438. data/lib/rubocop/cop/style/hash_except.rb +89 -9
  439. data/lib/rubocop/cop/style/hash_like_case.rb +4 -10
  440. data/lib/rubocop/cop/style/hash_syntax.rb +25 -4
  441. data/lib/rubocop/cop/style/hash_transform_keys.rb +6 -1
  442. data/lib/rubocop/cop/style/hash_transform_values.rb +4 -1
  443. data/lib/rubocop/cop/style/identical_conditional_branches.rb +17 -2
  444. data/lib/rubocop/cop/style/if_unless_modifier.rb +77 -10
  445. data/lib/rubocop/cop/style/if_with_boolean_literal_branches.rb +31 -4
  446. data/lib/rubocop/cop/style/if_with_semicolon.rb +4 -4
  447. data/lib/rubocop/cop/style/implicit_runtime_error.rb +3 -3
  448. data/lib/rubocop/cop/style/in_pattern_then.rb +1 -1
  449. data/lib/rubocop/cop/style/infinite_loop.rb +2 -5
  450. data/lib/rubocop/cop/style/inline_comment.rb +1 -1
  451. data/lib/rubocop/cop/style/inverse_methods.rb +17 -13
  452. data/lib/rubocop/cop/style/invertible_unless_condition.rb +114 -0
  453. data/lib/rubocop/cop/style/ip_addresses.rb +1 -1
  454. data/lib/rubocop/cop/style/keyword_parameters_order.rb +2 -2
  455. data/lib/rubocop/cop/style/lambda.rb +1 -1
  456. data/lib/rubocop/cop/style/lambda_call.rb +1 -1
  457. data/lib/rubocop/cop/style/line_end_concatenation.rb +6 -3
  458. data/lib/rubocop/cop/style/magic_comment_format.rb +307 -0
  459. data/lib/rubocop/cop/style/map_compact_with_conditional_block.rb +136 -0
  460. data/lib/rubocop/cop/style/map_to_hash.rb +3 -3
  461. data/lib/rubocop/cop/style/map_to_set.rb +61 -0
  462. data/lib/rubocop/cop/style/method_call_with_args_parentheses/omit_parentheses.rb +39 -19
  463. data/lib/rubocop/cop/style/method_call_with_args_parentheses/require_parentheses.rb +5 -1
  464. data/lib/rubocop/cop/style/method_call_with_args_parentheses.rb +9 -9
  465. data/lib/rubocop/cop/style/method_call_without_args_parentheses.rb +22 -3
  466. data/lib/rubocop/cop/style/method_called_on_do_end_block.rb +5 -2
  467. data/lib/rubocop/cop/style/method_def_parentheses.rb +12 -5
  468. data/lib/rubocop/cop/style/min_max.rb +4 -4
  469. data/lib/rubocop/cop/style/min_max_comparison.rb +83 -0
  470. data/lib/rubocop/cop/style/missing_else.rb +37 -25
  471. data/lib/rubocop/cop/style/missing_respond_to_missing.rb +1 -1
  472. data/lib/rubocop/cop/style/mixin_grouping.rb +5 -5
  473. data/lib/rubocop/cop/style/mixin_usage.rb +1 -1
  474. data/lib/rubocop/cop/style/module_function.rb +30 -8
  475. data/lib/rubocop/cop/style/multiline_block_chain.rb +4 -2
  476. data/lib/rubocop/cop/style/multiline_if_modifier.rb +2 -6
  477. data/lib/rubocop/cop/style/multiline_if_then.rb +1 -1
  478. data/lib/rubocop/cop/style/multiline_in_pattern_then.rb +3 -5
  479. data/lib/rubocop/cop/style/multiline_memoization.rb +3 -3
  480. data/lib/rubocop/cop/style/multiline_method_signature.rb +3 -3
  481. data/lib/rubocop/cop/style/multiline_ternary_operator.rb +21 -6
  482. data/lib/rubocop/cop/style/multiline_when_then.rb +2 -4
  483. data/lib/rubocop/cop/style/multiple_comparison.rb +1 -1
  484. data/lib/rubocop/cop/style/mutable_constant.rb +1 -1
  485. data/lib/rubocop/cop/style/negated_if_else_condition.rb +18 -11
  486. data/lib/rubocop/cop/style/nested_file_dirname.rb +1 -1
  487. data/lib/rubocop/cop/style/nested_modifier.rb +1 -1
  488. data/lib/rubocop/cop/style/nested_parenthesized_calls.rb +11 -2
  489. data/lib/rubocop/cop/style/nested_ternary_operator.rb +20 -8
  490. data/lib/rubocop/cop/style/next.rb +3 -5
  491. data/lib/rubocop/cop/style/nil_comparison.rb +1 -1
  492. data/lib/rubocop/cop/style/nil_lambda.rb +5 -5
  493. data/lib/rubocop/cop/style/non_nil_check.rb +1 -1
  494. data/lib/rubocop/cop/style/not.rb +2 -2
  495. data/lib/rubocop/cop/style/numbered_parameters.rb +1 -1
  496. data/lib/rubocop/cop/style/numbered_parameters_limit.rb +12 -4
  497. data/lib/rubocop/cop/style/numeric_literal_prefix.rb +1 -1
  498. data/lib/rubocop/cop/style/numeric_literals.rb +16 -1
  499. data/lib/rubocop/cop/style/numeric_predicate.rb +53 -11
  500. data/lib/rubocop/cop/style/object_then.rb +6 -1
  501. data/lib/rubocop/cop/style/one_line_conditional.rb +4 -7
  502. data/lib/rubocop/cop/style/open_struct_use.rb +1 -1
  503. data/lib/rubocop/cop/style/operator_method_call.rb +67 -0
  504. data/lib/rubocop/cop/style/option_hash.rb +1 -1
  505. data/lib/rubocop/cop/style/optional_arguments.rb +1 -1
  506. data/lib/rubocop/cop/style/optional_boolean_parameter.rb +1 -1
  507. data/lib/rubocop/cop/style/or_assignment.rb +1 -1
  508. data/lib/rubocop/cop/style/parallel_assignment.rb +3 -1
  509. data/lib/rubocop/cop/style/parentheses_around_condition.rb +1 -1
  510. data/lib/rubocop/cop/style/percent_literal_delimiters.rb +1 -1
  511. data/lib/rubocop/cop/style/percent_q_literals.rb +1 -1
  512. data/lib/rubocop/cop/style/perl_backrefs.rb +23 -2
  513. data/lib/rubocop/cop/style/preferred_hash_methods.rb +1 -1
  514. data/lib/rubocop/cop/style/proc.rb +5 -2
  515. data/lib/rubocop/cop/style/quoted_symbols.rb +1 -1
  516. data/lib/rubocop/cop/style/raise_args.rb +1 -1
  517. data/lib/rubocop/cop/style/random_with_offset.rb +1 -1
  518. data/lib/rubocop/cop/style/redundant_argument.rb +5 -2
  519. data/lib/rubocop/cop/style/redundant_assignment.rb +1 -1
  520. data/lib/rubocop/cop/style/redundant_begin.rb +20 -6
  521. data/lib/rubocop/cop/style/redundant_capital_w.rb +1 -1
  522. data/lib/rubocop/cop/style/redundant_condition.rb +50 -13
  523. data/lib/rubocop/cop/style/redundant_conditional.rb +1 -5
  524. data/lib/rubocop/cop/style/redundant_constant_base.rb +85 -0
  525. data/lib/rubocop/cop/style/redundant_double_splat_hash_braces.rb +45 -0
  526. data/lib/rubocop/cop/style/redundant_each.rb +116 -0
  527. data/lib/rubocop/cop/style/redundant_exception.rb +1 -1
  528. data/lib/rubocop/cop/style/redundant_fetch_block.rb +2 -2
  529. data/lib/rubocop/cop/style/redundant_file_extension_in_require.rb +1 -1
  530. data/lib/rubocop/cop/style/redundant_freeze.rb +1 -1
  531. data/lib/rubocop/cop/style/redundant_heredoc_delimiter_quotes.rb +58 -0
  532. data/lib/rubocop/cop/style/redundant_initialize.rb +3 -1
  533. data/lib/rubocop/cop/style/redundant_interpolation.rb +24 -3
  534. data/lib/rubocop/cop/style/redundant_parentheses.rb +23 -25
  535. data/lib/rubocop/cop/style/redundant_percent_q.rb +1 -1
  536. data/lib/rubocop/cop/style/redundant_regexp_character_class.rb +9 -3
  537. data/lib/rubocop/cop/style/redundant_regexp_escape.rb +21 -4
  538. data/lib/rubocop/cop/style/redundant_return.rb +9 -2
  539. data/lib/rubocop/cop/style/redundant_self.rb +3 -1
  540. data/lib/rubocop/cop/style/redundant_self_assignment.rb +2 -2
  541. data/lib/rubocop/cop/style/redundant_self_assignment_branch.rb +1 -1
  542. data/lib/rubocop/cop/style/redundant_sort.rb +25 -10
  543. data/lib/rubocop/cop/style/redundant_sort_by.rb +25 -9
  544. data/lib/rubocop/cop/style/redundant_string_escape.rb +184 -0
  545. data/lib/rubocop/cop/style/regexp_literal.rb +1 -1
  546. data/lib/rubocop/cop/style/require_order.rb +133 -0
  547. data/lib/rubocop/cop/style/rescue_modifier.rb +2 -2
  548. data/lib/rubocop/cop/style/rescue_standard_error.rb +15 -15
  549. data/lib/rubocop/cop/style/return_nil.rb +1 -1
  550. data/lib/rubocop/cop/style/safe_navigation.rb +45 -11
  551. data/lib/rubocop/cop/style/sample.rb +1 -1
  552. data/lib/rubocop/cop/style/select_by_regexp.rb +14 -6
  553. data/lib/rubocop/cop/style/self_assignment.rb +3 -3
  554. data/lib/rubocop/cop/style/semicolon.rb +53 -6
  555. data/lib/rubocop/cop/style/send.rb +1 -1
  556. data/lib/rubocop/cop/style/signal_exception.rb +9 -7
  557. data/lib/rubocop/cop/style/single_line_block_params.rb +2 -2
  558. data/lib/rubocop/cop/style/single_line_methods.rb +2 -2
  559. data/lib/rubocop/cop/style/slicing_with_range.rb +2 -2
  560. data/lib/rubocop/cop/style/sole_nested_conditional.rb +44 -16
  561. data/lib/rubocop/cop/style/static_class.rb +33 -2
  562. data/lib/rubocop/cop/style/stderr_puts.rb +2 -2
  563. data/lib/rubocop/cop/style/string_concatenation.rb +6 -7
  564. data/lib/rubocop/cop/style/string_hash_keys.rb +5 -2
  565. data/lib/rubocop/cop/style/string_literals.rb +1 -5
  566. data/lib/rubocop/cop/style/string_literals_in_interpolation.rb +1 -1
  567. data/lib/rubocop/cop/style/string_methods.rb +1 -1
  568. data/lib/rubocop/cop/style/strip.rb +1 -1
  569. data/lib/rubocop/cop/style/struct_inheritance.rb +5 -5
  570. data/lib/rubocop/cop/style/swap_values.rb +2 -2
  571. data/lib/rubocop/cop/style/symbol_array.rb +12 -7
  572. data/lib/rubocop/cop/style/symbol_literal.rb +1 -1
  573. data/lib/rubocop/cop/style/symbol_proc.rb +46 -14
  574. data/lib/rubocop/cop/style/ternary_parentheses.rb +2 -14
  575. data/lib/rubocop/cop/style/top_level_method_definition.rb +3 -1
  576. data/lib/rubocop/cop/style/trailing_body_on_class.rb +1 -1
  577. data/lib/rubocop/cop/style/trailing_body_on_method_definition.rb +1 -1
  578. data/lib/rubocop/cop/style/trailing_body_on_module.rb +1 -1
  579. data/lib/rubocop/cop/style/trailing_comma_in_arguments.rb +5 -5
  580. data/lib/rubocop/cop/style/trailing_comma_in_array_literal.rb +1 -1
  581. data/lib/rubocop/cop/style/trailing_comma_in_block_args.rb +2 -2
  582. data/lib/rubocop/cop/style/trailing_comma_in_hash_literal.rb +1 -1
  583. data/lib/rubocop/cop/style/trailing_method_end_statement.rb +1 -1
  584. data/lib/rubocop/cop/style/trailing_underscore_variable.rb +2 -2
  585. data/lib/rubocop/cop/style/trivial_accessors.rb +4 -1
  586. data/lib/rubocop/cop/style/unless_else.rb +1 -1
  587. data/lib/rubocop/cop/style/unless_logical_operators.rb +1 -1
  588. data/lib/rubocop/cop/style/unpack_first.rb +8 -5
  589. data/lib/rubocop/cop/style/variable_interpolation.rb +1 -1
  590. data/lib/rubocop/cop/style/when_then.rb +1 -1
  591. data/lib/rubocop/cop/style/word_array.rb +60 -6
  592. data/lib/rubocop/cop/style/yoda_condition.rb +14 -7
  593. data/lib/rubocop/cop/style/yoda_expression.rb +90 -0
  594. data/lib/rubocop/cop/style/zero_length_predicate.rb +41 -20
  595. data/lib/rubocop/cop/team.rb +64 -57
  596. data/lib/rubocop/cop/util.rb +44 -8
  597. data/lib/rubocop/cop/variable_force/assignment.rb +1 -1
  598. data/lib/rubocop/cop/variable_force/scope.rb +3 -3
  599. data/lib/rubocop/cop/variable_force/variable.rb +5 -3
  600. data/lib/rubocop/cop/variable_force/variable_table.rb +4 -2
  601. data/lib/rubocop/cop/variable_force.rb +18 -30
  602. data/lib/rubocop/cops_documentation_generator.rb +53 -13
  603. data/lib/rubocop/directive_comment.rb +4 -4
  604. data/lib/rubocop/ext/comment.rb +18 -0
  605. data/lib/rubocop/ext/processed_source.rb +2 -0
  606. data/lib/rubocop/ext/range.rb +15 -0
  607. data/lib/rubocop/feature_loader.rb +94 -0
  608. data/lib/rubocop/file_patterns.rb +43 -0
  609. data/lib/rubocop/formatter/clang_style_formatter.rb +1 -1
  610. data/lib/rubocop/formatter/disabled_config_formatter.rb +36 -16
  611. data/lib/rubocop/formatter/formatter_set.rb +20 -19
  612. data/lib/rubocop/formatter/git_hub_actions_formatter.rb +15 -2
  613. data/lib/rubocop/formatter/html_formatter.rb +4 -5
  614. data/lib/rubocop/formatter/junit_formatter.rb +4 -1
  615. data/lib/rubocop/formatter/markdown_formatter.rb +3 -1
  616. data/lib/rubocop/formatter/offense_count_formatter.rb +10 -5
  617. data/lib/rubocop/formatter/simple_text_formatter.rb +9 -8
  618. data/lib/rubocop/formatter/tap_formatter.rb +1 -1
  619. data/lib/rubocop/formatter/worst_offenders_formatter.rb +6 -3
  620. data/lib/rubocop/formatter.rb +34 -0
  621. data/lib/rubocop/magic_comment.rb +27 -2
  622. data/lib/rubocop/options.rb +128 -53
  623. data/lib/rubocop/path_util.rb +50 -22
  624. data/lib/rubocop/rake_task.rb +34 -9
  625. data/lib/rubocop/result_cache.rb +26 -23
  626. data/lib/rubocop/rspec/cop_helper.rb +26 -3
  627. data/lib/rubocop/rspec/expect_offense.rb +9 -7
  628. data/lib/rubocop/rspec/shared_contexts.rb +46 -9
  629. data/lib/rubocop/rspec/support.rb +16 -2
  630. data/lib/rubocop/runner.rb +78 -23
  631. data/lib/rubocop/server/cache.rb +155 -0
  632. data/lib/rubocop/server/cli.rb +147 -0
  633. data/lib/rubocop/server/client_command/base.rb +44 -0
  634. data/lib/rubocop/server/client_command/exec.rb +64 -0
  635. data/lib/rubocop/server/client_command/restart.rb +25 -0
  636. data/lib/rubocop/server/client_command/start.rb +48 -0
  637. data/lib/rubocop/server/client_command/status.rb +28 -0
  638. data/lib/rubocop/server/client_command/stop.rb +31 -0
  639. data/lib/rubocop/server/client_command.rb +26 -0
  640. data/lib/rubocop/server/core.rb +111 -0
  641. data/lib/rubocop/server/errors.rb +23 -0
  642. data/lib/rubocop/server/helper.rb +34 -0
  643. data/lib/rubocop/server/server_command/base.rb +50 -0
  644. data/lib/rubocop/server/server_command/exec.rb +34 -0
  645. data/lib/rubocop/server/server_command/stop.rb +24 -0
  646. data/lib/rubocop/server/server_command.rb +21 -0
  647. data/lib/rubocop/server/socket_reader.rb +69 -0
  648. data/lib/rubocop/server.rb +53 -0
  649. data/lib/rubocop/target_finder.rb +1 -1
  650. data/lib/rubocop/target_ruby.rb +8 -7
  651. data/lib/rubocop/version.rb +22 -9
  652. data/lib/rubocop.rb +50 -35
  653. metadata +97 -36
  654. data/lib/rubocop/cop/gemspec/date_assignment.rb +0 -49
  655. data/lib/rubocop/cop/mixin/ignored_methods.rb +0 -52
@@ -0,0 +1,162 @@
1
+ # frozen_string_literal: true
2
+
3
+ module RuboCop
4
+ module Cop
5
+ module Lint
6
+ # Checks for non-atomic file operation.
7
+ # And then replace it with a nearly equivalent and atomic method.
8
+ #
9
+ # These can cause problems that are difficult to reproduce,
10
+ # especially in cases of frequent file operations in parallel,
11
+ # such as test runs with parallel_rspec.
12
+ #
13
+ # For examples: creating a directory if there is none, has the following problems
14
+ #
15
+ # An exception occurs when the directory didn't exist at the time of `exist?`,
16
+ # but someone else created it before `mkdir` was executed.
17
+ #
18
+ # Subsequent processes are executed without the directory that should be there
19
+ # when the directory existed at the time of `exist?`,
20
+ # but someone else deleted it shortly afterwards.
21
+ #
22
+ # @safety
23
+ # This cop is unsafe, because autocorrection change to atomic processing.
24
+ # The atomic processing of the replacement destination is not guaranteed
25
+ # to be strictly equivalent to that before the replacement.
26
+ #
27
+ # @example
28
+ # # bad - race condition with another process may result in an error in `mkdir`
29
+ # unless Dir.exist?(path)
30
+ # FileUtils.mkdir(path)
31
+ # end
32
+ #
33
+ # # good - atomic and idempotent creation
34
+ # FileUtils.mkdir_p(path)
35
+ #
36
+ # # bad - race condition with another process may result in an error in `remove`
37
+ # if File.exist?(path)
38
+ # FileUtils.remove(path)
39
+ # end
40
+ #
41
+ # # good - atomic and idempotent removal
42
+ # FileUtils.rm_f(path)
43
+ #
44
+ class NonAtomicFileOperation < Base
45
+ extend AutoCorrector
46
+ include Alignment
47
+
48
+ MSG_REMOVE_FILE_EXIST_CHECK = 'Remove unnecessary existence check ' \
49
+ '`%<receiver>s.%<method_name>s`.'
50
+ MSG_CHANGE_FORCE_METHOD = 'Use atomic file operation method `FileUtils.%<method_name>s`.'
51
+ MAKE_FORCE_METHODS = %i[makedirs mkdir_p mkpath].freeze
52
+ MAKE_METHODS = %i[mkdir].freeze
53
+ REMOVE_FORCE_METHODS = %i[rm_f rm_rf].freeze
54
+ REMOVE_METHODS = %i[remove remove_dir remove_entry remove_entry_secure
55
+ delete unlink remove_file rm rmdir safe_unlink].freeze
56
+ RESTRICT_ON_SEND = (MAKE_METHODS + MAKE_FORCE_METHODS + REMOVE_METHODS +
57
+ REMOVE_FORCE_METHODS).freeze
58
+
59
+ # @!method send_exist_node(node)
60
+ def_node_search :send_exist_node, <<-PATTERN
61
+ $(send (const nil? {:FileTest :File :Dir :Shell}) {:exist? :exists?} ...)
62
+ PATTERN
63
+
64
+ # @!method receiver_and_method_name(node)
65
+ def_node_matcher :receiver_and_method_name, <<-PATTERN
66
+ (send (const nil? $_) $_ ...)
67
+ PATTERN
68
+
69
+ # @!method force?(node)
70
+ def_node_search :force?, <<~PATTERN
71
+ (pair (sym :force) (:true))
72
+ PATTERN
73
+
74
+ # @!method explicit_not_force?(node)
75
+ def_node_search :explicit_not_force?, <<~PATTERN
76
+ (pair (sym :force) (:false))
77
+ PATTERN
78
+
79
+ def on_send(node)
80
+ return unless if_node_child?(node)
81
+ return if explicit_not_force?(node)
82
+ return unless (exist_node = send_exist_node(node.parent).first)
83
+ return unless exist_node.first_argument == node.first_argument
84
+
85
+ register_offense(node, exist_node)
86
+ end
87
+
88
+ private
89
+
90
+ def if_node_child?(node)
91
+ return false unless (parent = node.parent)
92
+
93
+ parent.if_type? && !allowable_use_with_if?(parent)
94
+ end
95
+
96
+ def allowable_use_with_if?(if_node)
97
+ if_node.condition.and_type? || if_node.condition.or_type? || if_node.else_branch
98
+ end
99
+
100
+ def register_offense(node, exist_node)
101
+ add_offense(node, message: message_change_force_method(node)) unless force_method?(node)
102
+
103
+ parent = node.parent
104
+ range = parent.loc.keyword.begin.join(parent.condition.source_range.end)
105
+
106
+ add_offense(range, message: message_remove_file_exist_check(exist_node)) do |corrector|
107
+ autocorrect(corrector, node, range) unless parent.elsif?
108
+ end
109
+ end
110
+
111
+ def message_change_force_method(node)
112
+ format(MSG_CHANGE_FORCE_METHOD, method_name: replacement_method(node))
113
+ end
114
+
115
+ def message_remove_file_exist_check(node)
116
+ receiver, method_name = receiver_and_method_name(node)
117
+ format(MSG_REMOVE_FILE_EXIST_CHECK, receiver: receiver, method_name: method_name)
118
+ end
119
+
120
+ def autocorrect(corrector, node, range)
121
+ corrector.remove(range)
122
+ autocorrect_replace_method(corrector, node)
123
+
124
+ if node.parent.modifier_form?
125
+ corrector.remove(node.source_range.end.join(node.parent.loc.keyword.begin))
126
+ else
127
+ corrector.remove(node.parent.loc.end)
128
+ end
129
+ end
130
+
131
+ def autocorrect_replace_method(corrector, node)
132
+ return if force_method?(node)
133
+
134
+ corrector.replace(node.child_nodes.first.loc.name, 'FileUtils')
135
+ corrector.replace(node.loc.selector, replacement_method(node))
136
+ end
137
+
138
+ def replacement_method(node)
139
+ if MAKE_METHODS.include?(node.method_name)
140
+ 'mkdir_p'
141
+ elsif REMOVE_METHODS.include?(node.method_name)
142
+ 'rm_f'
143
+ else
144
+ node.method_name
145
+ end
146
+ end
147
+
148
+ def force_method?(node)
149
+ force_method_name?(node) || force_option?(node)
150
+ end
151
+
152
+ def force_option?(node)
153
+ node.arguments.any? { |arg| force?(arg) }
154
+ end
155
+
156
+ def force_method_name?(node)
157
+ (MAKE_FORCE_METHODS + REMOVE_FORCE_METHODS).include?(node.method_name)
158
+ end
159
+ end
160
+ end
161
+ end
162
+ end
@@ -74,6 +74,18 @@ module RuboCop
74
74
  end
75
75
  end
76
76
 
77
+ def on_numblock(node)
78
+ return if target_ruby_version >= 3.0
79
+ return unless node.body
80
+ return unless unsorted_dir_loop?(node.send_node)
81
+
82
+ node.argument_list
83
+ .filter { |argument| var_is_required?(node.body, argument.name) }
84
+ .each do
85
+ add_offense(node.send_node) { |corrector| correct_block(corrector, node.send_node) }
86
+ end
87
+ end
88
+
77
89
  def on_block_pass(node)
78
90
  return if target_ruby_version >= 3.0
79
91
  return unless method_require?(node)
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Lint
6
- # This cop checks for non-local exits from iterators without a return
6
+ # Checks for non-local exits from iterators without a return
7
7
  # value. It registers an offense under these conditions:
8
8
  #
9
9
  # * No value is returned,
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Lint
6
- # This cop warns the usage of unsafe number conversions. Unsafe
6
+ # Warns the usage of unsafe number conversions. Unsafe
7
7
  # number conversion can cause unexpected error if auto type conversion
8
8
  # fails. Cop prefer parsing with number class instead.
9
9
  #
@@ -16,7 +16,8 @@ module RuboCop
16
16
  # NOTE: Some values cannot be converted properly using one of the `Kernel`
17
17
  # method (for instance, `Time` and `DateTime` values are allowed by this
18
18
  # cop by default). Similarly, Rails' duration methods do not work well
19
- # with `Integer()` and can be ignored with `IgnoredMethods`.
19
+ # with `Integer()` and can be allowed with `AllowedMethods`. By default,
20
+ # there are no methods to allowed.
20
21
  #
21
22
  # @safety
22
23
  # Autocorrection is unsafe because it is not guaranteed that the
@@ -45,7 +46,22 @@ module RuboCop
45
46
  # foo.try { |i| Float(i) }
46
47
  # bar.send { |i| Complex(i) }
47
48
  #
48
- # @example IgnoredMethods: [minutes]
49
+ # @example AllowedMethods: [] (default)
50
+ #
51
+ # # bad
52
+ # 10.minutes.to_i
53
+ #
54
+ # @example AllowedMethods: [minutes]
55
+ #
56
+ # # good
57
+ # 10.minutes.to_i
58
+ #
59
+ # @example AllowedPatterns: [] (default)
60
+ #
61
+ # # bad
62
+ # 10.minutes.to_i
63
+ #
64
+ # @example AllowedPatterns: ['min*']
49
65
  #
50
66
  # # good
51
67
  # 10.minutes.to_i
@@ -56,7 +72,8 @@ module RuboCop
56
72
  # Time.now.to_datetime.to_i
57
73
  class NumberConversion < Base
58
74
  extend AutoCorrector
59
- include IgnoredMethods
75
+ include AllowedMethods
76
+ include AllowedPattern
60
77
 
61
78
  CONVERSION_METHOD_CLASS_MAPPING = {
62
79
  to_i: "#{Integer.name}(%<number_object>s, 10)",
@@ -64,9 +81,9 @@ module RuboCop
64
81
  to_c: "#{Complex.name}(%<number_object>s)",
65
82
  to_r: "#{Rational.name}(%<number_object>s)"
66
83
  }.freeze
67
- MSG = 'Replace unsafe number conversion with number '\
68
- 'class parsing, instead of using '\
69
- '`%<current>s`, use stricter '\
84
+ MSG = 'Replace unsafe number conversion with number ' \
85
+ 'class parsing, instead of using ' \
86
+ '`%<current>s`, use stricter ' \
70
87
  '`%<corrected_method>s`.'
71
88
  CONVERSION_METHODS = %i[Integer Float Complex Rational to_i to_f to_c to_r].freeze
72
89
  METHODS = CONVERSION_METHOD_CLASS_MAPPING.keys.map(&:inspect).join(' ')
@@ -91,7 +108,7 @@ module RuboCop
91
108
 
92
109
  def handle_conversion_method(node)
93
110
  to_method(node) do |receiver, to_method|
94
- next if receiver.nil? || ignore_receiver?(receiver)
111
+ next if receiver.nil? || allow_receiver?(receiver)
95
112
 
96
113
  message = format(
97
114
  MSG,
@@ -135,9 +152,10 @@ module RuboCop
135
152
  corrector.remove(node.loc.end)
136
153
  end
137
154
 
138
- def ignore_receiver?(receiver)
155
+ def allow_receiver?(receiver)
139
156
  if receiver.numeric_type? || (receiver.send_type? &&
140
- (conversion_method?(receiver.method_name) || ignored_method?(receiver.method_name)))
157
+ (conversion_method?(receiver.method_name) ||
158
+ allowed_method_name?(receiver.method_name)))
141
159
  true
142
160
  elsif (receiver = top_receiver(receiver))
143
161
  receiver.const_type? && ignored_class?(receiver.const_name)
@@ -146,6 +164,10 @@ module RuboCop
146
164
  end
147
165
  end
148
166
 
167
+ def allowed_method_name?(name)
168
+ allowed_method?(name) || matches_allowed_pattern?(name)
169
+ end
170
+
149
171
  def top_receiver(node)
150
172
  receiver = node
151
173
  receiver = receiver.receiver until receiver.receiver.nil?
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Lint
6
- # This cop checks for uses of numbered parameter assignment.
6
+ # Checks for uses of numbered parameter assignment.
7
7
  # It emulates the following warning in Ruby 2.7:
8
8
  #
9
9
  # % ruby -ve '_1 = :value'
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Lint
6
- # This cop checks for unintended or-assignment to a constant.
6
+ # Checks for unintended or-assignment to a constant.
7
7
  #
8
8
  # Constants should always be assigned in the same location. And its value
9
9
  # should always be the same. If constants are assigned in multiple
@@ -11,8 +11,7 @@ module RuboCop
11
11
  #
12
12
  # @safety
13
13
  # This cop is unsafe because code that is already conditionally
14
- # assigning a constant may have its behavior changed by
15
- # auto-correction.
14
+ # assigning a constant may have its behavior changed by autocorrection.
16
15
  #
17
16
  # @example
18
17
  #
@@ -32,6 +31,8 @@ module RuboCop
32
31
  return unless lhs&.casgn_type?
33
32
 
34
33
  add_offense(node.loc.operator) do |corrector|
34
+ next if node.each_ancestor(:def, :defs).any?
35
+
35
36
  corrector.replace(node.loc.operator, '=')
36
37
  end
37
38
  end
@@ -7,6 +7,9 @@ module RuboCop
7
7
  # Checks the proper ordering of magic comments and whether
8
8
  # a magic comment is not placed before a shebang.
9
9
  #
10
+ # @safety
11
+ # This cop's autocorrection is unsafe because file encoding may change.
12
+ #
10
13
  # @example
11
14
  # # bad
12
15
  #
@@ -61,7 +64,7 @@ module RuboCop
61
64
  def magic_comment_lines
62
65
  lines = [nil, nil]
63
66
 
64
- magic_comments.each.with_index do |comment, index|
67
+ leading_magic_comments.each.with_index do |comment, index|
65
68
  if comment.encoding_specified?
66
69
  lines[0] = index
67
70
  elsif comment.frozen_string_literal_specified?
@@ -73,10 +76,6 @@ module RuboCop
73
76
 
74
77
  lines
75
78
  end
76
-
77
- def magic_comments
78
- leading_comment_lines.map { |line| MagicComment.parse(line) }
79
- end
80
79
  end
81
80
  end
82
81
  end
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Lint
6
- # This cops looks for references of Regexp captures that are out of range
6
+ # Looks for references of Regexp captures that are out of range
7
7
  # and thus always returns nil.
8
8
  #
9
9
  # @safety
@@ -68,6 +68,12 @@ module RuboCop
68
68
  @valid_ref = regexp_conditions.map { |condition| check_regexp(condition) }.compact.max
69
69
  end
70
70
 
71
+ def on_in_pattern(node)
72
+ regexp_patterns = regexp_patterns(node)
73
+
74
+ @valid_ref = regexp_patterns.map { |pattern| check_regexp(pattern) }.compact.max
75
+ end
76
+
71
77
  def on_nth_ref(node)
72
78
  backref, = *node
73
79
  return if @valid_ref.nil? || backref <= @valid_ref
@@ -84,6 +90,15 @@ module RuboCop
84
90
 
85
91
  private
86
92
 
93
+ def regexp_patterns(in_node)
94
+ pattern = in_node.pattern
95
+ if pattern.regexp_type?
96
+ [pattern]
97
+ else
98
+ pattern.each_descendant(:regexp).to_a
99
+ end
100
+ end
101
+
87
102
  def check_regexp(node)
88
103
  return if node.interpolation?
89
104
 
@@ -40,11 +40,16 @@ module RuboCop
40
40
  unless node.arguments.one? && first_argument_starts_with_left_parenthesis?(node)
41
41
  return true
42
42
  end
43
+ return true if first_argument_block_type?(node.first_argument)
43
44
 
44
45
  node.operator_method? || node.setter_method? || chained_calls?(node) ||
45
46
  valid_first_argument?(node.first_argument)
46
47
  end
47
48
 
49
+ def first_argument_block_type?(first_arg)
50
+ first_arg.block_type? || first_arg.numblock_type?
51
+ end
52
+
48
53
  def valid_first_argument?(first_arg)
49
54
  first_arg.operator_keyword? || first_arg.hash_type? || ternary_expression?(first_arg)
50
55
  end
@@ -55,7 +60,7 @@ module RuboCop
55
60
 
56
61
  def chained_calls?(node)
57
62
  first_argument = node.first_argument
58
- first_argument.send_type? && (node.children.last&.children&.count || 0) > 1
63
+ first_argument.call_type? && (node.children.last&.children&.count || 0) > 1
59
64
  end
60
65
 
61
66
  def ternary_expression?(node)
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Lint
6
- # This cop checks for quotes and commas in %w, e.g. `%w('foo', "bar")`
6
+ # Checks for quotes and commas in %w, e.g. `%w('foo', "bar")`
7
7
  #
8
8
  # It is more likely that the additional characters are unintended (for
9
9
  # example, mistranslating an array of literals to percent string notation)
@@ -50,7 +50,7 @@ module RuboCop
50
50
 
51
51
  add_offense(node) do |corrector|
52
52
  node.each_value do |value|
53
- range = value.loc.expression
53
+ range = value.source_range
54
54
 
55
55
  match = range.source.match(TRAILING_QUOTE)
56
56
  corrector.remove_trailing(range, match[0].length) if match
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Lint
6
- # This cop checks for colons and commas in %i, e.g. `%i(:foo, :bar)`
6
+ # Checks for colons and commas in %i, e.g. `%i(:foo, :bar)`
7
7
  #
8
8
  # It is more likely that the additional characters are unintended (for
9
9
  # example, mistranslating an array of literals to percent string notation)
@@ -41,7 +41,7 @@ module RuboCop
41
41
 
42
42
  def autocorrect(corrector, node)
43
43
  node.children.each do |child|
44
- range = child.loc.expression
44
+ range = child.source_range
45
45
 
46
46
  corrector.remove_trailing(range, 1) if range.source.end_with?(',')
47
47
  corrector.remove_leading(range, 1) if
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Lint
6
- # This cop checks for `raise` or `fail` statements which are
6
+ # Checks for `raise` or `fail` statements which are
7
7
  # raising `Exception` class.
8
8
  #
9
9
  # You can specify a module name that will be an implicit namespace
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Lint
6
- # This cop checks for `rand(1)` calls.
6
+ # Checks for `rand(1)` calls.
7
7
  # Such calls always return `0`.
8
8
  #
9
9
  # @example
@@ -6,7 +6,7 @@
6
6
  module RuboCop
7
7
  module Cop
8
8
  module Lint
9
- # This cop detects instances of rubocop:disable comments that can be
9
+ # Detects instances of rubocop:disable comments that can be
10
10
  # removed without causing any offenses to be reported. It's implemented
11
11
  # as a cop in that it inherits from the Cop base class and calls
12
12
  # add_offense. The unusual part of its implementation is that it doesn't
@@ -71,16 +71,16 @@ module RuboCop
71
71
  processed_source.comment_config.comment_only_line?(directive_comment_range.line) &&
72
72
  directive_comment_range.begin_pos == line_comment_range.begin_pos
73
73
  # When the previous line is blank, it should be retained
74
- range_with_surrounding_space(range: directive_comment_range, side: :right)
74
+ range_with_surrounding_space(directive_comment_range, side: :right)
75
75
  else
76
76
  # Eat the entire comment, the preceding space, and the preceding
77
77
  # newline if there is one.
78
78
  original_begin = directive_comment_range.begin_pos
79
79
  range = range_with_surrounding_space(
80
- range: directive_comment_range, side: :left, newlines: true
80
+ directive_comment_range, side: :left, newlines: true
81
81
  )
82
82
 
83
- range_with_surrounding_space(range: range,
83
+ range_with_surrounding_space(range,
84
84
  side: :right,
85
85
  # Special for a comment that
86
86
  # begins the file: remove
@@ -94,13 +94,13 @@ module RuboCop
94
94
  # is NOT being removed?
95
95
  if ends_its_line?(ranges.last) && trailing_range?(ranges, range)
96
96
  # Eat the comma on the left.
97
- range = range_with_surrounding_space(range: range, side: :left)
97
+ range = range_with_surrounding_space(range, side: :left)
98
98
  range = range_with_surrounding_comma(range, :left)
99
99
  end
100
100
 
101
101
  range = range_with_surrounding_comma(range, :right)
102
102
  # Eat following spaces up to EOL, but not the newline itself.
103
- range_with_surrounding_space(range: range, side: :right, newlines: false)
103
+ range_with_surrounding_space(range, side: :right, newlines: false)
104
104
  end
105
105
 
106
106
  def each_redundant_disable(&block)
@@ -113,6 +113,7 @@ module RuboCop
113
113
  def each_line_range(cop, line_ranges)
114
114
  line_ranges.each_with_index do |line_range, line_range_index|
115
115
  next if ignore_offense?(line_range)
116
+ next if expected_final_disable?(cop, line_range)
116
117
 
117
118
  comment = processed_source.comment_at_line(line_range.begin)
118
119
  redundant = if all_disabled?(comment)
@@ -127,23 +128,35 @@ module RuboCop
127
128
  end
128
129
  end
129
130
 
131
+ # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
130
132
  def each_already_disabled(cop, line_ranges)
131
133
  line_ranges.each_cons(2) do |previous_range, range|
132
134
  next if ignore_offense?(range)
133
- next unless followed_ranges?(previous_range, range)
134
-
135
135
  # If a cop is disabled in a range that begins on the same line as
136
136
  # the end of the previous range, it means that the cop was
137
137
  # already disabled by an earlier comment. So it's redundant
138
138
  # whether there are offenses or not.
139
+ next unless followed_ranges?(previous_range, range)
140
+
139
141
  comment = processed_source.comment_at_line(range.begin)
140
142
 
143
+ next unless comment
141
144
  # Comments disabling all cops don't count since it's reasonable
142
145
  # to disable a few select cops first and then all cops further
143
146
  # down in the code.
144
- yield comment, cop if comment && !all_disabled?(comment)
147
+ next if all_disabled?(comment)
148
+
149
+ redundant =
150
+ if department_disabled?(cop, comment)
151
+ find_redundant_department(cop, range)
152
+ else
153
+ cop
154
+ end
155
+
156
+ yield comment, redundant if redundant
145
157
  end
146
158
  end
159
+ # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
147
160
 
148
161
  def find_redundant_cop(cop, range)
149
162
  cop_offenses = offenses_to_check.select { |offense| offense.cop_name == cop }
@@ -179,11 +192,21 @@ module RuboCop
179
192
  end
180
193
 
181
194
  def ignore_offense?(line_range)
195
+ return true if line_range.min == CommentConfig::CONFIG_DISABLED_LINE_RANGE_MIN
196
+
182
197
  disabled_ranges.any? do |range|
183
198
  range.cover?(line_range.min) && range.cover?(line_range.max)
184
199
  end
185
200
  end
186
201
 
202
+ def expected_final_disable?(cop, line_range)
203
+ # A cop which is disabled in the config is being re-disabled until end of file
204
+ cop_class = RuboCop::Cop::Registry.global.find_by_cop_name cop
205
+ cop_class &&
206
+ !processed_source.registry.enabled?(cop_class, config) &&
207
+ line_range.max == Float::INFINITY
208
+ end
209
+
187
210
  def department_disabled?(cop, comment)
188
211
  directive = DirectiveComment.new(comment)
189
212
  directive.in_directive_department?(cop) && !directive.overridden_by_department?(cop)
@@ -208,8 +231,13 @@ module RuboCop
208
231
  cop_names = cops.sort.map { |c| describe(c) }.join(', ')
209
232
 
210
233
  add_offense(location, message: message(cop_names)) do |corrector|
211
- range = comment_range_with_surrounding_space(location, comment.loc.expression)
212
- corrector.remove(range)
234
+ range = comment_range_with_surrounding_space(location, comment.source_range)
235
+
236
+ if leave_free_comment?(comment, range)
237
+ corrector.replace(range, ' # ')
238
+ else
239
+ corrector.remove(range)
240
+ end
213
241
  end
214
242
  end
215
243
 
@@ -227,10 +255,16 @@ module RuboCop
227
255
  end
228
256
  end
229
257
 
258
+ def leave_free_comment?(comment, range)
259
+ free_comment = comment.text.gsub(range.source.strip, '')
260
+
261
+ !free_comment.empty? && !free_comment.start_with?('#')
262
+ end
263
+
230
264
  def cop_range(comment, cop)
231
265
  cop = remove_department_marker(cop)
232
- matching_range(comment.loc.expression, cop) ||
233
- matching_range(comment.loc.expression, Badge.parse(cop).cop_name) ||
266
+ matching_range(comment.source_range, cop) ||
267
+ matching_range(comment.source_range, Badge.parse(cop).cop_name) ||
234
268
  raise("Couldn't find #{cop} in comment: #{comment.text}")
235
269
  end
236
270
 
@@ -250,12 +284,18 @@ module RuboCop
250
284
  .all? { |intervening| /\A\s*,\s*\Z/.match?(intervening) }
251
285
  end
252
286
 
287
+ SIMILAR_COP_NAMES_CACHE = Hash.new do |hash, cop_name|
288
+ hash[:all_cop_names] = Registry.global.names unless hash.key?(:all_cop_names)
289
+ hash[cop_name] = NameSimilarity.find_similar_name(cop_name, hash[:all_cop_names])
290
+ end
291
+ private_constant :SIMILAR_COP_NAMES_CACHE
292
+
253
293
  def describe(cop)
254
294
  return 'all cops' if cop == 'all'
255
295
  return "`#{remove_department_marker(cop)}` department" if department_marker?(cop)
256
296
  return "`#{cop}`" if all_cop_names.include?(cop)
257
297
 
258
- similar = NameSimilarity.find_similar_name(cop, all_cop_names)
298
+ similar = SIMILAR_COP_NAMES_CACHE[cop]
259
299
  similar ? "`#{cop}` (did you mean `#{similar}`?)" : "`#{cop}` (unknown cop)"
260
300
  end
261
301