rubocop 1.8.1 → 1.9.0

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

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Style
+      # This cop checks for redundant `if` with boolean literal branches.
+      # It checks only conditions to return boolean value (`true` or `false`) for safe detection.
+      # The conditions to be checked are comparison methods, predicate methods, and double negative.
+      #
+      # @example
+      #   # bad
+      #   if foo == bar
+      #     true
+      #   else
+      #     false
+      #   end
+      #
+      #   # bad
+      #   foo == bar ? true : false
+      #
+      #   # good
+      #   foo == bar
+      #
+      class IfWithBooleanLiteralBranches < Base
+        extend AutoCorrector
+
+        MSG = 'Remove redundant %<keyword>s with boolean literal branches.'
+
+        def_node_matcher :if_with_boolean_literal_branches?, <<~PATTERN
+          (if #return_boolean_value? {(true) (false) | (false) (true)})
+        PATTERN
+        def_node_matcher :double_negative?, '(send (send _ :!) :!)'
+
+        def on_if(node)
+          return unless if_with_boolean_literal_branches?(node)
+
+          condition = node.condition
+          range, keyword = if node.ternary?
+                             range = condition.source_range.end.join(node.source_range.end)
+
+                             [range, 'ternary operator']
+                           else
+                             keyword = node.loc.keyword
+
+                             [keyword, "`#{keyword.source}`"]
+                           end
+
+          add_offense(range, message: format(MSG, keyword: keyword)) do |corrector|
+            replacement = replacement_condition(node, condition)
+
+            corrector.replace(node, replacement)
+          end
+        end
+
+        private
+
+        def return_boolean_value?(condition)
+          if condition.begin_type?
+            return_boolean_value?(condition.children.first)
+          elsif condition.or_type?
+            return_boolean_value?(condition.lhs) && return_boolean_value?(condition.rhs)
+          elsif condition.and_type?
+            return_boolean_value?(condition.rhs)
+          else
+            assume_boolean_value?(condition)
+          end
+        end
+
+        def assume_boolean_value?(condition)
+          return false unless condition.send_type?
+
+          condition.comparison_method? || condition.predicate_method? || double_negative?(condition)
+        end
+
+        def replacement_condition(node, condition)
+          bang = '!' if opposite_condition?(node)
+
+          if bang && require_parentheses?(condition)
+            "#{bang}(#{condition.source})"
+          else
+            "#{bang}#{condition.source}"
+          end
+        end
+
+        def opposite_condition?(node)
+          !node.unless? && node.if_branch.false_type? || node.unless? && node.if_branch.true_type?
+        end
+
+        def require_parentheses?(condition)
+          condition.and_type? || condition.or_type? ||
+            condition.send_type? && condition.comparison_method?
+        end
+      end
+    end
+  end
+end

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

@@ -50,6 +50,7 @@ module RuboCop
                          end
 
               corrector.replace(node, new_code)
+              corrector.wrap(node, '(', ')') if node.parent&.method?(:!)
             end
           end
         end

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

@@ -8,6 +8,9 @@ module RuboCop
       # With `IncludeSemanticChanges` set to `false` by default, this cop
       # does not report offenses for `!x.nil?` and does no changes that might
       # change behavior.
+      # Also `IncludeSemanticChanges` set to `false` with `EnforcedStyle: comparison` of
+      # `Style/NilComparison` cop, this cop does not report offenses for `x != nil` and
+      # does no changes to `!x.nil?` style.
       #
       # With `IncludeSemanticChanges` set to `true`, this cop reports offenses
       # for `!x.nil?` and autocorrects that and `x != nil` to solely `x`, which
@@ -41,6 +44,9 @@ module RuboCop
       class NonNilCheck < Base
         extend AutoCorrector
 
+        MSG_FOR_REPLACEMENT = 'Prefer `%<prefer>s` over `%<current>s`.'
+        MSG_FOR_REDUNDANCY = 'Explicit non-nil checks are usually redundant.'
+
         RESTRICT_ON_SEND = %i[!= nil? !].freeze
 
         def_node_matcher :not_equal_to_nil?, '(send _ :!= nil)'
@@ -49,11 +55,12 @@ module RuboCop
         def_node_matcher :not_and_nil_check?, '(send (send _ :nil?) :!)'
 
         def on_send(node)
-          return if ignored_node?(node)
-          return unless (offense_node = find_offense_node(node))
+          return if ignored_node?(node) ||
+                    !include_semantic_changes? && nil_comparison_style == 'comparison'
+          return unless register_offense?(node)
 
           message = message(node)
-          add_offense(offense_node, message: message) do |corrector|
+          add_offense(node, message: message) do |corrector|
             autocorrect(corrector, node)
           end
         end
@@ -73,13 +80,9 @@ module RuboCop
 
         private
 
-        def find_offense_node(node)
-          if not_equal_to_nil?(node)
-            node.loc.selector
-          elsif include_semantic_changes? &&
-                (not_and_nil_check?(node) || unless_and_nil_check?(node))
-            node
-          end
+        def register_offense?(node)
+          not_equal_to_nil?(node) ||
+            include_semantic_changes? && (not_and_nil_check?(node) || unless_and_nil_check?(node))
         end
 
         def autocorrect(corrector, node)
@@ -101,10 +104,11 @@ module RuboCop
         end
 
         def message(node)
-          if node.method?(:!=)
-            'Prefer `!expression.nil?` over `expression != nil`.'
+          if node.method?(:!=) && !include_semantic_changes?
+            prefer = "!#{node.receiver.source}.nil?"
+            format(MSG_FOR_REPLACEMENT, prefer: prefer, current: node.source)
           else
-            'Explicit non-nil checks are usually redundant.'
+            MSG_FOR_REDUNDANCY
           end
         end
 
@@ -138,6 +142,12 @@ module RuboCop
           corrector.replace(node.parent.loc.keyword, 'if')
           corrector.replace(node, receiver.source)
         end
+
+        def nil_comparison_style
+          nil_comparison_conf = config.for_cop('Style/NilComparison')
+
+          nil_comparison_conf['Enabled'] && nil_comparison_conf['EnforcedStyle']
+        end
       end
     end
   end

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

@@ -8,7 +8,7 @@ module RuboCop
       #
       # Endless methods added in Ruby 3.0 are also accepted by this cop.
       #
-      # If `Style/EndlessMethod` is enabled with `EnforcedStyle: allow` or
+      # If `Style/EndlessMethod` is enabled with `EnforcedStyle: allow_single_line` or
       # `allow_always`, single-line methods will be auto-corrected to endless
       # methods if there is only one statement in the body.
       #

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

@@ -80,8 +80,11 @@ module RuboCop
         end
 
         def correct_for_guard_condition_style(corrector, node, if_branch, and_operator)
+          outer_condition = node.condition
+          correct_outer_condition(corrector, outer_condition)
+
           condition = if_branch.condition
-          corrector.insert_after(node.condition, replacement_condition(and_operator, condition))
+          corrector.insert_after(outer_condition, replacement_condition(and_operator, condition))
 
           range = range_between(if_branch.loc.keyword.begin_pos, condition.source_range.end_pos)
           corrector.remove(range_with_surrounding_space(range: range, newlines: false))
@@ -106,8 +109,29 @@ module RuboCop
           corrector.insert_before(node.loc.keyword, comment_text) unless comments.empty?
         end
 
+        def correct_outer_condition(corrector, condition)
+          return unless requrie_parentheses?(condition)
+
+          range = range_between(
+            condition.loc.selector.end_pos, condition.first_argument.source_range.begin_pos
+          )
+
+          corrector.replace(range, '(')
+          corrector.insert_after(condition.last_argument.source_range, ')')
+        end
+
+        def requrie_parentheses?(condition)
+          condition.send_type? && !condition.arguments.empty? && !condition.parenthesized?
+        end
+
+        def arguments_range(node)
+          range_between(
+            node.first_argument.source_range.begin_pos, node.last_argument.source_range.end_pos
+          )
+        end
+
         def wrap_condition?(node)
-          node.or_type? ||
+          node.and_type? || node.or_type? ||
             (node.send_type? && node.arguments.any? && !node.parenthesized?)
         end
 

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

@@ -120,7 +120,7 @@ module RuboCop
           if condition.begin_type?
             condition.to_a.any? { |x| complex_condition?(x) }
           else
-            non_complex_expression?(condition) ? false : true
+            !non_complex_expression?(condition)
           end
         end
 

data/lib/rubocop/formatter/git_hub_actions_formatter.rb

@@ -23,6 +23,7 @@ module RuboCop
 
       def minimum_severity_to_fail
         @minimum_severity_to_fail ||= begin
+          # Unless given explicitly as `fail_level`, `:info` severity offenses do not fail
           name = options.fetch(:fail_level, :refactor)
           RuboCop::Cop::Severity.new(name)
         end

data/lib/rubocop/magic_comment.rb

@@ -27,7 +27,7 @@ module RuboCop
     end
 
     def any?
-      frozen_string_literal_specified? || encoding_specified?
+      frozen_string_literal_specified? || encoding_specified? || shareable_constant_value_specified?
     end
 
     # Does the magic comment enable the frozen string literal feature.
@@ -46,6 +46,10 @@ module RuboCop
       [true, false].include?(frozen_string_literal)
     end
 
+    def valid_shareable_constant_value?
+      %w[none literal experimental_everything experimental_copy].include?(shareable_constant_values)
+    end
+
     # Was a magic comment for the frozen string literal found?
     #
     # @return [Boolean]
@@ -53,6 +57,13 @@ module RuboCop
       specified?(frozen_string_literal)
     end
 
+    # Was a shareable_constant_value specified?
+    #
+    # @return [Boolean]
+    def shareable_constant_value_specified?
+      specified?(shareable_constant_value)
+    end
+
     # Expose the `frozen_string_literal` value coerced to a boolean if possible.
     #
     # @return [Boolean] if value is `true` or `false`
@@ -69,6 +80,13 @@ module RuboCop
       end
     end
 
+    # Expose the `shareable_constant_value` value coerced to a boolean if possible.
+    #
+    # @return [String] for shareable_constant_value config
+    def shareable_constant_value
+      extract_shareable_constant_value
+    end
+
     def encoding_specified?
       specified?(encoding)
     end
@@ -146,6 +164,10 @@ module RuboCop
       def extract_frozen_string_literal
         match('frozen[_-]string[_-]literal')
       end
+
+      def extract_shareable_constant_value
+        match('shareable[_-]constant[_-]values')
+      end
     end
 
     # Wrapper for Vim style magic comments.
@@ -176,6 +198,9 @@ module RuboCop
 
       # Vim comments cannot specify frozen string literal behavior.
       def frozen_string_literal; end
+
+      # Vim comments cannot specify shareable constant values behavior.
+      def shareable_constant_value; end
     end
 
     # Wrapper for regular magic comments not bound to an editor.
@@ -209,6 +234,10 @@ module RuboCop
       def extract_frozen_string_literal
         extract(/\A\s*#\s*frozen[_-]string[_-]literal:\s*(#{TOKEN})\s*\z/io)
       end
+
+      def extract_shareable_constant_value
+        extract(/\A\s*#\s*shareable[_-]constant[_-]value:\s*(#{TOKEN})\s*\z/io)
+      end
     end
   end
 end

data/lib/rubocop/options.rb

@@ -470,7 +470,7 @@ module RuboCop
                                          'This option applies to the previously',
                                          'specified --format, or the default format',
                                          'if no format is specified.'],
-      fail_level:                       ['Minimum severity (A/R/C/W/E/F) for exit',
+      fail_level:                       ['Minimum severity (A/I/R/C/W/E/F) for exit',
                                          'with error code.'],
       display_time:                     'Display elapsed time in seconds.',
       display_only_failed:              ['Only output offense messages. Omit passing',

data/lib/rubocop/rspec/expect_offense.rb

@@ -111,9 +111,12 @@ module RuboCop
         source
       end
 
-      def expect_offense(source, file = nil, severity: nil, **replacements)
+      def expect_offense(source, file = nil, severity: nil, chomp: false, **replacements)
         expected_annotations = parse_annotations(source, **replacements)
-        @processed_source = parse_processed_source(expected_annotations.plain_source, file)
+        source = expected_annotations.plain_source
+        source = source.chomp if chomp
+
+        @processed_source = parse_processed_source(source, file)
         @offenses = _investigate(cop, @processed_source)
         actual_annotations =
           expected_annotations.with_offense_annotations(@offenses)

data/lib/rubocop/runner.rb

@@ -390,6 +390,7 @@ module RuboCop
 
     def minimum_severity_to_fail
       @minimum_severity_to_fail ||= begin
+        # Unless given explicitly as `fail_level`, `:info` severity offenses do not fail
         name = @options[:fail_level] || :refactor
         RuboCop::Cop::Severity.new(name)
       end

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '1.8.1'
+    STRING = '1.9.0'
 
     MSG = '%<version>s (using Parser %<parser_version>s, '\
           'rubocop-ast %<rubocop_ast_version>s, ' \
@@ -37,7 +37,7 @@ module RuboCop
       features = Util.silence_warnings do
         # Suppress any config issues when loading the config (ie. deprecations,
         # pending cops, etc.).
-        env.config_store.for_pwd.loaded_features.sort
+        env.config_store.unvalidated.for_pwd.loaded_features.sort
       end
 
       features.map do |loaded_feature|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.9.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -252,10 +252,14 @@ files:
 - lib/rubocop/cop/generator/require_file_injector.rb
 - lib/rubocop/cop/ignored_node.rb
 - lib/rubocop/cop/internal_affairs.rb
+- lib/rubocop/cop/internal_affairs/empty_line_between_expect_offense_and_correction.rb
+- lib/rubocop/cop/internal_affairs/example_description.rb
 - lib/rubocop/cop/internal_affairs/method_name_equal.rb
 - lib/rubocop/cop/internal_affairs/node_destructuring.rb
 - lib/rubocop/cop/internal_affairs/node_type_predicate.rb
 - lib/rubocop/cop/internal_affairs/offense_location_keyword.rb
+- lib/rubocop/cop/internal_affairs/redundant_described_class_as_subject.rb
+- lib/rubocop/cop/internal_affairs/redundant_let_rubocop_config_new.rb
 - lib/rubocop/cop/internal_affairs/redundant_location_argument.rb
 - lib/rubocop/cop/internal_affairs/redundant_message_argument.rb
 - lib/rubocop/cop/internal_affairs/style_detected_api_use.rb
@@ -417,6 +421,8 @@ files:
 - lib/rubocop/cop/lint/non_deterministic_require_order.rb
 - lib/rubocop/cop/lint/non_local_exit_from_iterator.rb
 - lib/rubocop/cop/lint/number_conversion.rb
+- lib/rubocop/cop/lint/numbered_parameter_assignment.rb
+- lib/rubocop/cop/lint/or_assignment_to_constant.rb
 - lib/rubocop/cop/lint/ordered_magic_comments.rb
 - lib/rubocop/cop/lint/out_of_range_regexp_ref.rb
 - lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb
@@ -449,11 +455,13 @@ files:
 - lib/rubocop/cop/lint/shadowing_outer_local_variable.rb
 - lib/rubocop/cop/lint/struct_new_override.rb
 - lib/rubocop/cop/lint/suppressed_exception.rb
+- lib/rubocop/cop/lint/symbol_conversion.rb
 - lib/rubocop/cop/lint/syntax.rb
 - lib/rubocop/cop/lint/to_enum_arguments.rb
 - lib/rubocop/cop/lint/to_json.rb
 - lib/rubocop/cop/lint/top_level_return_with_argument.rb
 - lib/rubocop/cop/lint/trailing_comma_in_attribute_declaration.rb
+- lib/rubocop/cop/lint/triple_quotes.rb
 - lib/rubocop/cop/lint/underscore_prefixed_variable_name.rb
 - lib/rubocop/cop/lint/unexpected_block_arity.rb
 - lib/rubocop/cop/lint/unified_integer.rb
@@ -656,6 +664,7 @@ files:
 - lib/rubocop/cop/style/if_inside_else.rb
 - lib/rubocop/cop/style/if_unless_modifier.rb
 - lib/rubocop/cop/style/if_unless_modifier_of_if_unless.rb
+- lib/rubocop/cop/style/if_with_boolean_literal_branches.rb
 - lib/rubocop/cop/style/if_with_semicolon.rb
 - lib/rubocop/cop/style/implicit_runtime_error.rb
 - lib/rubocop/cop/style/infinite_loop.rb
@@ -856,7 +865,7 @@ metadata:
   homepage_uri: https://rubocop.org/
   changelog_uri: https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/rubocop-hq/rubocop/
-  documentation_uri: https://docs.rubocop.org/rubocop/1.8/
+  documentation_uri: https://docs.rubocop.org/rubocop/1.9/
   bug_tracker_uri: https://github.com/rubocop-hq/rubocop/issues
 post_install_message: 
 rdoc_options: []