rubocop 1.19.0 → 1.33.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (618) hide show
  1. checksums.yaml +4 -4
  2. data/LICENSE.txt +1 -1
  3. data/README.md +8 -7
  4. data/config/default.yml +417 -83
  5. data/config/obsoletion.yml +35 -2
  6. data/exe/rubocop +15 -7
  7. data/lib/rubocop/cache_config.rb +29 -0
  8. data/lib/rubocop/cli/command/auto_genenerate_config.rb +21 -6
  9. data/lib/rubocop/cli/command/execute_runner.rb +1 -1
  10. data/lib/rubocop/cli/command/init_dotfile.rb +2 -2
  11. data/lib/rubocop/cli/command/show_cops.rb +1 -1
  12. data/lib/rubocop/cli/command/show_docs_url.rb +48 -0
  13. data/lib/rubocop/cli/command/suggest_extensions.rb +5 -5
  14. data/lib/rubocop/cli.rb +4 -1
  15. data/lib/rubocop/config.rb +10 -1
  16. data/lib/rubocop/config_finder.rb +68 -0
  17. data/lib/rubocop/config_loader.rb +12 -48
  18. data/lib/rubocop/config_loader_resolver.rb +2 -2
  19. data/lib/rubocop/config_obsoletion/changed_parameter.rb +5 -0
  20. data/lib/rubocop/config_obsoletion/extracted_cop.rb +3 -1
  21. data/lib/rubocop/config_obsoletion/parameter_rule.rb +4 -0
  22. data/lib/rubocop/config_obsoletion.rb +7 -2
  23. data/lib/rubocop/config_validator.rb +30 -5
  24. data/lib/rubocop/cop/autocorrect_logic.rb +8 -2
  25. data/lib/rubocop/cop/badge.rb +8 -2
  26. data/lib/rubocop/cop/base.rb +9 -5
  27. data/lib/rubocop/cop/bundler/duplicated_gem.rb +4 -8
  28. data/lib/rubocop/cop/bundler/gem_comment.rb +3 -3
  29. data/lib/rubocop/cop/bundler/gem_filename.rb +103 -0
  30. data/lib/rubocop/cop/bundler/insecure_protocol_source.rb +45 -21
  31. data/lib/rubocop/cop/bundler/ordered_gems.rb +5 -14
  32. data/lib/rubocop/cop/corrector.rb +2 -2
  33. data/lib/rubocop/cop/correctors/alignment_corrector.rb +1 -1
  34. data/lib/rubocop/cop/correctors/condition_corrector.rb +1 -1
  35. data/lib/rubocop/cop/correctors/each_to_for_corrector.rb +2 -2
  36. data/lib/rubocop/cop/correctors/empty_line_corrector.rb +1 -1
  37. data/lib/rubocop/cop/correctors/for_to_each_corrector.rb +4 -2
  38. data/lib/rubocop/cop/correctors/if_then_corrector.rb +55 -0
  39. data/lib/rubocop/cop/correctors/lambda_literal_to_method_corrector.rb +3 -3
  40. data/lib/rubocop/cop/correctors/line_break_corrector.rb +8 -2
  41. data/lib/rubocop/cop/correctors/multiline_literal_brace_corrector.rb +3 -3
  42. data/lib/rubocop/cop/correctors/ordered_gem_corrector.rb +12 -11
  43. data/lib/rubocop/cop/correctors/parentheses_corrector.rb +1 -1
  44. data/lib/rubocop/cop/correctors/percent_literal_corrector.rb +1 -1
  45. data/lib/rubocop/cop/correctors/punctuation_corrector.rb +1 -1
  46. data/lib/rubocop/cop/correctors/space_corrector.rb +1 -1
  47. data/lib/rubocop/cop/correctors/string_literal_corrector.rb +1 -1
  48. data/lib/rubocop/cop/correctors/unused_arg_corrector.rb +2 -2
  49. data/lib/rubocop/cop/documentation.rb +20 -3
  50. data/lib/rubocop/cop/gemspec/dependency_version.rb +156 -0
  51. data/lib/rubocop/cop/gemspec/deprecated_attribute_assignment.rb +92 -0
  52. data/lib/rubocop/cop/gemspec/duplicated_assignment.rb +6 -22
  53. data/lib/rubocop/cop/gemspec/ordered_dependencies.rb +4 -13
  54. data/lib/rubocop/cop/gemspec/require_mfa.rb +145 -0
  55. data/lib/rubocop/cop/gemspec/required_ruby_version.rb +41 -27
  56. data/lib/rubocop/cop/gemspec/ruby_version_globals_usage.rb +4 -11
  57. data/lib/rubocop/cop/generator.rb +25 -19
  58. data/lib/rubocop/cop/internal_affairs/cop_description.rb +96 -0
  59. data/lib/rubocop/cop/internal_affairs/empty_line_between_expect_offense_and_correction.rb +1 -1
  60. data/lib/rubocop/cop/internal_affairs/location_line_equality_comparison.rb +60 -0
  61. data/lib/rubocop/cop/internal_affairs/method_name_end_with.rb +80 -0
  62. data/lib/rubocop/cop/internal_affairs/node_matcher_directive.rb +2 -6
  63. data/lib/rubocop/cop/internal_affairs/redundant_context_config_parameter.rb +46 -0
  64. data/lib/rubocop/cop/internal_affairs/redundant_described_class_as_subject.rb +1 -1
  65. data/lib/rubocop/cop/internal_affairs/redundant_let_rubocop_config_new.rb +1 -1
  66. data/lib/rubocop/cop/internal_affairs/redundant_location_argument.rb +1 -1
  67. data/lib/rubocop/cop/internal_affairs/redundant_message_argument.rb +1 -1
  68. data/lib/rubocop/cop/internal_affairs/redundant_method_dispatch_node.rb +47 -0
  69. data/lib/rubocop/cop/internal_affairs/undefined_config.rb +3 -1
  70. data/lib/rubocop/cop/internal_affairs/useless_restrict_on_send.rb +60 -0
  71. data/lib/rubocop/cop/internal_affairs.rb +6 -0
  72. data/lib/rubocop/cop/layout/argument_alignment.rb +57 -9
  73. data/lib/rubocop/cop/layout/assignment_indentation.rb +2 -2
  74. data/lib/rubocop/cop/layout/begin_end_alignment.rb +1 -1
  75. data/lib/rubocop/cop/layout/block_alignment.rb +4 -4
  76. data/lib/rubocop/cop/layout/block_end_newline.rb +33 -6
  77. data/lib/rubocop/cop/layout/case_indentation.rb +17 -1
  78. data/lib/rubocop/cop/layout/class_structure.rb +2 -1
  79. data/lib/rubocop/cop/layout/closing_parenthesis_indentation.rb +1 -1
  80. data/lib/rubocop/cop/layout/comment_indentation.rb +33 -4
  81. data/lib/rubocop/cop/layout/condition_position.rb +1 -1
  82. data/lib/rubocop/cop/layout/def_end_alignment.rb +1 -1
  83. data/lib/rubocop/cop/layout/dot_position.rb +39 -6
  84. data/lib/rubocop/cop/layout/else_alignment.rb +1 -1
  85. data/lib/rubocop/cop/layout/empty_comment.rb +3 -3
  86. data/lib/rubocop/cop/layout/empty_line_after_guard_clause.rb +1 -1
  87. data/lib/rubocop/cop/layout/empty_line_after_multiline_condition.rb +1 -1
  88. data/lib/rubocop/cop/layout/empty_line_between_defs.rb +23 -2
  89. data/lib/rubocop/cop/layout/empty_lines.rb +1 -1
  90. data/lib/rubocop/cop/layout/empty_lines_around_arguments.rb +1 -1
  91. data/lib/rubocop/cop/layout/empty_lines_around_attribute_accessor.rb +25 -4
  92. data/lib/rubocop/cop/layout/empty_lines_around_begin_body.rb +1 -1
  93. data/lib/rubocop/cop/layout/empty_lines_around_block_body.rb +5 -5
  94. data/lib/rubocop/cop/layout/empty_lines_around_class_body.rb +10 -10
  95. data/lib/rubocop/cop/layout/empty_lines_around_exception_handling_keywords.rb +12 -5
  96. data/lib/rubocop/cop/layout/empty_lines_around_method_body.rb +1 -1
  97. data/lib/rubocop/cop/layout/empty_lines_around_module_body.rb +10 -10
  98. data/lib/rubocop/cop/layout/end_alignment.rb +3 -4
  99. data/lib/rubocop/cop/layout/end_of_line.rb +1 -1
  100. data/lib/rubocop/cop/layout/extra_spacing.rb +1 -1
  101. data/lib/rubocop/cop/layout/first_argument_indentation.rb +34 -29
  102. data/lib/rubocop/cop/layout/first_array_element_indentation.rb +22 -15
  103. data/lib/rubocop/cop/layout/first_array_element_line_break.rb +1 -1
  104. data/lib/rubocop/cop/layout/first_hash_element_indentation.rb +53 -14
  105. data/lib/rubocop/cop/layout/first_hash_element_line_break.rb +1 -1
  106. data/lib/rubocop/cop/layout/first_method_argument_line_break.rb +1 -1
  107. data/lib/rubocop/cop/layout/first_method_parameter_line_break.rb +1 -1
  108. data/lib/rubocop/cop/layout/first_parameter_indentation.rb +2 -2
  109. data/lib/rubocop/cop/layout/hash_alignment.rb +10 -3
  110. data/lib/rubocop/cop/layout/heredoc_argument_closing_parenthesis.rb +2 -2
  111. data/lib/rubocop/cop/layout/heredoc_indentation.rb +1 -1
  112. data/lib/rubocop/cop/layout/indentation_consistency.rb +1 -1
  113. data/lib/rubocop/cop/layout/indentation_style.rb +1 -1
  114. data/lib/rubocop/cop/layout/indentation_width.rb +12 -10
  115. data/lib/rubocop/cop/layout/initial_indentation.rb +2 -2
  116. data/lib/rubocop/cop/layout/leading_comment_space.rb +2 -2
  117. data/lib/rubocop/cop/layout/leading_empty_lines.rb +1 -1
  118. data/lib/rubocop/cop/layout/line_continuation_leading_space.rb +112 -0
  119. data/lib/rubocop/cop/layout/line_continuation_spacing.rb +130 -0
  120. data/lib/rubocop/cop/layout/line_end_string_concatenation_indentation.rb +2 -2
  121. data/lib/rubocop/cop/layout/line_length.rb +16 -12
  122. data/lib/rubocop/cop/layout/multiline_array_brace_layout.rb +1 -1
  123. data/lib/rubocop/cop/layout/multiline_array_line_breaks.rb +1 -1
  124. data/lib/rubocop/cop/layout/multiline_assignment_layout.rb +2 -2
  125. data/lib/rubocop/cop/layout/multiline_block_layout.rb +5 -5
  126. data/lib/rubocop/cop/layout/multiline_hash_brace_layout.rb +1 -1
  127. data/lib/rubocop/cop/layout/multiline_hash_key_line_breaks.rb +1 -1
  128. data/lib/rubocop/cop/layout/multiline_method_argument_line_breaks.rb +7 -1
  129. data/lib/rubocop/cop/layout/multiline_method_call_brace_layout.rb +1 -1
  130. data/lib/rubocop/cop/layout/multiline_method_call_indentation.rb +23 -6
  131. data/lib/rubocop/cop/layout/multiline_method_definition_brace_layout.rb +1 -1
  132. data/lib/rubocop/cop/layout/multiline_method_parameter_line_breaks.rb +45 -0
  133. data/lib/rubocop/cop/layout/multiline_operation_indentation.rb +9 -10
  134. data/lib/rubocop/cop/layout/redundant_line_break.rb +5 -5
  135. data/lib/rubocop/cop/layout/rescue_ensure_alignment.rb +8 -7
  136. data/lib/rubocop/cop/layout/single_line_block_chain.rb +16 -5
  137. data/lib/rubocop/cop/layout/space_after_colon.rb +1 -1
  138. data/lib/rubocop/cop/layout/space_after_not.rb +2 -1
  139. data/lib/rubocop/cop/layout/space_around_block_parameters.rb +2 -2
  140. data/lib/rubocop/cop/layout/space_around_equals_in_parameter_default.rb +2 -1
  141. data/lib/rubocop/cop/layout/space_around_keyword.rb +2 -2
  142. data/lib/rubocop/cop/layout/space_around_operators.rb +1 -1
  143. data/lib/rubocop/cop/layout/space_before_block_braces.rb +3 -3
  144. data/lib/rubocop/cop/layout/space_before_brackets.rb +8 -0
  145. data/lib/rubocop/cop/layout/space_before_comment.rb +2 -2
  146. data/lib/rubocop/cop/layout/space_before_first_arg.rb +5 -1
  147. data/lib/rubocop/cop/layout/space_in_lambda_literal.rb +12 -6
  148. data/lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb +10 -10
  149. data/lib/rubocop/cop/layout/space_inside_block_braces.rb +8 -6
  150. data/lib/rubocop/cop/layout/space_inside_parens.rb +74 -28
  151. data/lib/rubocop/cop/layout/space_inside_reference_brackets.rb +2 -2
  152. data/lib/rubocop/cop/layout/space_inside_string_interpolation.rb +1 -1
  153. data/lib/rubocop/cop/layout/trailing_empty_lines.rb +9 -9
  154. data/lib/rubocop/cop/layout/trailing_whitespace.rb +3 -3
  155. data/lib/rubocop/cop/lint/ambiguous_assignment.rb +1 -1
  156. data/lib/rubocop/cop/lint/ambiguous_block_association.rb +28 -7
  157. data/lib/rubocop/cop/lint/ambiguous_operator.rb +7 -7
  158. data/lib/rubocop/cop/lint/ambiguous_operator_precedence.rb +111 -0
  159. data/lib/rubocop/cop/lint/ambiguous_range.rb +13 -13
  160. data/lib/rubocop/cop/lint/ambiguous_regexp_literal.rb +6 -2
  161. data/lib/rubocop/cop/lint/assignment_in_condition.rb +8 -6
  162. data/lib/rubocop/cop/lint/binary_operator_with_identical_operands.rb +19 -6
  163. data/lib/rubocop/cop/lint/boolean_symbol.rb +6 -1
  164. data/lib/rubocop/cop/lint/circular_argument_reference.rb +1 -1
  165. data/lib/rubocop/cop/lint/constant_definition_in_block.rb +1 -1
  166. data/lib/rubocop/cop/lint/constant_overwritten_in_rescue.rb +51 -0
  167. data/lib/rubocop/cop/lint/debugger.rb +14 -6
  168. data/lib/rubocop/cop/lint/deprecated_class_methods.rb +31 -13
  169. data/lib/rubocop/cop/lint/deprecated_constants.rb +4 -3
  170. data/lib/rubocop/cop/lint/deprecated_open_ssl_constant.rb +6 -0
  171. data/lib/rubocop/cop/lint/disjunctive_assignment_in_constructor.rb +24 -1
  172. data/lib/rubocop/cop/lint/duplicate_branch.rb +1 -1
  173. data/lib/rubocop/cop/lint/duplicate_case_condition.rb +1 -1
  174. data/lib/rubocop/cop/lint/duplicate_elsif_condition.rb +1 -1
  175. data/lib/rubocop/cop/lint/duplicate_hash_key.rb +1 -1
  176. data/lib/rubocop/cop/lint/duplicate_methods.rb +1 -1
  177. data/lib/rubocop/cop/lint/duplicate_regexp_character_class_element.rb +1 -1
  178. data/lib/rubocop/cop/lint/duplicate_require.rb +11 -2
  179. data/lib/rubocop/cop/lint/duplicate_rescue_exception.rb +1 -1
  180. data/lib/rubocop/cop/lint/each_with_object_argument.rb +2 -2
  181. data/lib/rubocop/cop/lint/else_layout.rb +13 -9
  182. data/lib/rubocop/cop/lint/empty_block.rb +1 -1
  183. data/lib/rubocop/cop/lint/empty_class.rb +1 -1
  184. data/lib/rubocop/cop/lint/empty_conditional_body.rb +64 -3
  185. data/lib/rubocop/cop/lint/empty_ensure.rb +1 -1
  186. data/lib/rubocop/cop/lint/empty_expression.rb +1 -1
  187. data/lib/rubocop/cop/lint/empty_file.rb +1 -1
  188. data/lib/rubocop/cop/lint/empty_in_pattern.rb +4 -2
  189. data/lib/rubocop/cop/lint/empty_interpolation.rb +1 -1
  190. data/lib/rubocop/cop/lint/empty_when.rb +4 -2
  191. data/lib/rubocop/cop/lint/ensure_return.rb +1 -1
  192. data/lib/rubocop/cop/lint/erb_new_arguments.rb +2 -2
  193. data/lib/rubocop/cop/lint/flip_flop.rb +1 -1
  194. data/lib/rubocop/cop/lint/float_comparison.rb +1 -1
  195. data/lib/rubocop/cop/lint/float_out_of_range.rb +2 -2
  196. data/lib/rubocop/cop/lint/hash_compare_by_identity.rb +12 -3
  197. data/lib/rubocop/cop/lint/heredoc_method_call_position.rb +1 -1
  198. data/lib/rubocop/cop/lint/implicit_string_concatenation.rb +1 -1
  199. data/lib/rubocop/cop/lint/incompatible_io_select_with_fiber_scheduler.rb +79 -0
  200. data/lib/rubocop/cop/lint/ineffective_access_modifier.rb +1 -1
  201. data/lib/rubocop/cop/lint/inherit_exception.rb +19 -28
  202. data/lib/rubocop/cop/lint/interpolation_check.rb +7 -2
  203. data/lib/rubocop/cop/lint/lambda_without_literal_block.rb +10 -3
  204. data/lib/rubocop/cop/lint/literal_as_condition.rb +6 -1
  205. data/lib/rubocop/cop/lint/literal_in_interpolation.rb +1 -1
  206. data/lib/rubocop/cop/lint/loop.rb +5 -4
  207. data/lib/rubocop/cop/lint/missing_cop_enable_directive.rb +1 -1
  208. data/lib/rubocop/cop/lint/missing_super.rb +1 -1
  209. data/lib/rubocop/cop/lint/nested_method_definition.rb +1 -1
  210. data/lib/rubocop/cop/lint/nested_percent_literal.rb +1 -1
  211. data/lib/rubocop/cop/lint/non_atomic_file_operation.rb +157 -0
  212. data/lib/rubocop/cop/lint/non_deterministic_require_order.rb +9 -5
  213. data/lib/rubocop/cop/lint/non_local_exit_from_iterator.rb +1 -1
  214. data/lib/rubocop/cop/lint/number_conversion.rb +47 -11
  215. data/lib/rubocop/cop/lint/numbered_parameter_assignment.rb +2 -2
  216. data/lib/rubocop/cop/lint/or_assignment_to_constant.rb +4 -3
  217. data/lib/rubocop/cop/lint/out_of_range_regexp_ref.rb +17 -0
  218. data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb +12 -8
  219. data/lib/rubocop/cop/lint/percent_string_array.rb +11 -1
  220. data/lib/rubocop/cop/lint/percent_symbol_array.rb +1 -1
  221. data/lib/rubocop/cop/lint/raise_exception.rb +5 -1
  222. data/lib/rubocop/cop/lint/rand_one.rb +1 -1
  223. data/lib/rubocop/cop/lint/redundant_cop_disable_directive.rb +6 -6
  224. data/lib/rubocop/cop/lint/redundant_cop_enable_directive.rb +2 -2
  225. data/lib/rubocop/cop/lint/redundant_dir_glob_sort.rb +5 -0
  226. data/lib/rubocop/cop/lint/redundant_require_statement.rb +4 -1
  227. data/lib/rubocop/cop/lint/redundant_safe_navigation.rb +13 -5
  228. data/lib/rubocop/cop/lint/redundant_splat_expansion.rb +1 -1
  229. data/lib/rubocop/cop/lint/redundant_string_coercion.rb +1 -1
  230. data/lib/rubocop/cop/lint/redundant_with_index.rb +1 -1
  231. data/lib/rubocop/cop/lint/redundant_with_object.rb +1 -1
  232. data/lib/rubocop/cop/lint/refinement_import_methods.rb +51 -0
  233. data/lib/rubocop/cop/lint/regexp_as_condition.rb +3 -3
  234. data/lib/rubocop/cop/lint/require_parentheses.rb +1 -1
  235. data/lib/rubocop/cop/lint/require_range_parentheses.rb +57 -0
  236. data/lib/rubocop/cop/lint/require_relative_self_path.rb +50 -0
  237. data/lib/rubocop/cop/lint/rescue_exception.rb +1 -1
  238. data/lib/rubocop/cop/lint/return_in_void_context.rb +6 -18
  239. data/lib/rubocop/cop/lint/safe_navigation_chain.rb +38 -1
  240. data/lib/rubocop/cop/lint/safe_navigation_consistency.rb +1 -1
  241. data/lib/rubocop/cop/lint/safe_navigation_with_empty.rb +1 -1
  242. data/lib/rubocop/cop/lint/script_permission.rb +1 -1
  243. data/lib/rubocop/cop/lint/self_assignment.rb +1 -1
  244. data/lib/rubocop/cop/lint/shadowed_argument.rb +1 -1
  245. data/lib/rubocop/cop/lint/shadowed_exception.rb +1 -1
  246. data/lib/rubocop/cop/lint/shadowing_outer_local_variable.rb +12 -2
  247. data/lib/rubocop/cop/lint/struct_new_override.rb +3 -3
  248. data/lib/rubocop/cop/lint/suppressed_exception.rb +1 -1
  249. data/lib/rubocop/cop/lint/symbol_conversion.rb +5 -4
  250. data/lib/rubocop/cop/lint/syntax.rb +2 -3
  251. data/lib/rubocop/cop/lint/to_enum_arguments.rb +1 -1
  252. data/lib/rubocop/cop/lint/to_json.rb +1 -1
  253. data/lib/rubocop/cop/lint/top_level_return_with_argument.rb +1 -1
  254. data/lib/rubocop/cop/lint/trailing_comma_in_attribute_declaration.rb +2 -2
  255. data/lib/rubocop/cop/lint/triple_quotes.rb +1 -1
  256. data/lib/rubocop/cop/lint/underscore_prefixed_variable_name.rb +1 -1
  257. data/lib/rubocop/cop/lint/unexpected_block_arity.rb +9 -4
  258. data/lib/rubocop/cop/lint/unified_integer.rb +3 -1
  259. data/lib/rubocop/cop/lint/unreachable_code.rb +1 -1
  260. data/lib/rubocop/cop/lint/unreachable_loop.rb +5 -5
  261. data/lib/rubocop/cop/lint/unused_block_argument.rb +1 -1
  262. data/lib/rubocop/cop/lint/unused_method_argument.rb +4 -5
  263. data/lib/rubocop/cop/lint/uri_escape_unescape.rb +1 -1
  264. data/lib/rubocop/cop/lint/uri_regexp.rb +1 -1
  265. data/lib/rubocop/cop/lint/useless_access_modifier.rb +1 -1
  266. data/lib/rubocop/cop/lint/useless_assignment.rb +1 -1
  267. data/lib/rubocop/cop/lint/useless_else_without_rescue.rb +2 -3
  268. data/lib/rubocop/cop/lint/useless_method_definition.rb +4 -3
  269. data/lib/rubocop/cop/lint/useless_ruby2_keywords.rb +117 -0
  270. data/lib/rubocop/cop/lint/useless_setter_call.rb +8 -5
  271. data/lib/rubocop/cop/lint/useless_times.rb +19 -14
  272. data/lib/rubocop/cop/lint/void.rb +1 -1
  273. data/lib/rubocop/cop/metrics/abc_size.rb +10 -2
  274. data/lib/rubocop/cop/metrics/block_length.rb +8 -7
  275. data/lib/rubocop/cop/metrics/block_nesting.rb +1 -1
  276. data/lib/rubocop/cop/metrics/class_length.rb +1 -1
  277. data/lib/rubocop/cop/metrics/cyclomatic_complexity.rb +1 -10
  278. data/lib/rubocop/cop/metrics/method_length.rb +10 -8
  279. data/lib/rubocop/cop/metrics/module_length.rb +2 -2
  280. data/lib/rubocop/cop/metrics/parameter_lists.rb +6 -3
  281. data/lib/rubocop/cop/metrics/perceived_complexity.rb +2 -2
  282. data/lib/rubocop/cop/metrics/utils/abc_size_calculator.rb +3 -4
  283. data/lib/rubocop/cop/metrics/utils/code_length_calculator.rb +24 -5
  284. data/lib/rubocop/cop/metrics/utils/repeated_attribute_discount.rb +1 -1
  285. data/lib/rubocop/cop/mixin/allowed_methods.rb +15 -1
  286. data/lib/rubocop/cop/mixin/allowed_pattern.rb +48 -0
  287. data/lib/rubocop/cop/mixin/annotation_comment.rb +57 -34
  288. data/lib/rubocop/cop/mixin/check_line_breakable.rb +4 -0
  289. data/lib/rubocop/cop/mixin/code_length.rb +1 -1
  290. data/lib/rubocop/cop/mixin/comments_help.rb +28 -2
  291. data/lib/rubocop/cop/mixin/def_node.rb +2 -7
  292. data/lib/rubocop/cop/mixin/documentation_comment.rb +5 -2
  293. data/lib/rubocop/cop/mixin/duplication.rb +1 -1
  294. data/lib/rubocop/cop/mixin/end_keyword_alignment.rb +1 -2
  295. data/lib/rubocop/cop/mixin/enforce_superclass.rb +5 -0
  296. data/lib/rubocop/cop/mixin/frozen_string_literal.rb +23 -1
  297. data/lib/rubocop/cop/mixin/gemspec_help.rb +30 -0
  298. data/lib/rubocop/cop/mixin/hash_alignment_styles.rb +4 -3
  299. data/lib/rubocop/cop/mixin/hash_shorthand_syntax.rb +86 -0
  300. data/lib/rubocop/cop/mixin/hash_transform_method.rb +3 -3
  301. data/lib/rubocop/cop/mixin/heredoc.rb +1 -3
  302. data/lib/rubocop/cop/mixin/line_length_help.rb +17 -6
  303. data/lib/rubocop/cop/mixin/method_complexity.rb +4 -9
  304. data/lib/rubocop/cop/mixin/multiline_element_indentation.rb +35 -13
  305. data/lib/rubocop/cop/mixin/multiline_expression_indentation.rb +6 -5
  306. data/lib/rubocop/cop/mixin/multiline_literal_brace_layout.rb +1 -1
  307. data/lib/rubocop/cop/mixin/ordered_gem_node.rb +9 -1
  308. data/lib/rubocop/cop/mixin/percent_array.rb +70 -3
  309. data/lib/rubocop/cop/mixin/preceding_following_alignment.rb +9 -1
  310. data/lib/rubocop/cop/mixin/preferred_delimiters.rb +2 -2
  311. data/lib/rubocop/cop/mixin/range_help.rb +7 -3
  312. data/lib/rubocop/cop/mixin/space_after_punctuation.rb +1 -1
  313. data/lib/rubocop/cop/mixin/space_before_punctuation.rb +1 -1
  314. data/lib/rubocop/cop/mixin/statement_modifier.rb +2 -2
  315. data/lib/rubocop/cop/mixin/string_help.rb +1 -1
  316. data/lib/rubocop/cop/mixin/surrounding_space.rb +4 -2
  317. data/lib/rubocop/cop/mixin/trailing_body.rb +1 -1
  318. data/lib/rubocop/cop/mixin/trailing_comma.rb +1 -1
  319. data/lib/rubocop/cop/naming/accessor_method_name.rb +4 -2
  320. data/lib/rubocop/cop/naming/ascii_identifiers.rb +1 -4
  321. data/lib/rubocop/cop/naming/binary_operator_parameter_name.rb +1 -1
  322. data/lib/rubocop/cop/naming/block_forwarding.rb +121 -0
  323. data/lib/rubocop/cop/naming/block_parameter_name.rb +2 -2
  324. data/lib/rubocop/cop/naming/class_and_module_camel_case.rb +1 -1
  325. data/lib/rubocop/cop/naming/constant_name.rb +2 -2
  326. data/lib/rubocop/cop/naming/file_name.rb +39 -6
  327. data/lib/rubocop/cop/naming/heredoc_delimiter_case.rb +1 -1
  328. data/lib/rubocop/cop/naming/heredoc_delimiter_naming.rb +1 -1
  329. data/lib/rubocop/cop/naming/inclusive_language.rb +12 -11
  330. data/lib/rubocop/cop/naming/memoized_instance_variable_name.rb +6 -5
  331. data/lib/rubocop/cop/naming/method_name.rb +6 -6
  332. data/lib/rubocop/cop/naming/method_parameter_name.rb +2 -2
  333. data/lib/rubocop/cop/naming/predicate_name.rb +32 -3
  334. data/lib/rubocop/cop/naming/rescued_exceptions_variable_name.rb +8 -1
  335. data/lib/rubocop/cop/naming/variable_name.rb +10 -1
  336. data/lib/rubocop/cop/naming/variable_number.rb +28 -18
  337. data/lib/rubocop/cop/offense.rb +1 -1
  338. data/lib/rubocop/cop/security/compound_hash.rb +105 -0
  339. data/lib/rubocop/cop/security/eval.rb +1 -1
  340. data/lib/rubocop/cop/security/io_methods.rb +49 -0
  341. data/lib/rubocop/cop/security/json_load.rb +9 -8
  342. data/lib/rubocop/cop/security/marshal_load.rb +1 -1
  343. data/lib/rubocop/cop/security/open.rb +15 -1
  344. data/lib/rubocop/cop/security/yaml_load.rb +14 -4
  345. data/lib/rubocop/cop/style/accessor_grouping.rb +6 -6
  346. data/lib/rubocop/cop/style/alias.rb +4 -4
  347. data/lib/rubocop/cop/style/and_or.rb +14 -9
  348. data/lib/rubocop/cop/style/arguments_forwarding.rb +14 -3
  349. data/lib/rubocop/cop/style/array_coercion.rb +22 -4
  350. data/lib/rubocop/cop/style/array_join.rb +1 -1
  351. data/lib/rubocop/cop/style/ascii_comments.rb +1 -4
  352. data/lib/rubocop/cop/style/attr.rb +1 -1
  353. data/lib/rubocop/cop/style/auto_resource_cleanup.rb +1 -1
  354. data/lib/rubocop/cop/style/bare_percent_literals.rb +1 -1
  355. data/lib/rubocop/cop/style/bisected_attr_accessor/macro.rb +1 -1
  356. data/lib/rubocop/cop/style/bisected_attr_accessor.rb +1 -1
  357. data/lib/rubocop/cop/style/block_comments.rb +1 -1
  358. data/lib/rubocop/cop/style/block_delimiters.rb +57 -14
  359. data/lib/rubocop/cop/style/case_equality.rb +7 -10
  360. data/lib/rubocop/cop/style/case_like_if.rb +6 -1
  361. data/lib/rubocop/cop/style/character_literal.rb +9 -2
  362. data/lib/rubocop/cop/style/class_and_module_children.rb +14 -5
  363. data/lib/rubocop/cop/style/class_check.rb +1 -1
  364. data/lib/rubocop/cop/style/class_equality_comparison.rb +51 -4
  365. data/lib/rubocop/cop/style/class_methods.rb +1 -1
  366. data/lib/rubocop/cop/style/class_methods_definitions.rb +1 -1
  367. data/lib/rubocop/cop/style/class_vars.rb +1 -1
  368. data/lib/rubocop/cop/style/collection_compact.rb +41 -21
  369. data/lib/rubocop/cop/style/collection_methods.rb +9 -7
  370. data/lib/rubocop/cop/style/colon_method_call.rb +1 -1
  371. data/lib/rubocop/cop/style/colon_method_definition.rb +1 -1
  372. data/lib/rubocop/cop/style/combinable_loops.rb +6 -5
  373. data/lib/rubocop/cop/style/command_literal.rb +1 -1
  374. data/lib/rubocop/cop/style/comment_annotation.rb +26 -40
  375. data/lib/rubocop/cop/style/commented_keyword.rb +12 -7
  376. data/lib/rubocop/cop/style/conditional_assignment.rb +2 -1
  377. data/lib/rubocop/cop/style/constant_visibility.rb +1 -1
  378. data/lib/rubocop/cop/style/date_time.rb +6 -1
  379. data/lib/rubocop/cop/style/def_with_parentheses.rb +17 -12
  380. data/lib/rubocop/cop/style/dir.rb +4 -1
  381. data/lib/rubocop/cop/style/document_dynamic_eval_definition.rb +1 -1
  382. data/lib/rubocop/cop/style/documentation.rb +24 -9
  383. data/lib/rubocop/cop/style/documentation_method.rb +1 -1
  384. data/lib/rubocop/cop/style/double_negation.rb +85 -7
  385. data/lib/rubocop/cop/style/each_for_simple_loop.rb +1 -1
  386. data/lib/rubocop/cop/style/each_with_object.rb +1 -1
  387. data/lib/rubocop/cop/style/empty_block_parameter.rb +1 -1
  388. data/lib/rubocop/cop/style/empty_case_condition.rb +13 -4
  389. data/lib/rubocop/cop/style/empty_else.rb +40 -3
  390. data/lib/rubocop/cop/style/empty_heredoc.rb +73 -0
  391. data/lib/rubocop/cop/style/empty_lambda_parameter.rb +1 -1
  392. data/lib/rubocop/cop/style/empty_literal.rb +2 -2
  393. data/lib/rubocop/cop/style/empty_method.rb +19 -4
  394. data/lib/rubocop/cop/style/encoding.rb +27 -16
  395. data/lib/rubocop/cop/style/end_block.rb +1 -1
  396. data/lib/rubocop/cop/style/endless_method.rb +1 -1
  397. data/lib/rubocop/cop/style/env_home.rb +56 -0
  398. data/lib/rubocop/cop/style/eval_with_location.rb +1 -1
  399. data/lib/rubocop/cop/style/even_odd.rb +1 -1
  400. data/lib/rubocop/cop/style/expand_path_arguments.rb +1 -1
  401. data/lib/rubocop/cop/style/explicit_block_argument.rb +23 -13
  402. data/lib/rubocop/cop/style/exponential_notation.rb +1 -1
  403. data/lib/rubocop/cop/style/fetch_env_var.rb +132 -0
  404. data/lib/rubocop/cop/style/file_read.rb +112 -0
  405. data/lib/rubocop/cop/style/file_write.rb +136 -0
  406. data/lib/rubocop/cop/style/float_division.rb +11 -3
  407. data/lib/rubocop/cop/style/for.rb +5 -1
  408. data/lib/rubocop/cop/style/format_string.rb +1 -1
  409. data/lib/rubocop/cop/style/format_string_token.rb +74 -23
  410. data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +13 -5
  411. data/lib/rubocop/cop/style/global_std_stream.rb +5 -1
  412. data/lib/rubocop/cop/style/global_vars.rb +1 -1
  413. data/lib/rubocop/cop/style/guard_clause.rb +51 -4
  414. data/lib/rubocop/cop/style/hash_as_last_array_item.rb +11 -0
  415. data/lib/rubocop/cop/style/hash_conversion.rb +3 -2
  416. data/lib/rubocop/cop/style/hash_each_methods.rb +6 -1
  417. data/lib/rubocop/cop/style/hash_except.rb +89 -12
  418. data/lib/rubocop/cop/style/hash_like_case.rb +1 -1
  419. data/lib/rubocop/cop/style/hash_syntax.rb +39 -3
  420. data/lib/rubocop/cop/style/hash_transform_keys.rb +16 -13
  421. data/lib/rubocop/cop/style/hash_transform_values.rb +14 -13
  422. data/lib/rubocop/cop/style/identical_conditional_branches.rb +19 -17
  423. data/lib/rubocop/cop/style/if_inside_else.rb +15 -0
  424. data/lib/rubocop/cop/style/if_unless_modifier.rb +5 -4
  425. data/lib/rubocop/cop/style/if_with_boolean_literal_branches.rb +22 -6
  426. data/lib/rubocop/cop/style/implicit_runtime_error.rb +3 -3
  427. data/lib/rubocop/cop/style/in_pattern_then.rb +1 -1
  428. data/lib/rubocop/cop/style/infinite_loop.rb +4 -3
  429. data/lib/rubocop/cop/style/inline_comment.rb +1 -1
  430. data/lib/rubocop/cop/style/inverse_methods.rb +11 -4
  431. data/lib/rubocop/cop/style/ip_addresses.rb +1 -1
  432. data/lib/rubocop/cop/style/keyword_parameters_order.rb +2 -2
  433. data/lib/rubocop/cop/style/lambda.rb +1 -1
  434. data/lib/rubocop/cop/style/lambda_call.rb +14 -22
  435. data/lib/rubocop/cop/style/line_end_concatenation.rb +16 -3
  436. data/lib/rubocop/cop/style/map_compact_with_conditional_block.rb +136 -0
  437. data/lib/rubocop/cop/style/map_to_hash.rb +68 -0
  438. data/lib/rubocop/cop/style/method_call_with_args_parentheses/omit_parentheses.rb +28 -8
  439. data/lib/rubocop/cop/style/method_call_with_args_parentheses/require_parentheses.rb +6 -2
  440. data/lib/rubocop/cop/style/method_call_with_args_parentheses.rb +15 -13
  441. data/lib/rubocop/cop/style/method_call_without_args_parentheses.rb +20 -3
  442. data/lib/rubocop/cop/style/method_called_on_do_end_block.rb +1 -1
  443. data/lib/rubocop/cop/style/method_def_parentheses.rb +18 -14
  444. data/lib/rubocop/cop/style/min_max.rb +1 -1
  445. data/lib/rubocop/cop/style/missing_else.rb +24 -24
  446. data/lib/rubocop/cop/style/missing_respond_to_missing.rb +1 -1
  447. data/lib/rubocop/cop/style/mixin_grouping.rb +2 -2
  448. data/lib/rubocop/cop/style/mixin_usage.rb +1 -1
  449. data/lib/rubocop/cop/style/module_function.rb +11 -12
  450. data/lib/rubocop/cop/style/multiline_block_chain.rb +1 -1
  451. data/lib/rubocop/cop/style/multiline_if_modifier.rb +2 -2
  452. data/lib/rubocop/cop/style/multiline_if_then.rb +1 -1
  453. data/lib/rubocop/cop/style/multiline_in_pattern_then.rb +3 -5
  454. data/lib/rubocop/cop/style/multiline_memoization.rb +1 -1
  455. data/lib/rubocop/cop/style/multiline_method_signature.rb +2 -2
  456. data/lib/rubocop/cop/style/multiline_ternary_operator.rb +37 -11
  457. data/lib/rubocop/cop/style/multiline_when_then.rb +3 -5
  458. data/lib/rubocop/cop/style/multiple_comparison.rb +1 -1
  459. data/lib/rubocop/cop/style/mutable_constant.rb +74 -7
  460. data/lib/rubocop/cop/style/negated_if.rb +1 -1
  461. data/lib/rubocop/cop/style/negated_if_else_condition.rb +1 -1
  462. data/lib/rubocop/cop/style/negated_unless.rb +1 -1
  463. data/lib/rubocop/cop/style/nested_file_dirname.rb +66 -0
  464. data/lib/rubocop/cop/style/nested_modifier.rb +1 -1
  465. data/lib/rubocop/cop/style/nested_parenthesized_calls.rb +11 -2
  466. data/lib/rubocop/cop/style/nested_ternary_operator.rb +20 -8
  467. data/lib/rubocop/cop/style/next.rb +1 -1
  468. data/lib/rubocop/cop/style/nil_comparison.rb +1 -1
  469. data/lib/rubocop/cop/style/nil_lambda.rb +2 -2
  470. data/lib/rubocop/cop/style/non_nil_check.rb +3 -3
  471. data/lib/rubocop/cop/style/not.rb +4 -4
  472. data/lib/rubocop/cop/style/numbered_parameters.rb +46 -0
  473. data/lib/rubocop/cop/style/numbered_parameters_limit.rb +50 -0
  474. data/lib/rubocop/cop/style/numeric_literal_prefix.rb +1 -1
  475. data/lib/rubocop/cop/style/numeric_literals.rb +18 -10
  476. data/lib/rubocop/cop/style/numeric_predicate.rb +58 -11
  477. data/lib/rubocop/cop/style/object_then.rb +69 -0
  478. data/lib/rubocop/cop/style/one_line_conditional.rb +19 -40
  479. data/lib/rubocop/cop/style/open_struct_use.rb +69 -0
  480. data/lib/rubocop/cop/style/option_hash.rb +1 -1
  481. data/lib/rubocop/cop/style/optional_arguments.rb +5 -1
  482. data/lib/rubocop/cop/style/optional_boolean_parameter.rb +16 -5
  483. data/lib/rubocop/cop/style/or_assignment.rb +1 -1
  484. data/lib/rubocop/cop/style/parallel_assignment.rb +1 -1
  485. data/lib/rubocop/cop/style/parentheses_around_condition.rb +13 -3
  486. data/lib/rubocop/cop/style/percent_literal_delimiters.rb +1 -1
  487. data/lib/rubocop/cop/style/percent_q_literals.rb +3 -3
  488. data/lib/rubocop/cop/style/perl_backrefs.rb +1 -1
  489. data/lib/rubocop/cop/style/preferred_hash_methods.rb +9 -4
  490. data/lib/rubocop/cop/style/proc.rb +1 -1
  491. data/lib/rubocop/cop/style/quoted_symbols.rb +22 -8
  492. data/lib/rubocop/cop/style/raise_args.rb +11 -5
  493. data/lib/rubocop/cop/style/random_with_offset.rb +1 -1
  494. data/lib/rubocop/cop/style/redundant_argument.rb +21 -11
  495. data/lib/rubocop/cop/style/redundant_assignment.rb +1 -1
  496. data/lib/rubocop/cop/style/redundant_begin.rb +43 -11
  497. data/lib/rubocop/cop/style/redundant_capital_w.rb +2 -3
  498. data/lib/rubocop/cop/style/redundant_condition.rb +131 -16
  499. data/lib/rubocop/cop/style/redundant_conditional.rb +1 -1
  500. data/lib/rubocop/cop/style/redundant_exception.rb +1 -1
  501. data/lib/rubocop/cop/style/redundant_fetch_block.rb +5 -1
  502. data/lib/rubocop/cop/style/redundant_file_extension_in_require.rb +13 -4
  503. data/lib/rubocop/cop/style/redundant_freeze.rb +5 -5
  504. data/lib/rubocop/cop/style/redundant_initialize.rb +154 -0
  505. data/lib/rubocop/cop/style/redundant_interpolation.rb +40 -5
  506. data/lib/rubocop/cop/style/redundant_parentheses.rb +3 -2
  507. data/lib/rubocop/cop/style/redundant_percent_q.rb +3 -4
  508. data/lib/rubocop/cop/style/redundant_regexp_character_class.rb +12 -3
  509. data/lib/rubocop/cop/style/redundant_regexp_escape.rb +2 -2
  510. data/lib/rubocop/cop/style/redundant_return.rb +2 -2
  511. data/lib/rubocop/cop/style/redundant_self.rb +12 -2
  512. data/lib/rubocop/cop/style/redundant_self_assignment.rb +7 -7
  513. data/lib/rubocop/cop/style/redundant_self_assignment_branch.rb +24 -29
  514. data/lib/rubocop/cop/style/redundant_sort.rb +68 -20
  515. data/lib/rubocop/cop/style/redundant_sort_by.rb +1 -1
  516. data/lib/rubocop/cop/style/regexp_literal.rb +4 -4
  517. data/lib/rubocop/cop/style/rescue_modifier.rb +1 -1
  518. data/lib/rubocop/cop/style/rescue_standard_error.rb +13 -13
  519. data/lib/rubocop/cop/style/return_nil.rb +3 -2
  520. data/lib/rubocop/cop/style/safe_navigation.rb +30 -15
  521. data/lib/rubocop/cop/style/sample.rb +6 -4
  522. data/lib/rubocop/cop/style/select_by_regexp.rb +144 -0
  523. data/lib/rubocop/cop/style/self_assignment.rb +1 -1
  524. data/lib/rubocop/cop/style/semicolon.rb +28 -4
  525. data/lib/rubocop/cop/style/send.rb +1 -1
  526. data/lib/rubocop/cop/style/signal_exception.rb +1 -1
  527. data/lib/rubocop/cop/style/single_argument_dig.rb +10 -0
  528. data/lib/rubocop/cop/style/single_line_block_params.rb +3 -3
  529. data/lib/rubocop/cop/style/single_line_methods.rb +2 -2
  530. data/lib/rubocop/cop/style/slicing_with_range.rb +14 -1
  531. data/lib/rubocop/cop/style/sole_nested_conditional.rb +89 -26
  532. data/lib/rubocop/cop/style/special_global_vars.rb +70 -8
  533. data/lib/rubocop/cop/style/static_class.rb +6 -6
  534. data/lib/rubocop/cop/style/stderr_puts.rb +1 -1
  535. data/lib/rubocop/cop/style/string_chars.rb +4 -2
  536. data/lib/rubocop/cop/style/string_concatenation.rb +17 -8
  537. data/lib/rubocop/cop/style/string_hash_keys.rb +5 -1
  538. data/lib/rubocop/cop/style/string_literals_in_interpolation.rb +1 -1
  539. data/lib/rubocop/cop/style/string_methods.rb +1 -1
  540. data/lib/rubocop/cop/style/strip.rb +1 -1
  541. data/lib/rubocop/cop/style/struct_inheritance.rb +7 -3
  542. data/lib/rubocop/cop/style/swap_values.rb +8 -4
  543. data/lib/rubocop/cop/style/symbol_array.rb +9 -6
  544. data/lib/rubocop/cop/style/symbol_literal.rb +1 -1
  545. data/lib/rubocop/cop/style/symbol_proc.rb +86 -8
  546. data/lib/rubocop/cop/style/ternary_parentheses.rb +18 -5
  547. data/lib/rubocop/cop/style/trailing_body_on_class.rb +1 -1
  548. data/lib/rubocop/cop/style/trailing_body_on_method_definition.rb +1 -1
  549. data/lib/rubocop/cop/style/trailing_body_on_module.rb +1 -1
  550. data/lib/rubocop/cop/style/trailing_comma_in_arguments.rb +1 -1
  551. data/lib/rubocop/cop/style/trailing_comma_in_array_literal.rb +2 -2
  552. data/lib/rubocop/cop/style/trailing_comma_in_block_args.rb +20 -1
  553. data/lib/rubocop/cop/style/trailing_comma_in_hash_literal.rb +2 -2
  554. data/lib/rubocop/cop/style/trailing_method_end_statement.rb +2 -5
  555. data/lib/rubocop/cop/style/trailing_underscore_variable.rb +1 -1
  556. data/lib/rubocop/cop/style/trivial_accessors.rb +12 -10
  557. data/lib/rubocop/cop/style/unless_else.rb +5 -1
  558. data/lib/rubocop/cop/style/unless_logical_operators.rb +1 -1
  559. data/lib/rubocop/cop/style/unpack_first.rb +5 -2
  560. data/lib/rubocop/cop/style/variable_interpolation.rb +1 -1
  561. data/lib/rubocop/cop/style/when_then.rb +1 -1
  562. data/lib/rubocop/cop/style/word_array.rb +4 -5
  563. data/lib/rubocop/cop/style/yoda_condition.rb +25 -8
  564. data/lib/rubocop/cop/style/zero_length_predicate.rb +7 -1
  565. data/lib/rubocop/cop/team.rb +3 -3
  566. data/lib/rubocop/cop/util.rb +25 -6
  567. data/lib/rubocop/cop/variable_force/branch.rb +1 -1
  568. data/lib/rubocop/cop/variable_force.rb +1 -5
  569. data/lib/rubocop/cops_documentation_generator.rb +38 -9
  570. data/lib/rubocop/formatter/disabled_config_formatter.rb +19 -2
  571. data/lib/rubocop/formatter/formatter_set.rb +20 -18
  572. data/lib/rubocop/formatter/git_hub_actions_formatter.rb +15 -2
  573. data/lib/rubocop/formatter/html_formatter.rb +7 -12
  574. data/lib/rubocop/formatter/json_formatter.rb +4 -1
  575. data/lib/rubocop/formatter/markdown_formatter.rb +78 -0
  576. data/lib/rubocop/formatter/offense_count_formatter.rb +8 -2
  577. data/lib/rubocop/formatter/simple_text_formatter.rb +9 -8
  578. data/lib/rubocop/formatter/worst_offenders_formatter.rb +1 -2
  579. data/lib/rubocop/formatter.rb +31 -0
  580. data/lib/rubocop/magic_comment.rb +74 -19
  581. data/lib/rubocop/options.rb +232 -138
  582. data/lib/rubocop/rake_task.rb +35 -10
  583. data/lib/rubocop/remote_config.rb +2 -4
  584. data/lib/rubocop/result_cache.rb +27 -16
  585. data/lib/rubocop/rspec/cop_helper.rb +3 -3
  586. data/lib/rubocop/rspec/expect_offense.rb +9 -5
  587. data/lib/rubocop/rspec/parallel_formatter.rb +90 -0
  588. data/lib/rubocop/rspec/shared_contexts.rb +34 -10
  589. data/lib/rubocop/rspec/support.rb +15 -0
  590. data/lib/rubocop/runner.rb +40 -11
  591. data/lib/rubocop/server/cache.rb +141 -0
  592. data/lib/rubocop/server/cli.rb +121 -0
  593. data/lib/rubocop/server/client_command/base.rb +44 -0
  594. data/lib/rubocop/server/client_command/exec.rb +59 -0
  595. data/lib/rubocop/server/client_command/restart.rb +25 -0
  596. data/lib/rubocop/server/client_command/start.rb +43 -0
  597. data/lib/rubocop/server/client_command/status.rb +28 -0
  598. data/lib/rubocop/server/client_command/stop.rb +31 -0
  599. data/lib/rubocop/server/client_command.rb +26 -0
  600. data/lib/rubocop/server/core.rb +79 -0
  601. data/lib/rubocop/server/errors.rb +23 -0
  602. data/lib/rubocop/server/helper.rb +34 -0
  603. data/lib/rubocop/server/server_command/base.rb +50 -0
  604. data/lib/rubocop/server/server_command/exec.rb +34 -0
  605. data/lib/rubocop/server/server_command/stop.rb +24 -0
  606. data/lib/rubocop/server/server_command.rb +21 -0
  607. data/lib/rubocop/server/socket_reader.rb +65 -0
  608. data/lib/rubocop/server.rb +53 -0
  609. data/lib/rubocop/string_interpreter.rb +4 -4
  610. data/lib/rubocop/target_finder.rb +1 -1
  611. data/lib/rubocop/target_ruby.rb +14 -6
  612. data/lib/rubocop/version.rb +15 -8
  613. data/lib/rubocop/yaml_duplication_checker.rb +1 -1
  614. data/lib/rubocop.rb +42 -30
  615. metadata +97 -13
  616. data/lib/rubocop/cop/gemspec/date_assignment.rb +0 -57
  617. data/lib/rubocop/cop/mixin/ignored_methods.rb +0 -52
  618. data/lib/rubocop/cop/mixin/ignored_pattern.rb +0 -29
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Style
6
- # This cop enforces the use of explicit block argument to avoid writing
6
+ # Enforces the use of explicit block argument to avoid writing
7
7
  # block literal that just passes its arguments to another block.
8
8
  #
9
9
  # NOTE: This cop only registers an offense if the block args match the
@@ -42,7 +42,7 @@ module RuboCop
42
42
  include RangeHelp
43
43
  extend AutoCorrector
44
44
 
45
- MSG = 'Consider using explicit block argument in the '\
45
+ MSG = 'Consider using explicit block argument in the ' \
46
46
  "surrounding method's signature over `yield`."
47
47
 
48
48
  # @!method yielding_block?(node)
@@ -67,17 +67,27 @@ module RuboCop
67
67
  # so this can cause crashes in haml_lint
68
68
  return unless def_node
69
69
 
70
+ block_name = extract_block_name(def_node)
71
+
70
72
  add_offense(block_node) do |corrector|
71
73
  corrector.remove(block_body_range(block_node, send_node))
72
74
 
73
- add_block_argument(send_node, corrector)
74
- add_block_argument(def_node, corrector) if @def_nodes.add?(def_node)
75
+ add_block_argument(send_node, corrector, block_name)
76
+ add_block_argument(def_node, corrector, block_name) if @def_nodes.add?(def_node)
75
77
  end
76
78
  end
77
79
  end
78
80
 
79
81
  private
80
82
 
83
+ def extract_block_name(def_node)
84
+ if def_node.block_argument?
85
+ def_node.arguments.last.name
86
+ else
87
+ 'block'
88
+ end
89
+ end
90
+
81
91
  def yielding_arguments?(block_args, yield_args)
82
92
  yield_args = yield_args.dup.fill(
83
93
  nil,
@@ -91,15 +101,15 @@ module RuboCop
91
101
  end
92
102
  end
93
103
 
94
- def add_block_argument(node, corrector)
104
+ def add_block_argument(node, corrector, block_name)
95
105
  if node.arguments?
96
- insert_argument(node, corrector)
106
+ insert_argument(node, corrector, block_name)
97
107
  elsif empty_arguments?(node)
98
- corrector.replace(node.arguments, '(&block)')
108
+ corrector.replace(node.arguments, "(&#{block_name})")
99
109
  elsif call_like?(node)
100
- correct_call_node(node, corrector)
110
+ correct_call_node(node, corrector, block_name)
101
111
  else
102
- corrector.insert_after(node.loc.name, '(&block)')
112
+ corrector.insert_after(node.loc.name, "(&#{block_name})")
103
113
  end
104
114
  end
105
115
 
@@ -112,16 +122,16 @@ module RuboCop
112
122
  node.call_type? || node.zsuper_type? || node.super_type?
113
123
  end
114
124
 
115
- def insert_argument(node, corrector)
125
+ def insert_argument(node, corrector, block_name)
116
126
  last_arg = node.arguments.last
117
127
  arg_range = range_with_surrounding_comma(last_arg.source_range, :right)
118
- replacement = ' &block'
128
+ replacement = " &#{block_name}"
119
129
  replacement = ",#{replacement}" unless arg_range.source.end_with?(',')
120
130
  corrector.insert_after(arg_range, replacement) unless last_arg.blockarg_type?
121
131
  end
122
132
 
123
- def correct_call_node(node, corrector)
124
- corrector.insert_after(node, '(&block)')
133
+ def correct_call_node(node, corrector, block_name)
134
+ corrector.insert_after(node, "(&#{block_name})")
125
135
  return unless node.parenthesized?
126
136
 
127
137
  args_begin = Util.args_begin(node)
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Style
6
- # This cop enforces consistency when using exponential notation
6
+ # Enforces consistency when using exponential notation
7
7
  # for numbers in the code (eg 1.2e4). Different styles are supported:
8
8
  #
9
9
  # * `scientific` which enforces a mantissa between 1 (inclusive) and 10 (exclusive).
@@ -0,0 +1,132 @@
1
+ # frozen_string_literal: true
2
+
3
+ module RuboCop
4
+ module Cop
5
+ module Style
6
+ # Suggests `ENV.fetch` for the replacement of `ENV[]`.
7
+ # `ENV[]` silently fails and returns `nil` when the environment variable is unset,
8
+ # which may cause unexpected behaviors when the developer forgets to set it.
9
+ # On the other hand, `ENV.fetch` raises KeyError or returns the explicitly
10
+ # specified default value.
11
+ #
12
+ # @example
13
+ # # bad
14
+ # ENV['X']
15
+ # x = ENV['X']
16
+ #
17
+ # # good
18
+ # ENV.fetch('X')
19
+ # x = ENV.fetch('X')
20
+ #
21
+ # # also good
22
+ # !ENV['X']
23
+ # ENV['X'].some_method # (e.g. `.nil?`)
24
+ #
25
+ class FetchEnvVar < Base
26
+ extend AutoCorrector
27
+
28
+ MSG = 'Use `ENV.fetch(%<key>s)` or `ENV.fetch(%<key>s, nil)` instead of `ENV[%<key>s]`.'
29
+
30
+ # @!method env_with_bracket?(node)
31
+ def_node_matcher :env_with_bracket?, <<~PATTERN
32
+ (send (const nil? :ENV) :[] $_)
33
+ PATTERN
34
+
35
+ def on_send(node)
36
+ env_with_bracket?(node) do |name_node|
37
+ break unless offensive?(node)
38
+
39
+ message = format(MSG, key: name_node.source)
40
+ add_offense(node, message: message) do |corrector|
41
+ corrector.replace(node, new_code(name_node))
42
+ end
43
+ end
44
+ end
45
+
46
+ private
47
+
48
+ def allowed_var?(node)
49
+ env_key_node = node.children.last
50
+ env_key_node.str_type? && cop_config['AllowedVars'].include?(env_key_node.value)
51
+ end
52
+
53
+ def used_as_flag?(node)
54
+ return false if node.root?
55
+ return true if used_if_condition_in_body(node)
56
+
57
+ node.parent.send_type? && (node.parent.prefix_bang? || node.parent.comparison_method?)
58
+ end
59
+
60
+ def used_if_condition_in_body(node)
61
+ if_node = node.ancestors.find(&:if_type?)
62
+
63
+ return false unless (condition = if_node&.condition)
64
+ return true if condition.send_type? && (condition.child_nodes == node.child_nodes)
65
+
66
+ used_in_condition?(node, condition)
67
+ end
68
+
69
+ def used_in_condition?(node, condition)
70
+ if condition.send_type?
71
+ return true if condition.assignment_method? && partial_matched?(node, condition)
72
+ return false if !condition.comparison_method? && !condition.predicate_method?
73
+ end
74
+
75
+ condition.child_nodes.any?(node)
76
+ end
77
+
78
+ # Avoid offending in the following cases:
79
+ # `ENV['key'] if ENV['key'] = x`
80
+ def partial_matched?(node, condition)
81
+ node.child_nodes == node.child_nodes & condition.child_nodes
82
+ end
83
+
84
+ def offensive?(node)
85
+ !(allowed_var?(node) || allowable_use?(node))
86
+ end
87
+
88
+ # Check if the node is a receiver and receives a message with dot syntax.
89
+ def message_chained_with_dot?(node)
90
+ return false if node.root?
91
+
92
+ parent = node.parent
93
+ return false if !parent.call_type? || parent.children.first != node
94
+
95
+ parent.dot? || parent.safe_navigation?
96
+ end
97
+
98
+ # The following are allowed cases:
99
+ #
100
+ # - Used as a flag (e.g., `if ENV['X']` or `!ENV['X']`) because
101
+ # it simply checks whether the variable is set.
102
+ # - Receiving a message with dot syntax, e.g. `ENV['X'].nil?`.
103
+ # - `ENV['key']` assigned by logical AND/OR assignment.
104
+ # - `ENV['key']` is the LHS of a `||`.
105
+ def allowable_use?(node)
106
+ used_as_flag?(node) || message_chained_with_dot?(node) || assigned?(node) || or_lhs?(node)
107
+ end
108
+
109
+ # The following are allowed cases:
110
+ #
111
+ # - `ENV['key']` is a receiver of `||=`, e.g. `ENV['X'] ||= y`.
112
+ # - `ENV['key']` is a receiver of `&&=`, e.g. `ENV['X'] &&= y`.
113
+ def assigned?(node)
114
+ return false unless (parent = node.parent)&.assignment?
115
+
116
+ lhs, _method, _rhs = *parent
117
+ node == lhs
118
+ end
119
+
120
+ def or_lhs?(node)
121
+ return false unless (parent = node.parent)&.or_type?
122
+
123
+ parent.lhs == node || parent.parent&.or_type?
124
+ end
125
+
126
+ def new_code(name_node)
127
+ "ENV.fetch(#{name_node.source}, nil)"
128
+ end
129
+ end
130
+ end
131
+ end
132
+ end
@@ -0,0 +1,112 @@
1
+ # frozen_string_literal: true
2
+
3
+ module RuboCop
4
+ module Cop
5
+ module Style
6
+ # Favor `File.(bin)read` convenience methods.
7
+ #
8
+ # @example
9
+ # ## text mode
10
+ # # bad
11
+ # File.open(filename).read
12
+ # File.open(filename, &:read)
13
+ # File.open(filename) { |f| f.read }
14
+ # File.open(filename) do |f|
15
+ # f.read
16
+ # end
17
+ # File.open(filename, 'r').read
18
+ # File.open(filename, 'r', &:read)
19
+ # File.open(filename, 'r') do |f|
20
+ # f.read
21
+ # end
22
+ #
23
+ # # good
24
+ # File.read(filename)
25
+ #
26
+ # @example
27
+ # ## binary mode
28
+ # # bad
29
+ # File.open(filename, 'rb').read
30
+ # File.open(filename, 'rb', &:read)
31
+ # File.open(filename, 'rb') do |f|
32
+ # f.read
33
+ # end
34
+ #
35
+ # # good
36
+ # File.binread(filename)
37
+ #
38
+ class FileRead < Base
39
+ extend AutoCorrector
40
+ include RangeHelp
41
+
42
+ MSG = 'Use `File.%<read_method>s`.'
43
+
44
+ RESTRICT_ON_SEND = %i[open].freeze
45
+
46
+ READ_FILE_START_TO_FINISH_MODES = %w[r rt rb r+ r+t r+b].to_set.freeze
47
+
48
+ # @!method file_open?(node)
49
+ def_node_matcher :file_open?, <<~PATTERN
50
+ (send
51
+ (const {nil? cbase} :File)
52
+ :open
53
+ $_
54
+ (str $%READ_FILE_START_TO_FINISH_MODES)?
55
+ $(block-pass (sym :read))?
56
+ )
57
+ PATTERN
58
+
59
+ # @!method send_read?(node)
60
+ def_node_matcher :send_read?, <<~PATTERN
61
+ (send _ :read)
62
+ PATTERN
63
+
64
+ # @!method block_read?(node)
65
+ def_node_matcher :block_read?, <<~PATTERN
66
+ (block _ (args (arg $_)) (send (lvar $_) :read))
67
+ PATTERN
68
+
69
+ def on_send(node)
70
+ evidence(node) do |filename, mode, read_node|
71
+ message = format(MSG, read_method: read_method(mode))
72
+
73
+ add_offense(read_node, message: message) do |corrector|
74
+ range = range_between(node.loc.selector.begin_pos, read_node.loc.expression.end_pos)
75
+ replacement = "#{read_method(mode)}(#{filename.source})"
76
+
77
+ corrector.replace(range, replacement)
78
+ end
79
+ end
80
+ end
81
+
82
+ private
83
+
84
+ def evidence(node)
85
+ file_open?(node) do |filename, mode_array, block_pass|
86
+ read_node?(node, block_pass) do |read_node|
87
+ yield(filename, mode_array.first || 'r', read_node)
88
+ end
89
+ end
90
+ end
91
+
92
+ def read_node?(node, block_pass)
93
+ if block_pass.any?
94
+ yield(node)
95
+ elsif file_open_read?(node.parent)
96
+ yield(node.parent)
97
+ end
98
+ end
99
+
100
+ def file_open_read?(node)
101
+ return true if send_read?(node)
102
+
103
+ block_read?(node) { |block_arg, read_lvar| block_arg == read_lvar }
104
+ end
105
+
106
+ def read_method(mode)
107
+ mode.end_with?('b') ? :binread : :read
108
+ end
109
+ end
110
+ end
111
+ end
112
+ end
@@ -0,0 +1,136 @@
1
+ # frozen_string_literal: true
2
+
3
+ module RuboCop
4
+ module Cop
5
+ module Style
6
+ # Favor `File.(bin)write` convenience methods.
7
+ #
8
+ # NOTE: There are different method signatures between `File.write` (class method)
9
+ # and `File#write` (instance method). The following case will be allowed because
10
+ # static analysis does not know the contents of the splat argument:
11
+ #
12
+ # [source,ruby]
13
+ # ----
14
+ # File.open(filename, 'w') do |f|
15
+ # f.write(*objects)
16
+ # end
17
+ # ----
18
+ #
19
+ # @example
20
+ # ## text mode
21
+ # # bad
22
+ # File.open(filename, 'w').write(content)
23
+ # File.open(filename, 'w') do |f|
24
+ # f.write(content)
25
+ # end
26
+ #
27
+ # # good
28
+ # File.write(filename, content)
29
+ #
30
+ # @example
31
+ # ## binary mode
32
+ # # bad
33
+ # File.open(filename, 'wb').write(content)
34
+ # File.open(filename, 'wb') do |f|
35
+ # f.write(content)
36
+ # end
37
+ #
38
+ # # good
39
+ # File.binwrite(filename, content)
40
+ #
41
+ class FileWrite < Base
42
+ extend AutoCorrector
43
+ include RangeHelp
44
+
45
+ MSG = 'Use `File.%<write_method>s`.'
46
+
47
+ RESTRICT_ON_SEND = %i[open].to_set.freeze
48
+
49
+ TRUNCATING_WRITE_MODES = %w[w wt wb w+ w+t w+b].to_set.freeze
50
+
51
+ # @!method file_open?(node)
52
+ def_node_matcher :file_open?, <<~PATTERN
53
+ (send
54
+ (const {nil? cbase} :File)
55
+ :open
56
+ $_
57
+ (str $%TRUNCATING_WRITE_MODES)
58
+ (block-pass (sym :write))?
59
+ )
60
+ PATTERN
61
+
62
+ # @!method send_write?(node)
63
+ def_node_matcher :send_write?, <<~PATTERN
64
+ (send _ :write $_)
65
+ PATTERN
66
+
67
+ # @!method block_write?(node)
68
+ def_node_matcher :block_write?, <<~PATTERN
69
+ (block _ (args (arg $_)) (send (lvar $_) :write $_))
70
+ PATTERN
71
+
72
+ def on_send(node)
73
+ evidence(node) do |filename, mode, content, write_node|
74
+ message = format(MSG, write_method: write_method(mode))
75
+
76
+ add_offense(write_node, message: message) do |corrector|
77
+ range = range_between(node.loc.selector.begin_pos, write_node.loc.expression.end_pos)
78
+ replacement = replacement(mode, filename, content, write_node)
79
+
80
+ corrector.replace(range, replacement)
81
+ end
82
+ end
83
+ end
84
+
85
+ def evidence(node)
86
+ file_open?(node) do |filename, mode|
87
+ file_open_write?(node.parent) do |content|
88
+ yield(filename, mode, content, node.parent)
89
+ end
90
+ end
91
+ end
92
+
93
+ private
94
+
95
+ def file_open_write?(node)
96
+ content = send_write?(node) || block_write?(node) do |block_arg, lvar, write_arg|
97
+ write_arg if block_arg == lvar
98
+ end
99
+ return false if content&.splat_type?
100
+
101
+ yield(content) if content
102
+ end
103
+
104
+ def write_method(mode)
105
+ mode.end_with?('b') ? :binwrite : :write
106
+ end
107
+
108
+ def replacement(mode, filename, content, write_node)
109
+ replacement = "#{write_method(mode)}(#{filename.source}, #{content.source})"
110
+
111
+ if heredoc?(write_node)
112
+ first_argument = write_node.body.first_argument
113
+
114
+ <<~REPLACEMENT.chomp
115
+ #{replacement}
116
+ #{heredoc_range(first_argument).source}
117
+ REPLACEMENT
118
+ else
119
+ replacement
120
+ end
121
+ end
122
+
123
+ def heredoc?(write_node)
124
+ write_node.block_type? && (first_argument = write_node.body.first_argument) &&
125
+ first_argument.respond_to?(:heredoc?) && first_argument.heredoc?
126
+ end
127
+
128
+ def heredoc_range(first_argument)
129
+ range_between(
130
+ first_argument.loc.heredoc_body.begin_pos, first_argument.loc.heredoc_end.end_pos
131
+ )
132
+ end
133
+ end
134
+ end
135
+ end
136
+ end
@@ -3,12 +3,20 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Style
6
- # This cop checks for division with integers coerced to floats.
6
+ # Checks for division with integers coerced to floats.
7
7
  # It is recommended to either always use `fdiv` or coerce one side only.
8
8
  # This cop also provides other options for code consistency.
9
9
  #
10
- # This cop is marked as unsafe, because if operand variable is a string object
11
- # then `.to_f` will be removed and an error will occur.
10
+ # @safety
11
+ # This cop is unsafe, because if the operand variable is a string object
12
+ # then `.to_f` will be removed and an error will occur.
13
+ #
14
+ # [source,ruby]
15
+ # ----
16
+ # a = '1.2'
17
+ # b = '3.4'
18
+ # a.to_f / b.to_f # Both `to_f` calls are required here
19
+ # ----
12
20
  #
13
21
  # @example EnforcedStyle: single_coerce (default)
14
22
  # # bad
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Style
6
- # This cop looks for uses of the `for` keyword or `each` method. The
6
+ # Looks for uses of the `for` keyword or `each` method. The
7
7
  # preferred alternative is set in the EnforcedStyle configuration
8
8
  # parameter. An `each` call with a block on a single line is always
9
9
  # allowed.
@@ -38,6 +38,10 @@ module RuboCop
38
38
  # end
39
39
  # end
40
40
  #
41
+ # @safety
42
+ # This cop's autocorrection is unsafe because the scope of
43
+ # variables is different between `each` and `for`.
44
+ #
41
45
  class For < Base
42
46
  include ConfigurableEnforcedStyle
43
47
  include RangeHelp
@@ -3,7 +3,7 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Style
6
- # This cop enforces the use of a single string formatting utility.
6
+ # Enforces the use of a single string formatting utility.
7
7
  # Valid options include Kernel#format, Kernel#sprintf and String#%.
8
8
  #
9
9
  # The detection of String#% cannot be implemented in a reliable
@@ -11,7 +11,8 @@ module RuboCop
11
11
  # The reason is that _unannotated_ format is very similar
12
12
  # to encoded URLs or Date/Time formatting strings.
13
13
  #
14
- # This cop can be customized ignored methods with `IgnoredMethods`.
14
+ # This cop can be customized allowed methods with `AllowedMethods`.
15
+ # By default, there are no methods to allowed.
15
16
  #
16
17
  # @example EnforcedStyle: annotated (default)
17
18
  #
@@ -61,29 +62,41 @@ module RuboCop
61
62
  # # good
62
63
  # format('%06d', 10)
63
64
  #
64
- # @example IgnoredMethods: [redirect]
65
+ # @example AllowedMethods: [] (default)
66
+ #
67
+ # # bad
68
+ # redirect('foo/%{bar_id}')
69
+ #
70
+ # @example AllowedMethods: [redirect]
71
+ #
72
+ # # good
73
+ # redirect('foo/%{bar_id}')
74
+ #
75
+ # @example AllowedPatterns: [] (default)
76
+ #
77
+ # # bad
78
+ # redirect('foo/%{bar_id}')
79
+ #
80
+ # @example AllowedPatterns: [/redirect/]
65
81
  #
66
82
  # # good
67
83
  # redirect('foo/%{bar_id}')
68
84
  #
69
85
  class FormatStringToken < Base
70
86
  include ConfigurableEnforcedStyle
71
- include IgnoredMethods
87
+ include AllowedMethods
88
+ include AllowedPattern
89
+ extend AutoCorrector
72
90
 
73
91
  def on_str(node)
74
- return if format_string_token?(node) || use_ignored_method?(node)
92
+ return if format_string_token?(node) || use_allowed_method?(node)
75
93
 
76
94
  detections = collect_detections(node)
77
95
  return if detections.empty?
78
96
  return if allowed_unannotated?(detections)
79
97
 
80
- detections.each do |detected_style, token_range|
81
- if detected_style == style
82
- correct_style_detected
83
- else
84
- style_detected(detected_style)
85
- add_offense(token_range, message: message(detected_style))
86
- end
98
+ detections.each do |detected_sequence, token_range|
99
+ check_sequence(detected_sequence, token_range)
87
100
  end
88
101
  end
89
102
 
@@ -101,8 +114,43 @@ module RuboCop
101
114
  !node.value.include?('%') || node.each_ancestor(:xstr, :regexp).any?
102
115
  end
103
116
 
104
- def use_ignored_method?(node)
105
- (parent = node.parent) && parent.send_type? && ignored_method?(parent.method_name)
117
+ def use_allowed_method?(node)
118
+ send_parent = node.each_ancestor(:send).first
119
+ send_parent &&
120
+ (allowed_method?(send_parent.method_name) ||
121
+ matches_allowed_pattern?(send_parent.method_name))
122
+ end
123
+
124
+ def check_sequence(detected_sequence, token_range)
125
+ if detected_sequence.style == style
126
+ correct_style_detected
127
+ elsif correctable_sequence?(detected_sequence.type)
128
+ style_detected(detected_sequence.style)
129
+ add_offense(token_range, message: message(detected_sequence.style)) do |corrector|
130
+ autocorrect_sequence(corrector, detected_sequence, token_range)
131
+ end
132
+ end
133
+ end
134
+
135
+ def correctable_sequence?(detected_type)
136
+ detected_type == 's' || style == :annotated || style == :unannotated
137
+ end
138
+
139
+ def autocorrect_sequence(corrector, detected_sequence, token_range)
140
+ return if style == :unannotated
141
+
142
+ name = detected_sequence.name
143
+ return if name.nil?
144
+
145
+ flags = detected_sequence.flags
146
+ width = detected_sequence.width
147
+ precision = detected_sequence.precision
148
+ type = detected_sequence.style == :template ? 's' : detected_sequence.type
149
+ correction = case style
150
+ when :annotated then "%<#{name}>#{flags}#{width}#{precision}#{type}"
151
+ when :template then "%#{flags}#{width}#{precision}{#{name}}"
152
+ end
153
+ corrector.replace(token_range, correction)
106
154
  end
107
155
 
108
156
  def unannotated_format?(node, detected_style)
@@ -142,30 +190,33 @@ module RuboCop
142
190
  def token_ranges(contents)
143
191
  format_string = RuboCop::Cop::Utils::FormatString.new(contents.source)
144
192
 
145
- format_string.format_sequences.each do |seq|
146
- next if seq.percent?
193
+ format_string.format_sequences.each do |detected_sequence|
194
+ next if detected_sequence.percent?
147
195
 
148
- detected_style = seq.style
149
- token = contents.begin.adjust(begin_pos: seq.begin_pos, end_pos: seq.end_pos)
196
+ token = contents.begin.adjust(begin_pos: detected_sequence.begin_pos,
197
+ end_pos: detected_sequence.end_pos)
150
198
 
151
- yield(detected_style, token)
199
+ yield(detected_sequence, token)
152
200
  end
153
201
  end
154
202
 
155
203
  def collect_detections(node)
156
204
  detections = []
157
- tokens(node) do |detected_style, token_range|
158
- unless unannotated_format?(node, detected_style)
159
- detections << [detected_style, token_range]
205
+ tokens(node) do |detected_sequence, token_range|
206
+ unless unannotated_format?(node, detected_sequence.style)
207
+ detections << [detected_sequence, token_range]
160
208
  end
161
209
  end
162
210
  detections
163
211
  end
164
212
 
165
213
  def allowed_unannotated?(detections)
166
- return false if detections.size > max_unannotated_placeholders_allowed
214
+ return false unless detections.all? do |detected_sequence,|
215
+ detected_sequence.style == :unannotated
216
+ end
217
+ return true if detections.size <= max_unannotated_placeholders_allowed
167
218
 
168
- detections.all? { |detected_style,| detected_style == :unannotated }
219
+ detections.any? { |detected_sequence,| !correctable_sequence?(detected_sequence.type) }
169
220
  end
170
221
 
171
222
  def max_unannotated_placeholders_allowed