rubocop 0.91.0 → 0.91.1

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

@@ -211,8 +211,7 @@ module RuboCop
         end
 
         def whitespace_after?(node)
-          index = index_of_last_token(node)
-          last_token = processed_source.tokens[index]
+          last_token = processed_source.last_token_of(node)
           last_token.space_after?
         end
       end

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

@@ -76,12 +76,13 @@ module RuboCop
         end
 
         def argument_tokens(node)
-          pipes = tokens(node).select { |token| token.type == :tPIPE }
+          tokens = processed_source.tokens_within(node)
+          pipes = tokens.select { |token| token.type == :tPIPE }
           begin_pos, end_pos = pipes.map do |pipe|
-            tokens(node).index(pipe)
+            tokens.index(pipe)
           end
 
-          tokens(node)[begin_pos + 1..end_pos - 1]
+          tokens[begin_pos + 1..end_pos - 1]
         end
       end
     end

data/lib/rubocop/cop/util.rb

@@ -5,7 +5,6 @@ module RuboCop
     # This module contains a collection of useful utility methods.
     module Util
       include PathUtil
-      include TokensUtil
 
       # Match literal regex characters, not including anchors, character
       # classes, alternatives, groups, repetitions, references, etc

data/lib/rubocop/directive_comment.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module RuboCop
+  # This class wraps the `Parser::Source::Comment` object that represents a
+  # special `rubocop:disable` and `rubocop:enable` comment and exposes what
+  # cops it contains.
+  class DirectiveComment
+    attr_reader :comment
+
+    def initialize(comment)
+      @comment = comment
+    end
+
+    # Return all the cops specified in the directive
+    def cops
+      match = comment.text.match(CommentConfig::COMMENT_DIRECTIVE_REGEXP)
+      return unless match
+
+      cops_string = match.captures[1]
+      cops_string.split(/,\s*/).uniq.sort
+    end
+
+    # Checks if this directive contains all the given cop names
+    def match?(cop_names)
+      cops == cop_names.uniq.sort
+    end
+
+    def range
+      comment.location.expression
+    end
+  end
+end

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '0.91.0'
+    STRING = '0.91.1'
 
     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: 0.91.0
+  version: 0.91.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-15 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -744,7 +744,6 @@ files:
 - lib/rubocop/cop/style/yoda_condition.rb
 - lib/rubocop/cop/style/zero_length_predicate.rb
 - lib/rubocop/cop/team.rb
-- lib/rubocop/cop/tokens_util.rb
 - lib/rubocop/cop/util.rb
 - lib/rubocop/cop/utils/format_string.rb
 - lib/rubocop/cop/variable_force.rb
@@ -757,6 +756,7 @@ files:
 - lib/rubocop/cop/variable_force/variable_table.rb
 - lib/rubocop/cops_documentation_generator.rb
 - lib/rubocop/core_ext/string.rb
+- lib/rubocop/directive_comment.rb
 - lib/rubocop/error.rb
 - lib/rubocop/ext/processed_source.rb
 - lib/rubocop/ext/regexp_node.rb

data/lib/rubocop/cop/tokens_util.rb

@@ -1,84 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  # Common methods and behaviors for dealing with tokens.
-  module TokensUtil
-    module_function
-
-    # rubocop:disable Metrics/AbcSize
-    def tokens(node)
-      @tokens ||= {}
-      return @tokens[node.object_id] if @tokens[node.object_id]
-
-      @tokens[node.object_id] =
-        # The tokens list is always sorted by token position,
-        # except for cases when heredoc is passed as a method argument.
-        # In this case tokens are interleaved by heredoc contents' tokens.
-        # We can try a fast (binary) search, assuming the mentioned cases are rare,
-        # and fallback to linear search if failed.
-        if (tokens = fast_tokens(node))
-          tokens
-        else
-          begin_pos = node.source_range.begin_pos
-          end_pos   = node.source_range.end_pos
-
-          processed_source.tokens.select do |token|
-            token.end_pos <= end_pos && token.begin_pos >= begin_pos
-          end
-        end
-    end
-    # rubocop:enable Metrics/AbcSize
-
-    def index_of_first_token(node)
-      index = fast_index_of_first_token(node)
-      return index if index
-
-      begin_pos = node.source_range.begin_pos
-      processed_source.tokens.index { |token| token.begin_pos == begin_pos }
-    end
-
-    def index_of_last_token(node)
-      index = fast_index_of_last_token(node)
-      return index if index
-
-      end_pos = node.source_range.end_pos
-      processed_source.tokens.index { |token| token.end_pos == end_pos }
-    end
-
-    private
-
-    def fast_index_of_first_token(node)
-      begin_pos = node.source_range.begin_pos
-      tokens = processed_source.tokens
-
-      index = tokens.bsearch_index { |token| token.begin_pos >= begin_pos }
-      index if index && tokens[index].begin_pos == begin_pos
-    end
-
-    def fast_index_of_last_token(node)
-      end_pos = node.source_range.end_pos
-      tokens = processed_source.tokens
-
-      index = tokens.bsearch_index { |token| token.end_pos >= end_pos }
-      index if index && tokens[index].end_pos == end_pos
-    end
-
-    def fast_tokens(node)
-      begin_index = index_of_first_token(node)
-      end_index   = index_of_last_token(node)
-
-      tokens = processed_source.tokens[begin_index..end_index]
-      tokens if sorted_tokens?(tokens)
-    end
-
-    def sorted_tokens?(tokens)
-      prev_begin_pos = -1
-      tokens.each do |token|
-        return false if token.begin_pos < prev_begin_pos
-
-        prev_begin_pos = token.begin_pos
-      end
-      true
-    end
-  end
-end