rubocop 0.85.0 → 0.88.0
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.
- checksums.yaml +4 -4
- data/README.md +25 -17
- data/bin/rubocop-profile +31 -0
- data/config/default.yml +132 -11
- data/lib/rubocop.rb +17 -1
- data/lib/rubocop/cli.rb +2 -4
- data/lib/rubocop/cli/command/auto_genenerate_config.rb +42 -7
- data/lib/rubocop/cli/command/init_dotfile.rb +1 -1
- data/lib/rubocop/cli/command/show_cops.rb +1 -1
- data/lib/rubocop/config.rb +1 -1
- data/lib/rubocop/config_loader.rb +39 -67
- data/lib/rubocop/config_loader_resolver.rb +1 -1
- data/lib/rubocop/config_obsoletion.rb +0 -1
- data/lib/rubocop/config_store.rb +4 -0
- data/lib/rubocop/cop/autocorrect_logic.rb +14 -24
- data/lib/rubocop/cop/badge.rb +1 -1
- data/lib/rubocop/cop/base.rb +407 -0
- data/lib/rubocop/cop/bundler/insecure_protocol_source.rb +10 -20
- data/lib/rubocop/cop/commissioner.rb +48 -50
- data/lib/rubocop/cop/cop.rb +91 -235
- data/lib/rubocop/cop/corrector.rb +38 -115
- data/lib/rubocop/cop/correctors/multiline_literal_brace_corrector.rb +26 -0
- data/lib/rubocop/cop/gemspec/required_ruby_version.rb +7 -2
- data/lib/rubocop/cop/gemspec/ruby_version_globals_usage.rb +1 -1
- data/lib/rubocop/cop/generator.rb +1 -1
- data/lib/rubocop/cop/generator/configuration_injector.rb +1 -1
- data/lib/rubocop/cop/internal_affairs/node_type_predicate.rb +11 -14
- data/lib/rubocop/cop/layout/case_indentation.rb +18 -19
- data/lib/rubocop/cop/layout/class_structure.rb +2 -37
- data/lib/rubocop/cop/layout/comment_indentation.rb +3 -3
- data/lib/rubocop/cop/layout/empty_comment.rb +1 -1
- data/lib/rubocop/cop/layout/empty_lines_around_access_modifier.rb +1 -0
- data/lib/rubocop/cop/layout/empty_lines_around_attribute_accessor.rb +3 -8
- data/lib/rubocop/cop/layout/end_alignment.rb +3 -2
- data/lib/rubocop/cop/layout/end_of_line.rb +1 -1
- data/lib/rubocop/cop/layout/first_argument_indentation.rb +5 -1
- data/lib/rubocop/cop/layout/first_array_element_line_break.rb +1 -1
- data/lib/rubocop/cop/layout/hash_alignment.rb +2 -3
- data/lib/rubocop/cop/layout/heredoc_indentation.rb +1 -1
- data/lib/rubocop/cop/layout/multiline_block_layout.rb +17 -7
- data/lib/rubocop/cop/layout/space_after_colon.rb +1 -1
- data/lib/rubocop/cop/layout/space_around_block_parameters.rb +22 -27
- data/lib/rubocop/cop/layout/space_around_keyword.rb +2 -2
- data/lib/rubocop/cop/layout/space_around_method_call_operator.rb +27 -68
- data/lib/rubocop/cop/layout/space_around_operators.rb +1 -1
- data/lib/rubocop/cop/layout/space_before_block_braces.rb +14 -0
- data/lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb +4 -3
- data/lib/rubocop/cop/layout/space_inside_block_braces.rb +1 -1
- data/lib/rubocop/cop/layout/space_inside_hash_literal_braces.rb +2 -2
- data/lib/rubocop/cop/legacy/corrections_proxy.rb +49 -0
- data/lib/rubocop/cop/legacy/corrector.rb +29 -0
- data/lib/rubocop/cop/lint/constant_resolution.rb +89 -0
- data/lib/rubocop/cop/lint/deprecated_open_ssl_constant.rb +4 -4
- data/lib/rubocop/cop/lint/disjunctive_assignment_in_constructor.rb +8 -2
- data/lib/rubocop/cop/lint/duplicate_elsif_condition.rb +39 -0
- data/lib/rubocop/cop/lint/duplicate_methods.rb +2 -2
- data/lib/rubocop/cop/lint/float_out_of_range.rb +1 -1
- data/lib/rubocop/cop/lint/format_parameter_mismatch.rb +38 -2
- data/lib/rubocop/cop/lint/implicit_string_concatenation.rb +3 -2
- data/lib/rubocop/cop/lint/interpolation_check.rb +13 -0
- data/lib/rubocop/cop/lint/literal_as_condition.rb +11 -1
- data/lib/rubocop/cop/lint/mixed_regexp_capture_types.rb +8 -1
- data/lib/rubocop/cop/lint/nested_method_definition.rb +14 -20
- data/lib/rubocop/cop/lint/non_deterministic_require_order.rb +69 -2
- data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb +8 -3
- data/lib/rubocop/cop/lint/percent_string_array.rb +1 -1
- data/lib/rubocop/cop/lint/percent_symbol_array.rb +1 -1
- data/lib/rubocop/cop/lint/raise_exception.rb +12 -4
- data/lib/rubocop/cop/lint/rand_one.rb +1 -1
- data/lib/rubocop/cop/lint/redundant_cop_disable_directive.rb +31 -25
- data/lib/rubocop/cop/lint/redundant_splat_expansion.rb +2 -2
- data/lib/rubocop/cop/lint/regexp_as_condition.rb +6 -0
- data/lib/rubocop/cop/lint/safe_navigation_with_empty.rb +9 -1
- data/lib/rubocop/cop/lint/suppressed_exception.rb +1 -1
- data/lib/rubocop/cop/lint/syntax.rb +11 -26
- data/lib/rubocop/cop/lint/unused_method_argument.rb +1 -1
- data/lib/rubocop/cop/lint/useless_access_modifier.rb +1 -1
- data/lib/rubocop/cop/metrics/block_length.rb +22 -0
- data/lib/rubocop/cop/metrics/class_length.rb +25 -2
- data/lib/rubocop/cop/metrics/cyclomatic_complexity.rb +35 -3
- data/lib/rubocop/cop/metrics/method_length.rb +23 -0
- data/lib/rubocop/cop/metrics/module_length.rb +25 -2
- data/lib/rubocop/cop/metrics/utils/abc_size_calculator.rb +1 -1
- data/lib/rubocop/cop/metrics/utils/code_length_calculator.rb +129 -0
- data/lib/rubocop/cop/metrics/utils/iterating_block.rb +61 -0
- data/lib/rubocop/cop/mixin/allowed_methods.rb +19 -0
- data/lib/rubocop/cop/mixin/auto_corrector.rb +12 -0
- data/lib/rubocop/cop/mixin/code_length.rb +4 -0
- data/lib/rubocop/cop/mixin/configurable_formatting.rb +1 -1
- data/lib/rubocop/cop/mixin/configurable_naming.rb +1 -1
- data/lib/rubocop/cop/mixin/documentation_comment.rb +2 -2
- data/lib/rubocop/cop/mixin/end_keyword_alignment.rb +1 -1
- data/lib/rubocop/cop/mixin/enforce_superclass.rb +3 -1
- data/lib/rubocop/cop/mixin/first_element_line_break.rb +1 -1
- data/lib/rubocop/cop/mixin/multiline_expression_indentation.rb +1 -1
- data/lib/rubocop/cop/mixin/nil_methods.rb +3 -5
- data/lib/rubocop/cop/mixin/ordered_gem_node.rb +6 -1
- data/lib/rubocop/cop/mixin/parentheses.rb +1 -2
- data/lib/rubocop/cop/mixin/preceding_following_alignment.rb +1 -1
- data/lib/rubocop/cop/mixin/range_help.rb +1 -1
- data/lib/rubocop/cop/mixin/regexp_literal_help.rb +27 -0
- data/lib/rubocop/cop/mixin/statement_modifier.rb +3 -3
- data/lib/rubocop/cop/mixin/string_literals_help.rb +1 -1
- data/lib/rubocop/cop/mixin/surrounding_space.rb +10 -5
- data/lib/rubocop/cop/mixin/too_many_lines.rb +3 -13
- data/lib/rubocop/cop/mixin/trailing_comma.rb +1 -1
- data/lib/rubocop/cop/mixin/uncommunicative_name.rb +6 -4
- data/lib/rubocop/cop/mixin/visibility_help.rb +50 -0
- data/lib/rubocop/cop/naming/ascii_identifiers.rb +27 -4
- data/lib/rubocop/cop/naming/binary_operator_parameter_name.rb +3 -3
- data/lib/rubocop/cop/naming/file_name.rb +1 -3
- data/lib/rubocop/cop/naming/heredoc_delimiter_naming.rb +1 -1
- data/lib/rubocop/cop/naming/method_name.rb +1 -1
- data/lib/rubocop/cop/naming/method_parameter_name.rb +1 -1
- data/lib/rubocop/cop/naming/predicate_name.rb +3 -5
- data/lib/rubocop/cop/naming/variable_name.rb +1 -1
- data/lib/rubocop/cop/naming/variable_number.rb +1 -1
- data/lib/rubocop/cop/offense.rb +16 -2
- data/lib/rubocop/cop/registry.rb +62 -7
- data/lib/rubocop/cop/style/accessor_grouping.rb +147 -0
- data/lib/rubocop/cop/style/array_coercion.rb +63 -0
- data/lib/rubocop/cop/style/auto_resource_cleanup.rb +3 -2
- data/lib/rubocop/cop/style/bare_percent_literals.rb +1 -1
- data/lib/rubocop/cop/style/bisected_attr_accessor.rb +146 -0
- data/lib/rubocop/cop/style/block_delimiters.rb +2 -4
- data/lib/rubocop/cop/style/case_like_if.rb +217 -0
- data/lib/rubocop/cop/style/class_and_module_children.rb +1 -1
- data/lib/rubocop/cop/style/class_vars.rb +21 -0
- data/lib/rubocop/cop/style/command_literal.rb +1 -1
- data/lib/rubocop/cop/style/commented_keyword.rb +5 -2
- data/lib/rubocop/cop/style/conditional_assignment.rb +2 -2
- data/lib/rubocop/cop/style/copyright.rb +3 -3
- data/lib/rubocop/cop/style/date_time.rb +1 -1
- data/lib/rubocop/cop/style/dir.rb +2 -2
- data/lib/rubocop/cop/style/disable_cops_within_source_code_directive.rb +1 -1
- data/lib/rubocop/cop/style/documentation.rb +2 -2
- data/lib/rubocop/cop/style/empty_case_condition.rb +8 -6
- data/lib/rubocop/cop/style/empty_literal.rb +5 -5
- data/lib/rubocop/cop/style/encoding.rb +1 -1
- data/lib/rubocop/cop/style/expand_path_arguments.rb +2 -2
- data/lib/rubocop/cop/style/exponential_notation.rb +8 -10
- data/lib/rubocop/cop/style/float_division.rb +7 -10
- data/lib/rubocop/cop/style/format_string_token.rb +5 -5
- data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +1 -1
- data/lib/rubocop/cop/style/hash_as_last_array_item.rb +62 -0
- data/lib/rubocop/cop/style/hash_like_case.rb +76 -0
- data/lib/rubocop/cop/style/identical_conditional_branches.rb +1 -1
- data/lib/rubocop/cop/style/if_inside_else.rb +1 -1
- data/lib/rubocop/cop/style/if_unless_modifier.rb +11 -11
- data/lib/rubocop/cop/style/if_unless_modifier_of_if_unless.rb +12 -0
- data/lib/rubocop/cop/style/inverse_methods.rb +1 -1
- data/lib/rubocop/cop/style/ip_addresses.rb +1 -1
- data/lib/rubocop/cop/style/missing_else.rb +1 -11
- data/lib/rubocop/cop/style/multiline_block_chain.rb +10 -1
- data/lib/rubocop/cop/style/multiline_if_then.rb +1 -1
- data/lib/rubocop/cop/style/multiline_ternary_operator.rb +17 -6
- data/lib/rubocop/cop/style/mutable_constant.rb +4 -4
- data/lib/rubocop/cop/style/nested_parenthesized_calls.rb +2 -5
- data/lib/rubocop/cop/style/nested_ternary_operator.rb +27 -0
- data/lib/rubocop/cop/style/next.rb +2 -2
- data/lib/rubocop/cop/style/numeric_literal_prefix.rb +2 -2
- data/lib/rubocop/cop/style/numeric_predicate.rb +3 -4
- data/lib/rubocop/cop/style/parallel_assignment.rb +3 -3
- data/lib/rubocop/cop/style/percent_literal_delimiters.rb +1 -1
- data/lib/rubocop/cop/style/proc.rb +1 -1
- data/lib/rubocop/cop/style/random_with_offset.rb +4 -10
- data/lib/rubocop/cop/style/redundant_assignment.rb +117 -0
- data/lib/rubocop/cop/style/redundant_conditional.rb +4 -3
- data/lib/rubocop/cop/style/redundant_exception.rb +14 -10
- data/lib/rubocop/cop/style/redundant_fetch_block.rb +122 -0
- data/lib/rubocop/cop/style/redundant_file_extension_in_require.rb +50 -0
- data/lib/rubocop/cop/style/redundant_freeze.rb +1 -1
- data/lib/rubocop/cop/style/redundant_parentheses.rb +8 -2
- data/lib/rubocop/cop/style/redundant_percent_q.rb +2 -2
- data/lib/rubocop/cop/style/redundant_regexp_character_class.rb +4 -3
- data/lib/rubocop/cop/style/redundant_regexp_escape.rb +14 -23
- data/lib/rubocop/cop/style/redundant_self.rb +6 -9
- data/lib/rubocop/cop/style/redundant_sort.rb +3 -2
- data/lib/rubocop/cop/style/rescue_standard_error.rb +1 -1
- data/lib/rubocop/cop/style/sample.rb +1 -1
- data/lib/rubocop/cop/style/semicolon.rb +1 -1
- data/lib/rubocop/cop/style/signal_exception.rb +1 -1
- data/lib/rubocop/cop/style/stabby_lambda_parentheses.rb +3 -2
- data/lib/rubocop/cop/style/stderr_puts.rb +1 -1
- data/lib/rubocop/cop/style/struct_inheritance.rb +23 -2
- data/lib/rubocop/cop/style/symbol_array.rb +5 -5
- data/lib/rubocop/cop/style/symbol_proc.rb +1 -1
- data/lib/rubocop/cop/style/ternary_parentheses.rb +1 -1
- data/lib/rubocop/cop/style/trailing_method_end_statement.rb +9 -32
- data/lib/rubocop/cop/style/trivial_accessors.rb +8 -7
- data/lib/rubocop/cop/style/word_array.rb +1 -1
- data/lib/rubocop/cop/style/yoda_condition.rb +18 -1
- data/lib/rubocop/cop/style/zero_length_predicate.rb +2 -2
- data/lib/rubocop/cop/team.rb +105 -81
- data/lib/rubocop/cop/util.rb +2 -2
- data/lib/rubocop/cop/utils/format_string.rb +19 -2
- data/lib/rubocop/cop/variable_force/variable.rb +5 -3
- data/lib/rubocop/file_finder.rb +12 -12
- data/lib/rubocop/formatter/disabled_config_formatter.rb +2 -2
- data/lib/rubocop/formatter/formatter_set.rb +1 -1
- data/lib/rubocop/name_similarity.rb +7 -3
- data/lib/rubocop/options.rb +15 -8
- data/lib/rubocop/path_util.rb +4 -19
- data/lib/rubocop/platform.rb +1 -1
- data/lib/rubocop/rake_task.rb +6 -9
- data/lib/rubocop/result_cache.rb +12 -8
- data/lib/rubocop/rspec/cop_helper.rb +4 -4
- data/lib/rubocop/rspec/expect_offense.rb +65 -21
- data/lib/rubocop/rspec/shared_contexts.rb +19 -16
- data/lib/rubocop/runner.rb +34 -33
- data/lib/rubocop/target_finder.rb +3 -3
- data/lib/rubocop/target_ruby.rb +2 -2
- data/lib/rubocop/version.rb +1 -1
- metadata +34 -9
- data/lib/rubocop/cop/mixin/classish_length.rb +0 -37
@@ -19,6 +19,15 @@ module RuboCop
|
|
19
19
|
# @@test = 10
|
20
20
|
# end
|
21
21
|
#
|
22
|
+
# class A
|
23
|
+
# def self.test(name, value)
|
24
|
+
# class_variable_set("@@#{name}", value)
|
25
|
+
# end
|
26
|
+
# end
|
27
|
+
#
|
28
|
+
# class A; end
|
29
|
+
# A.class_variable_set(:@@test, 10)
|
30
|
+
#
|
22
31
|
# # good
|
23
32
|
# class A
|
24
33
|
# @test = 10
|
@@ -30,6 +39,12 @@ module RuboCop
|
|
30
39
|
# end
|
31
40
|
# end
|
32
41
|
#
|
42
|
+
# class A
|
43
|
+
# def self.test(name)
|
44
|
+
# class_variable_get("@@#{name}") # you can access without offense
|
45
|
+
# end
|
46
|
+
# end
|
47
|
+
#
|
33
48
|
class ClassVars < Cop
|
34
49
|
MSG = 'Replace class var %<class_var>s with a class ' \
|
35
50
|
'instance var.'
|
@@ -38,6 +53,12 @@ module RuboCop
|
|
38
53
|
add_offense(node, location: :name)
|
39
54
|
end
|
40
55
|
|
56
|
+
def on_send(node)
|
57
|
+
return unless node.method?(:class_variable_set)
|
58
|
+
|
59
|
+
add_offense(node.first_argument)
|
60
|
+
end
|
61
|
+
|
41
62
|
def message(node)
|
42
63
|
class_var, = *node
|
43
64
|
format(MSG, class_var: class_var)
|
@@ -46,17 +46,20 @@ module RuboCop
|
|
46
46
|
private
|
47
47
|
|
48
48
|
KEYWORDS = %w[begin class def end module].freeze
|
49
|
+
KEYWORD_REGEXES = KEYWORDS.map { |w| /^\s*#{w}\s/ }.freeze
|
50
|
+
|
49
51
|
ALLOWED_COMMENTS = %w[
|
50
52
|
:nodoc:
|
51
53
|
:yields:
|
52
54
|
rubocop:disable
|
53
55
|
rubocop:todo
|
54
56
|
].freeze
|
57
|
+
ALLOWED_COMMENT_REGEXES = ALLOWED_COMMENTS.map { |c| /#\s*#{c}/ }.freeze
|
55
58
|
|
56
59
|
def offensive?(comment)
|
57
60
|
line = line(comment)
|
58
|
-
|
59
|
-
|
61
|
+
KEYWORD_REGEXES.any? { |r| r.match?(line) } &&
|
62
|
+
ALLOWED_COMMENT_REGEXES.none? { |r| r.match?(line) }
|
60
63
|
end
|
61
64
|
|
62
65
|
def message(comment)
|
@@ -30,7 +30,7 @@ module RuboCop
|
|
30
30
|
end
|
31
31
|
|
32
32
|
def tail(branch)
|
33
|
-
branch.begin_type? ?
|
33
|
+
branch.begin_type? ? Array(branch).last : branch
|
34
34
|
end
|
35
35
|
|
36
36
|
# rubocop:disable Metrics/AbcSize
|
@@ -67,7 +67,7 @@ module RuboCop
|
|
67
67
|
|
68
68
|
private
|
69
69
|
|
70
|
-
def expand_elsif(node, elsif_branches = [])
|
70
|
+
def expand_elsif(node, elsif_branches = []) # rubocop:todo Metrics/CyclomaticComplexity
|
71
71
|
return [] if node.nil? || !node.if_type? || !node.elsif?
|
72
72
|
|
73
73
|
elsif_branches << node.if_branch
|
@@ -72,14 +72,14 @@ module RuboCop
|
|
72
72
|
return false if token_index >= processed_source.tokens.size
|
73
73
|
|
74
74
|
token = processed_source.tokens[token_index]
|
75
|
-
token.comment? && token.text
|
75
|
+
token.comment? && /^#!.*$/.match?(token.text)
|
76
76
|
end
|
77
77
|
|
78
78
|
def encoding_token?(processed_source, token_index)
|
79
79
|
return false if token_index >= processed_source.tokens.size
|
80
80
|
|
81
81
|
token = processed_source.tokens[token_index]
|
82
|
-
token.comment? &&
|
82
|
+
token.comment? && /^#.*coding\s?[:=]\s?(?:UTF|utf)-8/.match?(token.text)
|
83
83
|
end
|
84
84
|
|
85
85
|
def notice_found?(processed_source)
|
@@ -88,7 +88,7 @@ module RuboCop
|
|
88
88
|
processed_source.each_token do |token|
|
89
89
|
break unless token.comment?
|
90
90
|
|
91
|
-
notice_found =
|
91
|
+
notice_found = notice_regexp.match?(token.text)
|
92
92
|
break if notice_found
|
93
93
|
end
|
94
94
|
notice_found
|
@@ -21,8 +21,8 @@ module RuboCop
|
|
21
21
|
"file's directory."
|
22
22
|
|
23
23
|
def_node_matcher :dir_replacement?, <<~PATTERN
|
24
|
-
{(send (const nil? :File) :expand_path (send (const nil? :File) :dirname #file_keyword?))
|
25
|
-
(send (const nil? :File) :dirname (send (const nil? :File) :realpath #file_keyword?))}
|
24
|
+
{(send (const {nil? cbase} :File) :expand_path (send (const {nil? cbase} :File) :dirname #file_keyword?))
|
25
|
+
(send (const {nil? cbase} :File) :dirname (send (const {nil? cbase} :File) :realpath #file_keyword?))}
|
26
26
|
PATTERN
|
27
27
|
|
28
28
|
def on_send(node)
|
@@ -104,7 +104,7 @@ module RuboCop
|
|
104
104
|
end
|
105
105
|
|
106
106
|
def compact_namespace?(node)
|
107
|
-
node.loc.name.source
|
107
|
+
/::/.match?(node.loc.name.source)
|
108
108
|
end
|
109
109
|
|
110
110
|
# First checks if the :nodoc: comment is associated with the
|
@@ -123,7 +123,7 @@ module RuboCop
|
|
123
123
|
end
|
124
124
|
|
125
125
|
def nodoc?(comment, require_all = false)
|
126
|
-
|
126
|
+
/^#\s*:nodoc:#{"\s+all\s*$" if require_all}/.match?(comment.text)
|
127
127
|
end
|
128
128
|
|
129
129
|
def nodoc(node)
|
@@ -43,13 +43,15 @@ module RuboCop
|
|
43
43
|
|
44
44
|
def on_case(case_node)
|
45
45
|
return if case_node.condition
|
46
|
-
return if case_node.when_branches.any? do |when_branch|
|
47
|
-
when_branch.each_descendant.any?(&:return_type?)
|
48
|
-
end
|
49
46
|
|
50
|
-
|
51
|
-
|
52
|
-
|
47
|
+
branch_bodies = [
|
48
|
+
*case_node.when_branches.map(&:body),
|
49
|
+
case_node.else_branch
|
50
|
+
].compact
|
51
|
+
|
52
|
+
return if branch_bodies.any? do |body|
|
53
|
+
body.return_type? ||
|
54
|
+
body.each_descendant.any?(&:return_type?)
|
53
55
|
end
|
54
56
|
|
55
57
|
add_offense(case_node, location: :keyword)
|
@@ -25,13 +25,13 @@ module RuboCop
|
|
25
25
|
STR_MSG = 'Use string literal `%<prefer>s` instead of ' \
|
26
26
|
'`String.new`.'
|
27
27
|
|
28
|
-
def_node_matcher :array_node, '(send (const nil? :Array) :new)'
|
29
|
-
def_node_matcher :hash_node, '(send (const nil? :Hash) :new)'
|
30
|
-
def_node_matcher :str_node, '(send (const nil? :String) :new)'
|
28
|
+
def_node_matcher :array_node, '(send (const {nil? cbase} :Array) :new)'
|
29
|
+
def_node_matcher :hash_node, '(send (const {nil? cbase} :Hash) :new)'
|
30
|
+
def_node_matcher :str_node, '(send (const {nil? cbase} :String) :new)'
|
31
31
|
def_node_matcher :array_with_block,
|
32
|
-
'(block (send (const nil? :Array) :new) args _)'
|
32
|
+
'(block (send (const {nil? cbase} :Array) :new) args _)'
|
33
33
|
def_node_matcher :hash_with_block,
|
34
|
-
'(block (send (const nil? :Hash) :new) args _)'
|
34
|
+
'(block (send (const {nil? cbase} :Hash) :new) args _)'
|
35
35
|
|
36
36
|
def on_send(node)
|
37
37
|
add_offense(node, message: ARR_MSG) if offense_array_node?(node)
|
@@ -53,7 +53,7 @@ module RuboCop
|
|
53
53
|
|
54
54
|
def_node_matcher :file_expand_path, <<~PATTERN
|
55
55
|
(send
|
56
|
-
(const nil? :File) :expand_path
|
56
|
+
(const {nil? cbase} :File) :expand_path
|
57
57
|
$_
|
58
58
|
$_)
|
59
59
|
PATTERN
|
@@ -69,7 +69,7 @@ module RuboCop
|
|
69
69
|
(send
|
70
70
|
(send
|
71
71
|
(send
|
72
|
-
(const nil? :Pathname) :new
|
72
|
+
(const {nil? cbase} :Pathname) :new
|
73
73
|
$_) :parent) :expand_path)
|
74
74
|
PATTERN
|
75
75
|
|
@@ -60,6 +60,11 @@ module RuboCop
|
|
60
60
|
#
|
61
61
|
class ExponentialNotation < Cop
|
62
62
|
include ConfigurableEnforcedStyle
|
63
|
+
MESSAGES = {
|
64
|
+
scientific: 'Use a mantissa in [1, 10[.',
|
65
|
+
engineering: 'Use an exponent divisible by 3 and a mantissa in [0.1, 1000[.',
|
66
|
+
integral: 'Use an integer as mantissa, without trailing zero.'
|
67
|
+
}.freeze
|
63
68
|
|
64
69
|
def on_float(node)
|
65
70
|
add_offense(node) if offense?(node)
|
@@ -69,7 +74,7 @@ module RuboCop
|
|
69
74
|
|
70
75
|
def scientific?(node)
|
71
76
|
mantissa, = node.source.split('e')
|
72
|
-
|
77
|
+
/^-?[1-9](\.\d*[0-9])?$/.match?(mantissa)
|
73
78
|
end
|
74
79
|
|
75
80
|
def engineering?(node)
|
@@ -85,7 +90,7 @@ module RuboCop
|
|
85
90
|
|
86
91
|
def integral(node)
|
87
92
|
mantissa, = node.source.split('e')
|
88
|
-
|
93
|
+
/^-?[1-9](\d*[1-9])?$/.match?(mantissa)
|
89
94
|
end
|
90
95
|
|
91
96
|
def offense?(node)
|
@@ -104,14 +109,7 @@ module RuboCop
|
|
104
109
|
end
|
105
110
|
|
106
111
|
def message(_node)
|
107
|
-
|
108
|
-
when :scientific
|
109
|
-
'Use a mantissa in [1, 10[.'
|
110
|
-
when :engineering
|
111
|
-
'Use an exponent divisible by 3 and a mantissa in [0.1, 1000[.'
|
112
|
-
when :integral
|
113
|
-
'Use an integer as mantissa, without trailing zero.'
|
114
|
-
end
|
112
|
+
MESSAGES[style]
|
115
113
|
end
|
116
114
|
end
|
117
115
|
end
|
@@ -41,6 +41,12 @@ module RuboCop
|
|
41
41
|
# a.fdiv(b)
|
42
42
|
class FloatDivision < Cop
|
43
43
|
include ConfigurableEnforcedStyle
|
44
|
+
MESSAGES = {
|
45
|
+
left_coerce: 'Prefer using `.to_f` on the left side.',
|
46
|
+
right_coerce: 'Prefer using `.to_f` on the right side.',
|
47
|
+
single_coerce: 'Prefer using `.to_f` on one side only.',
|
48
|
+
fdiv: 'Prefer using `fdiv` for float divisions.'
|
49
|
+
}.freeze
|
44
50
|
|
45
51
|
def_node_matcher :right_coerce?, <<~PATTERN
|
46
52
|
(send _ :/ (send _ :to_f))
|
@@ -77,16 +83,7 @@ module RuboCop
|
|
77
83
|
end
|
78
84
|
|
79
85
|
def message(_node)
|
80
|
-
|
81
|
-
when :left_coerce
|
82
|
-
'Prefer using `.to_f` on the left side.'
|
83
|
-
when :right_coerce
|
84
|
-
'Prefer using `.to_f` on the right side.'
|
85
|
-
when :single_coerce
|
86
|
-
'Prefer using `.to_f` on one side only.'
|
87
|
-
when :fdiv
|
88
|
-
'Prefer using `fdiv` for float divisions.'
|
89
|
-
end
|
86
|
+
MESSAGES[style]
|
90
87
|
end
|
91
88
|
end
|
92
89
|
end
|
@@ -75,11 +75,11 @@ module RuboCop
|
|
75
75
|
|
76
76
|
# rubocop:disable Style/FormatStringToken
|
77
77
|
def message_text(style)
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
78
|
+
{
|
79
|
+
annotated: 'annotated tokens (like `%<foo>s`)',
|
80
|
+
template: 'template tokens (like `%{foo}`)',
|
81
|
+
unannotated: 'unannotated tokens (like `%s`)'
|
82
|
+
}[style]
|
83
83
|
end
|
84
84
|
# rubocop:enable Style/FormatStringToken
|
85
85
|
|
@@ -148,7 +148,7 @@ module RuboCop
|
|
148
148
|
end
|
149
149
|
|
150
150
|
next_token = processed_source.tokens[token_number]
|
151
|
-
token = next_token if
|
151
|
+
token = next_token if Encoding::ENCODING_PATTERN.match?(next_token&.text)
|
152
152
|
|
153
153
|
token
|
154
154
|
end
|
@@ -0,0 +1,62 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module RuboCop
|
4
|
+
module Cop
|
5
|
+
module Style
|
6
|
+
# Checks for presence or absence of braces around hash literal as a last
|
7
|
+
# array item depending on configuration.
|
8
|
+
#
|
9
|
+
# @example EnforcedStyle: braces (default)
|
10
|
+
# # bad
|
11
|
+
# [1, 2, one: 1, two: 2]
|
12
|
+
#
|
13
|
+
# # good
|
14
|
+
# [1, 2, { one: 1, two: 2 }]
|
15
|
+
#
|
16
|
+
# @example EnforcedStyle: no_braces
|
17
|
+
# # bad
|
18
|
+
# [1, 2, { one: 1, two: 2 }]
|
19
|
+
#
|
20
|
+
# # good
|
21
|
+
# [1, 2, one: 1, two: 2]
|
22
|
+
#
|
23
|
+
class HashAsLastArrayItem < Base
|
24
|
+
include ConfigurableEnforcedStyle
|
25
|
+
extend AutoCorrector
|
26
|
+
|
27
|
+
def on_hash(node)
|
28
|
+
return unless node.parent&.array_type?
|
29
|
+
|
30
|
+
if braces_style?
|
31
|
+
check_braces(node)
|
32
|
+
else
|
33
|
+
check_no_braces(node)
|
34
|
+
end
|
35
|
+
end
|
36
|
+
|
37
|
+
private
|
38
|
+
|
39
|
+
def check_braces(node)
|
40
|
+
return if node.braces?
|
41
|
+
|
42
|
+
add_offense(node, message: 'Wrap hash in `{` and `}`.') do |corrector|
|
43
|
+
corrector.wrap(node, '{', '}')
|
44
|
+
end
|
45
|
+
end
|
46
|
+
|
47
|
+
def check_no_braces(node)
|
48
|
+
return unless node.braces?
|
49
|
+
|
50
|
+
add_offense(node, message: 'Omit the braces around the hash.') do |corrector|
|
51
|
+
corrector.remove(node.loc.begin)
|
52
|
+
corrector.remove(node.loc.end)
|
53
|
+
end
|
54
|
+
end
|
55
|
+
|
56
|
+
def braces_style?
|
57
|
+
style == :braces
|
58
|
+
end
|
59
|
+
end
|
60
|
+
end
|
61
|
+
end
|
62
|
+
end
|
@@ -0,0 +1,76 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module RuboCop
|
4
|
+
module Cop
|
5
|
+
module Style
|
6
|
+
# This cop checks for places where `case-when` represents a simple 1:1
|
7
|
+
# mapping and can be replaced with a hash lookup.
|
8
|
+
#
|
9
|
+
# @example MinBranchesCount: 3 (default)
|
10
|
+
# # bad
|
11
|
+
# case country
|
12
|
+
# when 'europe'
|
13
|
+
# 'http://eu.example.com'
|
14
|
+
# when 'america'
|
15
|
+
# 'http://us.example.com'
|
16
|
+
# when 'australia'
|
17
|
+
# 'http://au.example.com'
|
18
|
+
# end
|
19
|
+
#
|
20
|
+
# # good
|
21
|
+
# SITES = {
|
22
|
+
# 'europe' => 'http://eu.example.com',
|
23
|
+
# 'america' => 'http://us.example.com',
|
24
|
+
# 'australia' => 'http://au.example.com'
|
25
|
+
# }
|
26
|
+
# SITES[country]
|
27
|
+
#
|
28
|
+
# @example MinBranchesCount: 4
|
29
|
+
# # good
|
30
|
+
# case country
|
31
|
+
# when 'europe'
|
32
|
+
# 'http://eu.example.com'
|
33
|
+
# when 'america'
|
34
|
+
# 'http://us.example.com'
|
35
|
+
# when 'australia'
|
36
|
+
# 'http://au.example.com'
|
37
|
+
# end
|
38
|
+
#
|
39
|
+
class HashLikeCase < Base
|
40
|
+
MSG = 'Consider replacing `case-when` with a hash lookup.'
|
41
|
+
|
42
|
+
def_node_matcher :hash_like_case?, <<~PATTERN
|
43
|
+
(case
|
44
|
+
_
|
45
|
+
(when
|
46
|
+
${str_type? sym_type?}
|
47
|
+
$[!nil? recursive_basic_literal?])+ nil?)
|
48
|
+
PATTERN
|
49
|
+
|
50
|
+
def on_case(node)
|
51
|
+
return if node.when_branches.size < min_branches_count
|
52
|
+
|
53
|
+
hash_like_case?(node) do |condition_nodes, body_nodes|
|
54
|
+
if nodes_of_same_type?(condition_nodes) &&
|
55
|
+
nodes_of_same_type?(body_nodes)
|
56
|
+
add_offense(node)
|
57
|
+
end
|
58
|
+
end
|
59
|
+
end
|
60
|
+
|
61
|
+
private
|
62
|
+
|
63
|
+
def nodes_of_same_type?(nodes)
|
64
|
+
nodes.all? { |node| node.type == nodes.first.type }
|
65
|
+
end
|
66
|
+
|
67
|
+
def min_branches_count
|
68
|
+
length = cop_config['MinBranchesCount'] || 3
|
69
|
+
return length if length.is_a?(Integer) && length.positive?
|
70
|
+
|
71
|
+
raise 'MinBranchesCount needs to be a positive integer!'
|
72
|
+
end
|
73
|
+
end
|
74
|
+
end
|
75
|
+
end
|
76
|
+
end
|