rubocop-ast 1.7.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25e84f96e233a9c966ad15efd834e109fea1c11d0998e2913ffd81310568d2b2
-  data.tar.gz: f6b8a033d2fd90518fb102f2cfaa27a5ef32bcfb892783ef79e2b9ad33ab4235
+  metadata.gz: b3a3081c514303a8fb2f6ac3e4616da1d5f41ac4bd21d63407f9281534443385
+  data.tar.gz: dabd9d626ee4dd67946126b81f1a8852da16bb561caaabc91fa4b89648186fa6
 SHA512:
-  metadata.gz: 326d28041a4c30d64cac801ceec9677eea264c7a98754217ae27b026bf9779122803402cdddd8306881320e8ac185ce3ff708d4b6e2c869840622303b50b9ab1
-  data.tar.gz: 293b516ba03824c5c9fc56557943993688cf0796bd7ffe567434f7633ca71aa24aec8ebcac89284c3b7b9fb7d38302cf666b1e7b0bb844700d70bad8c65cc767
+  metadata.gz: f678e9d3b6da22c1be2861fd023121c50b161dfff5986ed14f49199c251bb041a2d2c3e93cacb86c9368dd71f8ed7575620984eeb54e65eaf183f062ffa11dee
+  data.tar.gz: 948888c0e83bca6acf73b06a0e5030bab2fde65cafa6366c6a3054cb07eca722d938f28a8b1e1bb226c8f48c9bb483b9d66704d432fdc87e23a4d2461809bb38

data/README.md

@@ -1,11 +1,11 @@
 # RuboCop AST
 
 [![Gem Version](https://badge.fury.io/rb/rubocop-ast.svg)](https://badge.fury.io/rb/rubocop-ast)
-[![CI](https://github.com/rubocop-hq/rubocop-ast/workflows/CI/badge.svg)](https://github.com/rubocop-hq/rubocop-ast/actions?query=workflow%3ACI)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/a29666e6373bc41bc0a9/test_coverage)](https://codeclimate.com/github/rubocop-hq/rubocop-ast/test_coverage)
-[![Maintainability](https://api.codeclimate.com/v1/badges/a29666e6373bc41bc0a9/maintainability)](https://codeclimate.com/github/rubocop-hq/rubocop-ast/maintainability)
+[![CI](https://github.com/rubocop/rubocop-ast/workflows/CI/badge.svg)](https://github.com/rubocop/rubocop-ast/actions?query=workflow%3ACI)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/a29666e6373bc41bc0a9/test_coverage)](https://codeclimate.com/github/rubocop/rubocop-ast/test_coverage)
+[![Maintainability](https://api.codeclimate.com/v1/badges/a29666e6373bc41bc0a9/maintainability)](https://codeclimate.com/github/rubocop/rubocop-ast/maintainability)
 
-Contains the classes needed by [RuboCop](https://github.com/rubocop-hq/rubocop) to deal with Ruby's AST, in particular:
+Contains the classes needed by [RuboCop](https://github.com/rubocop/rubocop) to deal with Ruby's AST, in particular:
 
 * `RuboCop::AST::Node` ([doc](docs/modules/ROOT/pages/node_types.adoc))
 * `RuboCop::AST::NodePattern` ([doc](docs/modules/ROOT/pages/node_pattern.adoc))

data/lib/rubocop/ast/builder.rb

@@ -20,6 +20,7 @@ module RuboCop
       # @api private
       NODE_MAP = {
         and:          AndNode,
+        and_asgn:     AndAsgnNode,
         alias:        AliasNode,
         arg:          ArgNode,
         blockarg:     ArgNode,
@@ -32,10 +33,15 @@ module RuboCop
         shadowarg:    ArgNode,
         args:         ArgsNode,
         array:        ArrayNode,
+        lvasgn:       AsgnNode,
+        ivasgn:       AsgnNode,
+        cvasgn:       AsgnNode,
+        gvasgn:       AsgnNode,
         block:        BlockNode,
         numblock:     BlockNode,
         break:        BreakNode,
         case_match:   CaseMatchNode,
+        casgn:        CasgnNode,
         case:         CaseNode,
         class:        ClassNode,
         const:        ConstNode,
@@ -60,6 +66,8 @@ module RuboCop
         lambda:       LambdaNode,
         module:       ModuleNode,
         next:         NextNode,
+        op_asgn:      OpAsgnNode,
+        or_asgn:      OrAsgnNode,
         or:           OrNode,
         pair:         PairNode,
         procarg0:     Procarg0Node,

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module AST
+    # A node extension for `op_asgn` nodes.
+    # This will be used in place of a plain node when the builder constructs
+    # the AST, making its methods available to all assignment nodes within RuboCop.
+    class AndAsgnNode < OpAsgnNode
+      # The operator being used for assignment as a symbol.
+      #
+      # @return [Symbol] the assignment operator
+      def operator
+        :'&&'
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module AST
+    # A node extension for `lvasgn`, `ivasgn`, `cvasgn`, and `gvasgn` nodes.
+    # This will be used in place of a plain node when the builder constructs
+    # the AST, making its methods available to all assignment nodes within RuboCop.
+    class AsgnNode < Node
+      # The name of the variable being assigned as a symbol.
+      #
+      # @return [Symbol] the name of the variable being assigned
+      def name
+        node_parts[0]
+      end
+
+      # The expression being assigned to the variable.
+      #
+      # @return [Node] the expression being assigned.
+      def expression
+        node_parts[1]
+      end
+    end
+  end
+end

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

@@ -31,9 +31,23 @@ module RuboCop
         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/casgn_node.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module AST
+    # A node extension for `casgn` nodes.
+    # This will be used in place of a plain node when the builder constructs
+    # the AST, making its methods available to all assignment nodes within RuboCop.
+    class CasgnNode < Node
+      # The namespace of the constant being assigned.
+      #
+      # @return [Node, nil] the node associated with the scope (e.g. cbase, const, ...)
+      def namespace
+        node_parts[0]
+      end
+
+      # The name of the variable being assigned as a symbol.
+      #
+      # @return [Symbol] the name of the variable being assigned
+      def name
+        node_parts[1]
+      end
+
+      # The expression being assigned to the variable.
+      #
+      # @return [Node] the expression being assigned.
+      def expression
+        node_parts[2]
+      end
+    end
+  end
+end

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

@@ -4,8 +4,6 @@ module RuboCop
   module AST
     # A node extension for `const` nodes.
     class ConstNode < Node
-      # The `send` node associated with this block.
-      #
       # @return [Node, nil] the node associated with the scope (e.g. cbase, const, ...)
       def namespace
         children[0]
@@ -16,8 +14,6 @@ module RuboCop
         children[1]
       end
 
-      # The body of this block.
-      #
       # @return [Boolean] if the constant is a Module / Class, according to the standard convention.
       #                   Note: some classes might have uppercase in which case this method
       #                         returns false

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

@@ -28,9 +28,9 @@ module RuboCop
         node_parts[1]
       end
 
-      # The `block` node associated with this method dispatch, if any.
+      # The `block` or `numblock` node associated with this method dispatch, if any.
       #
-      # @return [BlockNode, nil] the `block` node associated with this method
+      # @return [BlockNode, nil] the `block` or `numblock` node associated with this method
       #                          call or `nil`
       def block_node
         parent if block_literal?
@@ -154,7 +154,7 @@ module RuboCop
       #
       # @return [Boolean] whether the dispatched method has a block
       def block_literal?
-        parent&.block_type? && eql?(parent.send_node)
+        (parent&.block_type? || parent&.numblock_type?) && eql?(parent.send_node)
       end
 
       # Checks whether this node is an arithmetic operation

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module AST
+    # A node extension for `op_asgn` nodes.
+    # This will be used in place of a plain node when the builder constructs
+    # the AST, making its methods available to all assignment nodes within RuboCop.
+    class OpAsgnNode < Node
+      # @return [AsgnNode] the assignment node
+      def assignment_node
+        node_parts[0]
+      end
+
+      # The name of the variable being assigned as a symbol.
+      #
+      # @return [Symbol] the name of the variable being assigned
+      def name
+        assignment_node.name
+      end
+
+      # The operator being used for assignment as a symbol.
+      #
+      # @return [Symbol] the assignment operator
+      def operator
+        node_parts[1]
+      end
+
+      # The expression being assigned to the variable.
+      #
+      # @return [Node] the expression being assigned.
+      def expression
+        node_parts.last
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module AST
+    # A node extension for `op_asgn` nodes.
+    # This will be used in place of a plain node when the builder constructs
+    # the AST, making its methods available to all assignment nodes within RuboCop.
+    class OrAsgnNode < OpAsgnNode
+      # The operator being used for assignment as a symbol.
+      #
+      # @return [Symbol] the assignment operator
+      def operator
+        :'||'
+      end
+    end
+  end
+end

data/lib/rubocop/ast/node.rb

@@ -317,7 +317,11 @@ module RuboCop
         # returns nil if answer cannot be determined
         ancestors = each_ancestor(:class, :module, :sclass, :casgn, :block)
         result    = ancestors.map do |ancestor|
-          parent_module_name_part(ancestor) { |full_name| return full_name }
+          parent_module_name_part(ancestor) do |full_name|
+            return nil unless full_name
+
+            full_name
+          end
         end.compact.reverse.join('::')
         result.empty? ? 'Object' : result
       end
@@ -421,7 +425,7 @@ module RuboCop
       end
 
       def keyword?
-        return true if special_keyword? || send_type? && prefix_not?
+        return true if special_keyword? || (send_type? && prefix_not?)
         return false unless KEYWORDS.include?(type)
 
         !OPERATOR_KEYWORDS.include?(type) || loc.operator.is?(type.to_s)
@@ -460,7 +464,7 @@ module RuboCop
       end
 
       def numeric_type?
-        int_type? || float_type?
+        int_type? || float_type? || rational_type? || complex_type?
       end
 
       def range_type?
@@ -503,20 +507,20 @@ module RuboCop
       # @deprecated Use `:class_constructor?`
       # @!method struct_constructor?(node = self)
       def_node_matcher :struct_constructor?, <<~PATTERN
-        (block (send #global_const?(:Struct) :new ...) _ $_)
+        ({block numblock} (send #global_const?(:Struct) :new ...) _ $_)
       PATTERN
 
       # @!method class_definition?(node = self)
       def_node_matcher :class_definition?, <<~PATTERN
         {(class _ _ $_)
          (sclass _ $_)
-         (block (send #global_const?({:Struct :Class}) :new ...) _ $_)}
+         ({block numblock} (send #global_const?({:Struct :Class}) :new ...) _ $_)}
       PATTERN
 
       # @!method module_definition?(node = self)
       def_node_matcher :module_definition?, <<~PATTERN
         {(module _ $_)
-         (block (send #global_const?(:Module) :new ...) _ $_)}
+         ({block numblock} (send #global_const?(:Module) :new ...) _ $_)}
       PATTERN
 
       # Some expressions are evaluated for their value, some for their side

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/lexer.rex.rb

@@ -2,7 +2,7 @@
 # encoding: UTF-8
 #--
 # This file is automatically generated. Do not modify it.
-# Generated by: oedipus_lex version 2.5.2.
+# Generated by: oedipus_lex version 2.6.0.
 # Source: lib/rubocop/ast/node_pattern/lexer.rex
 #++
 

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

@@ -54,7 +54,7 @@ module RuboCop
           children_nodes.sum(&:nb_captures)
         end
 
-        # @return [Boolean] returns true iff matches variable number of elements
+        # @return [Boolean] returns whether it matches a variable number of elements
         def variadic?
           arity.is_a?(Range)
         end

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/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/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.7.0'
+      STRING = '1.13.0'
     end
   end
 end

data/lib/rubocop/ast.rb

@@ -39,10 +39,12 @@ require_relative 'ast/node/and_node'
 require_relative 'ast/node/arg_node'
 require_relative 'ast/node/args_node'
 require_relative 'ast/node/array_node'
+require_relative 'ast/node/asgn_node'
 require_relative 'ast/node/block_node'
 require_relative 'ast/node/break_node'
 require_relative 'ast/node/case_match_node'
 require_relative 'ast/node/case_node'
+require_relative 'ast/node/casgn_node'
 require_relative 'ast/node/class_node'
 require_relative 'ast/node/const_node'
 require_relative 'ast/node/def_node'
@@ -61,6 +63,9 @@ require_relative 'ast/node/keyword_splat_node'
 require_relative 'ast/node/lambda_node'
 require_relative 'ast/node/module_node'
 require_relative 'ast/node/next_node'
+require_relative 'ast/node/op_asgn_node'
+require_relative 'ast/node/and_asgn_node'
+require_relative 'ast/node/or_asgn_node'
 require_relative 'ast/node/or_node'
 require_relative 'ast/node/pair_node'
 require_relative 'ast/node/procarg0_node'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-ast
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-28 00:00:00.000000000 Z
+date: 2021-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -63,14 +63,17 @@ files:
 - lib/rubocop/ast/ext/range_min_max.rb
 - lib/rubocop/ast/node.rb
 - lib/rubocop/ast/node/alias_node.rb
+- lib/rubocop/ast/node/and_asgn_node.rb
 - lib/rubocop/ast/node/and_node.rb
 - lib/rubocop/ast/node/arg_node.rb
 - lib/rubocop/ast/node/args_node.rb
 - lib/rubocop/ast/node/array_node.rb
+- lib/rubocop/ast/node/asgn_node.rb
 - lib/rubocop/ast/node/block_node.rb
 - lib/rubocop/ast/node/break_node.rb
 - lib/rubocop/ast/node/case_match_node.rb
 - lib/rubocop/ast/node/case_node.rb
+- lib/rubocop/ast/node/casgn_node.rb
 - lib/rubocop/ast/node/class_node.rb
 - lib/rubocop/ast/node/const_node.rb
 - lib/rubocop/ast/node/def_node.rb
@@ -102,6 +105,8 @@ files:
 - lib/rubocop/ast/node/mixin/predicate_operator_node.rb
 - lib/rubocop/ast/node/module_node.rb
 - lib/rubocop/ast/node/next_node.rb
+- lib/rubocop/ast/node/op_asgn_node.rb
+- lib/rubocop/ast/node/or_asgn_node.rb
 - lib/rubocop/ast/node/or_node.rb
 - lib/rubocop/ast/node/pair_node.rb
 - lib/rubocop/ast/node/procarg0_node.rb
@@ -145,15 +150,15 @@ files:
 - lib/rubocop/ast/token.rb
 - lib/rubocop/ast/traversal.rb
 - lib/rubocop/ast/version.rb
-homepage: https://github.com/rubocop-hq/rubocop-ast
+homepage: https://github.com/rubocop/rubocop-ast
 licenses:
 - MIT
 metadata:
   homepage_uri: https://www.rubocop.org/
-  changelog_uri: https://github.com/rubocop-hq/rubocop-ast/blob/master/CHANGELOG.md
-  source_code_uri: https://github.com/rubocop-hq/rubocop-ast/
+  changelog_uri: https://github.com/rubocop/rubocop-ast/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/rubocop/rubocop-ast/
   documentation_uri: https://docs.rubocop.org/rubocop-ast/
-  bug_tracker_uri: https://github.com/rubocop-hq/rubocop-ast/issues
+  bug_tracker_uri: https://github.com/rubocop/rubocop-ast/issues
 post_install_message:
 rdoc_options: []
 require_paths: