rubocop 1.0.0 → 1.1.0

data/lib/rubocop/cop/team.rb

@@ -99,7 +99,12 @@ module RuboCop
       def self.forces_for(cops)
         needed = Hash.new { |h, k| h[k] = [] }
         cops.each do |cop|
-          Array(cop.class.joining_forces).each { |force| needed[force] << cop }
+          forces = cop.class.joining_forces
+          if forces.is_a?(Array)
+            forces.each { |force| needed[force] << cop }
+          elsif forces
+            needed[forces] << cop
+          end
         end
 
         needed.map do |force_class, joining_cops|

data/lib/rubocop/cop/util.rb

@@ -62,7 +62,7 @@ module RuboCop
       end
 
       def begins_its_line?(range)
-        (range.source_line =~ /\S/) == range.column
+        range.source_line.index(/\S/) == range.column
       end
 
       # Returns, for example, a bare `if` node if the given node is an `if`

data/lib/rubocop/ext/regexp_node.rb

@@ -10,19 +10,22 @@ module RuboCop
       end
       private_constant :ANY
 
-      class << self
-        attr_reader :parsed_cache
-      end
-      @parsed_cache = {}
-
       # @return [Regexp::Expression::Root, nil]
-      def parsed_tree
+      # Note: we extend Regexp nodes to provide `loc` and `expression`
+      # see `ext/regexp_parser`.
+      attr_reader :parsed_tree
+
+      def assign_properties(*)
+        super
+
         str = with_interpolations_blanked
-        Ext::RegexpNode.parsed_cache[str] ||= begin
+        @parsed_tree = begin
           Regexp::Parser.parse(str, options: options)
         rescue StandardError
           nil
         end
+        origin = loc.begin.end
+        @parsed_tree&.each_expression(true) { |e| e.origin = origin }
       end
 
       def each_capture(named: ANY)

data/lib/rubocop/ext/regexp_parser.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Ext
+    # Extensions for `regexp_parser` gem
+    module RegexpParser
+      # Source map for RegexpParser nodes
+      class Map < ::Parser::Source::Map
+        attr_reader :body, :quantifier, :begin, :end
+
+        def initialize(expression, body:, quantifier: nil, begin_l: nil, end_l: nil)
+          @begin = begin_l
+          @end = end_l
+          @body = body
+          @quantifier = quantifier
+          super(expression)
+        end
+      end
+
+      module Expression
+        # Add `expression` and `loc` to all `regexp_parser` nodes
+        module Base
+          attr_accessor :origin
+
+          # Shortcut to `loc.expression`
+          def expression
+            @expression ||= origin.adjust(begin_pos: ts, end_pos: ts + full_length)
+          end
+
+          # @returns a location map like `parser` does, with:
+          #   - expression: complete expression
+          #   - quantifier: for `+`, `{1,2}`, etc.
+          #   - begin/end: for `[` and `]` (only CharacterSet for now)
+          #
+          # E.g.
+          #     [a-z]{2,}
+          #     ^^^^^^^^^ expression
+          #          ^^^^ quantifier
+          #     ^^^^^     body
+          #     ^         begin
+          #         ^     end
+          #
+          # Please open issue if you need other locations
+          def loc
+            @loc ||= begin
+              Map.new(expression, **build_location)
+            end
+          end
+
+          private
+
+          def build_location
+            return { body: expression } unless (q = quantifier)
+
+            body = expression.adjust(end_pos: -q.text.length)
+            q_loc = expression.with(begin_pos: body.end_pos)
+            { body: body, quantifier: q_loc }
+          end
+        end
+
+        # Provide `CharacterSet` with `begin` and `end` locations.
+        module CharacterSet
+          def build_location
+            h = super
+            body = h[:body]
+            h.merge!(
+              begin_l: body.with(end_pos: body.begin_pos + 1),
+              end_l: body.with(begin_pos: body.end_pos - 1)
+            )
+          end
+        end
+      end
+      ::Regexp::Expression::Base.include Expression::Base
+      ::Regexp::Expression::CharacterSet.include Expression::CharacterSet
+    end
+  end
+end

data/lib/rubocop/formatter/formatter_set.rb

@@ -30,7 +30,7 @@ module RuboCop
 
       FORMATTER_APIS.each do |method_name|
         define_method(method_name) do |*args|
-          each { |f| f.send(method_name, *args) }
+          each { |f| f.public_send(method_name, *args) }
         end
       end
 

data/lib/rubocop/magic_comment.rb

@@ -194,7 +194,7 @@ module RuboCop
     class SimpleComment < MagicComment
       # Match `encoding` or `coding`
       def encoding
-        extract(/\A\s*\#.*\b(?:en)?coding: (#{TOKEN})/i)
+        extract(/\A\s*\#.*\b(?:en)?coding: (#{TOKEN})/io)
       end
 
       private
@@ -207,7 +207,7 @@ module RuboCop
       # Case-insensitive and dashes/underscores are acceptable.
       # @see https://git.io/vM7Mg
       def extract_frozen_string_literal
-        extract(/\A\s*#\s*frozen[_-]string[_-]literal:\s*(#{TOKEN})\s*\z/i)
+        extract(/\A\s*#\s*frozen[_-]string[_-]literal:\s*(#{TOKEN})\s*\z/io)
       end
     end
   end

data/lib/rubocop/rspec/shared_contexts.rb

@@ -138,3 +138,7 @@ end
 RSpec.shared_context 'ruby 2.7', :ruby27 do
   let(:ruby_version) { 2.7 }
 end
+
+RSpec.shared_context 'ruby 3.0', :ruby30 do
+  let(:ruby_version) { 3.0 }
+end

data/lib/rubocop/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-21 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -94,14 +94,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -351,10 +351,12 @@ files:
 - lib/rubocop/cop/lint/duplicate_elsif_condition.rb
 - lib/rubocop/cop/lint/duplicate_hash_key.rb
 - lib/rubocop/cop/lint/duplicate_methods.rb
+- lib/rubocop/cop/lint/duplicate_regexp_character_class_element.rb
 - lib/rubocop/cop/lint/duplicate_require.rb
 - lib/rubocop/cop/lint/duplicate_rescue_exception.rb
 - lib/rubocop/cop/lint/each_with_object_argument.rb
 - lib/rubocop/cop/lint/else_layout.rb
+- lib/rubocop/cop/lint/empty_block.rb
 - lib/rubocop/cop/lint/empty_conditional_body.rb
 - lib/rubocop/cop/lint/empty_ensure.rb
 - lib/rubocop/cop/lint/empty_expression.rb
@@ -419,11 +421,13 @@ files:
 - lib/rubocop/cop/lint/struct_new_override.rb
 - lib/rubocop/cop/lint/suppressed_exception.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/underscore_prefixed_variable_name.rb
 - lib/rubocop/cop/lint/unified_integer.rb
+- lib/rubocop/cop/lint/unmodified_reduce_accumulator.rb
 - lib/rubocop/cop/lint/unreachable_code.rb
 - lib/rubocop/cop/lint/unreachable_loop.rb
 - lib/rubocop/cop/lint/unused_block_argument.rb
@@ -545,6 +549,7 @@ files:
 - lib/rubocop/cop/style/accessor_grouping.rb
 - lib/rubocop/cop/style/alias.rb
 - lib/rubocop/cop/style/and_or.rb
+- lib/rubocop/cop/style/arguments_forwarding.rb
 - lib/rubocop/cop/style/array_coercion.rb
 - lib/rubocop/cop/style/array_join.rb
 - lib/rubocop/cop/style/ascii_comments.rb
@@ -578,6 +583,7 @@ files:
 - lib/rubocop/cop/style/def_with_parentheses.rb
 - lib/rubocop/cop/style/dir.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
 - lib/rubocop/cop/style/documentation_method.rb
 - lib/rubocop/cop/style/double_cop_disable_directive.rb
@@ -717,6 +723,7 @@ files:
 - lib/rubocop/cop/style/string_methods.rb
 - lib/rubocop/cop/style/strip.rb
 - lib/rubocop/cop/style/struct_inheritance.rb
+- lib/rubocop/cop/style/swap_values.rb
 - lib/rubocop/cop/style/symbol_array.rb
 - lib/rubocop/cop/style/symbol_literal.rb
 - lib/rubocop/cop/style/symbol_proc.rb
@@ -757,6 +764,7 @@ files:
 - lib/rubocop/error.rb
 - lib/rubocop/ext/processed_source.rb
 - lib/rubocop/ext/regexp_node.rb
+- lib/rubocop/ext/regexp_parser.rb
 - lib/rubocop/file_finder.rb
 - lib/rubocop/formatter/auto_gen_config_formatter.rb
 - lib/rubocop/formatter/base_formatter.rb
@@ -805,7 +813,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.0/
+  documentation_uri: https://docs.rubocop.org/rubocop/1.1/
   bug_tracker_uri: https://github.com/rubocop-hq/rubocop/issues
 post_install_message: 
 rdoc_options: []