rubocop-ast 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a691b22abba3de79be3aca5f66247b20b5bdd8fe0bcbe1403d5455c4da25fae9
-  data.tar.gz: d0984b47a3d0f683447361683acb58afa4fcfffb1597bed575cce1d34fafd90e
+  metadata.gz: 35f0c94d6021f2223c413d1751c4e816346b740cf01663e5444325256ba987aa
+  data.tar.gz: 010a37da8da2e08bea4785821709b9e10cdedb02e133f33b1b8a12051939517e
 SHA512:
-  metadata.gz: 165cfc53926eecd29099f29554dae5e751bb1bee7c4fc42f49abe93db18ea3dbf6589b7b57e6e16aaabf7e842ea253dd41609ab2af343c44db4181af4c815c79
-  data.tar.gz: f150ffa3ae23ae80f4e3572a529fd19d42509e025e013c02c52eb408c60f3feaf55ef1d53304c19586ad2bf3b3b0ca7aac18503bc45b56ed3ad534dc875d894f
+  metadata.gz: ac8387283324c91278d848e1411cdede002cda15d00e20d2a889a5f7b4b37eed217e05e5538cfc99dfd2022ea68afae87eb4698db9d58aef2e08f15f3e5930e2
+  data.tar.gz: 3505c65f6921744d681f226f9f2e476a662c2da564db8f2534dd53a5cd17d15a4eadf839e7bf8d9e4bd8d769f0351527ad1a53c7da5a11cc3dc6f4e760a7c955

data/lib/rubocop/ast.rb

@@ -63,6 +63,7 @@ require_relative 'ast/node/while_node'
 require_relative 'ast/node/yield_node'
 require_relative 'ast/builder'
 require_relative 'ast/processed_source'
+require_relative 'ast/rubocop_compatibility'
 require_relative 'ast/token'
 require_relative 'ast/traversal'
 require_relative 'ast/version'

data/lib/rubocop/ast/node.rb

@@ -92,6 +92,16 @@ module RuboCop
         @mutable_attributes[:parent] = node
       end
 
+      # @return [Boolean]
+      def parent?
+        !!parent
+      end
+
+      # @return [Boolean]
+      def root?
+        !parent
+      end
+
       def complete!
         @mutable_attributes.freeze
         each_child_node(&:complete!)
@@ -299,8 +309,10 @@ module RuboCop
         self
       end
 
+      # Note: Some rare nodes may have no source, like `s(:args)` in `foo {}`
+      # @return [String, nil]
       def source
-        loc.expression.source
+        loc.expression&.source
       end
 
       def source_range

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

@@ -28,6 +28,8 @@ module RuboCop
 
       # @return [Boolean] if the constant starts with `::` (aka s(:cbase))
       def absolute?
+        return false unless namespace
+
         each_path.first.cbase_type?
       end
 

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

@@ -42,7 +42,7 @@ module RuboCop
       #
       # @return [Boolean] whether the dispatched method is a macro method
       def macro?
-        !receiver && macro_scope?
+        !receiver && in_macro_scope?
       end
 
       # Checks whether the dispatched method is an access modifier.
@@ -222,31 +222,21 @@ module RuboCop
 
       private
 
-      def_node_matcher :macro_scope?, <<~PATTERN
-        {^{({sclass class module block} ...) class_constructor?}
-         ^^{({sclass class module block} ... ({begin if} ...)) class_constructor?}
-         ^#macro_kwbegin_wrapper?
-         #root_node?}
+      def_node_matcher :in_macro_scope?, <<~PATTERN
+        {
+          root?                                    # Either a root node,
+          ^{                                       # or the parent is...
+            sclass class module class_constructor? # a class-like node
+            [ {                                    # or some "wrapper"
+                kwbegin begin block
+                (if _condition <%0 _>)  # note: we're excluding the condition of `if` nodes
+              }
+              #in_macro_scope?                     # that is itself in a macro scope
+            ]
+          }
+        }
       PATTERN
 
-      # Check if a node's parent is a kwbegin wrapper within a macro scope
-      #
-      # @param parent [Node] parent of the node being checked
-      #
-      # @return [Boolean] true if the parent is a kwbegin in a macro scope
-      def macro_kwbegin_wrapper?(parent)
-        parent.kwbegin_type? && macro_scope?(parent)
-      end
-
-      # Check if a node does not have a parent
-      #
-      # @param node [Node]
-      #
-      # @return [Boolean] if the parent is nil
-      def root_node?(node)
-        node.parent.nil?
-      end
-
       def_node_matcher :adjacent_def_modifier?, <<~PATTERN
         (send nil? _ ({def defs} ...))
       PATTERN

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

@@ -14,12 +14,9 @@ module RuboCop
         o: 0
       }.freeze
 
-      # Note: The 'o' option is ignored.
-      #
       # @return [Regexp] a regexp of this node
       def to_regexp
-        option = regopt.children.map { |opt| OPTIONS.fetch(opt) }.inject(:|)
-        Regexp.new(content, option)
+        Regexp.new(content, options)
       end
 
       # @return [RuboCop::AST::Node] a regopt node
@@ -27,6 +24,13 @@ module RuboCop
         children.last
       end
 
+      # Note: The 'o' option is ignored.
+      #
+      # @return [Integer] the Regexp option bits as returned by Regexp#options
+      def options
+        regopt.children.map { |opt| OPTIONS.fetch(opt) }.inject(0, :|)
+      end
+
       # @return [String] a string of regexp content
       def content
         children.select(&:str_type?).map(&:str_content).join

data/lib/rubocop/ast/processed_source.rb

@@ -229,9 +229,9 @@ module RuboCop
         when 2.7
           require 'parser/ruby27'
           Parser::Ruby27
-        when 2.8
-          require 'parser/ruby28'
-          Parser::Ruby28
+        when 2.8, 3.0
+          require 'parser/ruby30'
+          Parser::Ruby30
         else
           raise ArgumentError,
                 "RuboCop found unknown Ruby version: #{ruby_version.inspect}"
@@ -269,7 +269,8 @@ module RuboCop
       # is passed as a method argument. In this case tokens are interleaved by
       # heredoc contents' tokens.
       def sorted_tokens
-        @sorted_tokens ||= tokens.sort_by(&:begin_pos)
+        # Use stable sort.
+        @sorted_tokens ||= tokens.sort_by.with_index { |token, i| [token.begin_pos, i] }
       end
 
       def source_range(range_or_node)

data/lib/rubocop/ast/rubocop_compatibility.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module RuboCop
+  # ...
+  module AST
+    # Responsible for compatibility with main gem
+    # @api private
+    module RuboCopCompatibility
+      INCOMPATIBLE_COPS = {
+        '0.89.0' => 'Layout/LineLength',
+        '0.92.0' => 'Style/MixinUsage'
+      }.freeze
+      def rubocop_loaded
+        loaded = Gem::Version.new(RuboCop::Version::STRING)
+        incompatible = INCOMPATIBLE_COPS.select do |k, _v|
+          loaded < Gem::Version.new(k)
+        end.values
+        return if incompatible.empty?
+
+        warn <<~WARNING
+          *** WARNING – Incompatible versions of `rubocop` and `rubocop-ast`
+          You may encounter issues with the following \
+          Cop#{'s' if incompatible.size > 1}: #{incompatible.join(', ')}
+          Please upgrade rubocop to at least v#{INCOMPATIBLE_COPS.keys.last}
+        WARNING
+      end
+    end
+
+    extend RuboCopCompatibility
+  end
+end

data/lib/rubocop/ast/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module AST
     module Version
-      STRING = '0.4.0'
+      STRING = '0.6.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-ast
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2020-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.1.4
+        version: 2.7.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.1.4
+        version: 2.7.1.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +116,7 @@ files:
 - lib/rubocop/ast/node/yield_node.rb
 - lib/rubocop/ast/node_pattern.rb
 - lib/rubocop/ast/processed_source.rb
+- lib/rubocop/ast/rubocop_compatibility.rb
 - lib/rubocop/ast/sexp.rb
 - lib/rubocop/ast/token.rb
 - lib/rubocop/ast/traversal.rb