rubocop 1.45.1 → 1.48.1

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

@@ -297,11 +297,11 @@ module RuboCop
         end
 
         def begin_range(node, method_call)
-          range_between(node.loc.expression.begin_pos, method_call.loc.expression.begin_pos)
+          range_between(node.source_range.begin_pos, method_call.source_range.begin_pos)
         end
 
         def end_range(node, method_call)
-          range_between(method_call.loc.expression.end_pos, node.loc.expression.end_pos)
+          range_between(method_call.source_range.end_pos, node.source_range.end_pos)
         end
 
         def add_safe_nav_to_all_methods_in_chain(corrector,

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

@@ -8,7 +8,7 @@ module RuboCop
       #
       # @safety
       #   This cop is unsafe because `x..-1` and `x..` are only guaranteed to
-      #   be equivalent for `Array#[]`, and the cop cannot determine what class
+      #   be equivalent for `Array#[]`, `String#[]`, and the cop cannot determine what class
       #   the receiver is.
       #
       #   For example:

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

@@ -167,7 +167,7 @@ module RuboCop
           corrector.insert_before(condition,
                                   "#{'!' if node.unless?}#{replace_condition(node.condition)} && ")
 
-          corrector.remove(node.condition.loc.expression)
+          corrector.remove(node.condition.source_range)
           corrector.remove(range_with_surrounding_space(node.loc.keyword, newlines: false))
           corrector.replace(if_branch.loc.keyword, 'if')
         end
@@ -240,7 +240,7 @@ module RuboCop
         end
 
         def outer_condition_modify_form?(node, if_branch)
-          node.condition.loc.expression.begin_pos > if_branch.condition.loc.expression.begin_pos
+          node.condition.source_range.begin_pos > if_branch.condition.source_range.begin_pos
         end
       end
     end

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

@@ -49,7 +49,7 @@ module RuboCop
         end
 
         def stderr_puts_range(send)
-          range_between(send.loc.expression.begin_pos, send.loc.selector.end_pos)
+          range_between(send.source_range.begin_pos, send.loc.selector.end_pos)
         end
       end
     end

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

@@ -55,7 +55,7 @@ module RuboCop
           elsif (class_node = parent.parent).body.nil?
             corrector.remove(range_for_empty_class_body(class_node, parent))
           else
-            corrector.insert_after(parent.loc.expression, ' do')
+            corrector.insert_after(parent.source_range, ' do')
           end
         end
 

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

@@ -144,7 +144,7 @@ module RuboCop
         end
 
         def range_for_parentheses(offense, left)
-          range_between(offense.source_range.begin_pos - 1, left.loc.expression.end_pos - 1)
+          range_between(offense.source_range.begin_pos - 1, left.source_range.end_pos - 1)
         end
       end
     end

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

@@ -52,9 +52,9 @@ module RuboCop
         private
 
         def first_element_range(node, unpack_call)
-          Parser::Source::Range.new(node.loc.expression.source_buffer,
-                                    unpack_call.loc.expression.end_pos,
-                                    node.loc.expression.end_pos)
+          Parser::Source::Range.new(node.source_range.source_buffer,
+                                    unpack_call.source_range.end_pos,
+                                    node.source_range.end_pos)
         end
       end
     end

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

@@ -82,10 +82,19 @@ module RuboCop
           attr_accessor :largest_brackets
         end
 
+        def on_new_investigation
+          super
+
+          # Prevent O(n2) checks (checking the entire matrix once for each child array) by caching
+          @matrix_of_complex_content_cache = Hash.new do |cache, node|
+            cache[node] = matrix_of_complex_content?(node)
+          end
+        end
+
         def on_array(node)
           if bracketed_array_of?(:str, node)
             return if complex_content?(node.values)
-            return if within_2d_array_of_complex_content?(node)
+            return if within_matrix_of_complex_content?(node)
 
             check_bracketed_array(node, 'w')
           elsif node.percent_literal?(:string)
@@ -95,12 +104,15 @@ module RuboCop
 
         private
 
-        def within_2d_array_of_complex_content?(node)
+        def within_matrix_of_complex_content?(node)
           return false unless (parent = node.parent)
 
-          parent.array_type? &&
-            parent.values.all?(&:array_type?) &&
-            parent.values.any? { |subarray| complex_content?(subarray.values) }
+          parent.array_type? && @matrix_of_complex_content_cache[parent]
+        end
+
+        def matrix_of_complex_content?(array)
+          array.values.all?(&:array_type?) &&
+            array.values.any? { |subarray| complex_content?(subarray.values) }
         end
 
         def complex_content?(strings, complex_regex: word_regex)

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

@@ -145,7 +145,7 @@ module RuboCop
         end
 
         def actual_code_range(node)
-          range_between(node.loc.expression.begin_pos, node.loc.expression.end_pos)
+          range_between(node.source_range.begin_pos, node.source_range.end_pos)
         end
 
         def reverse_comparison(operator)

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

@@ -4,10 +4,13 @@ module RuboCop
   module Cop
     module Style
       # Checks for numeric comparisons that can be replaced
-      # by a predicate method, such as receiver.length == 0,
-      # receiver.length > 0, receiver.length != 0,
-      # receiver.length < 1 and receiver.size == 0 that can be
-      # replaced by receiver.empty? and !receiver.empty?.
+      # by a predicate method, such as `receiver.length == 0`,
+      # `receiver.length > 0`, and `receiver.length != 0`,
+      # `receiver.length < 1` and `receiver.size == 0` that can be
+      # replaced by `receiver.empty?` and `!receiver.empty?`.
+      #
+      # NOTE: `File`, `Tempfile`, and `StringIO` do not have `empty?`
+      # so allow `size == 0` and `size.zero?`.
       #
       # @safety
       #   This cop is unsafe because it cannot be guaranteed that the receiver
@@ -49,6 +52,7 @@ module RuboCop
 
         def check_zero_length_predicate(node)
           return unless (length_method = zero_length_predicate(node.parent))
+          return if non_polymorphic_collection?(node.parent)
 
           offense = node.loc.selector.join(node.parent.source_range.end)
           message = format(ZERO_MSG, current: "#{length_method}.zero?")
@@ -134,7 +138,7 @@ module RuboCop
         # @!method non_polymorphic_collection?(node)
         def_node_matcher :non_polymorphic_collection?, <<~PATTERN
           {(send (send (send (const {nil? cbase} :File) :stat _) ...) ...)
-           (send (send (send (const {nil? cbase} {:Tempfile :StringIO}) {:new :open} ...) ...) ...)}
+           (send (send (send (const {nil? cbase} {:File :Tempfile :StringIO}) {:new :open} ...) ...) ...)}
         PATTERN
       end
     end

data/lib/rubocop/cop/team.rb

@@ -28,7 +28,7 @@ module RuboCop
       def self.mobilize_cops(cop_classes, config, options = {})
         cop_classes = Registry.new(cop_classes.to_a, options) unless cop_classes.is_a?(Registry)
 
-        cop_classes.enabled(config).map do |cop_class|
+        cop_classes.map do |cop_class|
           cop_class.new(config, options)
         end
       end
@@ -58,6 +58,7 @@ module RuboCop
         @options = options
         reset
         @ready = true
+        @registry = Registry.new(cops, options.dup)
 
         validate_config
       end
@@ -84,7 +85,7 @@ module RuboCop
         # until there are no corrections left to perform
         # To speed things up, run autocorrecting cops by themselves, and only
         # run the other cops when no corrections are left
-        on_duty = roundup_relevant_cops(processed_source.file_path)
+        on_duty = roundup_relevant_cops(processed_source)
 
         autocorrect_cops, other_cops = on_duty.partition(&:autocorrect?)
         report = investigate_partial(autocorrect_cops, processed_source,
@@ -130,7 +131,7 @@ module RuboCop
           # holds source read in from stdin, when --stdin option is used
           @options[:stdin] = new_source
         else
-          filename = processed_source.buffer.name
+          filename = processed_source.file_path
           File.write(filename, new_source)
         end
         @updated_source_file = true
@@ -156,11 +157,13 @@ module RuboCop
       end
 
       # @return [Array<cop>]
-      def roundup_relevant_cops(filename)
-        cops.reject do |cop|
-          cop.excluded_file?(filename) ||
-            !support_target_ruby_version?(cop) ||
-            !support_target_rails_version?(cop)
+      def roundup_relevant_cops(processed_source)
+        cops.select do |cop|
+          next true if processed_source.comment_config.cop_opted_in?(cop)
+          next false if cop.excluded_file?(processed_source.file_path)
+          next false unless @registry.enabled?(cop, @config)
+
+          support_target_ruby_version?(cop) && support_target_rails_version?(cop)
         end
       end
 

data/lib/rubocop/cop/util.rb

@@ -3,6 +3,7 @@
 module RuboCop
   module Cop
     # This module contains a collection of useful utility methods.
+    # rubocop:disable Metrics/ModuleLength
     module Util
       include PathUtil
 
@@ -80,7 +81,7 @@ module RuboCop
       end
 
       def args_end(node)
-        node.loc.expression.end
+        node.source_range.end
       end
 
       def on_node(syms, sexp, excludes = [], &block)
@@ -92,13 +93,20 @@ module RuboCop
         sexp.each_child_node { |elem| on_node(syms, elem, excludes, &block) }
       end
 
+      # Arbitrarily chosen value, should be enough to cover
+      # the most nested source code in real world projects.
+      MAX_LINE_BEGINS_REGEX_INDEX = 50
       LINE_BEGINS_REGEX_CACHE = Hash.new do |hash, index|
-        hash[index] = /^\s{#{index}}\S/
+        hash[index] = /^\s{#{index}}\S/ if index <= MAX_LINE_BEGINS_REGEX_INDEX
       end
-      private_constant :LINE_BEGINS_REGEX_CACHE
+      private_constant :MAX_LINE_BEGINS_REGEX_INDEX, :LINE_BEGINS_REGEX_CACHE
 
       def begins_its_line?(range)
-        range.source_line.match?(LINE_BEGINS_REGEX_CACHE[range.column])
+        if (regex = LINE_BEGINS_REGEX_CACHE[range.column])
+          range.source_line.match?(regex)
+        else
+          range.source_line.index(/\S/) == range.column
+        end
       end
 
       # Returns, for example, a bare `if` node if the given node is an `if`
@@ -190,5 +198,6 @@ module RuboCop
         source == target || (source.is_a?(Array) && source.include?(target))
       end
     end
+    # rubocop:enable Metrics/ModuleLength
   end
 end

data/lib/rubocop/cop/variable_force/variable.rb

@@ -52,7 +52,7 @@ module RuboCop
             # if/unless keyword. A preceding assignment is needed to put the
             # variable in scope. For this reason we skip to the next assignment
             # here.
-            next if in_modifier_if?(assignment)
+            next if in_modifier_conditional?(assignment)
 
             break if !assignment.branch || assignment.branch == reference.branch
 
@@ -63,10 +63,12 @@ module RuboCop
         end
         # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
-        def in_modifier_if?(assignment)
+        def in_modifier_conditional?(assignment)
           parent = assignment.node.parent
           parent = parent.parent if parent&.begin_type?
-          parent&.if_type? && parent&.modifier_form?
+          return false if parent.nil?
+
+          (parent.if_type? || parent.while_type? || parent.until_type?) && parent.modifier_form?
         end
 
         def capture_with_block!

data/lib/rubocop/directive_comment.rb

@@ -45,9 +45,9 @@ module RuboCop
 
     def range
       match = comment.text.match(DIRECTIVE_COMMENT_REGEXP)
-      begin_pos = comment.loc.expression.begin_pos
+      begin_pos = comment.source_range.begin_pos
       Parser::Source::Range.new(
-        comment.loc.expression.source_buffer, begin_pos + match.begin(0), begin_pos + match.end(0)
+        comment.source_range.source_buffer, begin_pos + match.begin(0), begin_pos + match.end(0)
       )
     end
 
@@ -108,7 +108,7 @@ module RuboCop
 
     # Returns line number for directive
     def line_number
-      comment.loc.expression.line
+      comment.source_range.line
     end
 
     private

data/lib/rubocop/ext/comment.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Ext
+    # Extensions to `Parser::Source::Comment`.
+    module Comment
+      def source
+        loc.expression.source
+      end
+
+      def source_range
+        loc.expression
+      end
+    end
+  end
+end
+
+Parser::Source::Comment.include RuboCop::Ext::Comment

data/lib/rubocop/formatter/junit_formatter.rb

@@ -62,7 +62,10 @@ module RuboCop
       end
 
       def classname_attribute_value(file)
-        file.gsub(/\.rb\Z/, '').gsub("#{Dir.pwd}/", '').tr('/', '.')
+        @classname_attribute_value_cache ||= Hash.new do |hash, key|
+          hash[key] = key.gsub(/\.rb\Z/, '').gsub("#{Dir.pwd}/", '').tr('/', '.')
+        end
+        @classname_attribute_value_cache[file]
       end
 
       def finished(_inspected_files)

data/lib/rubocop/rspec/cop_helper.rb

@@ -69,7 +69,7 @@ module CopHelper
   end
 
   def _investigate(cop, processed_source)
-    team = RuboCop::Cop::Team.new([cop], nil, raise_error: true)
+    team = RuboCop::Cop::Team.new([cop], configuration, raise_error: true)
     report = team.investigate(processed_source)
     @last_corrector = report.correctors.first || RuboCop::Cop::Corrector.new(processed_source)
     report.offenses.reject(&:disabled?)

data/lib/rubocop/rspec/shared_contexts.rb

@@ -172,3 +172,7 @@ end
 RSpec.shared_context 'ruby 3.2' do
   let(:ruby_version) { 3.2 }
 end
+
+RSpec.shared_context 'ruby 3.3' do
+  let(:ruby_version) { 3.3 }
+end

data/lib/rubocop/rspec/support.rb

@@ -25,4 +25,5 @@ RSpec.configure do |config|
   config.include_context 'ruby 3.0', :ruby30
   config.include_context 'ruby 3.1', :ruby31
   config.include_context 'ruby 3.2', :ruby32
+  config.include_context 'ruby 3.3', :ruby33
 end

data/lib/rubocop/server/core.rb

@@ -100,7 +100,7 @@ module RuboCop
 
       def use_json_format?
         return true if ARGV.include?('--format=json') || ARGV.include?('--format=j')
-        return false unless (index = ARGV.index('--format'))
+        return false unless (index = ARGV.index('--format') || ARGV.index('-f'))
 
         format = ARGV[index + 1]
 

data/lib/rubocop/target_ruby.rb

@@ -4,7 +4,7 @@ module RuboCop
   # The kind of Ruby that code inspected by RuboCop is written in.
   # @api private
   class TargetRuby
-    KNOWN_RUBIES = [2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 3.0, 3.1, 3.2].freeze
+    KNOWN_RUBIES = [2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 3.0, 3.1, 3.2, 3.3].freeze
     DEFAULT_VERSION = 2.6
 
     OBSOLETE_RUBIES = {

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '1.45.1'
+    STRING = '1.48.1'
 
     MSG = '%<version>s (using Parser %<parser_version>s, ' \
           'rubocop-ast %<rubocop_ast_version>s, ' \

data/lib/rubocop.rb

@@ -14,6 +14,7 @@ require_relative 'rubocop/version'
 require 'rubocop-ast'
 
 require_relative 'rubocop/ast_aliases'
+require_relative 'rubocop/ext/comment'
 require_relative 'rubocop/ext/range'
 require_relative 'rubocop/ext/regexp_node'
 require_relative 'rubocop/ext/regexp_parser'
@@ -101,6 +102,7 @@ require_relative 'rubocop/cop/mixin/hash_shorthand_syntax'
 require_relative 'rubocop/cop/mixin/method_complexity'
 require_relative 'rubocop/cop/mixin/method_preference'
 require_relative 'rubocop/cop/mixin/min_body_length'
+require_relative 'rubocop/cop/mixin/min_branches_count'
 require_relative 'rubocop/cop/mixin/multiline_element_indentation'
 require_relative 'rubocop/cop/mixin/multiline_element_line_breaks'
 require_relative 'rubocop/cop/mixin/multiline_expression_indentation'
@@ -415,6 +417,7 @@ require_relative 'rubocop/cop/metrics/abc_size'
 require_relative 'rubocop/cop/metrics/block_length'
 require_relative 'rubocop/cop/metrics/block_nesting'
 require_relative 'rubocop/cop/metrics/class_length'
+require_relative 'rubocop/cop/metrics/collection_literal_length'
 require_relative 'rubocop/cop/metrics/method_length'
 require_relative 'rubocop/cop/metrics/module_length'
 require_relative 'rubocop/cop/metrics/parameter_lists'
@@ -480,6 +483,7 @@ require_relative 'rubocop/cop/style/copyright'
 require_relative 'rubocop/cop/style/date_time'
 require_relative 'rubocop/cop/style/def_with_parentheses'
 require_relative 'rubocop/cop/style/dir'
+require_relative 'rubocop/cop/style/dir_empty'
 require_relative 'rubocop/cop/style/disable_cops_within_source_code_directive'
 require_relative 'rubocop/cop/style/documentation_method'
 require_relative 'rubocop/cop/style/documentation'
@@ -505,6 +509,7 @@ require_relative 'rubocop/cop/style/expand_path_arguments'
 require_relative 'rubocop/cop/style/explicit_block_argument'
 require_relative 'rubocop/cop/style/exponential_notation'
 require_relative 'rubocop/cop/style/fetch_env_var'
+require_relative 'rubocop/cop/style/file_empty'
 require_relative 'rubocop/cop/style/file_read'
 require_relative 'rubocop/cop/style/file_write'
 require_relative 'rubocop/cop/style/float_division'

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 1.45.1
+  version: 1.48.1
 platform: ruby
 authors:
 - Bozhidar Batsov
 - Jonas Arvidsson
 - Yuji Nakayama
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-08 00:00:00.000000000 Z
+date: 2023-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -120,7 +120,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.24.1
+        version: 1.26.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.24.1
+        version: 1.26.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -273,6 +273,7 @@ files:
 - lib/rubocop/cop/internal_affairs/example_heredoc_delimiter.rb
 - lib/rubocop/cop/internal_affairs/inherit_deprecated_cop_class.rb
 - lib/rubocop/cop/internal_affairs/lambda_or_proc.rb
+- lib/rubocop/cop/internal_affairs/location_expression.rb
 - lib/rubocop/cop/internal_affairs/location_line_equality_comparison.rb
 - lib/rubocop/cop/internal_affairs/method_name_end_with.rb
 - lib/rubocop/cop/internal_affairs/method_name_equal.rb
@@ -281,12 +282,14 @@ files:
 - lib/rubocop/cop/internal_affairs/node_type_predicate.rb
 - lib/rubocop/cop/internal_affairs/numblock_handler.rb
 - lib/rubocop/cop/internal_affairs/offense_location_keyword.rb
+- lib/rubocop/cop/internal_affairs/processed_source_buffer_name.rb
 - lib/rubocop/cop/internal_affairs/redundant_context_config_parameter.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/redundant_method_dispatch_node.rb
+- lib/rubocop/cop/internal_affairs/redundant_source_range.rb
 - lib/rubocop/cop/internal_affairs/single_line_comparison.rb
 - lib/rubocop/cop/internal_affairs/style_detected_api_use.rb
 - lib/rubocop/cop/internal_affairs/undefined_config.rb
@@ -530,6 +533,7 @@ files:
 - lib/rubocop/cop/metrics/block_length.rb
 - lib/rubocop/cop/metrics/block_nesting.rb
 - lib/rubocop/cop/metrics/class_length.rb
+- lib/rubocop/cop/metrics/collection_literal_length.rb
 - lib/rubocop/cop/metrics/cyclomatic_complexity.rb
 - lib/rubocop/cop/metrics/method_length.rb
 - lib/rubocop/cop/metrics/module_length.rb
@@ -580,6 +584,7 @@ files:
 - lib/rubocop/cop/mixin/method_complexity.rb
 - lib/rubocop/cop/mixin/method_preference.rb
 - lib/rubocop/cop/mixin/min_body_length.rb
+- lib/rubocop/cop/mixin/min_branches_count.rb
 - lib/rubocop/cop/mixin/multiline_element_indentation.rb
 - lib/rubocop/cop/mixin/multiline_element_line_breaks.rb
 - lib/rubocop/cop/mixin/multiline_expression_indentation.rb
@@ -681,6 +686,7 @@ files:
 - lib/rubocop/cop/style/date_time.rb
 - lib/rubocop/cop/style/def_with_parentheses.rb
 - lib/rubocop/cop/style/dir.rb
+- lib/rubocop/cop/style/dir_empty.rb
 - lib/rubocop/cop/style/disable_cops_within_source_code_directive.rb
 - lib/rubocop/cop/style/document_dynamic_eval_definition.rb
 - lib/rubocop/cop/style/documentation.rb
@@ -706,6 +712,7 @@ files:
 - lib/rubocop/cop/style/explicit_block_argument.rb
 - lib/rubocop/cop/style/exponential_notation.rb
 - lib/rubocop/cop/style/fetch_env_var.rb
+- lib/rubocop/cop/style/file_empty.rb
 - lib/rubocop/cop/style/file_read.rb
 - lib/rubocop/cop/style/file_write.rb
 - lib/rubocop/cop/style/float_division.rb
@@ -902,6 +909,7 @@ files:
 - lib/rubocop/core_ext/string.rb
 - lib/rubocop/directive_comment.rb
 - lib/rubocop/error.rb
+- lib/rubocop/ext/comment.rb
 - lib/rubocop/ext/processed_source.rb
 - lib/rubocop/ext/range.rb
 - lib/rubocop/ext/regexp_node.rb
@@ -980,10 +988,10 @@ metadata:
   homepage_uri: https://rubocop.org/
   changelog_uri: https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/rubocop/rubocop/
-  documentation_uri: https://docs.rubocop.org/rubocop/1.45/
+  documentation_uri: https://docs.rubocop.org/rubocop/1.48/
   bug_tracker_uri: https://github.com/rubocop/rubocop/issues
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -998,8 +1006,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Automatic Ruby code style checking tool.
 test_files: []