rubocop 1.67.0 → 1.75.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (465) hide show
  1. checksums.yaml +4 -4
  2. data/LICENSE.txt +1 -1
  3. data/README.md +4 -4
  4. data/config/default.yml +264 -47
  5. data/config/internal_affairs.yml +20 -0
  6. data/config/obsoletion.yml +3 -1
  7. data/lib/rubocop/cached_data.rb +12 -4
  8. data/lib/rubocop/cli/command/execute_runner.rb +4 -4
  9. data/lib/rubocop/cli/command/show_cops.rb +24 -2
  10. data/lib/rubocop/cli/command/suggest_extensions.rb +7 -1
  11. data/lib/rubocop/cli/command/version.rb +2 -2
  12. data/lib/rubocop/cli.rb +1 -1
  13. data/lib/rubocop/comment_config.rb +2 -2
  14. data/lib/rubocop/config.rb +52 -10
  15. data/lib/rubocop/config_loader.rb +52 -9
  16. data/lib/rubocop/config_loader_resolver.rb +36 -10
  17. data/lib/rubocop/config_obsoletion/extracted_cop.rb +4 -3
  18. data/lib/rubocop/config_obsoletion/renamed_cop.rb +18 -3
  19. data/lib/rubocop/config_obsoletion.rb +46 -2
  20. data/lib/rubocop/config_validator.rb +25 -14
  21. data/lib/rubocop/cop/autocorrect_logic.rb +36 -19
  22. data/lib/rubocop/cop/base.rb +7 -1
  23. data/lib/rubocop/cop/bundler/duplicated_gem.rb +2 -2
  24. data/lib/rubocop/cop/bundler/gem_comment.rb +1 -1
  25. data/lib/rubocop/cop/bundler/gem_filename.rb +0 -1
  26. data/lib/rubocop/cop/bundler/insecure_protocol_source.rb +0 -1
  27. data/lib/rubocop/cop/correctors/alignment_corrector.rb +1 -12
  28. data/lib/rubocop/cop/correctors/for_to_each_corrector.rb +1 -1
  29. data/lib/rubocop/cop/correctors/percent_literal_corrector.rb +10 -0
  30. data/lib/rubocop/cop/gemspec/deprecated_attribute_assignment.rb +1 -2
  31. data/lib/rubocop/cop/gemspec/required_ruby_version.rb +0 -2
  32. data/lib/rubocop/cop/generator.rb +6 -0
  33. data/lib/rubocop/cop/internal_affairs/cop_enabled.rb +85 -0
  34. data/lib/rubocop/cop/internal_affairs/example_description.rb +8 -4
  35. data/lib/rubocop/cop/internal_affairs/location_exists.rb +116 -0
  36. data/lib/rubocop/cop/internal_affairs/location_expression.rb +2 -1
  37. data/lib/rubocop/cop/internal_affairs/location_line_equality_comparison.rb +3 -4
  38. data/lib/rubocop/cop/internal_affairs/node_first_or_last_argument.rb +3 -2
  39. data/lib/rubocop/cop/internal_affairs/node_matcher_directive.rb +1 -1
  40. data/lib/rubocop/cop/internal_affairs/node_pattern_groups/ast_processor.rb +63 -0
  41. data/lib/rubocop/cop/internal_affairs/node_pattern_groups/ast_walker.rb +131 -0
  42. data/lib/rubocop/cop/internal_affairs/node_pattern_groups.rb +230 -0
  43. data/lib/rubocop/cop/internal_affairs/node_type_group.rb +91 -0
  44. data/lib/rubocop/cop/internal_affairs/node_type_multiple_predicates.rb +126 -0
  45. data/lib/rubocop/cop/internal_affairs/node_type_predicate.rb +4 -3
  46. data/lib/rubocop/cop/internal_affairs/numblock_handler.rb +1 -1
  47. data/lib/rubocop/cop/internal_affairs/on_send_without_on_csend.rb +90 -0
  48. data/lib/rubocop/cop/internal_affairs/operator_keyword.rb +48 -0
  49. data/lib/rubocop/cop/internal_affairs/plugin.rb +33 -0
  50. data/lib/rubocop/cop/internal_affairs/redundant_described_class_as_subject.rb +6 -5
  51. data/lib/rubocop/cop/internal_affairs/redundant_source_range.rb +3 -1
  52. data/lib/rubocop/cop/internal_affairs/single_line_comparison.rb +5 -4
  53. data/lib/rubocop/cop/internal_affairs/style_detected_api_use.rb +0 -2
  54. data/lib/rubocop/cop/internal_affairs/undefined_config.rb +13 -2
  55. data/lib/rubocop/cop/internal_affairs.rb +7 -16
  56. data/lib/rubocop/cop/layout/access_modifier_indentation.rb +1 -1
  57. data/lib/rubocop/cop/layout/argument_alignment.rb +2 -9
  58. data/lib/rubocop/cop/layout/array_alignment.rb +1 -1
  59. data/lib/rubocop/cop/layout/begin_end_alignment.rb +0 -1
  60. data/lib/rubocop/cop/layout/block_alignment.rb +3 -2
  61. data/lib/rubocop/cop/layout/block_end_newline.rb +1 -0
  62. data/lib/rubocop/cop/layout/class_structure.rb +9 -9
  63. data/lib/rubocop/cop/layout/closing_parenthesis_indentation.rb +4 -4
  64. data/lib/rubocop/cop/layout/def_end_alignment.rb +1 -1
  65. data/lib/rubocop/cop/layout/dot_position.rb +1 -1
  66. data/lib/rubocop/cop/layout/else_alignment.rb +2 -2
  67. data/lib/rubocop/cop/layout/empty_line_after_guard_clause.rb +3 -3
  68. data/lib/rubocop/cop/layout/empty_line_between_defs.rb +7 -11
  69. data/lib/rubocop/cop/layout/empty_lines_around_access_modifier.rb +30 -4
  70. data/lib/rubocop/cop/layout/empty_lines_around_begin_body.rb +5 -6
  71. data/lib/rubocop/cop/layout/empty_lines_around_block_body.rb +1 -0
  72. data/lib/rubocop/cop/layout/empty_lines_around_exception_handling_keywords.rb +4 -5
  73. data/lib/rubocop/cop/layout/empty_lines_around_method_body.rb +23 -1
  74. data/lib/rubocop/cop/layout/end_alignment.rb +1 -1
  75. data/lib/rubocop/cop/layout/extra_spacing.rb +1 -1
  76. data/lib/rubocop/cop/layout/first_argument_indentation.rb +3 -8
  77. data/lib/rubocop/cop/layout/first_array_element_indentation.rb +2 -7
  78. data/lib/rubocop/cop/layout/first_hash_element_indentation.rb +2 -7
  79. data/lib/rubocop/cop/layout/first_hash_element_line_break.rb +1 -1
  80. data/lib/rubocop/cop/layout/first_parameter_indentation.rb +2 -2
  81. data/lib/rubocop/cop/layout/hash_alignment.rb +8 -6
  82. data/lib/rubocop/cop/layout/heredoc_argument_closing_parenthesis.rb +2 -1
  83. data/lib/rubocop/cop/layout/indentation_width.rb +8 -7
  84. data/lib/rubocop/cop/layout/leading_comment_space.rb +57 -2
  85. data/lib/rubocop/cop/layout/line_continuation_leading_space.rb +11 -2
  86. data/lib/rubocop/cop/layout/line_continuation_spacing.rb +7 -1
  87. data/lib/rubocop/cop/layout/line_end_string_concatenation_indentation.rb +2 -2
  88. data/lib/rubocop/cop/layout/line_length.rb +123 -4
  89. data/lib/rubocop/cop/layout/multiline_block_layout.rb +1 -0
  90. data/lib/rubocop/cop/layout/multiline_hash_key_line_breaks.rb +1 -1
  91. data/lib/rubocop/cop/layout/multiline_method_argument_line_breaks.rb +25 -0
  92. data/lib/rubocop/cop/layout/multiline_method_call_brace_layout.rb +2 -1
  93. data/lib/rubocop/cop/layout/multiline_method_call_indentation.rb +4 -4
  94. data/lib/rubocop/cop/layout/multiline_method_definition_brace_layout.rb +1 -1
  95. data/lib/rubocop/cop/layout/multiline_method_parameter_line_breaks.rb +1 -0
  96. data/lib/rubocop/cop/layout/multiline_operation_indentation.rb +3 -4
  97. data/lib/rubocop/cop/layout/parameter_alignment.rb +3 -4
  98. data/lib/rubocop/cop/layout/redundant_line_break.rb +19 -46
  99. data/lib/rubocop/cop/layout/rescue_ensure_alignment.rb +6 -7
  100. data/lib/rubocop/cop/layout/single_line_block_chain.rb +1 -1
  101. data/lib/rubocop/cop/layout/space_after_colon.rb +2 -2
  102. data/lib/rubocop/cop/layout/space_after_comma.rb +1 -1
  103. data/lib/rubocop/cop/layout/space_after_method_name.rb +1 -1
  104. data/lib/rubocop/cop/layout/space_after_semicolon.rb +11 -1
  105. data/lib/rubocop/cop/layout/space_around_keyword.rb +2 -1
  106. data/lib/rubocop/cop/layout/space_around_method_call_operator.rb +1 -1
  107. data/lib/rubocop/cop/layout/space_around_operators.rb +23 -21
  108. data/lib/rubocop/cop/layout/space_before_block_braces.rb +1 -0
  109. data/lib/rubocop/cop/layout/space_before_brackets.rb +5 -5
  110. data/lib/rubocop/cop/layout/space_before_comma.rb +1 -1
  111. data/lib/rubocop/cop/layout/space_before_semicolon.rb +1 -1
  112. data/lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb +10 -1
  113. data/lib/rubocop/cop/layout/space_inside_block_braces.rb +5 -0
  114. data/lib/rubocop/cop/layout/space_inside_hash_literal_braces.rb +7 -0
  115. data/lib/rubocop/cop/layout/space_inside_string_interpolation.rb +0 -1
  116. data/lib/rubocop/cop/layout/trailing_whitespace.rb +5 -3
  117. data/lib/rubocop/cop/lint/ambiguous_block_association.rb +1 -1
  118. data/lib/rubocop/cop/lint/array_literal_in_regexp.rb +118 -0
  119. data/lib/rubocop/cop/lint/assignment_in_condition.rb +1 -3
  120. data/lib/rubocop/cop/lint/binary_operator_with_identical_operands.rb +10 -12
  121. data/lib/rubocop/cop/lint/boolean_symbol.rb +1 -1
  122. data/lib/rubocop/cop/lint/circular_argument_reference.rb +4 -1
  123. data/lib/rubocop/cop/lint/constant_definition_in_block.rb +3 -3
  124. data/lib/rubocop/cop/lint/constant_reassignment.rb +148 -0
  125. data/lib/rubocop/cop/lint/cop_directive_syntax.rb +84 -0
  126. data/lib/rubocop/cop/lint/debugger.rb +3 -3
  127. data/lib/rubocop/cop/lint/deprecated_open_ssl_constant.rb +3 -2
  128. data/lib/rubocop/cop/lint/duplicate_branch.rb +39 -4
  129. data/lib/rubocop/cop/lint/duplicate_match_pattern.rb +1 -1
  130. data/lib/rubocop/cop/lint/duplicate_methods.rb +2 -17
  131. data/lib/rubocop/cop/lint/duplicate_regexp_character_class_element.rb +1 -1
  132. data/lib/rubocop/cop/lint/duplicate_set_element.rb +20 -7
  133. data/lib/rubocop/cop/lint/empty_conditional_body.rb +14 -64
  134. data/lib/rubocop/cop/lint/empty_ensure.rb +1 -1
  135. data/lib/rubocop/cop/lint/empty_expression.rb +0 -2
  136. data/lib/rubocop/cop/lint/empty_file.rb +0 -2
  137. data/lib/rubocop/cop/lint/ensure_return.rb +1 -1
  138. data/lib/rubocop/cop/lint/erb_new_arguments.rb +0 -6
  139. data/lib/rubocop/cop/lint/float_comparison.rb +20 -14
  140. data/lib/rubocop/cop/lint/float_out_of_range.rb +2 -4
  141. data/lib/rubocop/cop/lint/format_parameter_mismatch.rb +2 -2
  142. data/lib/rubocop/cop/lint/hash_new_with_keyword_arguments_as_default.rb +55 -0
  143. data/lib/rubocop/cop/lint/implicit_string_concatenation.rb +1 -1
  144. data/lib/rubocop/cop/lint/interpolation_check.rb +9 -0
  145. data/lib/rubocop/cop/lint/it_without_arguments_in_block.rb +3 -0
  146. data/lib/rubocop/cop/lint/literal_as_condition.rb +118 -9
  147. data/lib/rubocop/cop/lint/literal_assignment_in_condition.rb +1 -1
  148. data/lib/rubocop/cop/lint/literal_in_interpolation.rb +24 -6
  149. data/lib/rubocop/cop/lint/missing_cop_enable_directive.rb +1 -1
  150. data/lib/rubocop/cop/lint/missing_super.rb +2 -2
  151. data/lib/rubocop/cop/lint/mixed_case_range.rb +5 -8
  152. data/lib/rubocop/cop/lint/mixed_regexp_capture_types.rb +1 -1
  153. data/lib/rubocop/cop/lint/nested_method_definition.rb +10 -6
  154. data/lib/rubocop/cop/lint/next_without_accumulator.rb +1 -1
  155. data/lib/rubocop/cop/lint/no_return_in_begin_end_blocks.rb +2 -2
  156. data/lib/rubocop/cop/lint/non_atomic_file_operation.rb +12 -3
  157. data/lib/rubocop/cop/lint/non_deterministic_require_order.rb +3 -3
  158. data/lib/rubocop/cop/lint/non_local_exit_from_iterator.rb +3 -3
  159. data/lib/rubocop/cop/lint/number_conversion.rb +0 -1
  160. data/lib/rubocop/cop/lint/numbered_parameter_assignment.rb +1 -2
  161. data/lib/rubocop/cop/lint/numeric_operation_with_constant_result.rb +93 -0
  162. data/lib/rubocop/cop/lint/or_assignment_to_constant.rb +2 -3
  163. data/lib/rubocop/cop/lint/out_of_range_regexp_ref.rb +3 -2
  164. data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb +1 -5
  165. data/lib/rubocop/cop/lint/raise_exception.rb +29 -10
  166. data/lib/rubocop/cop/lint/redundant_cop_enable_directive.rb +1 -1
  167. data/lib/rubocop/cop/lint/redundant_regexp_quantifiers.rb +1 -1
  168. data/lib/rubocop/cop/lint/redundant_require_statement.rb +0 -21
  169. data/lib/rubocop/cop/lint/redundant_safe_navigation.rb +12 -7
  170. data/lib/rubocop/cop/lint/redundant_splat_expansion.rb +8 -7
  171. data/lib/rubocop/cop/lint/redundant_string_coercion.rb +2 -2
  172. data/lib/rubocop/cop/lint/redundant_type_conversion.rb +261 -0
  173. data/lib/rubocop/cop/lint/redundant_with_index.rb +3 -0
  174. data/lib/rubocop/cop/lint/redundant_with_object.rb +3 -0
  175. data/lib/rubocop/cop/lint/refinement_import_methods.rb +1 -1
  176. data/lib/rubocop/cop/lint/regexp_as_condition.rb +0 -1
  177. data/lib/rubocop/cop/lint/rescue_exception.rb +1 -1
  178. data/lib/rubocop/cop/lint/rescue_type.rb +3 -7
  179. data/lib/rubocop/cop/lint/return_in_void_context.rb +9 -11
  180. data/lib/rubocop/cop/lint/safe_navigation_chain.rb +17 -1
  181. data/lib/rubocop/cop/lint/safe_navigation_consistency.rb +5 -1
  182. data/lib/rubocop/cop/lint/self_assignment.rb +8 -10
  183. data/lib/rubocop/cop/lint/shadowed_exception.rb +1 -1
  184. data/lib/rubocop/cop/lint/shadowing_outer_local_variable.rb +8 -1
  185. data/lib/rubocop/cop/lint/shared_mutable_default.rb +76 -0
  186. data/lib/rubocop/cop/lint/suppressed_exception.rb +1 -1
  187. data/lib/rubocop/cop/lint/suppressed_exception_in_number_conversion.rb +111 -0
  188. data/lib/rubocop/cop/lint/symbol_conversion.rb +1 -1
  189. data/lib/rubocop/cop/lint/syntax.rb +4 -1
  190. data/lib/rubocop/cop/lint/to_enum_arguments.rb +1 -1
  191. data/lib/rubocop/cop/lint/top_level_return_with_argument.rb +1 -1
  192. data/lib/rubocop/cop/lint/unescaped_bracket_in_regexp.rb +88 -0
  193. data/lib/rubocop/cop/lint/unexpected_block_arity.rb +3 -1
  194. data/lib/rubocop/cop/lint/unmodified_reduce_accumulator.rb +1 -1
  195. data/lib/rubocop/cop/lint/unreachable_code.rb +52 -2
  196. data/lib/rubocop/cop/lint/unreachable_loop.rb +6 -6
  197. data/lib/rubocop/cop/lint/unused_method_argument.rb +18 -2
  198. data/lib/rubocop/cop/lint/useless_access_modifier.rb +5 -4
  199. data/lib/rubocop/cop/lint/useless_assignment.rb +1 -1
  200. data/lib/rubocop/cop/lint/useless_constant_scoping.rb +71 -0
  201. data/lib/rubocop/cop/lint/useless_defined.rb +55 -0
  202. data/lib/rubocop/cop/lint/useless_else_without_rescue.rb +4 -0
  203. data/lib/rubocop/cop/lint/useless_method_definition.rb +1 -1
  204. data/lib/rubocop/cop/lint/useless_numeric_operation.rb +2 -1
  205. data/lib/rubocop/cop/lint/useless_rescue.rb +2 -2
  206. data/lib/rubocop/cop/lint/useless_ruby2_keywords.rb +2 -2
  207. data/lib/rubocop/cop/lint/useless_setter_call.rb +14 -25
  208. data/lib/rubocop/cop/lint/void.rb +16 -12
  209. data/lib/rubocop/cop/message_annotator.rb +7 -3
  210. data/lib/rubocop/cop/metrics/block_length.rb +1 -0
  211. data/lib/rubocop/cop/metrics/block_nesting.rb +1 -1
  212. data/lib/rubocop/cop/metrics/class_length.rb +9 -9
  213. data/lib/rubocop/cop/metrics/collection_literal_length.rb +7 -0
  214. data/lib/rubocop/cop/metrics/cyclomatic_complexity.rb +5 -2
  215. data/lib/rubocop/cop/metrics/method_length.rb +9 -1
  216. data/lib/rubocop/cop/metrics/module_length.rb +1 -1
  217. data/lib/rubocop/cop/metrics/perceived_complexity.rb +1 -1
  218. data/lib/rubocop/cop/metrics/utils/abc_size_calculator.rb +1 -1
  219. data/lib/rubocop/cop/metrics/utils/code_length_calculator.rb +3 -4
  220. data/lib/rubocop/cop/metrics/utils/repeated_attribute_discount.rb +7 -7
  221. data/lib/rubocop/cop/mixin/alignment.rb +2 -2
  222. data/lib/rubocop/cop/mixin/allowed_pattern.rb +4 -4
  223. data/lib/rubocop/cop/mixin/check_assignment.rb +4 -12
  224. data/lib/rubocop/cop/mixin/check_line_breakable.rb +22 -12
  225. data/lib/rubocop/cop/mixin/check_single_line_suitability.rb +49 -0
  226. data/lib/rubocop/cop/mixin/comments_help.rb +8 -3
  227. data/lib/rubocop/cop/mixin/def_node.rb +1 -1
  228. data/lib/rubocop/cop/mixin/dig_help.rb +27 -0
  229. data/lib/rubocop/cop/mixin/empty_lines_around_body.rb +1 -1
  230. data/lib/rubocop/cop/mixin/endless_method_rewriter.rb +24 -0
  231. data/lib/rubocop/cop/mixin/forbidden_identifiers.rb +20 -0
  232. data/lib/rubocop/cop/mixin/forbidden_pattern.rb +16 -0
  233. data/lib/rubocop/cop/mixin/frozen_string_literal.rb +3 -2
  234. data/lib/rubocop/cop/mixin/hash_alignment_styles.rb +15 -14
  235. data/lib/rubocop/cop/mixin/hash_shorthand_syntax.rb +22 -22
  236. data/lib/rubocop/cop/mixin/hash_subset.rb +203 -0
  237. data/lib/rubocop/cop/mixin/hash_transform_method.rb +74 -74
  238. data/lib/rubocop/cop/mixin/line_length_help.rb +5 -4
  239. data/lib/rubocop/cop/mixin/method_complexity.rb +2 -1
  240. data/lib/rubocop/cop/mixin/multiline_expression_indentation.rb +7 -9
  241. data/lib/rubocop/cop/mixin/percent_literal.rb +1 -1
  242. data/lib/rubocop/cop/mixin/preceding_following_alignment.rb +68 -30
  243. data/lib/rubocop/cop/mixin/range_help.rb +15 -4
  244. data/lib/rubocop/cop/mixin/space_before_punctuation.rb +1 -1
  245. data/lib/rubocop/cop/mixin/statement_modifier.rb +8 -3
  246. data/lib/rubocop/cop/mixin/string_help.rb +2 -2
  247. data/lib/rubocop/cop/mixin/string_literals_help.rb +1 -1
  248. data/lib/rubocop/cop/mixin/target_ruby_version.rb +17 -1
  249. data/lib/rubocop/cop/mixin/trailing_comma.rb +21 -5
  250. data/lib/rubocop/cop/naming/accessor_method_name.rb +6 -6
  251. data/lib/rubocop/cop/naming/block_forwarding.rb +20 -16
  252. data/lib/rubocop/cop/naming/constant_name.rb +6 -7
  253. data/lib/rubocop/cop/naming/file_name.rb +0 -2
  254. data/lib/rubocop/cop/naming/memoized_instance_variable_name.rb +12 -13
  255. data/lib/rubocop/cop/naming/method_name.rb +64 -8
  256. data/lib/rubocop/cop/naming/predicate_name.rb +44 -0
  257. data/lib/rubocop/cop/naming/rescued_exceptions_variable_name.rb +6 -14
  258. data/lib/rubocop/cop/naming/variable_name.rb +50 -6
  259. data/lib/rubocop/cop/naming/variable_number.rb +2 -3
  260. data/lib/rubocop/cop/offense.rb +2 -3
  261. data/lib/rubocop/cop/registry.rb +9 -6
  262. data/lib/rubocop/cop/security/compound_hash.rb +2 -0
  263. data/lib/rubocop/cop/security/yaml_load.rb +3 -2
  264. data/lib/rubocop/cop/style/access_modifier_declarations.rb +86 -28
  265. data/lib/rubocop/cop/style/accessor_grouping.rb +19 -5
  266. data/lib/rubocop/cop/style/ambiguous_endless_method_definition.rb +79 -0
  267. data/lib/rubocop/cop/style/and_or.rb +1 -1
  268. data/lib/rubocop/cop/style/arguments_forwarding.rb +47 -28
  269. data/lib/rubocop/cop/style/array_first_last.rb +18 -2
  270. data/lib/rubocop/cop/style/array_intersect.rb +42 -30
  271. data/lib/rubocop/cop/style/bitwise_predicate.rb +100 -0
  272. data/lib/rubocop/cop/style/block_delimiters.rb +43 -25
  273. data/lib/rubocop/cop/style/case_like_if.rb +8 -11
  274. data/lib/rubocop/cop/style/class_and_module_children.rb +52 -11
  275. data/lib/rubocop/cop/style/class_equality_comparison.rb +1 -1
  276. data/lib/rubocop/cop/style/collection_methods.rb +2 -1
  277. data/lib/rubocop/cop/style/combinable_defined.rb +115 -0
  278. data/lib/rubocop/cop/style/combinable_loops.rb +3 -2
  279. data/lib/rubocop/cop/style/commented_keyword.rb +20 -3
  280. data/lib/rubocop/cop/style/comparable_between.rb +75 -0
  281. data/lib/rubocop/cop/style/concat_array_literals.rb +1 -1
  282. data/lib/rubocop/cop/style/conditional_assignment.rb +39 -27
  283. data/lib/rubocop/cop/style/constant_visibility.rb +3 -12
  284. data/lib/rubocop/cop/style/dig_chain.rb +89 -0
  285. data/lib/rubocop/cop/style/documentation.rb +1 -1
  286. data/lib/rubocop/cop/style/double_negation.rb +4 -4
  287. data/lib/rubocop/cop/style/each_for_simple_loop.rb +4 -7
  288. data/lib/rubocop/cop/style/each_with_object.rb +2 -3
  289. data/lib/rubocop/cop/style/empty_else.rb +4 -2
  290. data/lib/rubocop/cop/style/empty_literal.rb +5 -1
  291. data/lib/rubocop/cop/style/empty_method.rb +1 -1
  292. data/lib/rubocop/cop/style/endless_method.rb +150 -18
  293. data/lib/rubocop/cop/style/eval_with_location.rb +4 -4
  294. data/lib/rubocop/cop/style/exact_regexp_match.rb +2 -3
  295. data/lib/rubocop/cop/style/expand_path_arguments.rb +2 -7
  296. data/lib/rubocop/cop/style/explicit_block_argument.rb +16 -3
  297. data/lib/rubocop/cop/style/exponential_notation.rb +3 -3
  298. data/lib/rubocop/cop/style/fetch_env_var.rb +2 -1
  299. data/lib/rubocop/cop/style/file_null.rb +89 -0
  300. data/lib/rubocop/cop/style/file_touch.rb +75 -0
  301. data/lib/rubocop/cop/style/float_division.rb +8 -4
  302. data/lib/rubocop/cop/style/for.rb +1 -1
  303. data/lib/rubocop/cop/style/format_string_token.rb +38 -11
  304. data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +3 -2
  305. data/lib/rubocop/cop/style/global_std_stream.rb +3 -0
  306. data/lib/rubocop/cop/style/global_vars.rb +1 -3
  307. data/lib/rubocop/cop/style/guard_clause.rb +17 -3
  308. data/lib/rubocop/cop/style/hash_conversion.rb +1 -2
  309. data/lib/rubocop/cop/style/hash_each_methods.rb +6 -8
  310. data/lib/rubocop/cop/style/hash_except.rb +35 -147
  311. data/lib/rubocop/cop/style/hash_fetch_chain.rb +104 -0
  312. data/lib/rubocop/cop/style/hash_slice.rb +80 -0
  313. data/lib/rubocop/cop/style/hash_syntax.rb +9 -3
  314. data/lib/rubocop/cop/style/hash_transform_keys.rb +2 -2
  315. data/lib/rubocop/cop/style/hash_transform_values.rb +2 -2
  316. data/lib/rubocop/cop/style/identical_conditional_branches.rb +25 -6
  317. data/lib/rubocop/cop/style/if_inside_else.rb +10 -14
  318. data/lib/rubocop/cop/style/if_unless_modifier.rb +5 -5
  319. data/lib/rubocop/cop/style/if_with_boolean_literal_branches.rb +3 -4
  320. data/lib/rubocop/cop/style/if_with_semicolon.rb +20 -9
  321. data/lib/rubocop/cop/style/infinite_loop.rb +1 -1
  322. data/lib/rubocop/cop/style/inverse_methods.rb +15 -12
  323. data/lib/rubocop/cop/style/invertible_unless_condition.rb +2 -2
  324. data/lib/rubocop/cop/style/ip_addresses.rb +2 -2
  325. data/lib/rubocop/cop/style/it_assignment.rb +36 -0
  326. data/lib/rubocop/cop/style/it_block_parameter.rb +100 -0
  327. data/lib/rubocop/cop/style/keyword_arguments_merging.rb +67 -0
  328. data/lib/rubocop/cop/style/keyword_parameters_order.rb +14 -8
  329. data/lib/rubocop/cop/style/lambda.rb +1 -0
  330. data/lib/rubocop/cop/style/lambda_call.rb +10 -4
  331. data/lib/rubocop/cop/style/line_end_concatenation.rb +10 -4
  332. data/lib/rubocop/cop/style/map_into_array.rb +11 -3
  333. data/lib/rubocop/cop/style/map_to_hash.rb +1 -1
  334. data/lib/rubocop/cop/style/map_to_set.rb +3 -2
  335. data/lib/rubocop/cop/style/method_call_with_args_parentheses/omit_parentheses.rb +27 -17
  336. data/lib/rubocop/cop/style/method_call_with_args_parentheses.rb +2 -0
  337. data/lib/rubocop/cop/style/method_call_without_args_parentheses.rb +8 -11
  338. data/lib/rubocop/cop/style/method_called_on_do_end_block.rb +3 -4
  339. data/lib/rubocop/cop/style/method_def_parentheses.rb +1 -1
  340. data/lib/rubocop/cop/style/missing_else.rb +2 -0
  341. data/lib/rubocop/cop/style/missing_respond_to_missing.rb +33 -3
  342. data/lib/rubocop/cop/style/multiline_block_chain.rb +3 -2
  343. data/lib/rubocop/cop/style/multiline_memoization.rb +1 -1
  344. data/lib/rubocop/cop/style/multiline_method_signature.rb +1 -9
  345. data/lib/rubocop/cop/style/multiple_comparison.rb +52 -51
  346. data/lib/rubocop/cop/style/mutable_constant.rb +7 -8
  347. data/lib/rubocop/cop/style/negated_if_else_condition.rb +7 -5
  348. data/lib/rubocop/cop/style/nested_parenthesized_calls.rb +1 -1
  349. data/lib/rubocop/cop/style/nested_ternary_operator.rb +5 -4
  350. data/lib/rubocop/cop/style/next.rb +44 -0
  351. data/lib/rubocop/cop/style/not.rb +1 -1
  352. data/lib/rubocop/cop/style/object_then.rb +15 -15
  353. data/lib/rubocop/cop/style/one_line_conditional.rb +25 -4
  354. data/lib/rubocop/cop/style/open_struct_use.rb +5 -5
  355. data/lib/rubocop/cop/style/operator_method_call.rb +5 -6
  356. data/lib/rubocop/cop/style/or_assignment.rb +3 -6
  357. data/lib/rubocop/cop/style/parallel_assignment.rb +9 -18
  358. data/lib/rubocop/cop/style/parentheses_around_condition.rb +2 -2
  359. data/lib/rubocop/cop/style/percent_literal_delimiters.rb +1 -1
  360. data/lib/rubocop/cop/style/proc.rb +2 -2
  361. data/lib/rubocop/cop/style/quoted_symbols.rb +1 -1
  362. data/lib/rubocop/cop/style/raise_args.rb +15 -13
  363. data/lib/rubocop/cop/style/random_with_offset.rb +3 -3
  364. data/lib/rubocop/cop/style/redundant_argument.rb +3 -1
  365. data/lib/rubocop/cop/style/redundant_assignment.rb +1 -1
  366. data/lib/rubocop/cop/style/redundant_begin.rb +2 -1
  367. data/lib/rubocop/cop/style/redundant_condition.rb +95 -23
  368. data/lib/rubocop/cop/style/redundant_current_directory_in_path.rb +16 -5
  369. data/lib/rubocop/cop/style/redundant_double_splat_hash_braces.rb +6 -10
  370. data/lib/rubocop/cop/style/redundant_each.rb +1 -1
  371. data/lib/rubocop/cop/style/redundant_exception.rb +2 -2
  372. data/lib/rubocop/cop/style/redundant_format.rb +257 -0
  373. data/lib/rubocop/cop/style/redundant_freeze.rb +3 -3
  374. data/lib/rubocop/cop/style/redundant_initialize.rb +12 -3
  375. data/lib/rubocop/cop/style/redundant_line_continuation.rb +54 -18
  376. data/lib/rubocop/cop/style/redundant_parentheses.rb +56 -26
  377. data/lib/rubocop/cop/style/redundant_regexp_argument.rb +4 -0
  378. data/lib/rubocop/cop/style/redundant_regexp_character_class.rb +1 -1
  379. data/lib/rubocop/cop/style/redundant_regexp_escape.rb +1 -1
  380. data/lib/rubocop/cop/style/redundant_return.rb +2 -2
  381. data/lib/rubocop/cop/style/redundant_self.rb +9 -15
  382. data/lib/rubocop/cop/style/redundant_self_assignment.rb +20 -32
  383. data/lib/rubocop/cop/style/redundant_self_assignment_branch.rb +4 -4
  384. data/lib/rubocop/cop/style/redundant_sort.rb +3 -3
  385. data/lib/rubocop/cop/style/redundant_sort_by.rb +17 -1
  386. data/lib/rubocop/cop/style/redundant_string_escape.rb +2 -2
  387. data/lib/rubocop/cop/style/rescue_modifier.rb +5 -3
  388. data/lib/rubocop/cop/style/return_nil.rb +2 -2
  389. data/lib/rubocop/cop/style/safe_navigation.rb +32 -5
  390. data/lib/rubocop/cop/style/safe_navigation_chain_length.rb +52 -0
  391. data/lib/rubocop/cop/style/select_by_regexp.rb +5 -2
  392. data/lib/rubocop/cop/style/self_assignment.rb +11 -17
  393. data/lib/rubocop/cop/style/semicolon.rb +1 -1
  394. data/lib/rubocop/cop/style/send_with_literal_method_name.rb +2 -1
  395. data/lib/rubocop/cop/style/signal_exception.rb +2 -3
  396. data/lib/rubocop/cop/style/single_argument_dig.rb +9 -5
  397. data/lib/rubocop/cop/style/single_line_block_params.rb +1 -1
  398. data/lib/rubocop/cop/style/single_line_do_end_block.rb +15 -4
  399. data/lib/rubocop/cop/style/single_line_methods.rb +6 -7
  400. data/lib/rubocop/cop/style/slicing_with_range.rb +40 -11
  401. data/lib/rubocop/cop/style/sole_nested_conditional.rb +40 -106
  402. data/lib/rubocop/cop/style/special_global_vars.rb +1 -1
  403. data/lib/rubocop/cop/style/string_concatenation.rb +15 -14
  404. data/lib/rubocop/cop/style/string_literals.rb +1 -1
  405. data/lib/rubocop/cop/style/string_methods.rb +1 -1
  406. data/lib/rubocop/cop/style/super_arguments.rb +66 -19
  407. data/lib/rubocop/cop/style/swap_values.rb +4 -15
  408. data/lib/rubocop/cop/style/symbol_proc.rb +2 -0
  409. data/lib/rubocop/cop/style/ternary_parentheses.rb +25 -4
  410. data/lib/rubocop/cop/style/top_level_method_definition.rb +2 -1
  411. data/lib/rubocop/cop/style/trailing_comma_in_arguments.rb +11 -2
  412. data/lib/rubocop/cop/style/trailing_comma_in_array_literal.rb +47 -6
  413. data/lib/rubocop/cop/style/trailing_comma_in_hash_literal.rb +48 -6
  414. data/lib/rubocop/cop/style/trailing_underscore_variable.rb +4 -4
  415. data/lib/rubocop/cop/style/trivial_accessors.rb +1 -1
  416. data/lib/rubocop/cop/style/variable_interpolation.rb +1 -2
  417. data/lib/rubocop/cop/style/while_until_modifier.rb +0 -1
  418. data/lib/rubocop/cop/style/yoda_condition.rb +8 -4
  419. data/lib/rubocop/cop/style/yoda_expression.rb +2 -1
  420. data/lib/rubocop/cop/util.rb +12 -5
  421. data/lib/rubocop/cop/utils/format_string.rb +10 -5
  422. data/lib/rubocop/cop/variable_force/assignment.rb +18 -3
  423. data/lib/rubocop/cop/variable_force/branch.rb +1 -1
  424. data/lib/rubocop/cop/variable_force/scope.rb +1 -1
  425. data/lib/rubocop/cop/variable_force/variable.rb +14 -3
  426. data/lib/rubocop/cop/variable_force/variable_table.rb +5 -5
  427. data/lib/rubocop/cop/variable_force.rb +5 -11
  428. data/lib/rubocop/cops_documentation_generator.rb +50 -25
  429. data/lib/rubocop/directive_comment.rb +45 -11
  430. data/lib/rubocop/ext/regexp_node.rb +0 -1
  431. data/lib/rubocop/formatter/disabled_config_formatter.rb +2 -2
  432. data/lib/rubocop/formatter/formatter_set.rb +1 -1
  433. data/lib/rubocop/formatter/pacman_formatter.rb +1 -1
  434. data/lib/rubocop/lsp/diagnostic.rb +189 -0
  435. data/lib/rubocop/lsp/logger.rb +2 -2
  436. data/lib/rubocop/lsp/routes.rb +7 -23
  437. data/lib/rubocop/lsp/runtime.rb +18 -50
  438. data/lib/rubocop/lsp/server.rb +0 -2
  439. data/lib/rubocop/lsp/stdin_runner.rb +85 -0
  440. data/lib/rubocop/magic_comment.rb +11 -3
  441. data/lib/rubocop/options.rb +28 -12
  442. data/lib/rubocop/path_util.rb +15 -8
  443. data/lib/rubocop/plugin/configuration_integrator.rb +143 -0
  444. data/lib/rubocop/plugin/load_error.rb +26 -0
  445. data/lib/rubocop/plugin/loader.rb +100 -0
  446. data/lib/rubocop/plugin/not_supported_error.rb +29 -0
  447. data/lib/rubocop/plugin.rb +46 -0
  448. data/lib/rubocop/rake_task.rb +4 -1
  449. data/lib/rubocop/result_cache.rb +13 -13
  450. data/lib/rubocop/rspec/cop_helper.rb +13 -1
  451. data/lib/rubocop/rspec/expect_offense.rb +6 -2
  452. data/lib/rubocop/rspec/shared_contexts.rb +38 -1
  453. data/lib/rubocop/rspec/support.rb +4 -2
  454. data/lib/rubocop/runner.rb +26 -15
  455. data/lib/rubocop/server/cache.rb +47 -11
  456. data/lib/rubocop/server/cli.rb +2 -2
  457. data/lib/rubocop/target_finder.rb +7 -2
  458. data/lib/rubocop/target_ruby.rb +17 -2
  459. data/lib/rubocop/version.rb +53 -12
  460. data/lib/rubocop.rb +32 -1
  461. data/lib/ruby_lsp/rubocop/addon.rb +75 -0
  462. data/lib/ruby_lsp/rubocop/runtime_adapter.rb +65 -0
  463. metadata +78 -16
  464. data/lib/rubocop/cop/utils/regexp_ranges.rb +0 -113
  465. data/lib/rubocop/rspec/host_environment_simulation_helper.rb +0 -28
@@ -0,0 +1,148 @@
1
+ # frozen_string_literal: true
2
+
3
+ module RuboCop
4
+ module Cop
5
+ module Lint
6
+ # Checks for constant reassignments.
7
+ #
8
+ # Emulates Ruby's runtime warning "already initialized constant X"
9
+ # when a constant is reassigned in the same file and namespace using the
10
+ # `NAME = value` syntax.
11
+ #
12
+ # The cop cannot catch all offenses, like, for example, when a constant
13
+ # is reassigned in another file, or when using metaprogramming (`Module#const_set`).
14
+ #
15
+ # The cop only takes into account constants assigned in a "simple" way: directly
16
+ # inside class/module definition, or within another constant. Other type of assignments
17
+ # (e.g., inside a conditional) are disregarded.
18
+ #
19
+ # The cop also tracks constant removal using `Module#remove_const` with symbol
20
+ # or string argument.
21
+ #
22
+ # @example
23
+ # # bad
24
+ # X = :foo
25
+ # X = :bar
26
+ #
27
+ # # bad
28
+ # class A
29
+ # X = :foo
30
+ # X = :bar
31
+ # end
32
+ #
33
+ # # bad
34
+ # module A
35
+ # X = :foo
36
+ # X = :bar
37
+ # end
38
+ #
39
+ # # good - keep only one assignment
40
+ # X = :bar
41
+ #
42
+ # class A
43
+ # X = :bar
44
+ # end
45
+ #
46
+ # module A
47
+ # X = :bar
48
+ # end
49
+ #
50
+ # # good - use OR assignment
51
+ # X = :foo
52
+ # X ||= :bar
53
+ #
54
+ # # good - use conditional assignment
55
+ # X = :foo
56
+ # X = :bar unless defined?(X)
57
+ #
58
+ # # good - remove the assigned constant first
59
+ # class A
60
+ # X = :foo
61
+ # remove_const :X
62
+ # X = :bar
63
+ # end
64
+ #
65
+ class ConstantReassignment < Base
66
+ MSG = 'Constant `%<constant>s` is already assigned in this namespace.'
67
+
68
+ RESTRICT_ON_SEND = %i[remove_const].freeze
69
+
70
+ # @!method remove_constant(node)
71
+ def_node_matcher :remove_constant, <<~PATTERN
72
+ (send _ :remove_const
73
+ ({sym str} $_))
74
+ PATTERN
75
+
76
+ def on_casgn(node)
77
+ return unless fixed_constant_path?(node)
78
+ return unless simple_assignment?(node)
79
+ return if constant_names.add?(fully_qualified_constant_name(node))
80
+
81
+ add_offense(node, message: format(MSG, constant: node.name))
82
+ end
83
+
84
+ def on_send(node)
85
+ constant = remove_constant(node)
86
+
87
+ return unless constant
88
+
89
+ namespaces = ancestor_namespaces(node)
90
+
91
+ return if namespaces.none?
92
+
93
+ constant_names.delete(fully_qualified_name_for(namespaces, constant))
94
+ end
95
+
96
+ private
97
+
98
+ def fixed_constant_path?(node)
99
+ node.each_path.all? { |path| path.type?(:cbase, :const, :self) }
100
+ end
101
+
102
+ def simple_assignment?(node)
103
+ node.ancestors.all? do |ancestor|
104
+ return true if ancestor.type?(:module, :class)
105
+
106
+ ancestor.begin_type? || ancestor.literal? || ancestor.casgn_type? ||
107
+ freeze_method?(ancestor)
108
+ end
109
+ end
110
+
111
+ def freeze_method?(node)
112
+ node.send_type? && node.method?(:freeze)
113
+ end
114
+
115
+ def fully_qualified_constant_name(node)
116
+ if node.absolute?
117
+ namespace = node.namespace.const_type? ? node.namespace.source : nil
118
+
119
+ "#{namespace}::#{node.name}"
120
+ else
121
+ constant_namespaces = ancestor_namespaces(node) + constant_namespaces(node)
122
+
123
+ fully_qualified_name_for(constant_namespaces, node.name)
124
+ end
125
+ end
126
+
127
+ def fully_qualified_name_for(namespaces, constant)
128
+ ['', *namespaces, constant].join('::')
129
+ end
130
+
131
+ def constant_namespaces(node)
132
+ node.each_path.select(&:const_type?).map(&:short_name)
133
+ end
134
+
135
+ def ancestor_namespaces(node)
136
+ node
137
+ .each_ancestor(:class, :module)
138
+ .map { |ancestor| ancestor.identifier.short_name }
139
+ .reverse
140
+ end
141
+
142
+ def constant_names
143
+ @constant_names ||= Set.new
144
+ end
145
+ end
146
+ end
147
+ end
148
+ end
@@ -0,0 +1,84 @@
1
+ # frozen_string_literal: true
2
+
3
+ # rubocop:disable Lint/RedundantCopDisableDirective
4
+ # rubocop:disable Style/DoubleCopDisableDirective
5
+ module RuboCop
6
+ module Cop
7
+ module Lint
8
+ # Checks that `# rubocop:enable ...` and `# rubocop:disable ...` statements
9
+ # are strictly formatted.
10
+ #
11
+ # A comment can be added to the directive by prefixing it with `--`.
12
+ #
13
+ # @example
14
+ # # bad
15
+ # # rubocop:disable Layout/LineLength Style/Encoding
16
+ # # ^ missing comma
17
+ #
18
+ # # bad
19
+ # # rubocop:disable
20
+ #
21
+ # # bad
22
+ # # rubocop:disable Layout/LineLength # rubocop:disable Style/Encoding
23
+ #
24
+ # # bad
25
+ # # rubocop:wrongmode Layout/LineLength
26
+ #
27
+ # # good
28
+ # # rubocop:disable Layout/LineLength
29
+ #
30
+ # # good
31
+ # # rubocop:disable Layout/LineLength, Style/Encoding
32
+ #
33
+ # # good
34
+ # # rubocop:disable all
35
+ #
36
+ # # good
37
+ # # rubocop:disable Layout/LineLength -- This is a good comment.
38
+ #
39
+ class CopDirectiveSyntax < Base
40
+ COMMON_MSG = 'Malformed directive comment detected.'
41
+
42
+ MISSING_MODE_NAME_MSG = 'The mode name is missing.'
43
+ INVALID_MODE_NAME_MSG = 'The mode name must be one of `enable`, `disable`, or `todo`.'
44
+ MISSING_COP_NAME_MSG = 'The cop name is missing.'
45
+ MALFORMED_COP_NAMES_MSG = 'Cop names must be separated by commas. ' \
46
+ 'Comment in the directive must start with `--`.'
47
+
48
+ def on_new_investigation
49
+ processed_source.comments.each do |comment|
50
+ directive_comment = DirectiveComment.new(comment)
51
+ next unless directive_comment.start_with_marker?
52
+ next unless directive_comment.malformed?
53
+
54
+ message = offense_message(directive_comment)
55
+ add_offense(comment, message: message)
56
+ end
57
+ end
58
+
59
+ private
60
+
61
+ # rubocop:disable Metrics/MethodLength
62
+ def offense_message(directive_comment)
63
+ comment = directive_comment.comment
64
+ after_marker = comment.text.sub(DirectiveComment::DIRECTIVE_MARKER_REGEXP, '')
65
+ mode = after_marker.split(' ', 2).first
66
+ additional_msg = if mode.nil?
67
+ MISSING_MODE_NAME_MSG
68
+ elsif !DirectiveComment::AVAILABLE_MODES.include?(mode)
69
+ INVALID_MODE_NAME_MSG
70
+ elsif directive_comment.missing_cop_name?
71
+ MISSING_COP_NAME_MSG
72
+ else
73
+ MALFORMED_COP_NAMES_MSG
74
+ end
75
+
76
+ "#{COMMON_MSG} #{additional_msg}"
77
+ end
78
+ # rubocop:enable Metrics/MethodLength
79
+ end
80
+ end
81
+ end
82
+ end
83
+ # rubocop:enable Lint/RedundantCopDisableDirective
84
+ # rubocop:enable Style/DoubleCopDisableDirective
@@ -73,7 +73,7 @@ module RuboCop
73
73
  # require 'my_debugger/start'
74
74
  class Debugger < Base
75
75
  MSG = 'Remove debugger entry point `%<source>s`.'
76
- BLOCK_TYPES = %i[block numblock kwbegin].freeze
76
+ BLOCK_TYPES = %i[block numblock itblock kwbegin].freeze
77
77
 
78
78
  def on_send(node)
79
79
  return if assumed_usage_context?(node)
@@ -116,11 +116,11 @@ module RuboCop
116
116
 
117
117
  def assumed_usage_context?(node)
118
118
  # Basically, debugger methods are not used as a method argument without arguments.
119
- return false unless node.arguments.empty? && node.each_ancestor(:send, :csend).any?
119
+ return false unless node.arguments.empty? && node.each_ancestor(:call).any?
120
120
  return true if assumed_argument?(node)
121
121
 
122
122
  node.each_ancestor.none? do |ancestor|
123
- BLOCK_TYPES.include?(ancestor.type) || ancestor.lambda_or_proc?
123
+ ancestor.type?(:any_block, :kwbegin) || ancestor.lambda_or_proc?
124
124
  end
125
125
  end
126
126
 
@@ -33,6 +33,7 @@ module RuboCop
33
33
 
34
34
  MSG = 'Use `%<constant>s.%<method>s(%<replacement_args>s)` instead of `%<original>s`.'
35
35
 
36
+ RESTRICT_ON_SEND = %i[new digest].freeze
36
37
  NO_ARG_ALGORITHM = %w[BF DES IDEA RC4].freeze
37
38
 
38
39
  # @!method algorithm_const(node)
@@ -51,7 +52,7 @@ module RuboCop
51
52
  PATTERN
52
53
 
53
54
  def on_send(node)
54
- return if node.arguments.any? { |arg| arg.variable? || arg.send_type? || arg.const_type? }
55
+ return if node.arguments.any? { |arg| arg.variable? || arg.call_type? || arg.const_type? }
55
56
  return if digest_const?(node.receiver)
56
57
  return unless algorithm_const(node)
57
58
 
@@ -133,7 +134,7 @@ module RuboCop
133
134
  if NO_ARG_ALGORITHM.include?(algorithm_parts.first.upcase) && no_arguments
134
135
  "'#{algorithm_parts.first}'"
135
136
  else
136
- mode = 'cbc' unless size_and_mode == ['cbc']
137
+ mode = 'cbc' if size_and_mode.empty?
137
138
 
138
139
  "'#{(algorithm_parts + size_and_mode + [mode]).compact.take(3).join('-')}'"
139
140
  end
@@ -15,6 +15,9 @@ module RuboCop
15
15
  # With `IgnoreConstantBranches: true`, branches are not registered
16
16
  # as offenses if they return a constant value.
17
17
  #
18
+ # With `IgnoreDuplicateElseBranch: true`, in conditionals with multiple branches,
19
+ # duplicate 'else' branches are not registered as offenses.
20
+ #
18
21
  # @example
19
22
  # # bad
20
23
  # if foo
@@ -83,21 +86,37 @@ module RuboCop
83
86
  # else MEDIUM_SIZE
84
87
  # end
85
88
  #
89
+ # @example IgnoreDuplicateElseBranch: true
90
+ # # good
91
+ # if foo
92
+ # do_foo
93
+ # elsif bar
94
+ # do_bar
95
+ # else
96
+ # do_foo
97
+ # end
98
+ #
86
99
  class DuplicateBranch < Base
87
100
  MSG = 'Duplicate branch body detected.'
88
101
 
89
102
  def on_branching_statement(node)
90
- branches(node).each_with_object(Set.new) do |branch, previous|
91
- next unless consider_branch?(branch)
103
+ branches = branches(node)
104
+ branches.each_with_object(Set.new) do |branch, previous|
105
+ next unless consider_branch?(branches, branch)
92
106
 
93
107
  add_offense(offense_range(branch)) unless previous.add?(branch)
94
108
  end
95
109
  end
96
- alias on_if on_branching_statement
97
110
  alias on_case on_branching_statement
98
111
  alias on_case_match on_branching_statement
99
112
  alias on_rescue on_branching_statement
100
113
 
114
+ def on_if(node)
115
+ # Ignore 'elsif' nodes, because we don't want to check them separately whether
116
+ # the 'else' branch is duplicated. We want to check only on the outermost conditional.
117
+ on_branching_statement(node) unless node.elsif?
118
+ end
119
+
101
120
  private
102
121
 
103
122
  def offense_range(duplicate_branch)
@@ -118,10 +137,14 @@ module RuboCop
118
137
  node.branches.compact
119
138
  end
120
139
 
121
- def consider_branch?(branch)
140
+ def consider_branch?(branches, branch)
122
141
  return false if ignore_literal_branches? && literal_branch?(branch)
123
142
  return false if ignore_constant_branches? && const_branch?(branch)
124
143
 
144
+ if ignore_duplicate_else_branches? && duplicate_else_branch?(branches, branch)
145
+ return false
146
+ end
147
+
125
148
  true
126
149
  end
127
150
 
@@ -133,6 +156,10 @@ module RuboCop
133
156
  cop_config.fetch('IgnoreConstantBranches', false)
134
157
  end
135
158
 
159
+ def ignore_duplicate_else_branches?
160
+ cop_config.fetch('IgnoreDuplicateElseBranch', false)
161
+ end
162
+
136
163
  def literal_branch?(branch) # rubocop:disable Metrics/CyclomaticComplexity
137
164
  return false if !branch.literal? || branch.xstr_type?
138
165
  return true if branch.basic_literal?
@@ -147,6 +174,14 @@ module RuboCop
147
174
  def const_branch?(branch)
148
175
  branch.const_type?
149
176
  end
177
+
178
+ def duplicate_else_branch?(branches, branch)
179
+ return false unless (parent = branch.parent)
180
+
181
+ branches.size > 2 &&
182
+ branch.equal?(branches.last) &&
183
+ parent.respond_to?(:else?) && parent.else?
184
+ end
150
185
  end
151
186
  end
152
187
  end
@@ -106,7 +106,7 @@ module RuboCop
106
106
  private
107
107
 
108
108
  def pattern_identity(pattern)
109
- pattern_source = if pattern.hash_pattern_type? || pattern.match_alt_type?
109
+ pattern_source = if pattern.type?(:hash_pattern, :match_alt)
110
110
  pattern.children.map(&:source).sort.to_s
111
111
  else
112
112
  pattern.source
@@ -42,7 +42,6 @@ module RuboCop
42
42
  class DuplicateMethods < Base
43
43
  MSG = 'Method `%<method>s` is defined at both %<defined>s and %<current>s.'
44
44
  RESTRICT_ON_SEND = %i[alias_method attr_reader attr_writer attr_accessor attr].freeze
45
- DEF_TYPES = %i[def defs].freeze
46
45
 
47
46
  def initialize(config = nil, options = nil)
48
47
  super
@@ -54,14 +53,12 @@ module RuboCop
54
53
  # if a method definition is inside an if, it is very likely
55
54
  # that a different definition is used depending on platform, etc.
56
55
  return if node.each_ancestor.any?(&:if_type?)
57
- return if possible_dsl?(node)
58
56
 
59
57
  found_instance_method(node, node.method_name)
60
58
  end
61
59
 
62
60
  def on_defs(node)
63
61
  return if node.each_ancestor.any?(&:if_type?)
64
- return if possible_dsl?(node)
65
62
 
66
63
  if node.receiver.const_type?
67
64
  _, const_name = *node.receiver
@@ -79,7 +76,6 @@ module RuboCop
79
76
  def on_alias(node)
80
77
  return unless (name = method_alias?(node))
81
78
  return if node.ancestors.any?(&:if_type?)
82
- return if possible_dsl?(node)
83
79
 
84
80
  found_instance_method(node, name)
85
81
  end
@@ -94,7 +90,6 @@ module RuboCop
94
90
  def on_send(node)
95
91
  if (name = alias_method?(node))
96
92
  return if node.ancestors.any?(&:if_type?)
97
- return if possible_dsl?(node)
98
93
 
99
94
  found_instance_method(node, name)
100
95
  elsif (attr = node.attribute_accessor?)
@@ -166,7 +161,7 @@ module RuboCop
166
161
  end
167
162
 
168
163
  def method_key(node, method_name)
169
- if (ancestor_def = node.each_ancestor(*DEF_TYPES).first)
164
+ if (ancestor_def = node.each_ancestor(:any_def).first)
170
165
  "#{ancestor_def.method_name}.#{method_name}"
171
166
  else
172
167
  method_name
@@ -174,7 +169,7 @@ module RuboCop
174
169
  end
175
170
 
176
171
  def location(node)
177
- if DEF_TYPES.include?(node.type)
172
+ if node.any_def_type?
178
173
  node.loc.keyword.join(node.loc.name)
179
174
  else
180
175
  node.source_range
@@ -237,16 +232,6 @@ module RuboCop
237
232
  end
238
233
  end
239
234
 
240
- def possible_dsl?(node)
241
- # DSL methods may evaluate a block in the context of a newly created
242
- # class or module
243
- # Assume that if a method definition is inside any block call which
244
- # we can't identify, it could be a DSL
245
- node.each_ancestor(:block).any? do |ancestor|
246
- !ancestor.method?(:class_eval) && !ancestor.class_constructor?
247
- end
248
- end
249
-
250
235
  def source_location(node)
251
236
  range = node.source_range
252
237
  path = smart_path(range.source_buffer.name)
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Lint
6
- # Checks for duplicate elements in Regexp character classes.
6
+ # Checks for duplicate elements in `Regexp` character classes.
7
7
  #
8
8
  # @example
9
9
  #
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Lint
6
- # Checks for duplicate literal, constant, or variable elements in Set.
6
+ # Checks for duplicate literal, constant, or variable elements in `Set` and `SortedSet`.
7
7
  #
8
8
  # @example
9
9
  #
@@ -25,17 +25,28 @@ module RuboCop
25
25
  # # good
26
26
  # [:foo, :bar].to_set
27
27
  #
28
+ # # bad
29
+ # SortedSet[:foo, :bar, :foo]
30
+ #
31
+ # # good
32
+ # SortedSet[:foo, :bar]
33
+ #
34
+ # # bad
35
+ # SortedSet.new([:foo, :bar, :foo])
36
+ #
37
+ # # good
38
+ # SortedSet.new([:foo, :bar])
28
39
  class DuplicateSetElement < Base
29
40
  extend AutoCorrector
30
41
 
31
- MSG = 'Remove the duplicate element in Set.'
42
+ MSG = 'Remove the duplicate element in %<class_name>s.'
32
43
  RESTRICT_ON_SEND = %i[\[\] new to_set].freeze
33
44
 
34
45
  # @!method set_init_elements(node)
35
46
  def_node_matcher :set_init_elements, <<~PATTERN
36
47
  {
37
- (send (const {nil? cbase} :Set) :[] $...)
38
- (send (const {nil? cbase} :Set) :new (array $...))
48
+ (send (const {nil? cbase} {:Set :SortedSet}) :[] $...)
49
+ (send (const {nil? cbase} {:Set :SortedSet}) :new (array $...))
39
50
  (call (array $...) :to_set)
40
51
  }
41
52
  PATTERN
@@ -51,7 +62,7 @@ module RuboCop
51
62
  next if !set_element.literal? && !set_element.const_type? && !set_element.variable?
52
63
 
53
64
  if seen_elements.include?(set_element)
54
- register_offense(set_element, set_elements[index - 1])
65
+ register_offense(set_element, set_elements[index - 1], node)
55
66
  else
56
67
  seen_elements << set_element
57
68
  end
@@ -61,8 +72,10 @@ module RuboCop
61
72
 
62
73
  private
63
74
 
64
- def register_offense(current_element, prev_element)
65
- add_offense(current_element) do |corrector|
75
+ def register_offense(current_element, prev_element, node)
76
+ class_name = node.receiver.const_type? ? node.receiver.const_name : 'Set'
77
+
78
+ add_offense(current_element, message: format(MSG, class_name: class_name)) do |corrector|
66
79
  range = prev_element.source_range.end.join(current_element.source_range.end)
67
80
 
68
81
  corrector.remove(range)
@@ -7,11 +7,6 @@ module RuboCop
7
7
  #
8
8
  # NOTE: empty `else` branches are handled by `Style/EmptyElse`.
9
9
  #
10
- # @safety
11
- # Autocorrection for this cop is not safe. The conditions for empty branches that
12
- # the autocorrection removes may have side effects, or the logic in subsequent
13
- # branches may change due to the removal of a previous condition.
14
- #
15
10
  # @example
16
11
  # # bad
17
12
  # if condition
@@ -41,6 +36,13 @@ module RuboCop
41
36
  # if condition
42
37
  # do_something
43
38
  # elsif other_condition
39
+ # nil
40
+ # end
41
+ #
42
+ # # good
43
+ # if condition
44
+ # do_something
45
+ # elsif other_condition
44
46
  # do_something_else
45
47
  # end
46
48
  #
@@ -63,11 +65,9 @@ module RuboCop
63
65
  class EmptyConditionalBody < Base
64
66
  extend AutoCorrector
65
67
  include CommentsHelp
66
- include RangeHelp
67
68
 
68
69
  MSG = 'Avoid `%<keyword>s` branches without a body.'
69
70
 
70
- # rubocop:disable Metrics/AbcSize
71
71
  def on_if(node)
72
72
  return if node.body || same_line?(node.loc.begin, node.loc.end)
73
73
  return if cop_config['AllowComments'] && contains_comments?(node)
@@ -75,12 +75,11 @@ module RuboCop
75
75
  range = offense_range(node)
76
76
 
77
77
  add_offense(range, message: format(MSG, keyword: node.keyword)) do |corrector|
78
- next if node.parent&.call_type?
78
+ next unless can_simplify_conditional?(node)
79
79
 
80
- autocorrect(corrector, node)
80
+ flip_orphaned_else(corrector, node)
81
81
  end
82
82
  end
83
- # rubocop:enable Metrics/AbcSize
84
83
 
85
84
  private
86
85
 
@@ -92,53 +91,23 @@ module RuboCop
92
91
  end
93
92
  end
94
93
 
95
- def autocorrect(corrector, node)
96
- remove_comments(corrector, node)
97
- remove_empty_branch(corrector, node)
98
- correct_other_branches(corrector, node)
99
- end
100
-
101
- def remove_comments(corrector, node)
102
- comments_in_range(node).each do |comment|
103
- range = range_by_whole_lines(comment.source_range, include_final_newline: true)
104
- corrector.remove(range)
105
- end
94
+ def can_simplify_conditional?(node)
95
+ node.else_branch && node.loc.else.source == 'else'
106
96
  end
107
97
 
108
- # rubocop:disable Metrics/AbcSize
109
98
  def remove_empty_branch(corrector, node)
110
99
  range = if empty_if_branch?(node) && else_branch?(node)
111
100
  branch_range(node)
112
- elsif same_line?(node, else_kw_loc = node.loc.else)
113
- node.source_range.begin.join(else_kw_loc.begin)
114
- elsif node.parent&.loc.respond_to?(:end) &&
115
- same_line?(node, end_loc = node.parent.loc.end)
116
- node.source_range.begin.join(end_loc.begin)
117
101
  else
118
102
  deletion_range(branch_range(node))
119
103
  end
120
104
 
121
105
  corrector.remove(range)
122
106
  end
123
- # rubocop:enable Metrics/AbcSize
124
-
125
- def correct_other_branches(corrector, node)
126
- return unless require_other_branches_correction?(node)
127
-
128
- if node.else_branch&.if_type? && !node.else_branch.modifier_form?
129
- # Replace an orphaned `elsif` with `if`
130
- corrector.replace(node.else_branch.loc.keyword, 'if')
131
- else
132
- # Flip orphaned `else`
133
- corrector.replace(node.loc.else, "#{node.inverse_keyword} #{node.condition.source}")
134
- end
135
- end
136
-
137
- def require_other_branches_correction?(node)
138
- return false unless node.if_type? && node.else?
139
- return false if !empty_if_branch?(node) && node.elsif?
140
107
 
141
- !empty_elsif_branch?(node)
108
+ def flip_orphaned_else(corrector, node)
109
+ corrector.replace(node.loc.else, "#{node.inverse_keyword} #{node.condition.source}")
110
+ remove_empty_branch(corrector, node)
142
111
  end
143
112
 
144
113
  def empty_if_branch?(node)
@@ -149,36 +118,17 @@ module RuboCop
149
118
  if_branch.if_type? && !if_branch.body
150
119
  end
151
120
 
152
- def empty_elsif_branch?(node)
153
- return false unless (else_branch = node.else_branch)
154
-
155
- else_branch.if_type? && !else_branch.body
156
- end
157
-
158
121
  def else_branch?(node)
159
122
  node.else_branch && !node.else_branch.if_type?
160
123
  end
161
124
 
162
- # rubocop:disable Metrics/AbcSize
163
125
  def branch_range(node)
164
126
  if empty_if_branch?(node) && else_branch?(node)
165
127
  node.source_range.with(end_pos: node.loc.else.begin_pos)
166
128
  elsif node.loc.else
167
129
  node.source_range.with(end_pos: node.condition.source_range.end_pos)
168
- elsif all_branches_body_missing?(node)
169
- if_node = node.ancestors.detect(&:if?)
170
- node.source_range.join(if_node.loc.end.end)
171
- else
172
- node.source_range
173
130
  end
174
131
  end
175
- # rubocop:enable Metrics/AbcSize
176
-
177
- def all_branches_body_missing?(node)
178
- return false unless node.parent&.if_type?
179
-
180
- node.parent.branches.compact.empty?
181
- end
182
132
 
183
133
  def deletion_range(range)
184
134
  # Collect a range between the start of the `if` node and the next relevant node,
@@ -38,7 +38,7 @@ module RuboCop
38
38
  MSG = 'Empty `ensure` block detected.'
39
39
 
40
40
  def on_ensure(node)
41
- return if node.body
41
+ return if node.branch
42
42
 
43
43
  add_offense(node.loc.keyword) { |corrector| corrector.remove(node.loc.keyword) }
44
44
  end