rubocop 0.81.0 → 0.85.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.
- checksums.yaml +4 -4
- data/README.md +13 -17
- data/config/default.yml +141 -35
- data/lib/rubocop.rb +17 -61
- data/lib/rubocop/ast_aliases.rb +8 -0
- data/lib/rubocop/cli.rb +13 -7
- data/lib/rubocop/cli/command/auto_genenerate_config.rb +2 -2
- data/lib/rubocop/cli/command/show_cops.rb +2 -6
- data/lib/rubocop/comment_config.rb +1 -1
- data/lib/rubocop/config.rb +14 -2
- data/lib/rubocop/config_loader.rb +37 -33
- data/lib/rubocop/config_loader_resolver.rb +45 -6
- data/lib/rubocop/config_obsoletion.rb +1 -0
- data/lib/rubocop/config_store.rb +12 -2
- data/lib/rubocop/config_validator.rb +18 -1
- data/lib/rubocop/cop/autocorrect_logic.rb +1 -2
- data/lib/rubocop/cop/badge.rb +5 -5
- data/lib/rubocop/cop/bundler/gem_comment.rb +70 -1
- data/lib/rubocop/cop/bundler/insecure_protocol_source.rb +1 -1
- data/lib/rubocop/cop/commissioner.rb +0 -21
- data/lib/rubocop/cop/cop.rb +36 -21
- data/lib/rubocop/cop/corrector.rb +48 -24
- data/lib/rubocop/cop/correctors/alignment_corrector.rb +4 -8
- 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 +4 -4
- 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/space_corrector.rb +1 -3
- data/lib/rubocop/cop/correctors/string_literal_corrector.rb +2 -2
- data/lib/rubocop/cop/gemspec/ordered_dependencies.rb +1 -3
- data/lib/rubocop/cop/generator.rb +4 -3
- data/lib/rubocop/cop/ignored_node.rb +1 -3
- data/lib/rubocop/cop/internal_affairs/offense_location_keyword.rb +1 -1
- data/lib/rubocop/cop/layout/case_indentation.rb +3 -3
- data/lib/rubocop/cop/layout/class_structure.rb +19 -16
- data/lib/rubocop/cop/layout/condition_position.rb +12 -2
- data/lib/rubocop/cop/layout/dot_position.rb +1 -1
- data/lib/rubocop/cop/layout/empty_lines_around_access_modifier.rb +2 -6
- data/lib/rubocop/cop/layout/empty_lines_around_attribute_accessor.rb +126 -0
- data/lib/rubocop/cop/layout/end_of_line.rb +2 -2
- data/lib/rubocop/cop/layout/first_argument_indentation.rb +1 -3
- data/lib/rubocop/cop/layout/first_array_element_indentation.rb +14 -10
- data/lib/rubocop/cop/layout/first_array_element_line_break.rb +1 -1
- data/lib/rubocop/cop/layout/first_hash_element_indentation.rb +1 -1
- data/lib/rubocop/cop/layout/first_method_argument_line_break.rb +1 -3
- data/lib/rubocop/cop/layout/first_parameter_indentation.rb +2 -2
- data/lib/rubocop/cop/layout/hash_alignment.rb +6 -6
- data/lib/rubocop/cop/layout/heredoc_argument_closing_parenthesis.rb +5 -9
- data/lib/rubocop/cop/layout/heredoc_indentation.rb +21 -104
- data/lib/rubocop/cop/layout/{tab.rb → indentation_style.rb} +48 -6
- data/lib/rubocop/cop/layout/indentation_width.rb +1 -3
- data/lib/rubocop/cop/layout/leading_comment_space.rb +1 -1
- data/lib/rubocop/cop/layout/line_length.rb +23 -20
- data/lib/rubocop/cop/layout/multiline_block_layout.rb +1 -1
- data/lib/rubocop/cop/layout/multiline_method_argument_line_breaks.rb +1 -3
- data/lib/rubocop/cop/layout/multiline_operation_indentation.rb +13 -4
- data/lib/rubocop/cop/layout/space_around_block_parameters.rb +3 -3
- data/lib/rubocop/cop/layout/space_around_keyword.rb +2 -2
- data/lib/rubocop/cop/layout/space_around_method_call_operator.rb +131 -0
- data/lib/rubocop/cop/layout/space_around_operators.rb +19 -2
- data/lib/rubocop/cop/layout/space_before_comment.rb +1 -3
- data/lib/rubocop/cop/layout/space_in_lambda_literal.rb +1 -1
- data/lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb +1 -3
- data/lib/rubocop/cop/layout/space_inside_block_braces.rb +2 -2
- data/lib/rubocop/cop/layout/space_inside_range_literal.rb +2 -2
- data/lib/rubocop/cop/layout/space_inside_reference_brackets.rb +1 -3
- data/lib/rubocop/cop/layout/trailing_whitespace.rb +2 -2
- data/lib/rubocop/cop/lint/ambiguous_operator.rb +41 -0
- data/lib/rubocop/cop/lint/ambiguous_regexp_literal.rb +14 -0
- data/lib/rubocop/cop/lint/boolean_symbol.rb +2 -2
- data/lib/rubocop/cop/lint/debugger.rb +1 -1
- data/lib/rubocop/cop/lint/deprecated_open_ssl_constant.rb +137 -0
- data/lib/rubocop/cop/lint/duplicate_methods.rb +1 -5
- data/lib/rubocop/cop/lint/empty_when.rb +29 -6
- data/lib/rubocop/cop/lint/ensure_return.rb +19 -2
- data/lib/rubocop/cop/lint/erb_new_arguments.rb +1 -3
- data/lib/rubocop/cop/lint/format_parameter_mismatch.rb +33 -2
- 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_as_condition.rb +10 -13
- data/lib/rubocop/cop/lint/literal_in_interpolation.rb +1 -1
- data/lib/rubocop/cop/lint/loop.rb +1 -1
- data/lib/rubocop/cop/lint/mixed_regexp_capture_types.rb +69 -0
- data/lib/rubocop/cop/lint/multiple_comparison.rb +1 -1
- data/lib/rubocop/cop/lint/nested_percent_literal.rb +1 -1
- data/lib/rubocop/cop/lint/non_deterministic_require_order.rb +2 -2
- data/lib/rubocop/cop/lint/non_local_exit_from_iterator.rb +7 -7
- data/lib/rubocop/cop/lint/number_conversion.rb +1 -1
- data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb +33 -11
- data/lib/rubocop/cop/lint/percent_string_array.rb +2 -4
- data/lib/rubocop/cop/lint/raise_exception.rb +42 -6
- data/lib/rubocop/cop/lint/redundant_cop_disable_directive.rb +1 -6
- data/lib/rubocop/cop/lint/redundant_require_statement.rb +3 -3
- data/lib/rubocop/cop/lint/redundant_string_coercion.rb +1 -1
- data/lib/rubocop/cop/lint/rescue_exception.rb +1 -1
- data/lib/rubocop/cop/lint/suppressed_exception.rb +11 -4
- data/lib/rubocop/cop/lint/syntax.rb +1 -3
- data/lib/rubocop/cop/lint/unified_integer.rb +0 -2
- data/lib/rubocop/cop/lint/unreachable_code.rb +1 -1
- data/lib/rubocop/cop/lint/uri_regexp.rb +4 -4
- data/lib/rubocop/cop/lint/useless_access_modifier.rb +13 -3
- data/lib/rubocop/cop/lint/useless_assignment.rb +3 -2
- data/lib/rubocop/cop/lint/useless_else_without_rescue.rb +6 -1
- data/lib/rubocop/cop/lint/useless_setter_call.rb +1 -1
- data/lib/rubocop/cop/migration/department_name.rb +7 -7
- data/lib/rubocop/cop/mixin/alignment.rb +1 -3
- data/lib/rubocop/cop/mixin/array_min_size.rb +1 -3
- data/lib/rubocop/cop/mixin/check_line_breakable.rb +3 -9
- data/lib/rubocop/cop/mixin/configurable_enforced_style.rb +1 -3
- data/lib/rubocop/cop/mixin/configurable_formatting.rb +2 -4
- data/lib/rubocop/cop/mixin/frozen_string_literal.rb +10 -1
- data/lib/rubocop/cop/mixin/hash_transform_method.rb +9 -2
- data/lib/rubocop/cop/mixin/ignored_pattern.rb +1 -1
- data/lib/rubocop/cop/mixin/line_length_help.rb +3 -2
- data/lib/rubocop/cop/mixin/parser_diagnostic.rb +1 -1
- data/lib/rubocop/cop/mixin/regexp_literal_help.rb +16 -0
- data/lib/rubocop/cop/mixin/statement_modifier.rb +7 -22
- data/lib/rubocop/cop/mixin/target_ruby_version.rb +5 -1
- data/lib/rubocop/cop/mixin/trailing_comma.rb +2 -4
- data/lib/rubocop/cop/mixin/uncommunicative_name.rb +1 -1
- data/lib/rubocop/cop/naming/class_and_module_camel_case.rb +11 -1
- data/lib/rubocop/cop/naming/constant_name.rb +2 -1
- data/lib/rubocop/cop/naming/file_name.rb +27 -14
- data/lib/rubocop/cop/naming/heredoc_delimiter_naming.rb +1 -1
- data/lib/rubocop/cop/naming/method_name.rb +1 -5
- data/lib/rubocop/cop/naming/predicate_name.rb +1 -1
- data/lib/rubocop/cop/naming/rescued_exceptions_variable_name.rb +1 -1
- data/lib/rubocop/cop/registry.rb +74 -14
- data/lib/rubocop/cop/severity.rb +1 -3
- data/lib/rubocop/cop/style/alias.rb +4 -4
- data/lib/rubocop/cop/style/and_or.rb +7 -8
- data/lib/rubocop/cop/style/array_join.rb +2 -2
- data/lib/rubocop/cop/style/attr.rb +1 -3
- data/lib/rubocop/cop/style/bare_percent_literals.rb +1 -1
- data/lib/rubocop/cop/style/block_delimiters.rb +2 -8
- 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/conditional_assignment.rb +9 -11
- data/lib/rubocop/cop/style/copyright.rb +3 -3
- 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/double_cop_disable_directive.rb +1 -1
- data/lib/rubocop/cop/style/double_negation.rb +41 -4
- 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_literal.rb +1 -3
- data/lib/rubocop/cop/style/empty_method.rb +2 -6
- 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/format_string_token.rb +2 -3
- data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +3 -6
- data/lib/rubocop/cop/style/guard_clause.rb +25 -2
- data/lib/rubocop/cop/style/hash_each_methods.rb +4 -4
- data/lib/rubocop/cop/style/hash_syntax.rb +19 -12
- data/lib/rubocop/cop/style/hash_transform_values.rb +0 -3
- data/lib/rubocop/cop/style/if_unless_modifier.rb +23 -3
- data/lib/rubocop/cop/style/if_with_semicolon.rb +16 -0
- data/lib/rubocop/cop/style/inline_comment.rb +1 -1
- data/lib/rubocop/cop/style/lambda.rb +2 -2
- data/lib/rubocop/cop/style/lambda_call.rb +1 -21
- data/lib/rubocop/cop/style/method_call_with_args_parentheses/require_parentheses.rb +1 -3
- data/lib/rubocop/cop/style/method_call_without_args_parentheses.rb +1 -3
- data/lib/rubocop/cop/style/mixin_grouping.rb +1 -1
- data/lib/rubocop/cop/style/module_function.rb +2 -2
- 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 +16 -1
- data/lib/rubocop/cop/style/mutable_constant.rb +2 -4
- data/lib/rubocop/cop/style/negated_if.rb +3 -3
- data/lib/rubocop/cop/style/negated_unless.rb +3 -3
- 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 +5 -5
- 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 +1 -1
- data/lib/rubocop/cop/style/one_line_conditional.rb +3 -7
- data/lib/rubocop/cop/style/optional_arguments.rb +1 -1
- data/lib/rubocop/cop/style/or_assignment.rb +1 -1
- 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 +3 -4
- data/lib/rubocop/cop/style/redundant_conditional.rb +5 -4
- 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_parentheses.rb +2 -6
- data/lib/rubocop/cop/style/redundant_percent_q.rb +3 -3
- data/lib/rubocop/cop/style/redundant_regexp_character_class.rb +89 -0
- data/lib/rubocop/cop/style/redundant_regexp_escape.rb +130 -0
- 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/rescue_modifier.rb +1 -1
- data/lib/rubocop/cop/style/return_nil.rb +1 -1
- data/lib/rubocop/cop/style/safe_navigation.rb +3 -7
- data/lib/rubocop/cop/style/self_assignment.rb +1 -1
- data/lib/rubocop/cop/style/slicing_with_range.rb +39 -0
- data/lib/rubocop/cop/style/special_global_vars.rb +3 -7
- 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 +2 -2
- data/lib/rubocop/cop/style/symbol_literal.rb +2 -2
- data/lib/rubocop/cop/style/ternary_parentheses.rb +2 -5
- data/lib/rubocop/cop/style/trailing_comma_in_arguments.rb +4 -3
- data/lib/rubocop/cop/style/trailing_comma_in_array_literal.rb +3 -3
- data/lib/rubocop/cop/style/trailing_comma_in_block_args.rb +16 -13
- data/lib/rubocop/cop/style/trailing_comma_in_hash_literal.rb +3 -3
- data/lib/rubocop/cop/style/trailing_underscore_variable.rb +1 -3
- data/lib/rubocop/cop/style/trivial_accessors.rb +1 -1
- data/lib/rubocop/cop/style/unless_else.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/when_then.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/zero_length_predicate.rb +1 -1
- data/lib/rubocop/cop/team.rb +69 -25
- data/lib/rubocop/cop/util.rb +25 -1
- data/lib/rubocop/cop/utils/format_string.rb +18 -0
- data/lib/rubocop/cop/variable_force.rb +3 -9
- data/lib/rubocop/cop/variable_force/assignment.rb +1 -0
- data/lib/rubocop/cop/variable_force/branch.rb +1 -3
- data/lib/rubocop/cop/variable_force/scope.rb +1 -0
- data/lib/rubocop/cop/variable_force/variable.rb +3 -6
- data/lib/rubocop/ext/processed_source.rb +18 -0
- data/lib/rubocop/formatter/base_formatter.rb +0 -4
- data/lib/rubocop/formatter/disabled_config_formatter.rb +4 -12
- data/lib/rubocop/formatter/formatter_set.rb +1 -4
- data/lib/rubocop/formatter/junit_formatter.rb +14 -4
- data/lib/rubocop/formatter/pacman_formatter.rb +1 -1
- data/lib/rubocop/magic_comment.rb +1 -1
- data/lib/rubocop/name_similarity.rb +12 -9
- data/lib/rubocop/options.rb +33 -12
- data/lib/rubocop/remote_config.rb +1 -3
- data/lib/rubocop/result_cache.rb +5 -7
- data/lib/rubocop/rspec/cop_helper.rb +3 -26
- data/lib/rubocop/rspec/expect_offense.rb +49 -16
- data/lib/rubocop/rspec/shared_contexts.rb +54 -20
- data/lib/rubocop/runner.rb +21 -14
- data/lib/rubocop/target_finder.rb +7 -7
- data/lib/rubocop/target_ruby.rb +5 -2
- data/lib/rubocop/version.rb +5 -3
- metadata +47 -77
- data/lib/rubocop/ast/builder.rb +0 -85
- data/lib/rubocop/ast/node.rb +0 -637
- data/lib/rubocop/ast/node/alias_node.rb +0 -24
- data/lib/rubocop/ast/node/and_node.rb +0 -29
- data/lib/rubocop/ast/node/args_node.rb +0 -29
- data/lib/rubocop/ast/node/array_node.rb +0 -57
- data/lib/rubocop/ast/node/block_node.rb +0 -121
- data/lib/rubocop/ast/node/break_node.rb +0 -17
- data/lib/rubocop/ast/node/case_match_node.rb +0 -56
- data/lib/rubocop/ast/node/case_node.rb +0 -56
- data/lib/rubocop/ast/node/class_node.rb +0 -31
- data/lib/rubocop/ast/node/def_node.rb +0 -82
- data/lib/rubocop/ast/node/defined_node.rb +0 -17
- data/lib/rubocop/ast/node/ensure_node.rb +0 -17
- data/lib/rubocop/ast/node/float_node.rb +0 -12
- data/lib/rubocop/ast/node/for_node.rb +0 -53
- data/lib/rubocop/ast/node/forward_args_node.rb +0 -18
- data/lib/rubocop/ast/node/hash_node.rb +0 -109
- data/lib/rubocop/ast/node/if_node.rb +0 -175
- data/lib/rubocop/ast/node/int_node.rb +0 -12
- data/lib/rubocop/ast/node/keyword_splat_node.rb +0 -45
- data/lib/rubocop/ast/node/mixin/basic_literal_node.rb +0 -16
- data/lib/rubocop/ast/node/mixin/binary_operator_node.rb +0 -43
- data/lib/rubocop/ast/node/mixin/collection_node.rb +0 -15
- data/lib/rubocop/ast/node/mixin/conditional_node.rb +0 -45
- data/lib/rubocop/ast/node/mixin/hash_element_node.rb +0 -125
- data/lib/rubocop/ast/node/mixin/method_dispatch_node.rb +0 -261
- data/lib/rubocop/ast/node/mixin/method_identifier_predicates.rb +0 -114
- data/lib/rubocop/ast/node/mixin/modifier_node.rb +0 -17
- data/lib/rubocop/ast/node/mixin/numeric_node.rb +0 -21
- data/lib/rubocop/ast/node/mixin/parameterized_node.rb +0 -61
- data/lib/rubocop/ast/node/mixin/predicate_operator_node.rb +0 -35
- data/lib/rubocop/ast/node/module_node.rb +0 -24
- data/lib/rubocop/ast/node/or_node.rb +0 -29
- data/lib/rubocop/ast/node/pair_node.rb +0 -63
- data/lib/rubocop/ast/node/range_node.rb +0 -18
- data/lib/rubocop/ast/node/regexp_node.rb +0 -33
- data/lib/rubocop/ast/node/resbody_node.rb +0 -24
- data/lib/rubocop/ast/node/retry_node.rb +0 -17
- data/lib/rubocop/ast/node/return_node.rb +0 -24
- data/lib/rubocop/ast/node/self_class_node.rb +0 -24
- data/lib/rubocop/ast/node/send_node.rb +0 -13
- data/lib/rubocop/ast/node/str_node.rb +0 -16
- data/lib/rubocop/ast/node/super_node.rb +0 -21
- data/lib/rubocop/ast/node/symbol_node.rb +0 -12
- data/lib/rubocop/ast/node/until_node.rb +0 -35
- data/lib/rubocop/ast/node/when_node.rb +0 -53
- data/lib/rubocop/ast/node/while_node.rb +0 -35
- data/lib/rubocop/ast/node/yield_node.rb +0 -21
- data/lib/rubocop/ast/sexp.rb +0 -16
- data/lib/rubocop/ast/traversal.rb +0 -202
- data/lib/rubocop/formatter/disabled_lines_formatter.rb +0 -57
- data/lib/rubocop/node_pattern.rb +0 -887
- data/lib/rubocop/processed_source.rb +0 -216
- data/lib/rubocop/string_util.rb +0 -14
- data/lib/rubocop/token.rb +0 -114
@@ -9,7 +9,7 @@ module RuboCop
|
|
9
9
|
#
|
10
10
|
# The maximum line length is configured in the `Layout/LineLength`
|
11
11
|
# cop. The tab size is configured in the `IndentationWidth` of the
|
12
|
-
# `Layout/
|
12
|
+
# `Layout/IndentationStyle` cop.
|
13
13
|
#
|
14
14
|
# @example
|
15
15
|
# # bad
|
@@ -47,7 +47,7 @@ module RuboCop
|
|
47
47
|
def on_if(node)
|
48
48
|
msg = if eligible_node?(node)
|
49
49
|
MSG_USE_MODIFIER unless named_capture_in_condition?(node)
|
50
|
-
elsif
|
50
|
+
elsif too_long_due_to_modifier?(node)
|
51
51
|
MSG_USE_NORMAL
|
52
52
|
end
|
53
53
|
return unless msg
|
@@ -63,11 +63,16 @@ module RuboCop
|
|
63
63
|
else
|
64
64
|
to_modifier_form(node)
|
65
65
|
end
|
66
|
-
->(corrector) { corrector.replace(node
|
66
|
+
->(corrector) { corrector.replace(node, replacement) }
|
67
67
|
end
|
68
68
|
|
69
69
|
private
|
70
70
|
|
71
|
+
def too_long_due_to_modifier?(node)
|
72
|
+
node.modifier_form? && too_long_single_line?(node) &&
|
73
|
+
!another_statement_on_same_line?(node)
|
74
|
+
end
|
75
|
+
|
71
76
|
def ignored_patterns
|
72
77
|
config.for_cop('Layout/LineLength')['IgnoredPatterns'] || []
|
73
78
|
end
|
@@ -129,6 +134,21 @@ module RuboCop
|
|
129
134
|
node.ternary? || node.modifier_form? || node.elsif? || node.else?
|
130
135
|
end
|
131
136
|
|
137
|
+
def another_statement_on_same_line?(node)
|
138
|
+
line_no = node.source_range.last_line
|
139
|
+
|
140
|
+
# traverse the AST upwards until we find a 'begin' node
|
141
|
+
# we want to look at the following child and see if it is on the
|
142
|
+
# same line as this 'if' node
|
143
|
+
while node && !node.begin_type?
|
144
|
+
index = node.sibling_index
|
145
|
+
node = node.parent
|
146
|
+
end
|
147
|
+
|
148
|
+
node && (sibling = node.children[index + 1]) &&
|
149
|
+
sibling.source_range.first_line == line_no
|
150
|
+
end
|
151
|
+
|
132
152
|
def parenthesize?(node)
|
133
153
|
# Parenthesize corrected expression if changing to modifier-if form
|
134
154
|
# would change the meaning of the parent expression
|
@@ -19,11 +19,27 @@ module RuboCop
|
|
19
19
|
MSG = 'Do not use if x; Use the ternary operator instead.'
|
20
20
|
|
21
21
|
def on_normal_if_unless(node)
|
22
|
+
return unless node.else_branch
|
23
|
+
|
22
24
|
beginning = node.loc.begin
|
23
25
|
return unless beginning&.is?(';')
|
24
26
|
|
25
27
|
add_offense(node)
|
26
28
|
end
|
29
|
+
|
30
|
+
def autocorrect(node)
|
31
|
+
lambda do |corrector|
|
32
|
+
corrector.replace(node, correct_to_ternary(node))
|
33
|
+
end
|
34
|
+
end
|
35
|
+
|
36
|
+
private
|
37
|
+
|
38
|
+
def correct_to_ternary(node)
|
39
|
+
else_code = node.else_branch ? node.else_branch.source : 'nil'
|
40
|
+
|
41
|
+
"#{node.condition.source} ? #{node.if_branch.source} : #{else_code}"
|
42
|
+
end
|
27
43
|
end
|
28
44
|
end
|
29
45
|
end
|
@@ -23,7 +23,7 @@ module RuboCop
|
|
23
23
|
def investigate(processed_source)
|
24
24
|
processed_source.each_comment do |comment|
|
25
25
|
next if comment_line?(processed_source[comment.loc.line - 1]) ||
|
26
|
-
comment.text.match(/\A# rubocop:(enable|disable)/)
|
26
|
+
comment.text.match?(/\A# rubocop:(enable|disable)/)
|
27
27
|
|
28
28
|
add_offense(comment)
|
29
29
|
end
|
@@ -109,13 +109,13 @@ module RuboCop
|
|
109
109
|
end
|
110
110
|
|
111
111
|
def autocorrect_method_to_literal(corrector, node)
|
112
|
-
corrector.replace(node.send_node
|
112
|
+
corrector.replace(node.send_node, '->')
|
113
113
|
|
114
114
|
return unless node.arguments?
|
115
115
|
|
116
116
|
arg_str = "(#{lambda_arg_string(node.arguments)})"
|
117
117
|
|
118
|
-
corrector.insert_after(node.send_node
|
118
|
+
corrector.insert_after(node.send_node, arg_str)
|
119
119
|
corrector.remove(arguments_with_whitespace(node))
|
120
120
|
end
|
121
121
|
|
@@ -37,7 +37,7 @@ module RuboCop
|
|
37
37
|
receiver = node.receiver.source
|
38
38
|
replacement = node.source.sub("#{receiver}.", "#{receiver}.call")
|
39
39
|
|
40
|
-
corrector.replace(node
|
40
|
+
corrector.replace(node, replacement)
|
41
41
|
else
|
42
42
|
add_parentheses(node, corrector) unless node.parenthesized?
|
43
43
|
corrector.remove(node.loc.selector)
|
@@ -52,26 +52,6 @@ module RuboCop
|
|
52
52
|
implicit_style? && !node.implicit_call?
|
53
53
|
end
|
54
54
|
|
55
|
-
def add_parentheses(node, corrector)
|
56
|
-
if node.arguments.empty?
|
57
|
-
corrector.insert_after(node.source_range, '()')
|
58
|
-
else
|
59
|
-
corrector.replace(args_begin(node), '(')
|
60
|
-
corrector.insert_after(args_end(node), ')')
|
61
|
-
end
|
62
|
-
end
|
63
|
-
|
64
|
-
def args_begin(node)
|
65
|
-
loc = node.loc
|
66
|
-
selector =
|
67
|
-
node.super_type? || node.yield_type? ? loc.keyword : loc.selector
|
68
|
-
selector.end.resize(1)
|
69
|
-
end
|
70
|
-
|
71
|
-
def args_end(node)
|
72
|
-
node.loc.expression.end
|
73
|
-
end
|
74
|
-
|
75
55
|
def message(_node)
|
76
56
|
if explicit_style?
|
77
57
|
'Prefer the use of `lambda.call(...)` over `lambda.(...)`.'
|
@@ -22,9 +22,7 @@ module RuboCop
|
|
22
22
|
lambda do |corrector|
|
23
23
|
corrector.replace(args_begin(node), '(')
|
24
24
|
|
25
|
-
unless args_parenthesized?(node)
|
26
|
-
corrector.insert_after(args_end(node), ')')
|
27
|
-
end
|
25
|
+
corrector.insert_after(args_end(node), ')') unless args_parenthesized?(node)
|
28
26
|
end
|
29
27
|
end
|
30
28
|
|
@@ -41,9 +41,7 @@ module RuboCop
|
|
41
41
|
|
42
42
|
def same_name_assignment?(node)
|
43
43
|
any_assignment?(node) do |asgn_node|
|
44
|
-
if asgn_node.masgn_type?
|
45
|
-
next variable_in_mass_assignment?(node.method_name, asgn_node)
|
46
|
-
end
|
44
|
+
next variable_in_mass_assignment?(node.method_name, asgn_node) if asgn_node.masgn_type?
|
47
45
|
|
48
46
|
asgn_node.loc.name.source == node.method_name.to_s
|
49
47
|
end
|
@@ -72,7 +72,7 @@ module RuboCop
|
|
72
72
|
between = prev_mixin.loc.expression.end
|
73
73
|
.join(range.begin)
|
74
74
|
# if separated from previous mixin with only whitespace?
|
75
|
-
|
75
|
+
unless /\S/.match?(between.source)
|
76
76
|
range = range.join(between) # then remove that too
|
77
77
|
end
|
78
78
|
range
|
@@ -98,9 +98,9 @@ module RuboCop
|
|
98
98
|
|
99
99
|
lambda do |corrector|
|
100
100
|
if extend_self_node?(node)
|
101
|
-
corrector.replace(node
|
101
|
+
corrector.replace(node, 'module_function')
|
102
102
|
else
|
103
|
-
corrector.replace(node
|
103
|
+
corrector.replace(node, 'extend self')
|
104
104
|
end
|
105
105
|
end
|
106
106
|
end
|
@@ -22,6 +22,12 @@ module RuboCop
|
|
22
22
|
# when bar then do_something
|
23
23
|
# end
|
24
24
|
#
|
25
|
+
# # good
|
26
|
+
# case foo
|
27
|
+
# when bar then do_something(arg1,
|
28
|
+
# arg2)
|
29
|
+
# end
|
30
|
+
#
|
25
31
|
class MultilineWhenThen < Cop
|
26
32
|
include RangeHelp
|
27
33
|
|
@@ -32,7 +38,10 @@ module RuboCop
|
|
32
38
|
return unless node.then?
|
33
39
|
|
34
40
|
# Single line usage of `then` is not an offense
|
35
|
-
return if !node.children.last.nil? && !node.multiline?
|
41
|
+
return if !node.children.last.nil? && !node.multiline?
|
42
|
+
|
43
|
+
# Requires `then` for write `when` and its body on the same line.
|
44
|
+
return if require_then?(node)
|
36
45
|
|
37
46
|
# With more than one statements after then, there's not offense
|
38
47
|
return if accept_node_type?(node.body)
|
@@ -50,6 +59,12 @@ module RuboCop
|
|
50
59
|
end
|
51
60
|
end
|
52
61
|
|
62
|
+
def require_then?(when_node)
|
63
|
+
return false unless when_node.body
|
64
|
+
|
65
|
+
when_node.loc.line == when_node.body.loc.line
|
66
|
+
end
|
67
|
+
|
53
68
|
def accept_node_type?(node)
|
54
69
|
node&.begin_type? || node&.array_type? || node&.hash_type?
|
55
70
|
end
|
@@ -77,11 +77,9 @@ module RuboCop
|
|
77
77
|
if splat_value
|
78
78
|
correct_splat_expansion(corrector, expr, splat_value)
|
79
79
|
elsif node.array_type? && !node.bracketed?
|
80
|
-
corrector.
|
81
|
-
corrector.insert_after(expr, ']')
|
80
|
+
corrector.wrap(expr, '[', ']')
|
82
81
|
elsif requires_parentheses?(node)
|
83
|
-
corrector.
|
84
|
-
corrector.insert_after(expr, ')')
|
82
|
+
corrector.wrap(expr, '(', ')')
|
85
83
|
end
|
86
84
|
|
87
85
|
corrector.insert_after(expr, '.freeze')
|
@@ -6,9 +6,9 @@ module RuboCop
|
|
6
6
|
# Checks for uses of if with a negated condition. Only ifs
|
7
7
|
# without else are considered. There are three different styles:
|
8
8
|
#
|
9
|
-
#
|
10
|
-
#
|
11
|
-
#
|
9
|
+
# * both
|
10
|
+
# * prefix
|
11
|
+
# * postfix
|
12
12
|
#
|
13
13
|
# @example EnforcedStyle: both (default)
|
14
14
|
# # enforces `unless` for `prefix` and `postfix` conditionals
|
@@ -6,9 +6,9 @@ module RuboCop
|
|
6
6
|
# Checks for uses of unless with a negated condition. Only unless
|
7
7
|
# without else are considered. There are three different styles:
|
8
8
|
#
|
9
|
-
#
|
10
|
-
#
|
11
|
-
#
|
9
|
+
# * both
|
10
|
+
# * prefix
|
11
|
+
# * postfix
|
12
12
|
#
|
13
13
|
# @example EnforcedStyle: both (default)
|
14
14
|
# # enforces `if` for `prefix` and `postfix` conditionals
|
@@ -152,13 +152,13 @@ module RuboCop
|
|
152
152
|
"next #{node.inverse_keyword} #{node.condition.source}\n" \
|
153
153
|
"#{' ' * node.source_range.column}#{body.source}"
|
154
154
|
|
155
|
-
corrector.replace(node
|
155
|
+
corrector.replace(node, replacement)
|
156
156
|
end
|
157
157
|
|
158
158
|
def autocorrect_block(corrector, node)
|
159
159
|
next_code = "next #{node.inverse_keyword} #{node.condition.source}"
|
160
160
|
|
161
|
-
corrector.insert_before(node
|
161
|
+
corrector.insert_before(node, next_code)
|
162
162
|
|
163
163
|
corrector.remove(cond_range(node, node.condition))
|
164
164
|
corrector.remove(end_range(node))
|
@@ -11,7 +11,7 @@ module RuboCop
|
|
11
11
|
#
|
12
12
|
# With `IncludeSemanticChanges` set to `true`, this cop reports offenses
|
13
13
|
# for `!x.nil?` and autocorrects that and `x != nil` to solely `x`, which
|
14
|
-
# is
|
14
|
+
# is *usually* OK, but might change behavior.
|
15
15
|
#
|
16
16
|
# @example
|
17
17
|
# # bad
|
@@ -111,15 +111,15 @@ module RuboCop
|
|
111
111
|
|
112
112
|
return if expr == new_code
|
113
113
|
|
114
|
-
->(corrector) { corrector.replace(node
|
114
|
+
->(corrector) { corrector.replace(node, new_code) }
|
115
115
|
end
|
116
116
|
|
117
117
|
def autocorrect_non_nil(node, inner_node)
|
118
118
|
lambda do |corrector|
|
119
119
|
if inner_node.receiver
|
120
|
-
corrector.replace(node
|
120
|
+
corrector.replace(node, inner_node.receiver.source)
|
121
121
|
else
|
122
|
-
corrector.replace(node
|
122
|
+
corrector.replace(node, 'self')
|
123
123
|
end
|
124
124
|
end
|
125
125
|
end
|
@@ -127,7 +127,7 @@ module RuboCop
|
|
127
127
|
def autocorrect_unless_nil(node, receiver)
|
128
128
|
lambda do |corrector|
|
129
129
|
corrector.replace(node.parent.loc.keyword, 'if')
|
130
|
-
corrector.replace(node
|
130
|
+
corrector.replace(node, receiver.source)
|
131
131
|
end
|
132
132
|
end
|
133
133
|
end
|
@@ -36,7 +36,7 @@ module RuboCop
|
|
36
36
|
|
37
37
|
def autocorrect(node)
|
38
38
|
lambda do |corrector|
|
39
|
-
corrector.replace(node
|
39
|
+
corrector.replace(node, replacement(node))
|
40
40
|
end
|
41
41
|
end
|
42
42
|
|
@@ -49,13 +49,9 @@ module RuboCop
|
|
49
49
|
def replacement(node)
|
50
50
|
return to_ternary(node) unless node.parent
|
51
51
|
|
52
|
-
if %i[and or].include?(node.parent.type)
|
53
|
-
return "(#{to_ternary(node)})"
|
54
|
-
end
|
52
|
+
return "(#{to_ternary(node)})" if %i[and or].include?(node.parent.type)
|
55
53
|
|
56
|
-
if node.parent.send_type? && node.parent.operator_method?
|
57
|
-
return "(#{to_ternary(node)})"
|
58
|
-
end
|
54
|
+
return "(#{to_ternary(node)})" if node.parent.send_type? && node.parent.operator_method?
|
59
55
|
|
60
56
|
to_ternary(node)
|
61
57
|
end
|