rubocop 0.78.0 → 0.82.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/LICENSE.txt +1 -1
- data/README.md +4 -4
- data/config/default.yml +158 -48
- data/lib/rubocop.rb +19 -4
- data/lib/rubocop/ast/builder.rb +45 -42
- data/lib/rubocop/ast/node.rb +12 -19
- data/lib/rubocop/ast/node/array_node.rb +13 -0
- data/lib/rubocop/ast/node/block_node.rb +5 -1
- data/lib/rubocop/ast/node/case_match_node.rb +56 -0
- data/lib/rubocop/ast/node/def_node.rb +11 -0
- data/lib/rubocop/ast/node/forward_args_node.rb +18 -0
- data/lib/rubocop/ast/node/mixin/method_dispatch_node.rb +8 -0
- data/lib/rubocop/ast/node/regexp_node.rb +2 -4
- data/lib/rubocop/ast/traversal.rb +29 -10
- data/lib/rubocop/cli.rb +10 -4
- data/lib/rubocop/cli/command/show_cops.rb +11 -4
- data/lib/rubocop/comment_config.rb +6 -1
- data/lib/rubocop/config.rb +36 -10
- data/lib/rubocop/config_loader.rb +42 -33
- data/lib/rubocop/config_loader_resolver.rb +1 -1
- data/lib/rubocop/config_obsoletion.rb +4 -1
- data/lib/rubocop/config_validator.rb +66 -92
- data/lib/rubocop/cop/autocorrect_logic.rb +6 -3
- data/lib/rubocop/cop/badge.rb +5 -5
- data/lib/rubocop/cop/bundler/insecure_protocol_source.rb +1 -1
- data/lib/rubocop/cop/corrector.rb +48 -24
- data/lib/rubocop/cop/correctors/alignment_corrector.rb +2 -2
- data/lib/rubocop/cop/correctors/condition_corrector.rb +1 -2
- data/lib/rubocop/cop/correctors/empty_line_corrector.rb +1 -1
- data/lib/rubocop/cop/correctors/lambda_literal_to_method_corrector.rb +3 -3
- data/lib/rubocop/cop/correctors/line_break_corrector.rb +2 -2
- data/lib/rubocop/cop/correctors/percent_literal_corrector.rb +1 -1
- data/lib/rubocop/cop/correctors/string_literal_corrector.rb +2 -2
- data/lib/rubocop/cop/gemspec/ordered_dependencies.rb +1 -1
- data/lib/rubocop/cop/generator.rb +3 -4
- data/lib/rubocop/cop/generator/configuration_injector.rb +1 -1
- data/lib/rubocop/cop/internal_affairs/offense_location_keyword.rb +1 -1
- data/lib/rubocop/cop/layout/array_alignment.rb +53 -10
- data/lib/rubocop/cop/layout/block_end_newline.rb +5 -3
- data/lib/rubocop/cop/layout/dot_position.rb +1 -1
- data/lib/rubocop/cop/layout/else_alignment.rb +8 -0
- data/lib/rubocop/cop/layout/empty_line_between_defs.rb +2 -1
- data/lib/rubocop/cop/layout/end_of_line.rb +2 -2
- data/lib/rubocop/cop/layout/first_array_element_indentation.rb +16 -10
- data/lib/rubocop/cop/layout/first_hash_element_indentation.rb +1 -1
- data/lib/rubocop/cop/layout/hash_alignment.rb +8 -4
- data/lib/rubocop/cop/layout/heredoc_argument_closing_parenthesis.rb +2 -2
- data/lib/rubocop/cop/layout/heredoc_indentation.rb +2 -2
- data/lib/rubocop/cop/layout/{tab.rb → indentation_style.rb} +48 -6
- data/lib/rubocop/cop/layout/leading_comment_space.rb +34 -3
- data/lib/rubocop/cop/layout/line_length.rb +32 -3
- data/lib/rubocop/cop/layout/multiline_block_layout.rb +15 -6
- data/lib/rubocop/cop/layout/multiline_hash_brace_layout.rb +0 -4
- data/lib/rubocop/cop/layout/multiline_method_call_indentation.rb +1 -1
- data/lib/rubocop/cop/layout/space_around_block_parameters.rb +3 -3
- data/lib/rubocop/cop/layout/space_around_method_call_operator.rb +133 -0
- data/lib/rubocop/cop/layout/space_around_operators.rb +19 -1
- data/lib/rubocop/cop/layout/space_before_block_braces.rb +2 -2
- data/lib/rubocop/cop/layout/space_before_first_arg.rb +8 -0
- data/lib/rubocop/cop/layout/space_in_lambda_literal.rb +1 -1
- data/lib/rubocop/cop/layout/space_inside_block_braces.rb +2 -2
- data/lib/rubocop/cop/layout/space_inside_hash_literal_braces.rb +2 -9
- data/lib/rubocop/cop/layout/space_inside_range_literal.rb +2 -2
- data/lib/rubocop/cop/lint/boolean_symbol.rb +12 -0
- data/lib/rubocop/cop/lint/debugger.rb +2 -2
- data/lib/rubocop/cop/lint/erb_new_arguments.rb +1 -1
- data/lib/rubocop/cop/lint/implicit_string_concatenation.rb +1 -1
- data/lib/rubocop/cop/lint/inherit_exception.rb +1 -1
- data/lib/rubocop/cop/lint/interpolation_check.rb +1 -1
- data/lib/rubocop/cop/lint/literal_in_interpolation.rb +1 -1
- data/lib/rubocop/cop/lint/loop.rb +6 -4
- data/lib/rubocop/cop/lint/multiple_comparison.rb +1 -1
- data/lib/rubocop/cop/lint/nested_method_definition.rb +2 -2
- data/lib/rubocop/cop/lint/non_deterministic_require_order.rb +2 -2
- data/lib/rubocop/cop/lint/number_conversion.rb +1 -1
- data/lib/rubocop/cop/lint/percent_string_array.rb +2 -2
- data/lib/rubocop/cop/lint/raise_exception.rb +75 -0
- data/lib/rubocop/cop/lint/redundant_cop_disable_directive.rb +1 -1
- data/lib/rubocop/cop/lint/redundant_cop_enable_directive.rb +12 -7
- data/lib/rubocop/cop/lint/redundant_string_coercion.rb +1 -1
- data/lib/rubocop/cop/lint/safe_navigation_chain.rb +1 -1
- data/lib/rubocop/cop/lint/struct_new_override.rb +58 -0
- data/lib/rubocop/cop/lint/suppressed_exception.rb +12 -22
- data/lib/rubocop/cop/lint/unified_integer.rb +0 -2
- data/lib/rubocop/cop/lint/unused_method_argument.rb +32 -6
- data/lib/rubocop/cop/lint/uri_regexp.rb +4 -4
- data/lib/rubocop/cop/lint/useless_setter_call.rb +4 -0
- data/lib/rubocop/cop/migration/department_name.rb +47 -6
- data/lib/rubocop/cop/mixin/configurable_enforced_style.rb +4 -0
- data/lib/rubocop/cop/mixin/end_keyword_alignment.rb +6 -1
- data/lib/rubocop/cop/mixin/frozen_string_literal.rb +7 -7
- data/lib/rubocop/cop/mixin/hash_transform_method.rb +171 -0
- data/lib/rubocop/cop/mixin/line_length_help.rb +1 -1
- data/lib/rubocop/cop/mixin/method_complexity.rb +5 -0
- data/lib/rubocop/cop/mixin/statement_modifier.rb +4 -3
- data/lib/rubocop/cop/mixin/trailing_comma.rb +3 -10
- data/lib/rubocop/cop/naming/class_and_module_camel_case.rb +1 -1
- data/lib/rubocop/cop/naming/constant_name.rb +2 -1
- data/lib/rubocop/cop/naming/heredoc_delimiter_naming.rb +1 -1
- data/lib/rubocop/cop/naming/memoized_instance_variable_name.rb +1 -1
- data/lib/rubocop/cop/naming/method_name.rb +30 -0
- data/lib/rubocop/cop/naming/method_parameter_name.rb +1 -1
- data/lib/rubocop/cop/naming/rescued_exceptions_variable_name.rb +1 -1
- data/lib/rubocop/cop/registry.rb +15 -3
- data/lib/rubocop/cop/style/access_modifier_declarations.rb +26 -6
- data/lib/rubocop/cop/style/alias.rb +4 -4
- data/lib/rubocop/cop/style/and_or.rb +5 -6
- data/lib/rubocop/cop/style/array_join.rb +1 -1
- data/lib/rubocop/cop/style/block_delimiters.rb +60 -1
- data/lib/rubocop/cop/style/case_equality.rb +24 -1
- data/lib/rubocop/cop/style/character_literal.rb +2 -2
- data/lib/rubocop/cop/style/collection_methods.rb +2 -0
- data/lib/rubocop/cop/style/conditional_assignment.rb +8 -8
- data/lib/rubocop/cop/style/copyright.rb +1 -1
- data/lib/rubocop/cop/style/dir.rb +1 -1
- data/lib/rubocop/cop/style/disable_cops_within_source_code_directive.rb +49 -0
- data/lib/rubocop/cop/style/documentation.rb +43 -5
- data/lib/rubocop/cop/style/double_cop_disable_directive.rb +1 -1
- data/lib/rubocop/cop/style/each_for_simple_loop.rb +1 -1
- data/lib/rubocop/cop/style/each_with_object.rb +3 -3
- data/lib/rubocop/cop/style/empty_method.rb +1 -1
- data/lib/rubocop/cop/style/end_block.rb +6 -0
- data/lib/rubocop/cop/style/even_odd.rb +1 -1
- data/lib/rubocop/cop/style/expand_path_arguments.rb +3 -3
- data/lib/rubocop/cop/style/exponential_notation.rb +119 -0
- data/lib/rubocop/cop/style/format_string.rb +2 -2
- data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +89 -11
- data/lib/rubocop/cop/style/hash_each_methods.rb +89 -0
- data/lib/rubocop/cop/style/hash_syntax.rb +3 -5
- data/lib/rubocop/cop/style/hash_transform_keys.rb +83 -0
- data/lib/rubocop/cop/style/hash_transform_values.rb +80 -0
- data/lib/rubocop/cop/style/if_unless_modifier.rb +23 -3
- data/lib/rubocop/cop/style/inverse_methods.rb +9 -5
- data/lib/rubocop/cop/style/lambda.rb +3 -2
- data/lib/rubocop/cop/style/lambda_call.rb +2 -2
- data/lib/rubocop/cop/style/method_call_with_args_parentheses.rb +7 -205
- data/lib/rubocop/cop/style/method_call_with_args_parentheses/omit_parentheses.rb +169 -0
- data/lib/rubocop/cop/style/method_call_with_args_parentheses/require_parentheses.rb +54 -0
- data/lib/rubocop/cop/style/mixin_grouping.rb +1 -1
- data/lib/rubocop/cop/style/module_function.rb +58 -12
- data/lib/rubocop/cop/style/multiline_if_modifier.rb +1 -1
- data/lib/rubocop/cop/style/multiline_memoization.rb +1 -1
- data/lib/rubocop/cop/style/multiline_when_then.rb +5 -1
- data/lib/rubocop/cop/style/mutable_constant.rb +2 -4
- data/lib/rubocop/cop/style/nested_parenthesized_calls.rb +4 -4
- data/lib/rubocop/cop/style/next.rb +2 -2
- data/lib/rubocop/cop/style/nil_comparison.rb +1 -1
- data/lib/rubocop/cop/style/non_nil_check.rb +4 -4
- data/lib/rubocop/cop/style/not.rb +1 -1
- data/lib/rubocop/cop/style/numeric_literal_prefix.rb +1 -1
- data/lib/rubocop/cop/style/numeric_literals.rb +1 -1
- data/lib/rubocop/cop/style/numeric_predicate.rb +5 -4
- data/lib/rubocop/cop/style/one_line_conditional.rb +4 -3
- data/lib/rubocop/cop/style/or_assignment.rb +4 -3
- data/lib/rubocop/cop/style/percent_literal_delimiters.rb +7 -7
- data/lib/rubocop/cop/style/percent_q_literals.rb +1 -1
- data/lib/rubocop/cop/style/perl_backrefs.rb +2 -2
- data/lib/rubocop/cop/style/proc.rb +1 -1
- data/lib/rubocop/cop/style/raise_args.rb +1 -1
- data/lib/rubocop/cop/style/random_with_offset.rb +3 -3
- data/lib/rubocop/cop/style/redundant_condition.rb +18 -6
- data/lib/rubocop/cop/style/redundant_conditional.rb +1 -1
- data/lib/rubocop/cop/style/redundant_exception.rb +3 -3
- data/lib/rubocop/cop/style/redundant_interpolation.rb +2 -2
- data/lib/rubocop/cop/style/redundant_percent_q.rb +2 -2
- data/lib/rubocop/cop/style/redundant_return.rb +5 -7
- data/lib/rubocop/cop/style/redundant_self.rb +1 -1
- data/lib/rubocop/cop/style/redundant_sort.rb +2 -2
- data/lib/rubocop/cop/style/rescue_modifier.rb +1 -1
- data/lib/rubocop/cop/style/return_nil.rb +1 -1
- data/lib/rubocop/cop/style/safe_navigation.rb +1 -1
- data/lib/rubocop/cop/style/self_assignment.rb +1 -1
- data/lib/rubocop/cop/style/special_global_vars.rb +1 -1
- data/lib/rubocop/cop/style/stabby_lambda_parentheses.rb +1 -4
- data/lib/rubocop/cop/style/string_hash_keys.rb +1 -1
- data/lib/rubocop/cop/style/symbol_array.rb +3 -3
- data/lib/rubocop/cop/style/symbol_literal.rb +2 -2
- data/lib/rubocop/cop/style/ternary_parentheses.rb +2 -3
- data/lib/rubocop/cop/style/trailing_comma_in_arguments.rb +35 -22
- data/lib/rubocop/cop/style/trailing_comma_in_array_literal.rb +41 -0
- data/lib/rubocop/cop/style/trailing_comma_in_block_args.rb +88 -0
- data/lib/rubocop/cop/style/trailing_comma_in_hash_literal.rb +44 -0
- data/lib/rubocop/cop/style/trivial_accessors.rb +1 -1
- data/lib/rubocop/cop/style/unpack_first.rb +0 -4
- data/lib/rubocop/cop/style/variable_interpolation.rb +1 -1
- data/lib/rubocop/cop/style/while_until_modifier.rb +1 -1
- data/lib/rubocop/cop/style/word_array.rb +1 -1
- data/lib/rubocop/cop/style/yoda_condition.rb +16 -1
- data/lib/rubocop/cop/style/zero_length_predicate.rb +1 -1
- data/lib/rubocop/cop/variable_force.rb +4 -1
- data/lib/rubocop/formatter/clang_style_formatter.rb +1 -1
- data/lib/rubocop/formatter/formatter_set.rb +1 -1
- data/lib/rubocop/formatter/junit_formatter.rb +74 -0
- data/lib/rubocop/formatter/pacman_formatter.rb +1 -1
- data/lib/rubocop/formatter/tap_formatter.rb +1 -1
- data/lib/rubocop/node_pattern.rb +96 -10
- data/lib/rubocop/options.rb +7 -1
- data/lib/rubocop/processed_source.rb +1 -4
- data/lib/rubocop/rspec/cop_helper.rb +1 -1
- data/lib/rubocop/rspec/expect_offense.rb +1 -1
- data/lib/rubocop/rspec/shared_contexts.rb +5 -4
- data/lib/rubocop/runner.rb +1 -1
- data/lib/rubocop/target_ruby.rb +151 -0
- data/lib/rubocop/version.rb +1 -1
- metadata +39 -12
- data/lib/rubocop/cop/lint/end_in_method.rb +0 -40
- data/lib/rubocop/cop/style/braces_around_hash_parameters.rb +0 -209
- data/lib/rubocop/formatter/disabled_lines_formatter.rb +0 -57
@@ -42,13 +42,13 @@ module RuboCop
|
|
42
42
|
|
43
43
|
def autocorrect(node)
|
44
44
|
lambda do |corrector|
|
45
|
-
node.
|
45
|
+
node.each_value do |value|
|
46
46
|
range = value.loc.expression
|
47
47
|
|
48
48
|
match = range.source.match(TRAILING_QUOTE)
|
49
49
|
corrector.remove_trailing(range, match[0].length) if match
|
50
50
|
|
51
|
-
if range.source
|
51
|
+
if LEADING_QUOTE.match?(range.source)
|
52
52
|
corrector.remove_leading(range, 1)
|
53
53
|
end
|
54
54
|
end
|
@@ -0,0 +1,75 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module RuboCop
|
4
|
+
module Cop
|
5
|
+
module Lint
|
6
|
+
# This cop checks for `raise` or `fail` statements which are
|
7
|
+
# raising `Exception` class.
|
8
|
+
#
|
9
|
+
# You can specify a module name that will be an implicit namespace
|
10
|
+
# using `AllowedImplicitNamespaces` option. The cop cause a false positive
|
11
|
+
# for namespaced `Exception` when a namespace is omitted. This option can
|
12
|
+
# prevent the false positive by specifying a namespace to be omitted for
|
13
|
+
# `Exception`. Alternatively, make `Exception` a fully qualified class
|
14
|
+
# name with an explicit namespace.
|
15
|
+
#
|
16
|
+
# @example
|
17
|
+
# # bad
|
18
|
+
# raise Exception, 'Error message here'
|
19
|
+
#
|
20
|
+
# # good
|
21
|
+
# raise StandardError, 'Error message here'
|
22
|
+
#
|
23
|
+
# @example AllowedImplicitNamespaces: ['Gem']
|
24
|
+
# # good
|
25
|
+
# module Gem
|
26
|
+
# def self.foo
|
27
|
+
# raise Exception # This exception means `Gem::Exception`.
|
28
|
+
# end
|
29
|
+
# end
|
30
|
+
class RaiseException < Cop
|
31
|
+
MSG = 'Use `StandardError` over `Exception`.'
|
32
|
+
|
33
|
+
def_node_matcher :exception?, <<~PATTERN
|
34
|
+
(send nil? {:raise :fail} (const ${cbase nil?} :Exception) ... )
|
35
|
+
PATTERN
|
36
|
+
|
37
|
+
def_node_matcher :exception_new_with_message?, <<~PATTERN
|
38
|
+
(send nil? {:raise :fail}
|
39
|
+
(send (const ${cbase nil?} :Exception) :new ... ))
|
40
|
+
PATTERN
|
41
|
+
|
42
|
+
def on_send(node)
|
43
|
+
exception?(node, &check(node)) ||
|
44
|
+
exception_new_with_message?(node, &check(node))
|
45
|
+
end
|
46
|
+
|
47
|
+
private
|
48
|
+
|
49
|
+
def check(node)
|
50
|
+
lambda do |cbase|
|
51
|
+
return if cbase.nil? && implicit_namespace?(node)
|
52
|
+
|
53
|
+
add_offense(node)
|
54
|
+
end
|
55
|
+
end
|
56
|
+
|
57
|
+
def implicit_namespace?(node)
|
58
|
+
return false unless (parent = node.parent)
|
59
|
+
|
60
|
+
if parent.module_type?
|
61
|
+
namespace = parent.identifier.source
|
62
|
+
|
63
|
+
return allow_implicit_namespaces.include?(namespace)
|
64
|
+
end
|
65
|
+
|
66
|
+
implicit_namespace?(parent)
|
67
|
+
end
|
68
|
+
|
69
|
+
def allow_implicit_namespaces
|
70
|
+
cop_config['AllowedImplicitNamespaces'] || []
|
71
|
+
end
|
72
|
+
end
|
73
|
+
end
|
74
|
+
end
|
75
|
+
end
|
@@ -1,9 +1,11 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
# The Lint/RedundantCopEnableDirective
|
4
|
-
# to be able to provide a (bad) example of an
|
3
|
+
# The Lint/RedundantCopEnableDirective and Lint/RedundantCopDisableDirective
|
4
|
+
# cops need to be disabled so as to be able to provide a (bad) example of an
|
5
|
+
# unneeded enable.
|
5
6
|
|
6
7
|
# rubocop:disable Lint/RedundantCopEnableDirective
|
8
|
+
# rubocop:disable Lint/RedundantCopDisableDirective
|
7
9
|
module RuboCop
|
8
10
|
module Cop
|
9
11
|
module Lint
|
@@ -21,15 +23,15 @@ module RuboCop
|
|
21
23
|
# foo = 1
|
22
24
|
# @example
|
23
25
|
# # bad
|
24
|
-
# # rubocop:disable
|
25
|
-
#
|
26
|
-
# # rubocop:enable
|
26
|
+
# # rubocop:disable Style/StringLiterals
|
27
|
+
# foo = "1"
|
28
|
+
# # rubocop:enable Style/StringLiterals
|
27
29
|
# baz
|
28
30
|
# # rubocop:enable all
|
29
31
|
#
|
30
32
|
# # good
|
31
|
-
# # rubocop:disable
|
32
|
-
#
|
33
|
+
# # rubocop:disable Style/StringLiterals
|
34
|
+
# foo = "1"
|
33
35
|
# # rubocop:enable all
|
34
36
|
# baz
|
35
37
|
class RedundantCopEnableDirective < Cop
|
@@ -112,3 +114,6 @@ module RuboCop
|
|
112
114
|
end
|
113
115
|
end
|
114
116
|
end
|
117
|
+
|
118
|
+
# rubocop:enable Lint/RedundantCopDisableDirective
|
119
|
+
# rubocop:enable Lint/RedundantCopEnableDirective
|
@@ -0,0 +1,58 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module RuboCop
|
4
|
+
module Cop
|
5
|
+
module Lint
|
6
|
+
# This cop checks unexpected overrides of the `Struct` built-in methods
|
7
|
+
# via `Struct.new`.
|
8
|
+
#
|
9
|
+
# @example
|
10
|
+
# # bad
|
11
|
+
# Bad = Struct.new(:members, :clone, :count)
|
12
|
+
# b = Bad.new([], true, 1)
|
13
|
+
# b.members #=> [] (overriding `Struct#members`)
|
14
|
+
# b.clone #=> true (overriding `Object#clone`)
|
15
|
+
# b.count #=> 1 (overriding `Enumerable#count`)
|
16
|
+
#
|
17
|
+
# # good
|
18
|
+
# Good = Struct.new(:id, :name)
|
19
|
+
# g = Good.new(1, "foo")
|
20
|
+
# g.members #=> [:id, :name]
|
21
|
+
# g.clone #=> #<struct Good id=1, name="foo">
|
22
|
+
# g.count #=> 2
|
23
|
+
#
|
24
|
+
class StructNewOverride < Cop
|
25
|
+
MSG = '`%<member_name>s` member overrides `Struct#%<method_name>s`' \
|
26
|
+
' and it may be unexpected.'
|
27
|
+
|
28
|
+
STRUCT_METHOD_NAMES = Struct.instance_methods
|
29
|
+
STRUCT_MEMBER_NAME_TYPES = %i[sym str].freeze
|
30
|
+
|
31
|
+
def_node_matcher :struct_new, <<~PATTERN
|
32
|
+
(send
|
33
|
+
(const ${nil? cbase} :Struct) :new ...)
|
34
|
+
PATTERN
|
35
|
+
|
36
|
+
def on_send(node)
|
37
|
+
return unless struct_new(node) do
|
38
|
+
node.arguments.each_with_index do |arg, index|
|
39
|
+
# Ignore if the first argument is a class name
|
40
|
+
next if index.zero? && arg.str_type?
|
41
|
+
|
42
|
+
# Ignore if the argument is not a member name
|
43
|
+
next unless STRUCT_MEMBER_NAME_TYPES.include?(arg.type)
|
44
|
+
|
45
|
+
member_name = arg.value
|
46
|
+
|
47
|
+
next unless STRUCT_METHOD_NAMES.include?(member_name.to_sym)
|
48
|
+
|
49
|
+
message = format(MSG, member_name: member_name.inspect,
|
50
|
+
method_name: member_name.to_s)
|
51
|
+
add_offense(arg, message: message)
|
52
|
+
end
|
53
|
+
end
|
54
|
+
end
|
55
|
+
end
|
56
|
+
end
|
57
|
+
end
|
58
|
+
end
|
@@ -5,7 +5,7 @@ module RuboCop
|
|
5
5
|
module Lint
|
6
6
|
# This cop checks for *rescue* blocks with no body.
|
7
7
|
#
|
8
|
-
# @example
|
8
|
+
# @example
|
9
9
|
#
|
10
10
|
# # bad
|
11
11
|
# def some_method
|
@@ -14,25 +14,11 @@ module RuboCop
|
|
14
14
|
# end
|
15
15
|
#
|
16
16
|
# # bad
|
17
|
-
# def some_method
|
18
|
-
# do_something
|
19
|
-
# rescue
|
20
|
-
# # do nothing
|
21
|
-
# end
|
22
|
-
#
|
23
|
-
# # bad
|
24
17
|
# begin
|
25
18
|
# do_something
|
26
19
|
# rescue
|
27
20
|
# end
|
28
21
|
#
|
29
|
-
# # bad
|
30
|
-
# begin
|
31
|
-
# do_something
|
32
|
-
# rescue
|
33
|
-
# # do nothing
|
34
|
-
# end
|
35
|
-
#
|
36
22
|
# # good
|
37
23
|
# def some_method
|
38
24
|
# do_something
|
@@ -47,32 +33,36 @@ module RuboCop
|
|
47
33
|
# handle_exception
|
48
34
|
# end
|
49
35
|
#
|
50
|
-
# @example AllowComments: true
|
36
|
+
# @example AllowComments: true (default)
|
51
37
|
#
|
52
|
-
# #
|
38
|
+
# # good
|
53
39
|
# def some_method
|
54
40
|
# do_something
|
55
41
|
# rescue
|
42
|
+
# # do nothing
|
56
43
|
# end
|
57
44
|
#
|
58
|
-
# #
|
45
|
+
# # good
|
59
46
|
# begin
|
60
47
|
# do_something
|
61
48
|
# rescue
|
49
|
+
# # do nothing
|
62
50
|
# end
|
63
51
|
#
|
64
|
-
#
|
52
|
+
# @example AllowComments: false
|
53
|
+
#
|
54
|
+
# # bad
|
65
55
|
# def some_method
|
66
56
|
# do_something
|
67
57
|
# rescue
|
68
|
-
# # do nothing
|
58
|
+
# # do nothing
|
69
59
|
# end
|
70
60
|
#
|
71
|
-
# #
|
61
|
+
# # bad
|
72
62
|
# begin
|
73
63
|
# do_something
|
74
64
|
# rescue
|
75
|
-
# # do nothing
|
65
|
+
# # do nothing
|
76
66
|
# end
|
77
67
|
class SuppressedException < Cop
|
78
68
|
MSG = 'Do not suppress exceptions.'
|
@@ -38,9 +38,34 @@ module RuboCop
|
|
38
38
|
# def do_something(unused)
|
39
39
|
# end
|
40
40
|
#
|
41
|
+
# @example IgnoreNotImplementedMethods: true (default)
|
42
|
+
# # good
|
43
|
+
# def do_something(unused)
|
44
|
+
# raise NotImplementedError
|
45
|
+
# end
|
46
|
+
#
|
47
|
+
# def do_something_else(unused)
|
48
|
+
# fail "TODO"
|
49
|
+
# end
|
50
|
+
#
|
51
|
+
# @example IgnoreNotImplementedMethods: false
|
52
|
+
# # bad
|
53
|
+
# def do_something(unused)
|
54
|
+
# raise NotImplementedError
|
55
|
+
# end
|
56
|
+
#
|
57
|
+
# def do_something_else(unused)
|
58
|
+
# fail "TODO"
|
59
|
+
# end
|
60
|
+
#
|
41
61
|
class UnusedMethodArgument < Cop
|
42
62
|
include UnusedArgument
|
43
63
|
|
64
|
+
def_node_matcher :not_implemented?, <<~PATTERN
|
65
|
+
{(send nil? :raise (const nil? :NotImplementedError))
|
66
|
+
(send nil? :fail ...)}
|
67
|
+
PATTERN
|
68
|
+
|
44
69
|
def autocorrect(node)
|
45
70
|
UnusedArgCorrector.correct(processed_source, node)
|
46
71
|
end
|
@@ -51,16 +76,17 @@ module RuboCop
|
|
51
76
|
return unless variable.method_argument?
|
52
77
|
return if variable.keyword_argument? &&
|
53
78
|
cop_config['AllowUnusedKeywordArguments']
|
54
|
-
|
55
|
-
if cop_config['IgnoreEmptyMethods']
|
56
|
-
body = variable.scope.node.body
|
57
|
-
|
58
|
-
return if body.nil?
|
59
|
-
end
|
79
|
+
return if ignored_method?(variable.scope.node.body)
|
60
80
|
|
61
81
|
super
|
62
82
|
end
|
63
83
|
|
84
|
+
def ignored_method?(body)
|
85
|
+
cop_config['IgnoreEmptyMethods'] && body.nil? ||
|
86
|
+
cop_config['IgnoreNotImplementedMethods'] &&
|
87
|
+
not_implemented?(body)
|
88
|
+
end
|
89
|
+
|
64
90
|
def message(variable)
|
65
91
|
message = +"Unused method argument - `#{variable.name}`."
|
66
92
|
|
@@ -21,7 +21,7 @@ module RuboCop
|
|
21
21
|
def_node_matcher :uri_regexp_with_argument?, <<~PATTERN
|
22
22
|
(send
|
23
23
|
(const ${nil? cbase} :URI) :regexp
|
24
|
-
(str
|
24
|
+
${(str _) (array ...)})
|
25
25
|
PATTERN
|
26
26
|
|
27
27
|
def_node_matcher :uri_regexp_without_argument?, <<~PATTERN
|
@@ -32,7 +32,7 @@ module RuboCop
|
|
32
32
|
def on_send(node)
|
33
33
|
uri_regexp_with_argument?(node) do |double_colon, arg|
|
34
34
|
register_offense(
|
35
|
-
node, top_level: double_colon ? '::' : '', arg: "(
|
35
|
+
node, top_level: double_colon ? '::' : '', arg: "(#{arg.source})"
|
36
36
|
)
|
37
37
|
end
|
38
38
|
|
@@ -51,10 +51,10 @@ module RuboCop
|
|
51
51
|
double_colon, arg = captured_values
|
52
52
|
|
53
53
|
top_level = double_colon ? '::' : ''
|
54
|
-
argument = arg ? "(
|
54
|
+
argument = arg ? "(#{arg.source})" : ''
|
55
55
|
|
56
56
|
corrector.replace(
|
57
|
-
node
|
57
|
+
node,
|
58
58
|
"#{top_level}URI::DEFAULT_PARSER.make_regexp#{argument}"
|
59
59
|
)
|
60
60
|
end
|
@@ -6,6 +6,10 @@ module RuboCop
|
|
6
6
|
# This cop checks for setter call to local variable as the final
|
7
7
|
# expression of a function definition.
|
8
8
|
#
|
9
|
+
# Note: There are edge cases in which the local variable references a
|
10
|
+
# value that is also accessible outside the local scope. This is not
|
11
|
+
# detected by the cop, and it can yield a false positive.
|
12
|
+
#
|
9
13
|
# @example
|
10
14
|
#
|
11
15
|
# # bad
|
@@ -10,13 +10,29 @@ module RuboCop
|
|
10
10
|
|
11
11
|
MSG = 'Department name is missing.'
|
12
12
|
|
13
|
+
DISABLE_COMMENT_FORMAT =
|
14
|
+
/\A(# *rubocop *: *((dis|en)able|todo) +)(.*)/.freeze
|
15
|
+
|
16
|
+
# The token that makes up a disable comment.
|
17
|
+
# The allowed specification for comments after `# rubocop: disable` is
|
18
|
+
# `DepartmentName/CopName` or` all`.
|
19
|
+
DISABLING_COPS_CONTENT_TOKEN = %r{[A-z]+/[A-z]+|all}.freeze
|
20
|
+
|
13
21
|
def investigate(processed_source)
|
14
22
|
processed_source.each_comment do |comment|
|
15
|
-
next if comment.text !~
|
23
|
+
next if comment.text !~ DISABLE_COMMENT_FORMAT
|
16
24
|
|
17
25
|
offset = Regexp.last_match(1).length
|
18
|
-
|
19
|
-
|
26
|
+
|
27
|
+
Regexp.last_match(4).scan(/[^,]+|[\W]+/) do |name|
|
28
|
+
trimmed_name = name.strip
|
29
|
+
|
30
|
+
break if contain_plain_comment?(trimmed_name)
|
31
|
+
|
32
|
+
unless valid_content_token?(trimmed_name)
|
33
|
+
check_cop_name(trimmed_name, comment, offset)
|
34
|
+
end
|
35
|
+
|
20
36
|
offset += name.length
|
21
37
|
end
|
22
38
|
end
|
@@ -24,20 +40,45 @@ module RuboCop
|
|
24
40
|
|
25
41
|
def autocorrect(range)
|
26
42
|
shall_warn = false
|
27
|
-
|
43
|
+
cop_name = range.source
|
44
|
+
qualified_cop_name = Cop.registry.qualified_cop_name(cop_name,
|
28
45
|
nil, shall_warn)
|
46
|
+
unless qualified_cop_name.include?('/')
|
47
|
+
qualified_cop_name = qualified_legacy_cop_name(cop_name)
|
48
|
+
end
|
49
|
+
|
29
50
|
->(corrector) { corrector.replace(range, qualified_cop_name) }
|
30
51
|
end
|
31
52
|
|
32
53
|
private
|
33
54
|
|
34
|
-
def
|
35
|
-
|
55
|
+
def disable_comment_offset
|
56
|
+
Regexp.last_match(1).length
|
57
|
+
end
|
36
58
|
|
59
|
+
def check_cop_name(name, comment, offset)
|
37
60
|
start = comment.location.expression.begin_pos + offset
|
38
61
|
range = range_between(start, start + name.length)
|
62
|
+
|
39
63
|
add_offense(range, location: range)
|
40
64
|
end
|
65
|
+
|
66
|
+
def valid_content_token?(content_token)
|
67
|
+
!/\W+/.match(content_token).nil? ||
|
68
|
+
!DISABLING_COPS_CONTENT_TOKEN.match(content_token).nil?
|
69
|
+
end
|
70
|
+
|
71
|
+
def contain_plain_comment?(name)
|
72
|
+
name == '#'
|
73
|
+
end
|
74
|
+
|
75
|
+
def qualified_legacy_cop_name(cop_name)
|
76
|
+
legacy_cop_names = RuboCop::ConfigObsoletion::OBSOLETE_COPS.keys
|
77
|
+
|
78
|
+
legacy_cop_names.detect do |legacy_cop_name|
|
79
|
+
legacy_cop_name.split('/')[1] == cop_name
|
80
|
+
end
|
81
|
+
end
|
41
82
|
end
|
42
83
|
end
|
43
84
|
end
|