rubocop-ast 1.24.1 → 1.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f460fee9d6682f0942b107a76c8a24e59b3992e27cdb791a8d9d3e8902596bf0
-  data.tar.gz: 27b55278782ffad52905335f6ae6b1b1709e6156802d669158f903c4b04fecbd
+  metadata.gz: b08ce67ff41a6d40d8385735fe36ebe6fd90513f3cbafbd21afa4f9393a66f9a
+  data.tar.gz: 24e6a84531e66531bcf5c358cfbed40815d1fd3f1d91e598a5b884a1971bb3c7
 SHA512:
-  metadata.gz: f6302e8a65e1504fbe3a929f0e50d063ea07873c9650edc1f68f65525e57a2717f06fc87b64970cc98c06e63efa1058b16d6563aa2b2863a0a80a67b04c31e98
-  data.tar.gz: f8c7043155b9fb25ae1509c5bc8d3efe986ae9a74e302e886c3ad4947e5c06b79fd2ede7ba54aebdd3dc8bfe8b9f813ee5b6f2209140c7fee475dc31830f3d97
+  metadata.gz: 20a8ea979cb2335691b7b39c9986962edc2fe61667e712187e3904e2a984fc3327b38034eca64028a362724964e982d053a093432d3f7994edae592cd8f6fb83
+  data.tar.gz: 59ab4c65c59d3407224147391e8b253c930da8add826c50553b433039057865aa1211d13e90061bb4e3a40ebb97184ea8d5698f3b4f5d0ff7c3c343d14a566bd

data/lib/rubocop/ast/builder.rb

@@ -19,76 +19,77 @@ module RuboCop
 
       # @api private
       NODE_MAP = {
-        and:          AndNode,
-        and_asgn:     AndAsgnNode,
-        alias:        AliasNode,
-        arg:          ArgNode,
-        blockarg:     ArgNode,
-        forward_arg:  ArgNode,
-        kwarg:        ArgNode,
-        kwoptarg:     ArgNode,
-        kwrestarg:    ArgNode,
-        optarg:       ArgNode,
-        restarg:      ArgNode,
-        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,
-        def:          DefNode,
-        defined?:     DefinedNode,
-        defs:         DefNode,
-        dstr:         DstrNode,
-        ensure:       EnsureNode,
-        for:          ForNode,
-        forward_args: ForwardArgsNode,
-        float:        FloatNode,
-        hash:         HashNode,
-        if:           IfNode,
-        in_pattern:   InPatternNode,
-        int:          IntNode,
-        index:        IndexNode,
-        indexasgn:    IndexasgnNode,
-        irange:       RangeNode,
-        erange:       RangeNode,
-        kwargs:       HashNode,
-        kwsplat:      KeywordSplatNode,
-        lambda:       LambdaNode,
-        module:       ModuleNode,
-        next:         NextNode,
-        op_asgn:      OpAsgnNode,
-        or_asgn:      OrAsgnNode,
-        or:           OrNode,
-        pair:         PairNode,
-        procarg0:     Procarg0Node,
-        regexp:       RegexpNode,
-        rescue:       RescueNode,
-        resbody:      ResbodyNode,
-        return:       ReturnNode,
-        csend:        CsendNode,
-        send:         SendNode,
-        str:          StrNode,
-        xstr:         StrNode,
-        sclass:       SelfClassNode,
-        super:        SuperNode,
-        zsuper:       SuperNode,
-        sym:          SymbolNode,
-        until:        UntilNode,
-        until_post:   UntilNode,
-        when:         WhenNode,
-        while:        WhileNode,
-        while_post:   WhileNode,
-        yield:        YieldNode
+        and:                 AndNode,
+        and_asgn:            AndAsgnNode,
+        alias:               AliasNode,
+        arg:                 ArgNode,
+        blockarg:            ArgNode,
+        forward_arg:         ArgNode,
+        kwarg:               ArgNode,
+        kwoptarg:            ArgNode,
+        kwrestarg:           ArgNode,
+        optarg:              ArgNode,
+        restarg:             ArgNode,
+        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,
+        def:                 DefNode,
+        defined?:            DefinedNode,
+        defs:                DefNode,
+        dstr:                DstrNode,
+        ensure:              EnsureNode,
+        for:                 ForNode,
+        forward_args:        ForwardArgsNode,
+        forwarded_kwrestarg: KeywordSplatNode,
+        float:               FloatNode,
+        hash:                HashNode,
+        if:                  IfNode,
+        in_pattern:          InPatternNode,
+        int:                 IntNode,
+        index:               IndexNode,
+        indexasgn:           IndexasgnNode,
+        irange:              RangeNode,
+        erange:              RangeNode,
+        kwargs:              HashNode,
+        kwsplat:             KeywordSplatNode,
+        lambda:              LambdaNode,
+        module:              ModuleNode,
+        next:                NextNode,
+        op_asgn:             OpAsgnNode,
+        or_asgn:             OrAsgnNode,
+        or:                  OrNode,
+        pair:                PairNode,
+        procarg0:            Procarg0Node,
+        regexp:              RegexpNode,
+        rescue:              RescueNode,
+        resbody:             ResbodyNode,
+        return:              ReturnNode,
+        csend:               CsendNode,
+        send:                SendNode,
+        str:                 StrNode,
+        xstr:                StrNode,
+        sclass:              SelfClassNode,
+        super:               SuperNode,
+        zsuper:              SuperNode,
+        sym:                 SymbolNode,
+        until:               UntilNode,
+        until_post:          UntilNode,
+        when:                WhenNode,
+        while:               WhileNode,
+        while_post:          WhileNode,
+        yield:               YieldNode
       }.freeze
 
       # Generates {Node} from the given information.

data/lib/rubocop/ast/ext/range.rb

@@ -15,8 +15,8 @@ module RuboCop
         #     :bar
         #   ]
         #
-        #   node.loc.begin.line_span                         # => 1..1
-        #   node.loc.expression.line_span(exclude_end: true) # => 1...4
+        #   node.loc.begin.line_span                       # => 1..1
+        #   node.source_range.line_span(exclude_end: true) # => 1...4
         def line_span(exclude_end: false)
           ::Range.new(first_line, last_line, exclude_end)
         end

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

@@ -2,9 +2,9 @@
 
 module RuboCop
   module AST
-    # A node extension for `send` nodes. This will be used in place of a plain
+    # A node extension for `csend` nodes. This will be used in place of a plain
     # node when the builder constructs the AST, making its methods available
-    # to all `send` nodes within RuboCop.
+    # to all `csend` nodes within RuboCop.
     class CsendNode < SendNode
       def send_type?
         false

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

@@ -2,9 +2,9 @@
 
 module RuboCop
   module AST
-    # A node extension for `kwsplat` nodes. This will be used in place of a
-    # plain  node when the builder constructs the AST, making its methods
-    # available to all `kwsplat` nodes within RuboCop.
+    # A node extension for `kwsplat` and `forwarded_kwrestarg` nodes. This will be used in
+    # place of a plain node when the builder constructs the AST, making its methods available to
+    # all `kwsplat` and `forwarded_kwrestarg` nodes within RuboCop.
     class KeywordSplatNode < Node
       include HashElementNode
 
@@ -41,6 +41,13 @@ module RuboCop
       def node_parts
         [self, self]
       end
+
+      # This provides `forwarded_kwrestarg` node to return true to be compatible with `kwsplat` node.
+      #
+      # @return [true]
+      def kwsplat_type?
+        true
+      end
     end
   end
 end

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

@@ -5,7 +5,7 @@ module RuboCop
     # Common functionality for nodes that are a kind of method dispatch:
     # `send`, `csend`, `super`, `zsuper`, `yield`, `defined?`,
     # and (modern only): `index`, `indexasgn`, `lambda`
-    module MethodDispatchNode
+    module MethodDispatchNode # rubocop:disable Metrics/ModuleLength
       extend NodePattern::Macros
       include MethodIdentifierPredicates
 
@@ -28,6 +28,17 @@ module RuboCop
         node_parts[1]
       end
 
+      # The source range for the method name or keyword that dispatches this call.
+      #
+      # @return [Parser::Source::Range] the source range for the method name or keyword
+      def selector
+        if loc.respond_to? :keyword
+          loc.keyword
+        else
+          loc.selector
+        end
+      end
+
       # The `block` or `numblock` node associated with this method dispatch, if any.
       #
       # @return [BlockNode, nil] the `block` or `numblock` node associated with this method
@@ -147,7 +158,7 @@ module RuboCop
       #
       # @return [Boolean] whether the method is the implicit form of `#call`
       def implicit_call?
-        method?(:call) && !loc.selector
+        method?(:call) && !selector
       end
 
       # Whether this method dispatch has an explicit block.
@@ -222,9 +233,9 @@ module RuboCop
       #
       # @return [Boolean] whether this method is a unary operation
       def unary_operation?
-        return false unless loc.selector
+        return false unless selector
 
-        operator_method? && loc.expression.begin_pos == loc.selector.begin_pos
+        operator_method? && loc.expression.begin_pos == selector.begin_pos
       end
 
       # Checks whether this is a binary operation.
@@ -235,9 +246,9 @@ module RuboCop
       #
       # @return [Boolean] whether this method is a binary operation
       def binary_operation?
-        return false unless loc.selector
+        return false unless selector
 
-        operator_method? && loc.expression.begin_pos != loc.selector.begin_pos
+        operator_method? && loc.expression.begin_pos != selector.begin_pos
       end
 
       private

data/lib/rubocop/ast/node.rb

@@ -510,8 +510,14 @@ module RuboCop
 
       # @!method class_constructor?(node = self)
       def_node_matcher :class_constructor?, <<~PATTERN
-        {       (send #global_const?({:Class :Module :Struct}) :new ...)
-         (block (send #global_const?({:Class :Module :Struct}) :new ...) ...)}
+        {
+          (send #global_const?({:Class :Module :Struct}) :new ...)
+          (send #global_const?(:Data) :define ...)
+          ({block numblock} {
+            (send #global_const?({:Class :Module :Struct}) :new ...)
+            (send #global_const?(:Data) :define ...)
+          } ...)
+        }
       PATTERN
 
       # @deprecated Use `:class_constructor?`

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

@@ -38,7 +38,7 @@ module RuboCop
           end
 
           def visit_set
-            set = node.children.map(&:child).to_set.freeze
+            set = node.children.to_set(&:child).freeze
             NodePattern::Sets[set]
           end
 

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

@@ -47,7 +47,7 @@ module RuboCop
               # @return [String] a Rainbow colorized version of ruby
               def colorize(color_scheme = COLOR_SCHEME)
                 map = color_map(color_scheme)
-                ast.loc.expression.source_buffer.source.chars.map.with_index do |char, i|
+                ast.source_range.source_buffer.source.chars.map.with_index do |char, i|
                   Rainbow(char).color(map[i])
                 end.join
               end

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

@@ -75,6 +75,10 @@ module RuboCop
           self.class.new(type, children, { location: location })
         end
 
+        def source_range
+          loc.expression
+        end
+
         INT_TO_RANGE = Hash.new { |h, k| h[k] = k..k }
         private_constant :INT_TO_RANGE
 

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.5.1
+# This file is automatically generated by Racc 1.6.2
 # from Racc grammar file "".
 #
 

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

@@ -48,12 +48,12 @@ module RuboCop
 
             def emit_unary_op(type, operator_t = nil, *children)
               children[-1] = children[-1].first if children[-1].is_a?(Array) # token?
-              map = source_map(children.first.loc.expression, operator_t: operator_t)
+              map = source_map(children.first.source_range, operator_t: operator_t)
               n(type, children, map)
             end
 
             def emit_list(type, begin_t, children, end_t)
-              expr = children.first.loc.expression.join(children.last.loc.expression)
+              expr = children.first.source_range.join(children.last.source_range)
               map = source_map(expr, begin_t: begin_t, end_t: end_t)
               n(type, children, map)
             end
@@ -79,8 +79,7 @@ module RuboCop
             end
 
             def join_exprs(left_expr, right_expr)
-              left_expr.loc.expression
-                       .join(right_expr.loc.expression)
+              left_expr.source_range.join(right_expr.source_range)
             end
 
             def source_map(token_or_range, begin_t: nil, end_t: nil, operator_t: nil, selector_t: nil)

data/lib/rubocop/ast/processed_source.rb

@@ -27,7 +27,7 @@ module RuboCop
         # Defaults source encoding to UTF-8, regardless of the encoding it has
         # been read with, which could be non-utf8 depending on the default
         # external encoding.
-        source.force_encoding(Encoding::UTF_8) unless source.encoding == Encoding::UTF_8
+        (+source).force_encoding(Encoding::UTF_8) unless source.encoding == Encoding::UTF_8
 
         @raw_source = source
         @path = path
@@ -265,6 +265,9 @@ module RuboCop
         when 3.2
           require 'parser/ruby32'
           Parser::Ruby32
+        when 3.3
+          require 'parser/ruby33'
+          Parser::Ruby33
         else
           raise ArgumentError,
                 "RuboCop found unknown Ruby version: #{ruby_version.inspect}"

data/lib/rubocop/ast/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module AST
     module Version
-      STRING = '1.24.1'
+      STRING = '1.29.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-ast
 version: !ruby/object:Gem::Version
-  version: 1.24.1
+  version: 1.29.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-29 00:00:00.000000000 Z
+date: 2023-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -18,34 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.1.0
+        version: 3.2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.1.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.15.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.15.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.1.0
 description: "    RuboCop's Node and NodePattern classes.\n"
 email: rubocop@googlegroups.com
 executables: []
@@ -176,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: RuboCop tools to deal with Ruby code AST.