solargraph 0.51.2 → 0.54.2

data/lib/solargraph/parser/{legacy → parser_gem}/node_processors/ivasgn_node.rb

@@ -2,10 +2,10 @@
 
 module Solargraph
   module Parser
-    module Legacy
+    module ParserGem
       module NodeProcessors
         class IvasgnNode < Parser::NodeProcessor::Base
-          include Legacy::NodeMethods
+          include ParserGem::NodeMethods
 
           def process
             loc = get_node_location(node)

data/lib/solargraph/parser/{legacy → parser_gem}/node_processors/lvasgn_node.rb

@@ -2,14 +2,14 @@
 
 module Solargraph
   module Parser
-    module Legacy
+    module ParserGem
       module NodeProcessors
         class LvasgnNode < Parser::NodeProcessor::Base
-          include Legacy::NodeMethods
+          include ParserGem::NodeMethods
 
           def process
-            here = get_node_start_position(node)
-            presence = Range.new(here, region.closure.location.range.ending)
+            # variable not visible until next statement
+            presence = Range.new(get_node_end_position(node), region.closure.location.range.ending)
             loc = get_node_location(node)
             locals.push Solargraph::Pin::LocalVariable.new(
               location: loc,

data/lib/solargraph/parser/parser_gem/node_processors/masgn_node.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Solargraph
+  module Parser
+    module ParserGem
+      module NodeProcessors
+        class MasgnNode < Parser::NodeProcessor::Base
+          include ParserGem::NodeMethods
+
+          def process
+            # Example:
+            #
+            # s(:masgn,
+            #   s(:mlhs,
+            #     s(:send,
+            #       s(:send, nil, :a), :b=),
+            #     s(:lvasgn, :b),
+            #     s(:ivasgn, :@c)),
+            #   s(:array,
+            #     s(:int, 1),
+            #     s(:int, 2),
+            #     s(:int, 3)))
+            masgn = node
+            mlhs = masgn.children.fetch(0)
+            lhs_arr = mlhs.children
+            mass_rhs = node.children.fetch(1)
+
+            # Get pins created for the mlhs node
+            process_children
+
+            lhs_arr.each_with_index do |lhs, i|
+              location = get_node_location(lhs)
+              pin = if lhs.type == :lvasgn
+                      # lvasgn is a local variable
+                      locals.find { |l| l.location == location }
+                    else
+                      # e.g., ivasgn is an instance variable, etc
+                      pins.find { |iv| iv.location == location && iv.is_a?(Pin::BaseVariable) }
+                    end
+              # @todo in line below, nothing in typechecking alerts
+              #   when a non-existant method is called on 'l'
+              if pin.nil?
+                Solargraph.logger.debug { "Could not find local for masgn= value in location #{location.inspect} in #{lhs_arr} - masgn = #{masgn}, lhs.type = #{lhs.type}" }
+                next
+              end
+              pin.mass_assignment = [mass_rhs, i]
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/parser/{legacy → parser_gem}/node_processors/namespace_node.rb

@@ -2,10 +2,10 @@
 
 module Solargraph
   module Parser
-    module Legacy
+    module ParserGem
       module NodeProcessors
         class NamespaceNode < Parser::NodeProcessor::Base
-          include Legacy::NodeMethods
+          include ParserGem::NodeMethods
 
           def process
             sc = nil

data/lib/solargraph/parser/{legacy → parser_gem}/node_processors/orasgn_node.rb

@@ -2,7 +2,7 @@
 
 module Solargraph
   module Parser
-    module Legacy
+    module ParserGem
       module NodeProcessors
         class OrasgnNode < Parser::NodeProcessor::Base
           def process

data/lib/solargraph/parser/{legacy → parser_gem}/node_processors/resbody_node.rb

@@ -2,13 +2,13 @@
 
 module Solargraph
   module Parser
-    module Legacy
+    module ParserGem
       module NodeProcessors
         class ResbodyNode < Parser::NodeProcessor::Base
-          include Legacy::NodeMethods
+          include ParserGem::NodeMethods
 
           def process
-            if node.children[1]
+            if node.children[1] # Exception local variable name
               here = get_node_start_position(node.children[1])
               presence = Range.new(here, region.closure.location.range.ending)
               loc = get_node_location(node.children[1])

data/lib/solargraph/parser/{legacy → parser_gem}/node_processors/sclass_node.rb

@@ -2,7 +2,7 @@
 
 module Solargraph
   module Parser
-    module Legacy
+    module ParserGem
       module NodeProcessors
         class SclassNode < Parser::NodeProcessor::Base
           def process

data/lib/solargraph/parser/{legacy → parser_gem}/node_processors/send_node.rb

@@ -2,10 +2,10 @@
 
 module Solargraph
   module Parser
-    module Legacy
+    module ParserGem
       module NodeProcessors
         class SendNode < Parser::NodeProcessor::Base
-          include Legacy::NodeMethods
+          include ParserGem::NodeMethods
 
           def process
             if node.children[0].nil?
@@ -80,7 +80,7 @@ module Solargraph
                 )
               end
               if node.children[1] == :attr_writer || node.children[1] == :attr_accessor
-                pins.push Solargraph::Pin::Method.new(
+                method_pin = Solargraph::Pin::Method.new(
                   location: loc,
                   closure: clos,
                   name: "#{a.children[0]}=",
@@ -89,9 +89,10 @@ module Solargraph
                   visibility: region.visibility,
                   attribute: true
                 )
-                pins.last.parameters.push Pin::Parameter.new(name: 'value', decl: :arg, closure: pins.last)
-                if pins.last.return_type.defined?
-                  pins.last.docstring.add_tag YARD::Tags::Tag.new(:param, '', pins.last.return_type.to_s.split(', '), 'value')
+                pins.push method_pin
+                method_pin.parameters.push Pin::Parameter.new(name: 'value', decl: :arg, closure: pins.last)
+                if method_pin.return_type.defined?
+                  pins.last.docstring.add_tag YARD::Tags::Tag.new(:param, '', pins.last.return_type.items.map(&:rooted_tags), 'value')
                 end
               end
             end
@@ -112,6 +113,7 @@ module Solargraph
             end
           end
 
+          # @return [void]
           def process_prepend
             if node.children[2].is_a?(AST::Node) && node.children[2].type == :const
               cp = region.closure

data/lib/solargraph/parser/{rubyvm → parser_gem}/node_processors/sym_node.rb

@@ -2,7 +2,7 @@
 
 module Solargraph
   module Parser
-    module Rubyvm
+    module ParserGem
       module NodeProcessors
         class SymNode < Parser::NodeProcessor::Base
           def process

data/lib/solargraph/parser/parser_gem/node_processors.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'solargraph/parser/node_processor'
+
+module Solargraph
+  module Parser
+    module ParserGem
+      module NodeProcessors
+        autoload :BeginNode,     'solargraph/parser/parser_gem/node_processors/begin_node'
+        autoload :DefNode,       'solargraph/parser/parser_gem/node_processors/def_node'
+        autoload :DefsNode,      'solargraph/parser/parser_gem/node_processors/defs_node'
+        autoload :SendNode,      'solargraph/parser/parser_gem/node_processors/send_node'
+        autoload :NamespaceNode, 'solargraph/parser/parser_gem/node_processors/namespace_node'
+        autoload :SclassNode,    'solargraph/parser/parser_gem/node_processors/sclass_node'
+        autoload :IvasgnNode,    'solargraph/parser/parser_gem/node_processors/ivasgn_node'
+        autoload :CvasgnNode,    'solargraph/parser/parser_gem/node_processors/cvasgn_node'
+        autoload :LvasgnNode,    'solargraph/parser/parser_gem/node_processors/lvasgn_node'
+        autoload :GvasgnNode,    'solargraph/parser/parser_gem/node_processors/gvasgn_node'
+        autoload :CasgnNode,     'solargraph/parser/parser_gem/node_processors/casgn_node'
+        autoload :MasgnNode,     'solargraph/parser/parser_gem/node_processors/masgn_node'
+        autoload :AliasNode,     'solargraph/parser/parser_gem/node_processors/alias_node'
+        autoload :ArgsNode,      'solargraph/parser/parser_gem/node_processors/args_node'
+        autoload :BlockNode,     'solargraph/parser/parser_gem/node_processors/block_node'
+        autoload :OrasgnNode,    'solargraph/parser/parser_gem/node_processors/orasgn_node'
+        autoload :SymNode,       'solargraph/parser/parser_gem/node_processors/sym_node'
+        autoload :ResbodyNode,   'solargraph/parser/parser_gem/node_processors/resbody_node'
+      end
+    end
+
+    module NodeProcessor
+      register :source,       ParserGem::NodeProcessors::BeginNode
+      register :begin,        ParserGem::NodeProcessors::BeginNode
+      register :kwbegin,      ParserGem::NodeProcessors::BeginNode
+      register :rescue,       ParserGem::NodeProcessors::BeginNode
+      register :resbody,      ParserGem::NodeProcessors::ResbodyNode
+      register :def,          ParserGem::NodeProcessors::DefNode
+      register :defs,         ParserGem::NodeProcessors::DefsNode
+      register :send,         ParserGem::NodeProcessors::SendNode
+      register :class,        ParserGem::NodeProcessors::NamespaceNode
+      register :module,       ParserGem::NodeProcessors::NamespaceNode
+      register :sclass,       ParserGem::NodeProcessors::SclassNode
+      register :ivasgn,       ParserGem::NodeProcessors::IvasgnNode
+      register :cvasgn,       ParserGem::NodeProcessors::CvasgnNode
+      register :lvasgn,       ParserGem::NodeProcessors::LvasgnNode
+      register :gvasgn,       ParserGem::NodeProcessors::GvasgnNode
+      register :casgn,        ParserGem::NodeProcessors::CasgnNode
+      register :masgn,        ParserGem::NodeProcessors::MasgnNode
+      register :alias,        ParserGem::NodeProcessors::AliasNode
+      register :args,         ParserGem::NodeProcessors::ArgsNode
+      register :forward_args, ParserGem::NodeProcessors::ArgsNode
+      register :block,        ParserGem::NodeProcessors::BlockNode
+      register :or_asgn,      ParserGem::NodeProcessors::OrasgnNode
+      register :sym,          ParserGem::NodeProcessors::SymNode
+    end
+  end
+end

data/lib/solargraph/parser/parser_gem.rb

@@ -0,0 +1,12 @@
+module Solargraph
+  module Parser
+    module ParserGem
+      autoload :FlawedBuilder, 'solargraph/parser/parser_gem/flawed_builder'
+      autoload :ClassMethods, 'solargraph/parser/parser_gem/class_methods'
+      autoload :NodeMethods, 'solargraph/parser/parser_gem/node_methods'
+      autoload :NodeChainer, 'solargraph/parser/parser_gem/node_chainer'
+    end
+  end
+end
+
+require 'solargraph/parser/parser_gem/node_processors'

data/lib/solargraph/parser/region.rb

@@ -23,7 +23,7 @@ module Solargraph
 
       # @param source [Source]
       # @param namespace [String]
-      # @param scope [Symbol]
+      # @param scope [Symbol, nil]
       # @param visibility [Symbol]
       def initialize source: Solargraph::Source.load_string(''), closure: nil,
                      scope: nil, visibility: :public, lvars: []

data/lib/solargraph/parser/snippet.rb

@@ -1,7 +1,9 @@
 module Solargraph
   module Parser
     class Snippet
+      # @return [Range]
       attr_reader :range
+      # @return [String]
       attr_reader :text
 
       def initialize range, text

data/lib/solargraph/parser.rb

@@ -1,8 +1,7 @@
 module Solargraph
   module Parser
     autoload :CommentRipper, 'solargraph/parser/comment_ripper'
-    autoload :Legacy, 'solargraph/parser/legacy'
-    autoload :Rubyvm, 'solargraph/parser/rubyvm'
+    autoload :ParserGem, 'solargraph/parser/parser_gem'
     autoload :Region, 'solargraph/parser/region'
     autoload :NodeProcessor, 'solargraph/parser/node_processor'
     autoload :Snippet, 'solargraph/parser/snippet'
@@ -10,17 +9,14 @@ module Solargraph
     class SyntaxError < StandardError
     end
 
-    # True if the parser can use RubyVM.
-    #
-    def self.rubyvm?
-      # !!defined?(RubyVM::AbstractSyntaxTree)
-      false
-    end
+    # @deprecated
+    Legacy = ParserGem
 
-    selected = rubyvm? ? Rubyvm : Legacy
-    # include selected
-    extend selected::ClassMethods
+    ClassMethods = ParserGem::ClassMethods
+    # @todo should be able to just 'extend ClassMethods' here and
+    #   typecheck things off it in strict mode
+    extend ParserGem::ClassMethods
 
-    NodeMethods = (rubyvm? ? Rubyvm::NodeMethods : Legacy::NodeMethods)
+    NodeMethods = ParserGem::NodeMethods
   end
 end

data/lib/solargraph/pin/base.rb

@@ -15,6 +15,9 @@ module Solargraph
       # @return [Solargraph::Location]
       attr_reader :location
 
+      # @return [Solargraph::Location]
+      attr_reader :type_location
+
       # @return [String]
       attr_reader :name
 
@@ -25,12 +28,13 @@ module Solargraph
       attr_accessor :source
 
       # @param location [Solargraph::Location, nil]
-      # @param kind [Integer]
+      # @param type_location [Solargraph::Location, nil]
       # @param closure [Solargraph::Pin::Closure, nil]
       # @param name [String]
       # @param comments [String]
-      def initialize location: nil, closure: nil, name: '', comments: ''
+      def initialize location: nil, type_location: nil, closure: nil, name: '', comments: ''
         @location = location
+        @type_location = type_location
         @closure = closure
         @name = name
         @comments = comments
@@ -41,6 +45,46 @@ module Solargraph
         @comments ||= ''
       end
 
+      # @param generics_to_resolve [Enumerable<String>]
+      # @param return_type_context [ComplexType, nil]
+      # @param context [ComplexType]
+      # @param resolved_generic_values [Hash{String => ComplexType}]
+      # @return [self]
+      def resolve_generics_from_context(generics_to_resolve, return_type_context = nil, resolved_generic_values: {})
+        proxy return_type.resolve_generics_from_context(generics_to_resolve,
+                                                        return_type_context,
+                                                        resolved_generic_values: resolved_generic_values)
+      end
+
+      # @yieldparam [ComplexType]
+      # @yieldreturn [ComplexType]
+      # @return [self]
+      def transform_types(&transform)
+        proxy return_type.transform(&transform)
+      end
+
+      # Determine the concrete type for each of the generic type
+      # parameters used in this method based on the parameters passed
+      # into the its class and return a new method pin.
+      #
+      # @param definitions [Pin::Namespace] The module/class which uses generic types
+      # @param context_type [ComplexType] The receiver type
+      # @return [self]
+      def resolve_generics definitions, context_type
+        transform_types { |t| t.resolve_generics(definitions, context_type) if t }
+      end
+
+      def all_rooted?
+        !return_type || return_type.all_rooted?
+      end
+
+      # @param generics_to_erase [Enumerable<String>]
+      # @return [self]
+      def erase_generics(generics_to_erase)
+        return self if generics_to_erase.empty?
+        transform_types { |t| t.erase_generics(generics_to_erase) }
+      end
+
       # @return [String, nil]
       def filename
         return nil if location.nil?
@@ -58,7 +102,7 @@ module Solargraph
       end
 
       def to_s
-        name.to_s
+        to_rbs
       end
 
       # @return [Boolean]
@@ -66,6 +110,11 @@ module Solargraph
         false
       end
 
+      # @return [Location, nil]
+      def best_location
+        location || type_location
+      end
+
       # Pin equality is determined using the #nearly? method and also
       # requiring both pins to have the same location.
       #
@@ -103,13 +152,13 @@ module Solargraph
         @docstring ||= Solargraph::Source.parse_docstring('').to_docstring
       end
 
-      # @return [Array<YARD::Tags::Directive>]
+      # @return [::Array<YARD::Tags::Directive>]
       def directives
         parse_comments unless defined?(@directives)
         @directives
       end
 
-      # @return [Array<YARD::Tags::MacroDirective>]
+      # @return [::Array<YARD::Tags::MacroDirective>]
       def macros
         @macros ||= collect_macros
       end
@@ -216,12 +265,31 @@ module Solargraph
         result
       end
 
+      # @return [String]
       def identity
-        @identity ||= "#{closure.context.namespace}|#{name}"
+        @identity ||= "#{closure.path}|#{name}"
+      end
+
+      # @return [String, nil]
+      def to_rbs
+        return_type.to_rbs
+      end
+
+      # @return [String, nil]
+      def desc
+        if path
+          if to_rbs
+            path + ' ' + to_rbs
+          else
+            path
+          end
+        else
+          to_rbs
+        end
       end
 
       def inspect
-        "#<#{self.class} `#{self.path}` at #{self.location.inspect}>"
+        "#<#{self.class} `#{self.desc}` at #{self.location.inspect}>"
       end
 
       protected
@@ -266,8 +334,8 @@ module Solargraph
         true
       end
 
-      # @param dir1 [Array<YARD::Tags::Directive>]
-      # @param dir2 [Array<YARD::Tags::Directive>]
+      # @param dir1 [::Array<YARD::Tags::Directive>]
+      # @param dir2 [::Array<YARD::Tags::Directive>]
       # @return [Boolean]
       def compare_directives dir1, dir2
         return false if dir1.length != dir2.length
@@ -288,7 +356,7 @@ module Solargraph
           tag1.types == tag2.types
       end
 
-      # @return [Array<YARD::Tags::Handlers::Directive>]
+      # @return [::Array<YARD::Tags::Handlers::Directive>]
       def collect_macros
         return [] unless maybe_directives?
         parse = Solargraph::Source.parse_docstring(comments)

data/lib/solargraph/pin/base_variable.rb

@@ -9,10 +9,14 @@ module Solargraph
       # @return [Parser::AST::Node, nil]
       attr_reader :assignment
 
+      attr_accessor :mass_assignment
+
       # @param assignment [Parser::AST::Node, nil]
       def initialize assignment: nil, **splat
         super(**splat)
         @assignment = assignment
+        # @type [nil, ::Array(Parser::AST::Node, Integer)]
+        @mass_assignment = nil
       end
 
       def completion_item_kind
@@ -36,10 +40,12 @@ module Solargraph
         true
       end
 
-      def probe api_map
-        return ComplexType::UNDEFINED if @assignment.nil?
+      # @param parent_node [Parser::AST::Node]
+      # @param api_map [ApiMap]
+      # @return [::Array<ComplexType>]
+      def return_types_from_node(parent_node, api_map)
         types = []
-        returns_from(@assignment).each do |node|
+        value_position_nodes_only(parent_node).each do |node|
           # Nil nodes may not have a location
           if node.nil? || node.type == :NIL || node.type == :nil
             types.push ComplexType::NIL
@@ -50,13 +56,36 @@ module Solargraph
             clip = api_map.clip_at(location.filename, pos)
             # Use the return node for inference. The clip might infer from the
             # first node in a method call instead of the entire call.
-            chain = Parser.chain(node, nil, clip.in_block?)
-            result = chain.infer(api_map, closure, clip.locals)
+            chain = Parser.chain(node, nil, nil)
+            result = chain.infer(api_map, closure, clip.locals).self_to_type(closure.context)
             types.push result unless result.undefined?
           end
         end
-        return ComplexType::UNDEFINED if types.empty?
-        ComplexType.try_parse(*types.map(&:to_s))
+        types
+      end
+
+      # @param api_map [ApiMap]
+      # @return [ComplexType]
+      def probe api_map
+        unless @assignment.nil?
+          types = return_types_from_node(@assignment, api_map)
+          return ComplexType.new(types.uniq) unless types.empty?
+        end
+
+        unless @mass_assignment.nil?
+          mass_node, index = @mass_assignment
+          types = return_types_from_node(mass_node, api_map)
+          types.map! do |type|
+            if type.tuple?
+              type.all_params[index]
+            elsif ['::Array', '::Set', '::Enumerable'].include?(type.rooted_name)
+              type.all_params.first
+            end
+          end.compact!
+          return ComplexType.new(types.uniq) unless types.empty?
+        end
+
+        ComplexType::UNDEFINED
       end
 
       def == other
@@ -71,6 +100,10 @@ module Solargraph
         true
       end
 
+      def desc
+        "#{to_rbs} = #{assignment&.type.inspect}"
+      end
+
       private
 
       # @return [ComplexType]