rubocop 0.86.0 → 0.89.1

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 (377) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -1
  3. data/bin/rubocop-profile +32 -0
  4. data/config/default.yml +198 -25
  5. data/lib/rubocop.rb +30 -5
  6. data/lib/rubocop/cli.rb +2 -4
  7. data/lib/rubocop/cli/command/auto_genenerate_config.rb +42 -7
  8. data/lib/rubocop/cli/command/base.rb +1 -0
  9. data/lib/rubocop/cli/command/execute_runner.rb +1 -1
  10. data/lib/rubocop/cli/command/show_cops.rb +3 -3
  11. data/lib/rubocop/cli/command/version.rb +2 -2
  12. data/lib/rubocop/comment_config.rb +5 -7
  13. data/lib/rubocop/config.rb +20 -3
  14. data/lib/rubocop/config_loader.rb +41 -69
  15. data/lib/rubocop/config_loader_resolver.rb +3 -3
  16. data/lib/rubocop/config_obsoletion.rb +6 -2
  17. data/lib/rubocop/config_store.rb +4 -0
  18. data/lib/rubocop/config_validator.rb +2 -4
  19. data/lib/rubocop/cop/autocorrect_logic.rb +14 -24
  20. data/lib/rubocop/cop/badge.rb +1 -1
  21. data/lib/rubocop/cop/base.rb +407 -0
  22. data/lib/rubocop/cop/bundler/insecure_protocol_source.rb +10 -20
  23. data/lib/rubocop/cop/commissioner.rb +47 -50
  24. data/lib/rubocop/cop/cop.rb +85 -236
  25. data/lib/rubocop/cop/corrector.rb +38 -115
  26. data/lib/rubocop/cop/correctors/line_break_corrector.rb +4 -4
  27. data/lib/rubocop/cop/correctors/multiline_literal_brace_corrector.rb +26 -0
  28. data/lib/rubocop/cop/correctors/percent_literal_corrector.rb +2 -2
  29. data/lib/rubocop/cop/correctors/punctuation_corrector.rb +1 -1
  30. data/lib/rubocop/cop/correctors/unused_arg_corrector.rb +15 -18
  31. data/lib/rubocop/cop/force.rb +1 -0
  32. data/lib/rubocop/cop/gemspec/required_ruby_version.rb +38 -12
  33. data/lib/rubocop/cop/gemspec/ruby_version_globals_usage.rb +1 -1
  34. data/lib/rubocop/cop/generator.rb +1 -1
  35. data/lib/rubocop/cop/generator/configuration_injector.rb +2 -2
  36. data/lib/rubocop/cop/internal_affairs/method_name_equal.rb +4 -12
  37. data/lib/rubocop/cop/internal_affairs/node_destructuring.rb +1 -1
  38. data/lib/rubocop/cop/internal_affairs/node_type_predicate.rb +11 -14
  39. data/lib/rubocop/cop/internal_affairs/offense_location_keyword.rb +8 -8
  40. data/lib/rubocop/cop/internal_affairs/redundant_location_argument.rb +10 -7
  41. data/lib/rubocop/cop/internal_affairs/redundant_message_argument.rb +7 -8
  42. data/lib/rubocop/cop/internal_affairs/useless_message_assertion.rb +2 -2
  43. data/lib/rubocop/cop/layout/block_alignment.rb +1 -1
  44. data/lib/rubocop/cop/layout/case_indentation.rb +18 -19
  45. data/lib/rubocop/cop/layout/class_structure.rb +5 -44
  46. data/lib/rubocop/cop/layout/comment_indentation.rb +1 -1
  47. data/lib/rubocop/cop/layout/empty_lines.rb +0 -2
  48. data/lib/rubocop/cop/layout/empty_lines_around_access_modifier.rb +1 -0
  49. data/lib/rubocop/cop/layout/empty_lines_around_attribute_accessor.rb +1 -8
  50. data/lib/rubocop/cop/layout/end_alignment.rb +3 -2
  51. data/lib/rubocop/cop/layout/extra_spacing.rb +22 -36
  52. data/lib/rubocop/cop/layout/first_argument_indentation.rb +4 -0
  53. data/lib/rubocop/cop/layout/first_method_argument_line_break.rb +1 -1
  54. data/lib/rubocop/cop/layout/hash_alignment.rb +1 -2
  55. data/lib/rubocop/cop/layout/heredoc_indentation.rb +2 -2
  56. data/lib/rubocop/cop/layout/indentation_style.rb +0 -2
  57. data/lib/rubocop/cop/layout/leading_comment_space.rb +1 -1
  58. data/lib/rubocop/cop/layout/multiline_block_layout.rb +16 -6
  59. data/lib/rubocop/cop/layout/multiline_method_argument_line_breaks.rb +1 -1
  60. data/lib/rubocop/cop/layout/rescue_ensure_alignment.rb +0 -2
  61. data/lib/rubocop/cop/layout/space_around_block_parameters.rb +22 -27
  62. data/lib/rubocop/cop/layout/space_around_method_call_operator.rb +33 -66
  63. data/lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb +3 -2
  64. data/lib/rubocop/cop/legacy/corrections_proxy.rb +49 -0
  65. data/lib/rubocop/cop/legacy/corrector.rb +29 -0
  66. data/lib/rubocop/cop/lint/ambiguous_block_association.rb +7 -4
  67. data/lib/rubocop/cop/lint/ambiguous_operator.rb +15 -10
  68. data/lib/rubocop/cop/lint/ambiguous_regexp_literal.rb +11 -13
  69. data/lib/rubocop/cop/lint/assignment_in_condition.rb +2 -2
  70. data/lib/rubocop/cop/lint/big_decimal_new.rb +10 -10
  71. data/lib/rubocop/cop/lint/binary_operator_with_identical_operands.rb +50 -0
  72. data/lib/rubocop/cop/lint/boolean_symbol.rb +16 -11
  73. data/lib/rubocop/cop/lint/circular_argument_reference.rb +1 -1
  74. data/lib/rubocop/cop/lint/constant_resolution.rb +1 -1
  75. data/lib/rubocop/cop/lint/debugger.rb +7 -1
  76. data/lib/rubocop/cop/lint/deprecated_class_methods.rb +9 -10
  77. data/lib/rubocop/cop/lint/deprecated_open_ssl_constant.rb +21 -17
  78. data/lib/rubocop/cop/lint/disjunctive_assignment_in_constructor.rb +8 -2
  79. data/lib/rubocop/cop/lint/duplicate_case_condition.rb +1 -1
  80. data/lib/rubocop/cop/lint/duplicate_elsif_condition.rb +39 -0
  81. data/lib/rubocop/cop/lint/duplicate_hash_key.rb +1 -1
  82. data/lib/rubocop/cop/lint/duplicate_methods.rb +9 -6
  83. data/lib/rubocop/cop/lint/duplicate_rescue_exception.rb +60 -0
  84. data/lib/rubocop/cop/lint/each_with_object_argument.rb +1 -1
  85. data/lib/rubocop/cop/lint/else_layout.rb +1 -1
  86. data/lib/rubocop/cop/lint/empty_conditional_body.rb +67 -0
  87. data/lib/rubocop/cop/lint/empty_ensure.rb +5 -5
  88. data/lib/rubocop/cop/lint/empty_expression.rb +2 -2
  89. data/lib/rubocop/cop/lint/empty_interpolation.rb +5 -6
  90. data/lib/rubocop/cop/lint/empty_when.rb +2 -2
  91. data/lib/rubocop/cop/lint/ensure_return.rb +27 -29
  92. data/lib/rubocop/cop/lint/erb_new_arguments.rb +11 -10
  93. data/lib/rubocop/cop/lint/flip_flop.rb +1 -1
  94. data/lib/rubocop/cop/lint/float_comparison.rb +93 -0
  95. data/lib/rubocop/cop/lint/float_out_of_range.rb +1 -1
  96. data/lib/rubocop/cop/lint/format_parameter_mismatch.rb +5 -4
  97. data/lib/rubocop/cop/lint/heredoc_method_call_position.rb +13 -14
  98. data/lib/rubocop/cop/lint/implicit_string_concatenation.rb +5 -4
  99. data/lib/rubocop/cop/lint/ineffective_access_modifier.rb +8 -8
  100. data/lib/rubocop/cop/lint/inherit_exception.rb +12 -7
  101. data/lib/rubocop/cop/lint/interpolation_check.rb +21 -5
  102. data/lib/rubocop/cop/lint/literal_as_condition.rb +14 -2
  103. data/lib/rubocop/cop/lint/literal_in_interpolation.rb +7 -7
  104. data/lib/rubocop/cop/lint/loop.rb +23 -2
  105. data/lib/rubocop/cop/lint/missing_cop_enable_directive.rb +6 -5
  106. data/lib/rubocop/cop/lint/missing_super.rb +99 -0
  107. data/lib/rubocop/cop/lint/mixed_regexp_capture_types.rb +1 -1
  108. data/lib/rubocop/cop/lint/multiple_comparison.rb +6 -9
  109. data/lib/rubocop/cop/lint/nested_method_definition.rb +15 -21
  110. data/lib/rubocop/cop/lint/nested_percent_literal.rb +1 -1
  111. data/lib/rubocop/cop/lint/next_without_accumulator.rb +1 -1
  112. data/lib/rubocop/cop/lint/non_deterministic_require_order.rb +84 -13
  113. data/lib/rubocop/cop/lint/non_local_exit_from_iterator.rb +2 -2
  114. data/lib/rubocop/cop/lint/number_conversion.rb +6 -9
  115. data/lib/rubocop/cop/lint/ordered_magic_comments.rb +11 -13
  116. data/lib/rubocop/cop/lint/out_of_range_regexp_ref.rb +90 -0
  117. data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb +12 -13
  118. data/lib/rubocop/cop/lint/percent_string_array.rb +13 -12
  119. data/lib/rubocop/cop/lint/percent_symbol_array.rb +13 -12
  120. data/lib/rubocop/cop/lint/raise_exception.rb +12 -10
  121. data/lib/rubocop/cop/lint/rand_one.rb +3 -3
  122. data/lib/rubocop/cop/lint/redundant_cop_disable_directive.rb +41 -40
  123. data/lib/rubocop/cop/lint/redundant_cop_enable_directive.rb +7 -11
  124. data/lib/rubocop/cop/lint/redundant_require_statement.rb +4 -7
  125. data/lib/rubocop/cop/lint/redundant_splat_expansion.rb +15 -11
  126. data/lib/rubocop/cop/lint/redundant_string_coercion.rb +6 -13
  127. data/lib/rubocop/cop/lint/redundant_with_index.rb +11 -14
  128. data/lib/rubocop/cop/lint/redundant_with_object.rb +11 -14
  129. data/lib/rubocop/cop/lint/regexp_as_condition.rb +4 -6
  130. data/lib/rubocop/cop/lint/require_parentheses.rb +2 -2
  131. data/lib/rubocop/cop/lint/rescue_exception.rb +1 -1
  132. data/lib/rubocop/cop/lint/rescue_type.rb +8 -8
  133. data/lib/rubocop/cop/lint/return_in_void_context.rb +2 -4
  134. data/lib/rubocop/cop/lint/safe_navigation_chain.rb +3 -6
  135. data/lib/rubocop/cop/lint/safe_navigation_consistency.rb +14 -10
  136. data/lib/rubocop/cop/lint/safe_navigation_with_empty.rb +10 -2
  137. data/lib/rubocop/cop/lint/script_permission.rb +10 -7
  138. data/lib/rubocop/cop/lint/self_assignment.rb +78 -0
  139. data/lib/rubocop/cop/lint/send_with_mixin_argument.rb +5 -11
  140. data/lib/rubocop/cop/lint/shadowed_argument.rb +3 -3
  141. data/lib/rubocop/cop/lint/shadowed_exception.rb +2 -2
  142. data/lib/rubocop/cop/lint/shadowing_outer_local_variable.rb +3 -3
  143. data/lib/rubocop/cop/lint/struct_new_override.rb +1 -1
  144. data/lib/rubocop/cop/lint/suppressed_exception.rb +4 -7
  145. data/lib/rubocop/cop/lint/syntax.rb +11 -26
  146. data/lib/rubocop/cop/lint/to_json.rb +4 -6
  147. data/lib/rubocop/cop/lint/top_level_return_with_argument.rb +34 -0
  148. data/lib/rubocop/cop/lint/underscore_prefixed_variable_name.rb +4 -4
  149. data/lib/rubocop/cop/lint/unified_integer.rb +4 -6
  150. data/lib/rubocop/cop/lint/unreachable_code.rb +1 -1
  151. data/lib/rubocop/cop/lint/unreachable_loop.rb +174 -0
  152. data/lib/rubocop/cop/lint/unused_block_argument.rb +8 -3
  153. data/lib/rubocop/cop/lint/unused_method_argument.rb +9 -4
  154. data/lib/rubocop/cop/lint/uri_escape_unescape.rb +1 -1
  155. data/lib/rubocop/cop/lint/uri_regexp.rb +11 -47
  156. data/lib/rubocop/cop/lint/useless_access_modifier.rb +26 -16
  157. data/lib/rubocop/cop/lint/useless_assignment.rb +4 -4
  158. data/lib/rubocop/cop/lint/useless_else_without_rescue.rb +6 -15
  159. data/lib/rubocop/cop/lint/useless_setter_call.rb +4 -6
  160. data/lib/rubocop/cop/lint/void.rb +3 -7
  161. data/lib/rubocop/cop/metrics/abc_size.rb +1 -1
  162. data/lib/rubocop/cop/metrics/block_length.rb +24 -2
  163. data/lib/rubocop/cop/metrics/block_nesting.rb +2 -2
  164. data/lib/rubocop/cop/metrics/class_length.rb +26 -3
  165. data/lib/rubocop/cop/metrics/cyclomatic_complexity.rb +2 -1
  166. data/lib/rubocop/cop/metrics/method_length.rb +25 -2
  167. data/lib/rubocop/cop/metrics/module_length.rb +26 -3
  168. data/lib/rubocop/cop/metrics/parameter_lists.rb +2 -6
  169. data/lib/rubocop/cop/metrics/perceived_complexity.rb +7 -8
  170. data/lib/rubocop/cop/metrics/utils/abc_size_calculator.rb +48 -5
  171. data/lib/rubocop/cop/metrics/utils/code_length_calculator.rb +157 -0
  172. data/lib/rubocop/cop/metrics/utils/repeated_csend_discount.rb +37 -0
  173. data/lib/rubocop/cop/migration/department_name.rb +14 -16
  174. data/lib/rubocop/cop/mixin/alignment.rb +2 -1
  175. data/lib/rubocop/cop/mixin/allowed_methods.rb +19 -0
  176. data/lib/rubocop/cop/mixin/array_min_size.rb +1 -1
  177. data/lib/rubocop/cop/mixin/auto_corrector.rb +12 -0
  178. data/lib/rubocop/cop/mixin/check_line_breakable.rb +2 -2
  179. data/lib/rubocop/cop/mixin/code_length.rb +26 -5
  180. data/lib/rubocop/cop/mixin/configurable_formatting.rb +1 -1
  181. data/lib/rubocop/cop/mixin/enforce_superclass.rb +3 -1
  182. data/lib/rubocop/cop/mixin/hash_transform_method.rb +5 -11
  183. data/lib/rubocop/cop/mixin/line_length_help.rb +1 -3
  184. data/lib/rubocop/cop/mixin/method_complexity.rb +10 -2
  185. data/lib/rubocop/cop/mixin/multiline_literal_brace_layout.rb +1 -2
  186. data/lib/rubocop/cop/mixin/nil_methods.rb +3 -5
  187. data/lib/rubocop/cop/mixin/ordered_gem_node.rb +6 -1
  188. data/lib/rubocop/cop/mixin/percent_array.rb +2 -6
  189. data/lib/rubocop/cop/mixin/range_help.rb +18 -4
  190. data/lib/rubocop/cop/mixin/statement_modifier.rb +39 -10
  191. data/lib/rubocop/cop/mixin/surrounding_space.rb +4 -24
  192. data/lib/rubocop/cop/mixin/trailing_comma.rb +2 -4
  193. data/lib/rubocop/cop/mixin/uncommunicative_name.rb +10 -15
  194. data/lib/rubocop/cop/mixin/unused_argument.rb +4 -6
  195. data/lib/rubocop/cop/mixin/visibility_help.rb +50 -0
  196. data/lib/rubocop/cop/naming/accessor_method_name.rb +4 -2
  197. data/lib/rubocop/cop/naming/ascii_identifiers.rb +29 -6
  198. data/lib/rubocop/cop/naming/binary_operator_parameter_name.rb +3 -3
  199. data/lib/rubocop/cop/naming/block_parameter_name.rb +1 -1
  200. data/lib/rubocop/cop/naming/class_and_module_camel_case.rb +2 -2
  201. data/lib/rubocop/cop/naming/constant_name.rb +2 -2
  202. data/lib/rubocop/cop/naming/file_name.rb +3 -3
  203. data/lib/rubocop/cop/naming/heredoc_delimiter_case.rb +2 -2
  204. data/lib/rubocop/cop/naming/heredoc_delimiter_naming.rb +2 -2
  205. data/lib/rubocop/cop/naming/memoized_instance_variable_name.rb +2 -2
  206. data/lib/rubocop/cop/naming/method_name.rb +1 -1
  207. data/lib/rubocop/cop/naming/method_parameter_name.rb +2 -2
  208. data/lib/rubocop/cop/naming/predicate_name.rb +6 -10
  209. data/lib/rubocop/cop/naming/rescued_exceptions_variable_name.rb +12 -11
  210. data/lib/rubocop/cop/naming/variable_name.rb +1 -1
  211. data/lib/rubocop/cop/naming/variable_number.rb +1 -1
  212. data/lib/rubocop/cop/offense.rb +16 -2
  213. data/lib/rubocop/cop/registry.rb +3 -3
  214. data/lib/rubocop/cop/security/eval.rb +2 -2
  215. data/lib/rubocop/cop/security/json_load.rb +6 -8
  216. data/lib/rubocop/cop/security/marshal_load.rb +2 -4
  217. data/lib/rubocop/cop/security/open.rb +2 -2
  218. data/lib/rubocop/cop/security/yaml_load.rb +6 -6
  219. data/lib/rubocop/cop/style/access_modifier_declarations.rb +16 -9
  220. data/lib/rubocop/cop/style/accessor_grouping.rb +149 -0
  221. data/lib/rubocop/cop/style/alias.rb +41 -36
  222. data/lib/rubocop/cop/style/and_or.rb +9 -11
  223. data/lib/rubocop/cop/style/array_coercion.rb +63 -0
  224. data/lib/rubocop/cop/style/array_join.rb +6 -8
  225. data/lib/rubocop/cop/style/ascii_comments.rb +4 -4
  226. data/lib/rubocop/cop/style/attr.rb +11 -9
  227. data/lib/rubocop/cop/style/auto_resource_cleanup.rb +5 -7
  228. data/lib/rubocop/cop/style/bare_percent_literals.rb +10 -12
  229. data/lib/rubocop/cop/style/begin_block.rb +2 -2
  230. data/lib/rubocop/cop/style/bisected_attr_accessor.rb +141 -0
  231. data/lib/rubocop/cop/style/block_comments.rb +14 -18
  232. data/lib/rubocop/cop/style/block_delimiters.rb +23 -23
  233. data/lib/rubocop/cop/style/case_equality.rb +22 -3
  234. data/lib/rubocop/cop/style/case_like_if.rb +220 -0
  235. data/lib/rubocop/cop/style/class_and_module_children.rb +14 -11
  236. data/lib/rubocop/cop/style/class_check.rb +7 -9
  237. data/lib/rubocop/cop/style/class_methods.rb +7 -11
  238. data/lib/rubocop/cop/style/class_vars.rb +24 -7
  239. data/lib/rubocop/cop/style/collection_methods.rb +11 -17
  240. data/lib/rubocop/cop/style/colon_method_call.rb +8 -9
  241. data/lib/rubocop/cop/style/colon_method_definition.rb +6 -6
  242. data/lib/rubocop/cop/style/command_literal.rb +23 -24
  243. data/lib/rubocop/cop/style/comment_annotation.rb +15 -15
  244. data/lib/rubocop/cop/style/commented_keyword.rb +6 -3
  245. data/lib/rubocop/cop/style/conditional_assignment.rb +13 -4
  246. data/lib/rubocop/cop/style/constant_visibility.rb +3 -2
  247. data/lib/rubocop/cop/style/copyright.rb +12 -12
  248. data/lib/rubocop/cop/style/date_time.rb +2 -2
  249. data/lib/rubocop/cop/style/def_with_parentheses.rb +8 -10
  250. data/lib/rubocop/cop/style/dir.rb +9 -12
  251. data/lib/rubocop/cop/style/disable_cops_within_source_code_directive.rb +7 -9
  252. data/lib/rubocop/cop/style/documentation.rb +6 -8
  253. data/lib/rubocop/cop/style/documentation_method.rb +1 -1
  254. data/lib/rubocop/cop/style/double_cop_disable_directive.rb +12 -15
  255. data/lib/rubocop/cop/style/double_negation.rb +2 -2
  256. data/lib/rubocop/cop/style/each_for_simple_loop.rb +5 -8
  257. data/lib/rubocop/cop/style/each_with_object.rb +16 -19
  258. data/lib/rubocop/cop/style/empty_case_condition.rb +19 -20
  259. data/lib/rubocop/cop/style/empty_else.rb +17 -19
  260. data/lib/rubocop/cop/style/empty_literal.rb +20 -21
  261. data/lib/rubocop/cop/style/empty_method.rb +10 -13
  262. data/lib/rubocop/cop/style/encoding.rb +5 -9
  263. data/lib/rubocop/cop/style/end_block.rb +4 -6
  264. data/lib/rubocop/cop/style/eval_with_location.rb +9 -7
  265. data/lib/rubocop/cop/style/even_odd.rb +7 -11
  266. data/lib/rubocop/cop/style/expand_path_arguments.rb +23 -22
  267. data/lib/rubocop/cop/style/explicit_block_argument.rb +102 -0
  268. data/lib/rubocop/cop/style/exponential_notation.rb +7 -9
  269. data/lib/rubocop/cop/style/float_division.rb +8 -11
  270. data/lib/rubocop/cop/style/for.rb +11 -15
  271. data/lib/rubocop/cop/style/format_string.rb +21 -19
  272. data/lib/rubocop/cop/style/format_string_token.rb +10 -12
  273. data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +19 -41
  274. data/lib/rubocop/cop/style/global_std_stream.rb +65 -0
  275. data/lib/rubocop/cop/style/global_vars.rb +2 -2
  276. data/lib/rubocop/cop/style/guard_clause.rb +5 -6
  277. data/lib/rubocop/cop/style/hash_as_last_array_item.rb +69 -0
  278. data/lib/rubocop/cop/style/hash_each_methods.rb +5 -8
  279. data/lib/rubocop/cop/style/hash_like_case.rb +76 -0
  280. data/lib/rubocop/cop/style/hash_syntax.rb +4 -3
  281. data/lib/rubocop/cop/style/hash_transform_keys.rb +3 -2
  282. data/lib/rubocop/cop/style/hash_transform_values.rb +2 -1
  283. data/lib/rubocop/cop/style/identical_conditional_branches.rb +2 -2
  284. data/lib/rubocop/cop/style/if_inside_else.rb +3 -3
  285. data/lib/rubocop/cop/style/if_unless_modifier.rb +18 -40
  286. data/lib/rubocop/cop/style/if_unless_modifier_of_if_unless.rb +11 -3
  287. data/lib/rubocop/cop/style/if_with_semicolon.rb +3 -6
  288. data/lib/rubocop/cop/style/implicit_runtime_error.rb +1 -1
  289. data/lib/rubocop/cop/style/infinite_loop.rb +24 -24
  290. data/lib/rubocop/cop/style/inline_comment.rb +3 -3
  291. data/lib/rubocop/cop/style/inverse_methods.rb +22 -32
  292. data/lib/rubocop/cop/style/lambda.rb +7 -12
  293. data/lib/rubocop/cop/style/lambda_call.rb +14 -13
  294. data/lib/rubocop/cop/style/line_end_concatenation.rb +19 -16
  295. data/lib/rubocop/cop/style/method_call_with_args_parentheses.rb +2 -1
  296. data/lib/rubocop/cop/style/method_call_with_args_parentheses/omit_parentheses.rb +16 -11
  297. data/lib/rubocop/cop/style/method_call_with_args_parentheses/require_parentheses.rb +4 -8
  298. data/lib/rubocop/cop/style/method_call_without_args_parentheses.rb +8 -7
  299. data/lib/rubocop/cop/style/method_called_on_do_end_block.rb +2 -2
  300. data/lib/rubocop/cop/style/method_def_parentheses.rb +11 -16
  301. data/lib/rubocop/cop/style/min_max.rb +8 -12
  302. data/lib/rubocop/cop/style/missing_else.rb +11 -21
  303. data/lib/rubocop/cop/style/missing_respond_to_missing.rb +10 -3
  304. data/lib/rubocop/cop/style/mixin_grouping.rb +24 -27
  305. data/lib/rubocop/cop/style/mixin_usage.rb +1 -1
  306. data/lib/rubocop/cop/style/module_function.rb +10 -13
  307. data/lib/rubocop/cop/style/multiline_block_chain.rb +10 -1
  308. data/lib/rubocop/cop/style/multiline_if_modifier.rb +3 -10
  309. data/lib/rubocop/cop/style/multiline_if_then.rb +4 -10
  310. data/lib/rubocop/cop/style/multiline_memoization.rb +14 -12
  311. data/lib/rubocop/cop/style/multiline_method_signature.rb +2 -2
  312. data/lib/rubocop/cop/style/multiline_ternary_operator.rb +4 -6
  313. data/lib/rubocop/cop/style/multiline_when_then.rb +7 -9
  314. data/lib/rubocop/cop/style/multiple_comparison.rb +1 -1
  315. data/lib/rubocop/cop/style/mutable_constant.rb +27 -24
  316. data/lib/rubocop/cop/style/nested_parenthesized_calls.rb +5 -6
  317. data/lib/rubocop/cop/style/numeric_predicate.rb +7 -4
  318. data/lib/rubocop/cop/style/optional_boolean_parameter.rb +42 -0
  319. data/lib/rubocop/cop/style/parallel_assignment.rb +5 -5
  320. data/lib/rubocop/cop/style/percent_literal_delimiters.rb +1 -1
  321. data/lib/rubocop/cop/style/proc.rb +1 -1
  322. data/lib/rubocop/cop/style/random_with_offset.rb +5 -10
  323. data/lib/rubocop/cop/style/redundant_assignment.rb +117 -0
  324. data/lib/rubocop/cop/style/redundant_condition.rb +15 -3
  325. data/lib/rubocop/cop/style/redundant_exception.rb +18 -10
  326. data/lib/rubocop/cop/style/redundant_fetch_block.rb +26 -7
  327. data/lib/rubocop/cop/style/redundant_file_extension_in_require.rb +50 -0
  328. data/lib/rubocop/cop/style/redundant_freeze.rb +1 -1
  329. data/lib/rubocop/cop/style/redundant_parentheses.rb +7 -1
  330. data/lib/rubocop/cop/style/redundant_regexp_character_class.rb +2 -1
  331. data/lib/rubocop/cop/style/redundant_regexp_escape.rb +11 -11
  332. data/lib/rubocop/cop/style/redundant_sort.rb +26 -12
  333. data/lib/rubocop/cop/style/rescue_standard_error.rb +1 -1
  334. data/lib/rubocop/cop/style/safe_navigation.rb +4 -4
  335. data/lib/rubocop/cop/style/signal_exception.rb +3 -1
  336. data/lib/rubocop/cop/style/single_argument_dig.rb +54 -0
  337. data/lib/rubocop/cop/style/single_line_methods.rb +1 -1
  338. data/lib/rubocop/cop/style/stabby_lambda_parentheses.rb +3 -2
  339. data/lib/rubocop/cop/style/stderr_puts.rb +1 -1
  340. data/lib/rubocop/cop/style/string_concatenation.rb +92 -0
  341. data/lib/rubocop/cop/style/struct_inheritance.rb +3 -3
  342. data/lib/rubocop/cop/style/symbol_array.rb +1 -1
  343. data/lib/rubocop/cop/style/symbol_proc.rb +2 -2
  344. data/lib/rubocop/cop/style/trailing_method_end_statement.rb +9 -32
  345. data/lib/rubocop/cop/style/trivial_accessors.rb +8 -7
  346. data/lib/rubocop/cop/style/zero_length_predicate.rb +12 -8
  347. data/lib/rubocop/cop/team.rb +98 -82
  348. data/lib/rubocop/cop/tokens_util.rb +84 -0
  349. data/lib/rubocop/cop/util.rb +3 -13
  350. data/lib/rubocop/cop/utils/format_string.rb +1 -2
  351. data/lib/rubocop/cop/variable_force.rb +0 -2
  352. data/lib/rubocop/cop/variable_force/branch.rb +1 -0
  353. data/lib/rubocop/cop/variable_force/variable.rb +7 -5
  354. data/lib/rubocop/cops_documentation_generator.rb +282 -0
  355. data/lib/rubocop/error.rb +1 -0
  356. data/lib/rubocop/file_finder.rb +12 -12
  357. data/lib/rubocop/formatter/disabled_config_formatter.rb +2 -2
  358. data/lib/rubocop/formatter/formatter_set.rb +1 -0
  359. data/lib/rubocop/formatter/junit_formatter.rb +1 -1
  360. data/lib/rubocop/name_similarity.rb +1 -3
  361. data/lib/rubocop/options.rb +18 -11
  362. data/lib/rubocop/path_util.rb +17 -17
  363. data/lib/rubocop/rake_task.rb +7 -9
  364. data/lib/rubocop/result_cache.rb +12 -8
  365. data/lib/rubocop/rspec/cop_helper.rb +4 -4
  366. data/lib/rubocop/rspec/expect_offense.rb +53 -22
  367. data/lib/rubocop/rspec/shared_contexts.rb +16 -17
  368. data/lib/rubocop/runner.rb +35 -34
  369. data/lib/rubocop/target_finder.rb +13 -10
  370. data/lib/rubocop/target_ruby.rb +1 -1
  371. data/lib/rubocop/version.rb +2 -2
  372. metadata +40 -11
  373. data/lib/rubocop/cop/lint/useless_comparison.rb +0 -28
  374. data/lib/rubocop/cop/mixin/classish_length.rb +0 -37
  375. data/lib/rubocop/cop/mixin/parser_diagnostic.rb +0 -37
  376. data/lib/rubocop/cop/mixin/too_many_lines.rb +0 -35
  377. data/lib/rubocop/cop/style/method_missing_super.rb +0 -34
@@ -8,117 +8,25 @@ module RuboCop
8
8
  # Important!
9
9
  # The nodes modified by the corrections should be part of the
10
10
  # AST of the source_buffer.
11
- class Corrector
11
+ class Corrector < ::Parser::Source::TreeRewriter
12
+ # @param source [Parser::Source::Buffer, or anything
13
+ # leading to one via `(processed_source.)buffer`]
12
14
  #
13
- # @param source_buffer [Parser::Source::Buffer]
14
- # @param corrections [Array(#call)]
15
- # Array of Objects that respond to #call. They will receive the
16
- # corrector itself and should use its method to modify the source.
17
- #
18
- # @example
19
- #
20
- # class AndOrCorrector
21
- # def initialize(node)
22
- # @node = node
23
- # end
24
- #
25
- # def call(corrector)
26
- # replacement = (@node.type == :and ? '&&' : '||')
27
- # corrector.replace(@node.loc.operator, replacement)
28
- # end
29
- # end
30
- #
31
- # corrections = [AndOrCorrector.new(node)]
32
- # corrector = Corrector.new(source_buffer, corrections)
33
- def initialize(source_buffer, corrections = [])
34
- @source_buffer = source_buffer
35
- raise 'source_buffer should be a Parser::Source::Buffer' unless \
36
- source_buffer.is_a? Parser::Source::Buffer
37
-
38
- @corrections = corrections
39
- @source_rewriter = Parser::Source::TreeRewriter.new(
40
- source_buffer,
15
+ # corrector = Corrector.new(cop)
16
+ def initialize(source)
17
+ source = self.class.source_buffer(source)
18
+ super(
19
+ source,
41
20
  different_replacements: :raise,
42
21
  swallowed_insertions: :raise,
43
22
  crossing_deletions: :accept
44
23
  )
45
24
 
46
- @diagnostics = []
47
25
  # Don't print warnings to stderr if corrections conflict with each other
48
- @source_rewriter.diagnostics.consumer = lambda do |diagnostic|
49
- @diagnostics << diagnostic
50
- end
51
- end
52
-
53
- attr_reader :corrections, :diagnostics
54
-
55
- # Does the actual rewrite and returns string corresponding to
56
- # the rewritten source.
57
- #
58
- # @return [String]
59
- def rewrite
60
- @corrections.each do |correction|
61
- begin
62
- @source_rewriter.transaction do
63
- correction.call(self)
64
- end
65
- rescue ErrorWithAnalyzedFileLocation => e
66
- raise e unless e.cause.is_a?(::Parser::ClobberingError)
67
- end
68
- end
69
-
70
- @source_rewriter.process
71
- end
72
-
73
- # Removes the source range.
74
- #
75
- # @param [Parser::Source::Range, Rubocop::AST::Node] range or node
76
- def remove(node_or_range)
77
- range = to_range(node_or_range)
78
- @source_rewriter.remove(range)
79
- end
80
-
81
- # Inserts new code before the given source range.
82
- #
83
- # @param [Parser::Source::Range, Rubocop::AST::Node] range or node
84
- # @param [String] content
85
- def insert_before(node_or_range, content)
86
- range = to_range(node_or_range)
87
- # TODO: Fix Cops using bad ranges instead
88
- if range.end_pos > @source_buffer.source.size
89
- range = range.with(end_pos: @source_buffer.source.size)
90
- end
91
-
92
- @source_rewriter.insert_before(range, content)
93
- end
94
-
95
- # Inserts new code after the given source range.
96
- #
97
- # @param [Parser::Source::Range, Rubocop::AST::Node] range or node
98
- # @param [String] content
99
- def insert_after(node_or_range, content)
100
- range = to_range(node_or_range)
101
- @source_rewriter.insert_after(range, content)
26
+ diagnostics.consumer = ->(diagnostic) {}
102
27
  end
103
28
 
104
- # Wraps the given source range with the given before and after texts
105
- #
106
- # @param [Parser::Source::Range, Rubocop::AST::Node] range or node
107
- # @param [String] before
108
- # @param [String] after
109
- def wrap(node_or_range, before, after)
110
- range = to_range(node_or_range)
111
- @source_rewriter.wrap(range, before, after)
112
- end
113
-
114
- # Replaces the code of the source range `range` with `content`.
115
- #
116
- # @param [Parser::Source::Range, Rubocop::AST::Node] range or node
117
- # @param [String] content
118
- def replace(node_or_range, content)
119
- range = to_range(node_or_range)
120
- @source_rewriter.replace(range, content)
121
- end
29
+ alias rewrite process # Legacy
122
30
 
123
31
  # Removes `size` characters prior to the source range.
124
32
  #
@@ -126,10 +34,11 @@ module RuboCop
126
34
  # @param [Integer] size
127
35
  def remove_preceding(node_or_range, size)
128
36
  range = to_range(node_or_range)
129
- to_remove = Parser::Source::Range.new(range.source_buffer,
130
- range.begin_pos - size,
131
- range.begin_pos)
132
- @source_rewriter.remove(to_remove)
37
+ to_remove = range.with(
38
+ begin_pos: range.begin_pos - size,
39
+ end_pos: range.begin_pos
40
+ )
41
+ remove(to_remove)
133
42
  end
134
43
 
135
44
  # Removes `size` characters from the beginning of the given range.
@@ -140,10 +49,8 @@ module RuboCop
140
49
  # @param [Integer] size
141
50
  def remove_leading(node_or_range, size)
142
51
  range = to_range(node_or_range)
143
- to_remove = Parser::Source::Range.new(range.source_buffer,
144
- range.begin_pos,
145
- range.begin_pos + size)
146
- @source_rewriter.remove(to_remove)
52
+ to_remove = range.with(end_pos: range.begin_pos + size)
53
+ remove(to_remove)
147
54
  end
148
55
 
149
56
  # Removes `size` characters from the end of the given range.
@@ -154,10 +61,22 @@ module RuboCop
154
61
  # @param [Integer] size
155
62
  def remove_trailing(node_or_range, size)
156
63
  range = to_range(node_or_range)
157
- to_remove = Parser::Source::Range.new(range.source_buffer,
158
- range.end_pos - size,
159
- range.end_pos)
160
- @source_rewriter.remove(to_remove)
64
+ to_remove = range.with(begin_pos: range.end_pos - size)
65
+ remove(to_remove)
66
+ end
67
+
68
+ # Duck typing for get to a ::Parser::Source::Buffer
69
+ def self.source_buffer(source)
70
+ source = source.processed_source if source.respond_to?(:processed_source)
71
+ source = source.buffer if source.respond_to?(:buffer)
72
+ source = source.source_buffer if source.respond_to?(:source_buffer)
73
+
74
+ unless source.is_a? ::Parser::Source::Buffer
75
+ raise TypeError, 'Expected argument to lead to a Parser::Source::Buffer ' \
76
+ "but got #{source.inspect}"
77
+ end
78
+
79
+ source
161
80
  end
162
81
 
163
82
  private
@@ -178,8 +97,12 @@ module RuboCop
178
97
  range
179
98
  end
180
99
 
100
+ def check_range_validity(node_or_range)
101
+ super(to_range(node_or_range))
102
+ end
103
+
181
104
  def validate_buffer(buffer)
182
- return if buffer == @source_buffer
105
+ return if buffer == source_buffer
183
106
 
184
107
  unless buffer.is_a?(::Parser::Source::Buffer)
185
108
  # actually this should be enforced by parser gem
@@ -16,7 +16,7 @@ module RuboCop
16
16
  processed_source:)
17
17
  @processed_source = processed_source
18
18
  range = first_part_of(node.to_a.last)
19
- eol_comment = end_of_line_comment(node.source_range.line)
19
+ eol_comment = processed_source.comment_at_line(node.source_range.line)
20
20
 
21
21
  break_line_before(range: range, node: node, corrector: corrector,
22
22
  configured_width: configured_width)
@@ -29,8 +29,8 @@ module RuboCop
29
29
  configured_width:)
30
30
  corrector.insert_before(
31
31
  range,
32
- "\n" + ' ' * (node.loc.keyword.column +
33
- indent_steps * configured_width)
32
+ "\n#{' ' * (node.loc.keyword.column +
33
+ indent_steps * configured_width)}"
34
34
  )
35
35
  end
36
36
 
@@ -39,7 +39,7 @@ module RuboCop
39
39
 
40
40
  text = eol_comment.loc.expression.source
41
41
  corrector.insert_before(node,
42
- text + "\n" + (' ' * node.loc.keyword.column))
42
+ "#{text}\n#{' ' * node.loc.keyword.column}")
43
43
  corrector.remove(eol_comment)
44
44
  end
45
45
 
@@ -42,8 +42,34 @@ module RuboCop
42
42
 
43
43
  corrector.insert_before(
44
44
  last_element_range_with_trailing_comma(node).end,
45
+ content_if_comment_present(corrector, node)
46
+ )
47
+ end
48
+
49
+ def content_if_comment_present(corrector, node)
50
+ range = range_with_surrounding_space(
51
+ range: children(node).last.source_range,
52
+ side: :right
53
+ ).end.resize(1)
54
+ if range.source == '#'
55
+ select_content_to_be_inserted_after_last_element(corrector, node)
56
+ else
45
57
  node.loc.end.source
58
+ end
59
+ end
60
+
61
+ def select_content_to_be_inserted_after_last_element(corrector, node)
62
+ range = range_between(
63
+ node.loc.end.begin_pos,
64
+ range_by_whole_lines(node.loc.expression).end.end_pos
46
65
  )
66
+
67
+ remove_trailing_content_of_comment(corrector, range)
68
+ range.source
69
+ end
70
+
71
+ def remove_trailing_content_of_comment(corrector, range)
72
+ corrector.remove(range)
47
73
  end
48
74
 
49
75
  def last_element_range_with_trailing_comma(node)
@@ -71,7 +71,7 @@ module RuboCop
71
71
  prev_line_num,
72
72
  base_line_num,
73
73
  index)
74
- prev_line_num = word_node.first_line
74
+ prev_line_num = word_node.last_line
75
75
  content = fix_escaped_content(word_node, escape, delimiters)
76
76
  line_breaks + content
77
77
  end
@@ -110,7 +110,7 @@ module RuboCop
110
110
 
111
111
  def end_content(source)
112
112
  result = /\A(\s*)\]/.match(source.split("\n").last)
113
- ("\n" + result[1]) if result
113
+ "\n#{result[1]}" if result
114
114
  end
115
115
  end
116
116
  end
@@ -10,7 +10,7 @@ module RuboCop
10
10
  end
11
11
 
12
12
  def add_space(token)
13
- ->(corrector) { corrector.replace(token.pos, token.pos.source + ' ') }
13
+ ->(corrector) { corrector.replace(token.pos, "#{token.pos.source} ") }
14
14
  end
15
15
 
16
16
  def swap_comma(range)
@@ -9,33 +9,30 @@ module RuboCop
9
9
  class << self
10
10
  attr_reader :processed_source
11
11
 
12
- def correct(processed_source, node)
12
+ def correct(corrector, processed_source, node)
13
13
  return if %i[kwarg kwoptarg].include?(node.type)
14
14
 
15
15
  @processed_source = processed_source
16
16
 
17
17
  if node.blockarg_type?
18
- correct_for_blockarg_type(node)
18
+ correct_for_blockarg_type(corrector, node)
19
19
  else
20
- lambda do |corrector|
21
- variable_name = if node.optarg_type?
22
- node.node_parts[0]
23
- else
24
- # Extract only a var name without splat (`*`)
25
- node.source.gsub(/\A\*+/, '')
26
- end
27
- corrector.replace(node.loc.name, "_#{variable_name}")
28
- end
20
+ variable_name = if node.optarg_type?
21
+ node.node_parts[0]
22
+ else
23
+ # Extract only a var name without splat (`*`)
24
+ node.source.gsub(/\A\*+/, '')
25
+ end
26
+
27
+ corrector.replace(node.loc.name, "_#{variable_name}")
29
28
  end
30
29
  end
31
30
 
32
- def correct_for_blockarg_type(node)
33
- lambda do |corrector|
34
- range = range_with_surrounding_space(range: node.source_range,
35
- side: :left)
36
- range = range_with_surrounding_comma(range, :left)
37
- corrector.remove(range)
38
- end
31
+ def correct_for_blockarg_type(corrector, node)
32
+ range = range_with_surrounding_space(range: node.source_range, side: :left)
33
+ range = range_with_surrounding_comma(range, :left)
34
+
35
+ corrector.remove(range)
39
36
  end
40
37
  end
41
38
  end
@@ -11,6 +11,7 @@ module RuboCop
11
11
  end
12
12
 
13
13
  def self.inherited(subclass)
14
+ super
14
15
  all << subclass
15
16
  end
16
17
 
@@ -3,8 +3,8 @@
3
3
  module RuboCop
4
4
  module Cop
5
5
  module Gemspec
6
- # Checks that `required_ruby_version` of gemspec and `TargetRubyVersion`
7
- # of .rubocop.yml are equal.
6
+ # Checks that `required_ruby_version` of gemspec is specified and
7
+ # equal to `TargetRubyVersion` of .rubocop.yml.
8
8
  # Thereby, RuboCop to perform static analysis working on the version
9
9
  # required by gemspec.
10
10
  #
@@ -13,6 +13,11 @@ module RuboCop
13
13
  #
14
14
  # # bad
15
15
  # Gem::Specification.new do |spec|
16
+ # # no `required_ruby_version` specified
17
+ # end
18
+ #
19
+ # # bad
20
+ # Gem::Specification.new do |spec|
16
21
  # spec.required_ruby_version = '>= 2.4.0'
17
22
  # end
18
23
  #
@@ -35,18 +40,35 @@ module RuboCop
35
40
  # Gem::Specification.new do |spec|
36
41
  # spec.required_ruby_version = ['>= 2.5.0', '< 2.7.0']
37
42
  # end
43
+ #
44
+ # # good
45
+ # Gem::Specification.new do |spec|
46
+ # spec.required_ruby_version = '~> 2.5'
47
+ # end
38
48
  class RequiredRubyVersion < Cop
39
- MSG = '`required_ruby_version` (%<required_ruby_version>s, ' \
40
- 'declared in %<gemspec_filename>s) and `TargetRubyVersion` ' \
41
- '(%<target_ruby_version>s, which may be specified in ' \
42
- '.rubocop.yml) should be equal.'
49
+ include RangeHelp
50
+
51
+ NOT_EQUAL_MSG = '`required_ruby_version` (%<required_ruby_version>s, ' \
52
+ 'declared in %<gemspec_filename>s) and `TargetRubyVersion` ' \
53
+ '(%<target_ruby_version>s, which may be specified in ' \
54
+ '.rubocop.yml) should be equal.'
55
+ MISSING_MSG = '`required_ruby_version` should be specified.'
43
56
 
44
57
  def_node_search :required_ruby_version, <<~PATTERN
45
- (send _ :required_ruby_version= ${(str _) (array (str _))})
58
+ (send _ :required_ruby_version= $_)
59
+ PATTERN
60
+
61
+ def_node_matcher :string_version?, <<~PATTERN
62
+ {(str _) (array (str _))}
46
63
  PATTERN
47
64
 
65
+ # rubocop:disable Metrics/AbcSize
48
66
  def investigate(processed_source)
49
- required_ruby_version(processed_source.ast) do |version|
67
+ version = required_ruby_version(processed_source.ast).first
68
+
69
+ if version
70
+ return unless string_version?(version)
71
+
50
72
  ruby_version = extract_ruby_version(version)
51
73
 
52
74
  return if ruby_version == target_ruby_version.to_s
@@ -54,10 +76,14 @@ module RuboCop
54
76
  add_offense(
55
77
  processed_source.ast,
56
78
  location: version.loc.expression,
57
- message: message(ruby_version, target_ruby_version)
79
+ message: not_equal_message(ruby_version, target_ruby_version)
58
80
  )
81
+ else
82
+ range = source_range(processed_source.buffer, 1, 0)
83
+ add_offense(nil, location: range, message: MISSING_MSG)
59
84
  end
60
85
  end
86
+ # rubocop:enable Metrics/AbcSize
61
87
 
62
88
  private
63
89
 
@@ -68,12 +94,12 @@ module RuboCop
68
94
  end
69
95
  end
70
96
 
71
- required_ruby_version.str_content.match(/(\d\.\d)/)[1]
97
+ required_ruby_version.str_content.scan(/\d/).first(2).join('.')
72
98
  end
73
99
 
74
- def message(required_ruby_version, target_ruby_version)
100
+ def not_equal_message(required_ruby_version, target_ruby_version)
75
101
  format(
76
- MSG,
102
+ NOT_EQUAL_MSG,
77
103
  required_ruby_version: required_ruby_version,
78
104
  gemspec_filename: File.basename(processed_source.file_path),
79
105
  target_ruby_version: target_ruby_version
@@ -28,7 +28,7 @@ module RuboCop
28
28
  class RubyVersionGlobalsUsage < Cop
29
29
  MSG = 'Do not use `RUBY_VERSION` in gemspec file.'
30
30
 
31
- def_node_matcher :ruby_version?, '(const nil? :RUBY_VERSION)'
31
+ def_node_matcher :ruby_version?, '(const {cbase nil?} :RUBY_VERSION)'
32
32
 
33
33
  def_node_search :gem_specification?, <<~PATTERN
34
34
  (block