rubocop 0.68.1 → 0.69.0

data/lib/rubocop/cop/style/multiline_method_signature.rb

@@ -19,7 +19,7 @@ module RuboCop
       #   end
       #
       class MultilineMethodSignature < Cop
-        MSG = 'Avoid multi-line method signatures.'.freeze
+        MSG = 'Avoid multi-line method signatures.'
 
         def on_def(node)
           return unless node.arguments?

data/lib/rubocop/cop/style/multiline_ternary_operator.rb

@@ -25,7 +25,7 @@ module RuboCop
       #     end
       class MultilineTernaryOperator < Cop
         MSG = 'Avoid multi-line ternary operators, ' \
-              'use `if` or `unless` instead.'.freeze
+              'use `if` or `unless` instead.'
 
         def on_if(node)
           return unless node.ternary? && node.multiline?

data/lib/rubocop/cop/style/multiple_comparison.rb

@@ -16,7 +16,7 @@ module RuboCop
       #   foo if ['a', 'b', 'c'].include?(a)
       class MultipleComparison < Cop
         MSG = 'Avoid comparing a variable with multiple items ' \
-          'in a conditional, use `Array#include?` instead.'.freeze
+          'in a conditional, use `Array#include?` instead.'
 
         def on_or(node)
           root_of_or_node = root_of_or_node(node)

data/lib/rubocop/cop/style/mutable_constant.rb

@@ -54,7 +54,7 @@ module RuboCop
         include FrozenStringLiteral
         include ConfigurableEnforcedStyle
 
-        MSG = 'Freeze mutable objects assigned to constants.'.freeze
+        MSG = 'Freeze mutable objects assigned to constants.'
 
         def on_casgn(node)
           _scope, _const_name, value = *node
@@ -64,7 +64,7 @@ module RuboCop
         def on_or_asgn(node)
           lhs, value = *node
 
-          return unless lhs && lhs.casgn_type?
+          return unless lhs&.casgn_type?
 
           on_assignment(value)
         end
@@ -118,7 +118,7 @@ module RuboCop
         end
 
         def mutable_literal?(value)
-          value && value.mutable_literal?
+          value&.mutable_literal?
         end
 
         def immutable_literal?(node)

data/lib/rubocop/cop/style/negated_if.rb

@@ -73,7 +73,7 @@ module RuboCop
         include NegativeConditional
 
         def on_if(node)
-          return if node.elsif? || node.ternary?
+          return if node.unless? || node.elsif? || node.ternary?
           return if correct_style?(node)
 
           check_negative_conditional(node)

data/lib/rubocop/cop/style/negated_unless.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Style
+      # Checks for uses of unless with a negated condition. Only unless
+      # without else are considered. There are three different styles:
+      #
+      #   - both
+      #   - prefix
+      #   - postfix
+      #
+      # @example EnforcedStyle: both (default)
+      #   # enforces `if` for `prefix` and `postfix` conditionals
+      #
+      #   # bad
+      #   unless !foo
+      #     bar
+      #   end
+      #
+      #   # good
+      #   if foo
+      #     bar
+      #   end
+      #
+      #   # bad
+      #   bar unless !foo
+      #
+      #   # good
+      #   bar if foo
+      #
+      # @example EnforcedStyle: prefix
+      #   # enforces `if` for just `prefix` conditionals
+      #
+      #   # bad
+      #   unless !foo
+      #     bar
+      #   end
+      #
+      #   # good
+      #   if foo
+      #     bar
+      #   end
+      #
+      #   # good
+      #   bar unless !foo
+      #
+      # @example EnforcedStyle: postfix
+      #   # enforces `if` for just `postfix` conditionals
+      #
+      #   # bad
+      #   bar unless !foo
+      #
+      #   # good
+      #   bar if foo
+      #
+      #   # good
+      #   unless !foo
+      #     bar
+      #   end
+      class NegatedUnless < Cop
+        include ConfigurableEnforcedStyle
+        include NegativeConditional
+
+        def on_if(node)
+          return if node.if? || node.elsif? || node.ternary?
+          return if correct_style?(node)
+
+          check_negative_conditional(node)
+        end
+
+        def autocorrect(node)
+          ConditionCorrector.correct_negative_condition(node)
+        end
+
+        private
+
+        def message(node)
+          format(MSG, inverse: node.inverse_keyword, current: node.keyword)
+        end
+
+        def correct_style?(node)
+          style == :prefix && node.modifier_form? ||
+            style == :postfix && !node.modifier_form?
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/style/nested_modifier.rb

@@ -16,7 +16,7 @@ module RuboCop
       class NestedModifier < Cop
         include RangeHelp
 
-        MSG = 'Avoid using nested modifiers.'.freeze
+        MSG = 'Avoid using nested modifiers.'
 
         def on_while(node)
           check(node)
@@ -39,7 +39,7 @@ module RuboCop
         end
 
         def modifier?(node)
-          node && node.basic_conditional? && node.modifier_form?
+          node&.basic_conditional? && node&.modifier_form?
         end
 
         def autocorrect(node)
@@ -62,13 +62,13 @@ module RuboCop
         end
 
         def replacement_operator(keyword)
-          keyword == 'if'.freeze ? '&&'.freeze : '||'.freeze
+          keyword == 'if' ? '&&' : '||'
         end
 
         def left_hand_operand(node, operator)
           expr = node.condition.source
           expr = "(#{expr})" if node.condition.or_type? &&
-                                operator == '&&'.freeze
+                                operator == '&&'
           expr
         end
 

data/lib/rubocop/cop/style/nested_parenthesized_calls.rb

@@ -15,7 +15,7 @@ module RuboCop
       class NestedParenthesizedCalls < Cop
         include RangeHelp
 
-        MSG = 'Add parentheses to nested method call `%<source>s`.'.freeze
+        MSG = 'Add parentheses to nested method call `%<source>s`.'
 
         def on_send(node)
           return unless node.parenthesized?

data/lib/rubocop/cop/style/nested_ternary_operator.rb

@@ -17,7 +17,7 @@ module RuboCop
       #   end
       class NestedTernaryOperator < Cop
         MSG = 'Ternary operators must not be nested. Prefer `if` or `else` ' \
-              'constructs instead.'.freeze
+              'constructs instead.'
 
         def on_if(node)
           return unless node.ternary?

data/lib/rubocop/cop/style/next.rb

@@ -51,7 +51,7 @@ module RuboCop
         include MinBodyLength
         include RangeHelp
 
-        MSG = 'Use `next` to skip iteration.'.freeze
+        MSG = 'Use `next` to skip iteration.'
         EXIT_TYPES = %i[break return].freeze
 
         def self.autocorrect_incompatible_with
@@ -125,7 +125,7 @@ module RuboCop
         end
 
         def if_without_else?(node)
-          node && node.if_type? && !node.ternary? && !node.else?
+          node&.if_type? && !node.ternary? && !node.else?
         end
 
         def exit_body_type?(node)
@@ -137,7 +137,7 @@ module RuboCop
         def offense_node(body)
           *_, condition = *body
 
-          condition && condition.if_type? ? condition : body
+          condition&.if_type? ? condition : body
         end
 
         def offense_location(offense_node)
@@ -231,9 +231,9 @@ module RuboCop
           adjustment = delta + @reindented_lines[lineno]
           @reindented_lines[lineno] = adjustment
 
-          if adjustment > 0
+          if adjustment.positive?
             corrector.remove_leading(buffer.line_range(lineno), adjustment)
-          elsif adjustment < 0
+          elsif adjustment.negative?
             corrector.insert_before(buffer.line_range(lineno),
                                     ' ' * -adjustment)
           end

data/lib/rubocop/cop/style/nil_comparison.rb

@@ -31,8 +31,8 @@ module RuboCop
       class NilComparison < Cop
         include ConfigurableEnforcedStyle
 
-        PREDICATE_MSG = 'Prefer the use of the `nil?` predicate.'.freeze
-        EXPLICIT_MSG = 'Prefer the use of the `==` comparison.'.freeze
+        PREDICATE_MSG = 'Prefer the use of the `nil?` predicate.'
+        EXPLICIT_MSG = 'Prefer the use of the `==` comparison.'
 
         def_node_matcher :nil_comparison?, '(send _ {:== :===} nil)'
         def_node_matcher :nil_check?, '(send _ :nil?)'

data/lib/rubocop/cop/style/not.rb

@@ -16,7 +16,7 @@ module RuboCop
       class Not < Cop
         include RangeHelp
 
-        MSG = 'Use `!` instead of `not`.'.freeze
+        MSG = 'Use `!` instead of `not`.'
 
         OPPOSITE_METHODS = {
           :== => :!=,

data/lib/rubocop/cop/style/numeric_literal_prefix.rb

@@ -42,11 +42,11 @@ module RuboCop
         BINARY_REGEX = /^0B[01]+$/.freeze
         DECIMAL_REGEX = /^0[dD][0-9]+$/.freeze
 
-        OCTAL_ZERO_ONLY_MSG = 'Use 0 for octal literals.'.freeze
-        OCTAL_MSG = 'Use 0o for octal literals.'.freeze
-        HEX_MSG = 'Use 0x for hexadecimal literals.'.freeze
-        BINARY_MSG = 'Use 0b for binary literals.'.freeze
-        DECIMAL_MSG = 'Do not use prefixes for decimal literals.'.freeze
+        OCTAL_ZERO_ONLY_MSG = 'Use 0 for octal literals.'
+        OCTAL_MSG = 'Use 0o for octal literals.'
+        HEX_MSG = 'Use 0x for hexadecimal literals.'
+        BINARY_MSG = 'Use 0b for binary literals.'
+        DECIMAL_MSG = 'Do not use prefixes for decimal literals.'
 
         def on_int(node)
           type = literal_type(node)

data/lib/rubocop/cop/style/numeric_literals.rb

@@ -31,7 +31,7 @@ module RuboCop
         include IntegerNode
 
         MSG = 'Use underscores(_) as thousands separator and ' \
-              'separate every 3 digits with them.'.freeze
+              'separate every 3 digits with them.'
         DELIMITER_REGEXP = /[eE.]/.freeze
 
         def on_int(node)
@@ -97,7 +97,7 @@ module RuboCop
                           .reverse
                           .gsub(/...(?=.)/, '\&_')
                           .reverse
-          formatted_int.insert(0, '-') if int_part < 0
+          formatted_int.insert(0, '-') if int_part.negative?
           formatted_int
         end
 

data/lib/rubocop/cop/style/numeric_predicate.rb

@@ -45,7 +45,7 @@ module RuboCop
         include ConfigurableEnforcedStyle
         include IgnoredMethods
 
-        MSG = 'Use `%<prefer>s` instead of `%<current>s`.'.freeze
+        MSG = 'Use `%<prefer>s` instead of `%<current>s`.'
 
         REPLACEMENTS = {
           'zero?' => '==',
@@ -86,7 +86,7 @@ module RuboCop
               predicate(node)
             end
 
-          return unless numeric && operator && replacement_supported?(operator)
+          return unless numeric && operator
 
           [numeric, replacement(numeric, operator)]
         end
@@ -112,14 +112,6 @@ module RuboCop
           node.send_type? && node.binary_operation? && !node.parenthesized?
         end
 
-        def replacement_supported?(operator)
-          if %i[> <].include?(operator)
-            target_ruby_version >= 2.3
-          else
-            true
-          end
-        end
-
         def invert
           lambda do |comparison, numeric|
             comparison = { :> => :<, :< => :> }[comparison] || comparison

data/lib/rubocop/cop/style/one_line_conditional.rb

@@ -26,7 +26,7 @@ module RuboCop
         include OnNormalIfUnless
 
         MSG = 'Favor the ternary operator (`?:`) ' \
-              'over `%<keyword>s/then/else/end` constructs.'.freeze
+              'over `%<keyword>s/then/else/end` constructs.'
 
         def on_normal_if_unless(node)
           return unless node.single_line? && node.else_branch

data/lib/rubocop/cop/style/option_hash.rb

@@ -20,7 +20,7 @@ module RuboCop
       #     # ...
       #   end
       class OptionHash < Cop
-        MSG = 'Prefer keyword arguments to options hashes.'.freeze
+        MSG = 'Prefer keyword arguments to options hashes.'
 
         def_node_matcher :option_hash, <<-PATTERN
           (args ... $(optarg [#suspicious_name? _] (hash)))

data/lib/rubocop/cop/style/optional_arguments.rb

@@ -19,7 +19,7 @@ module RuboCop
       #   end
       class OptionalArguments < Cop
         MSG = 'Optional arguments should appear at the end ' \
-              'of the argument list.'.freeze
+              'of the argument list.'
 
         def on_def(node)
           each_misplaced_optional_arg(node.arguments) do |argument|

data/lib/rubocop/cop/style/or_assignment.rb

@@ -27,7 +27,7 @@ module RuboCop
       #   # good - set name to 'Bozhidar', only if it's nil or false
       #   name ||= 'Bozhidar'
       class OrAssignment < Cop
-        MSG = 'Use the double pipe equals operator `||=` instead.'.freeze
+        MSG = 'Use the double pipe equals operator `||=` instead.'
 
         def_node_matcher :ternary_assignment?, <<-PATTERN
           ({lvasgn ivasgn cvasgn gvasgn} _var

data/lib/rubocop/cop/style/parallel_assignment.rb

@@ -25,7 +25,7 @@ module RuboCop
       class ParallelAssignment < Cop
         include RescueNode
 
-        MSG = 'Do not use parallel assignment.'.freeze
+        MSG = 'Do not use parallel assignment.'
 
         def on_masgn(node)
           lhs, rhs = *node
@@ -229,7 +229,7 @@ module RuboCop
             # If the parallel assignment uses a rescue modifier and it is the
             # only contents of a method, then we want to make use of the
             # implicit begin
-            if node.parent.parent && node.parent.parent.def_type?
+            if node.parent.parent&.def_type?
               super + def_correction(rescue_result)
             else
               begin_correction(rescue_result)

data/lib/rubocop/cop/style/percent_q_literals.rb

@@ -30,8 +30,8 @@ module RuboCop
         include ConfigurableEnforcedStyle
 
         LOWER_CASE_Q_MSG = 'Do not use `%Q` unless interpolation is ' \
-                           'needed. Use `%q`.'.freeze
-        UPPER_CASE_Q_MSG = 'Use `%Q` instead of `%q`.'.freeze
+                           'needed. Use `%q`.'
+        UPPER_CASE_Q_MSG = 'Use `%Q` instead of `%q`.'
 
         def on_str(node)
           process(node, '%Q', '%q')

data/lib/rubocop/cop/style/perl_backrefs.rb

@@ -13,7 +13,7 @@ module RuboCop
       #   # good
       #   puts Regexp.last_match(1)
       class PerlBackrefs < Cop
-        MSG = 'Avoid the use of Perl-style backrefs.'.freeze
+        MSG = 'Avoid the use of Perl-style backrefs.'
 
         def on_nth_ref(node)
           add_offense(node)

data/lib/rubocop/cop/style/preferred_hash_methods.rb

@@ -28,7 +28,7 @@ module RuboCop
       class PreferredHashMethods < Cop
         include ConfigurableEnforcedStyle
 
-        MSG = 'Use `Hash#%<prefer>s` instead of `Hash#%<current>s`.'.freeze
+        MSG = 'Use `Hash#%<prefer>s` instead of `Hash#%<current>s`.'
 
         OFFENDING_SELECTORS = {
           short: %i[has_key? has_value?],

data/lib/rubocop/cop/style/proc.rb

@@ -14,7 +14,7 @@ module RuboCop
       #   p = proc { |n| puts n }
       #
       class Proc < Cop
-        MSG = 'Use `proc` instead of `Proc.new`.'.freeze
+        MSG = 'Use `proc` instead of `Proc.new`.'
 
         def_node_matcher :proc_new?,
                          '(block $(send (const nil? :Proc) :new) ...)'

data/lib/rubocop/cop/style/raise_args.rb

@@ -36,9 +36,9 @@ module RuboCop
         include ConfigurableEnforcedStyle
 
         EXPLODED_MSG = 'Provide an exception class and message ' \
-          'as arguments to `%<method>s`.'.freeze
+          'as arguments to `%<method>s`.'
         COMPACT_MSG = 'Provide an exception object ' \
-          'as an argument to `%<method>s`.'.freeze
+          'as an argument to `%<method>s`.'
 
         def on_send(node)
           return unless node.command?(:raise) || node.command?(:fail)