rubocop-ast 1.5.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4e1919e281d2cc09eca1c8f18effe89cd4c818f7981070e5cb222bde40d6be5
-  data.tar.gz: e7368a014cc2c9881552f935b6a841357275940e63ee567655f3bb151b118977
+  metadata.gz: e5f8cfde2fd4d1e7e8e61926e4bca24ca426274253cff583338688b38810ad8f
+  data.tar.gz: a9f1d7174de586df8f9004da23ce67738f43f2ffcc3309983be8cedb23960758
 SHA512:
-  metadata.gz: b1c16200ecf6bc69027525ac88c1214d9fb69ce8840307422560ac9c6e314c6d720e278100640da86a406e0d4ae7d229d3f943b4dd5a3446739584baa205336a
-  data.tar.gz: eafb7d829dd9c17182b43bc9ed091933bcb4ce7904b499a12a79054f76ecc25896917ae4f043f84790c2b2754f6563ab1457ce86fd58b8ddf490f8188263479a
+  metadata.gz: baeed38e039ead920084a839a7e216b3567bad48ebe10aa4577c43e666f06cc9156cff4b47a7a9994a27f6a5c9cb4f08c0cd745bc28ce7468e434328e4389c53
+  data.tar.gz: 652edd75af0f4d8f4e30c19350a8a6e5cdd95e3fbdd0cd2247a7fb15bdea32fa337548411f75e68cc68445ea218fc9217ad83c442ec0a849c51ef6eb3b09edde

data/lib/rubocop/ast.rb

@@ -53,6 +53,7 @@ require_relative 'ast/node/forward_args_node'
 require_relative 'ast/node/float_node'
 require_relative 'ast/node/hash_node'
 require_relative 'ast/node/if_node'
+require_relative 'ast/node/in_pattern_node'
 require_relative 'ast/node/index_node'
 require_relative 'ast/node/indexasgn_node'
 require_relative 'ast/node/int_node'

data/lib/rubocop/ast/builder.rb

@@ -49,6 +49,7 @@ module RuboCop
         float:        FloatNode,
         hash:         HashNode,
         if:           IfNode,
+        in_pattern:   InPatternNode,
         int:          IntNode,
         index:        IndexNode,
         indexasgn:    IndexasgnNode,

data/lib/rubocop/ast/node/case_match_node.rb

@@ -24,16 +24,30 @@ module RuboCop
         self
       end
 
-      # Returns an array of all the when branches in the `case` statement.
+      # Returns an array of all the `in` pattern branches in the `case` statement.
       #
-      # @return [Array<Node>] an array of `in_pattern` nodes
+      # @return [Array<InPatternNode>] an array of `in_pattern` nodes
       def in_pattern_branches
         node_parts[1...-1]
       end
 
+      # Returns an array of all the when branches in the `case` statement.
+      #
+      # @return [Array<Node, nil>] an array of the bodies of the `in` branches
+      # and the `else` (if any). Note that these bodies could be nil.
+      def branches
+        bodies = in_pattern_branches.map(&:body)
+        if else?
+          # `empty-else` node sets nil because it has no body.
+          else_branch.empty_else_type? ? bodies.push(nil) : bodies.push(else_branch)
+        end
+        bodies
+      end
+
       # Returns the else branch of the `case` statement, if any.
       #
       # @return [Node] the else branch node of the `case` statement
+      # @return [EmptyElse] the empty else branch node of the `case` statement
       # @return [nil] if the case statement does not have an else branch.
       def else_branch
         node_parts[-1]

data/lib/rubocop/ast/node/in_pattern_node.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module AST
+    # A node extension for `in` nodes. This will be used in place of a plain
+    # node when the builder constructs the AST, making its methods available
+    # to all `in` nodes within RuboCop.
+    class InPatternNode < Node
+      # Returns a node of the pattern in the `in` branch.
+      #
+      # @return [Node] a pattern node
+      def pattern
+        node_parts.first
+      end
+
+      # Returns the index of the `in` branch within the `case` statement.
+      #
+      # @return [Integer] the index of the `in` branch
+      def branch_index
+        parent.in_pattern_branches.index(self)
+      end
+
+      # Checks whether the `in` node has a `then` keyword.
+      #
+      # @return [Boolean] whether the `in` node has a `then` keyword
+      def then?
+        loc.begin&.is?('then')
+      end
+
+      # Returns the body of the `in` node.
+      #
+      # @return [Node, nil] the body of the `in` node
+      def body
+        node_parts[-1]
+      end
+    end
+  end
+end

data/lib/rubocop/ast/node/mixin/method_dispatch_node.rb

@@ -165,16 +165,34 @@ module RuboCop
         ARITHMETIC_OPERATORS.include?(method_name)
       end
 
-      # Checks if this node is part of a chain of `def` modifiers.
+      # Checks if this node is part of a chain of `def` or `defs` modifiers.
       #
       # @example
       #
       #   private def foo; end
       #
-      # @return [Boolean] whether the dispatched method is a `def` modifier
-      def def_modifier?
-        send_type? &&
-          adjacent_def_modifier? || each_child_node(:send).any?(&:def_modifier?)
+      # @return wether the `def|defs` node is a modifier or not.
+      # See also `def_modifier` that returns the node or `nil`
+      def def_modifier?(node = self)
+        !!def_modifier(node)
+      end
+
+      # Checks if this node is part of a chain of `def` or `defs` modifiers.
+      #
+      # @example
+      #
+      #   private def foo; end
+      #
+      # @return [Node | nil] returns the `def|defs` node this is a modifier for,
+      # or `nil` if it isn't a def modifier
+      def def_modifier(node = self)
+        arg = node.children[2]
+
+        return unless node.send_type? && node.receiver.nil? && arg.is_a?(::AST::Node)
+
+        return arg if arg.def_type? || arg.defs_type?
+
+        def_modifier(arg)
       end
 
       # Checks whether this is a lambda. Some versions of parser parses

data/lib/rubocop/ast/node_pattern.rb

@@ -80,23 +80,23 @@ module RuboCop
         "#<#{self.class} #{pattern}>"
       end
 
-      def marshal_load(pattern) #:nodoc:
+      def marshal_load(pattern) # :nodoc:
         initialize pattern
       end
 
-      def marshal_dump #:nodoc:
+      def marshal_dump # :nodoc:
         pattern
       end
 
-      def as_json(_options = nil) #:nodoc:
+      def as_json(_options = nil) # :nodoc:
         pattern
       end
 
-      def encode_with(coder) #:nodoc:
+      def encode_with(coder) # :nodoc:
         coder['pattern'] = pattern
       end
 
-      def init_with(coder) #:nodoc:
+      def init_with(coder) # :nodoc:
         initialize(coder['pattern'])
       end
 

data/lib/rubocop/ast/node_pattern/compiler/sequence_subcompiler.rb

@@ -347,7 +347,7 @@ module RuboCop
           def compile_loop_advance(to = '+=1')
             # The `#{@cur_child_var} ||` is just to avoid unused variable warning
             "(#{@cur_child_var} = #{@seq_var}.children[#{@cur_index_var} #{to}]; " \
-            "#{@cur_child_var} || true)"
+              "#{@cur_child_var} || true)"
           end
 
           def compile_loop(term)

data/lib/rubocop/ast/node_pattern/parser.rb

@@ -52,7 +52,7 @@ module RuboCop
 
           detail = node.loc&.expression&.source || node.to_s
           raise NodePattern::Invalid, 'parse error, expected unary node pattern ' \
-            "but got expression matching multiple elements: #{detail}"
+                                      "but got expression matching multiple elements: #{detail}"
         end
 
         # Overrides Racc::Parser's method:

data/lib/rubocop/ast/processed_source.rb

@@ -177,6 +177,14 @@ module RuboCop
         sorted_tokens[last_token_index(range_or_node)]
       end
 
+      # 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.
+      def sorted_tokens
+        # Use stable sort.
+        @sorted_tokens ||= tokens.sort_by.with_index { |token, i| [token.begin_pos, i] }
+      end
+
       private
 
       def comment_index
@@ -272,14 +280,6 @@ module RuboCop
         sorted_tokens.bsearch_index { |token| token.end_pos >= end_pos }
       end
 
-      # 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.
-      def sorted_tokens
-        # Use stable sort.
-        @sorted_tokens ||= tokens.sort_by.with_index { |token, i| [token.begin_pos, i] }
-      end
-
       def source_range(range_or_node)
         if range_or_node.respond_to?(:source_range)
           range_or_node.source_range

data/lib/rubocop/ast/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module AST
     module Version
-      STRING = '1.5.0'
+      STRING = '1.9.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-ast
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-02 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -82,6 +82,7 @@ files:
 - lib/rubocop/ast/node/forward_args_node.rb
 - lib/rubocop/ast/node/hash_node.rb
 - lib/rubocop/ast/node/if_node.rb
+- lib/rubocop/ast/node/in_pattern_node.rb
 - lib/rubocop/ast/node/index_node.rb
 - lib/rubocop/ast/node/indexasgn_node.rb
 - lib/rubocop/ast/node/int_node.rb