solargraph 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 031c6210f7be6462d12e8ce7dd5c25e30b6c097d
-  data.tar.gz: 422def5aafa30d23831434dafc5a69eb26d97e55
+  metadata.gz: a515f53b1eebf187bf4108abdba6c591f438cdb6
+  data.tar.gz: 832c13c89dcdf1bae7cb69aa3433d73346b86bec
 SHA512:
-  metadata.gz: e597e62a01501ee615fcac8a194940e9d85ea69346eeb245104340deb9d2db69de1553facb00d9b6e1dc9c9c3b932c8b5f4cda4a00e43bd41be240548633f8f0
-  data.tar.gz: 6137318fc634b925cc99a86b77b0ca86ae8c7f1ca842f4a864f93b88531151e3a96adc596aeb99fa94cf10c09e690432284090981e3c70b56151e72772d7dd95
+  metadata.gz: 74f08e71b1c0834aa6b18f4dcb0e176f91d0a40ac6f8a3fe3c76ad95081096eec4cb2ed904aaa7586433d05f8520214b9d1185755a549a2045870ba661acfd6e
+  data.tar.gz: 7ddcdf66369a65533d14e3c13763dad0ecb3f306b4b0ce7ef707802a61ae5b6c6d13a979b48bdd64c76b823064d32d9d1dd57dbd917d60e50dca018db1ab6799

data/lib/solargraph/api_map/source.rb

@@ -3,16 +3,23 @@ require 'parser/current'
 module Solargraph
   class ApiMap
     class Source
+      # @return [String]
       attr_reader :code
+
+      # @return [Parser::AST::Node]
       attr_reader :node
+
+      # @return [Array]
       attr_reader :comments
+
+      # @return [String]
       attr_reader :filename
 
       include NodeMethods
 
       def initialize code, node, comments, filename
         @code = code
-        root = AST::Node.new(:begin, [filename])
+        root = AST::Node.new(:source, [filename])
         root = root.append node
         @node = root
         @comments = comments
@@ -20,6 +27,8 @@ module Solargraph
         @filename = filename
         @namespace_nodes = {}
         @all_nodes = []
+        @node_stack = []
+        @node_tree = {}
         inner_map_node @node
       end
 
@@ -55,6 +64,14 @@ module Solargraph
         @class_variable_pins ||= []
       end
 
+      def local_variable_pins
+        @local_variable_pins ||= []
+      end
+
+      def global_variable_pins
+        @global_variable_pins ||= []
+      end
+
       def constant_pins
         @constant_pins ||= []
       end
@@ -78,6 +95,10 @@ module Solargraph
         frag.strip.gsub(/,$/, '')
       end
 
+      def tree_for node
+        @node_tree[node] || []
+      end
+
       def include? node
         @all_nodes.include? node
       end
@@ -115,7 +136,11 @@ module Solargraph
         source = self
         if node.kind_of?(AST::Node)
           @all_nodes.push node
-          return if node.type == :str or node.type == :dstr
+          if node.type == :str or node.type == :dstr
+            stack.pop
+            return
+          end
+          @node_stack.unshift node
           if node.type == :class or node.type == :module
             visibility = :public
             if node.children[0].kind_of?(AST::Node) and node.children[0].children[0].kind_of?(AST::Node) and node.children[0].children[0].type == :cbase
@@ -134,6 +159,7 @@ module Solargraph
           file = source.filename
           node.children.each do |c|
             if c.kind_of?(AST::Node)
+              @node_tree[c] = @node_stack.clone
               if c.type == :ivasgn
                 par = find_parent(stack, :class, :module, :def, :defs)
                 local_scope = ( (par.kind_of?(AST::Node) and par.type == :def) ? :instance : :class )
@@ -141,6 +167,7 @@ module Solargraph
                   ora = find_parent(stack, :or_asgn)
                   unless ora.nil?
                     u = c.updated(:ivasgn, c.children + ora.children[1..-1], nil)
+                    @node_tree[u] = @node_stack.clone
                     instance_variable_pins.push Solargraph::Pin::InstanceVariable.new(self, u, fqn || '', local_scope)
                   end
                 else
@@ -151,11 +178,27 @@ module Solargraph
                   ora = find_parent(stack, :or_asgn)
                   unless ora.nil?
                     u = c.updated(:cvasgn, c.children + ora.children[1..-1], nil)
+                    @node_tree[u] = @node_stack.clone
                     class_variable_pins.push Solargraph::Pin::ClassVariable.new(self, u, fqn || '')
                   end
                 else
                   class_variable_pins.push Solargraph::Pin::ClassVariable.new(self, c, fqn || '')
                 end
+              elsif c.type == :lvasgn
+                if c.children[1].nil?
+                  ora = find_parent(stack, :or_asgn)
+                  unless ora.nil?
+                    u = c.updated(:lvasgn, c.children + ora.children[1..-1], nil)
+                    @node_tree[u] = @node_stack.clone
+                    @docstring_hash[u.loc] = docstring_for(ora)
+                    local_variable_pins.push Solargraph::Pin::LocalVariable.new(self, u, fqn || '', @node_stack.clone)
+                  end
+                else
+                  @node_tree[c] = @node_stack.clone
+                  local_variable_pins.push Solargraph::Pin::LocalVariable.new(self, c, fqn || '', @node_stack.clone)
+                end
+              elsif c.type == :gvasgn
+                global_variable_pins.push Solargraph::Pin::GlobalVariable.new(self, c, fqn || '')
               elsif c.type == :sym
                 symbol_pins.push Solargraph::Pin::Symbol.new(self, c, fqn)
               elsif c.type == :casgn
@@ -165,8 +208,8 @@ module Solargraph
                   if c.kind_of?(AST::Node)
                     if c.type == :def and c.children[0].to_s[0].match(/[a-z]/i)
                       method_pins.push Solargraph::Pin::Method.new(source, c, fqn, scope, visibility)
-                      inner_map_node c, tree, visibility, scope, fqn, stack
-                      next
+                      #inner_map_node c, tree, visibility, scope, fqn, stack
+                      #next
                     elsif c.type == :defs
                       method_pins.push Solargraph::Pin::Method.new(source, c, fqn, :class, :public)
                       inner_map_node c, tree, :public, :class, fqn, stack
@@ -181,10 +224,10 @@ module Solargraph
                     elsif c.type == :send and [:attr_reader, :attr_writer, :attr_accessor].include?(c.children[1])
                       c.children[2..-1].each do |a|
                         if c.children[1] == :attr_reader or c.children[1] == :attr_accessor
-                          attribute_pins.push Solargraph::Pin::Attribute.new(self, a, fqn, :reader) #AttrPin.new(c)
+                          attribute_pins.push Solargraph::Pin::Attribute.new(self, a, fqn, :reader, docstring_for(c)) #AttrPin.new(c)
                         end
                         if c.children[1] == :attr_writer or c.children[1] == :attr_accessor
-                          attribute_pins.push Solargraph::Pin::Attribute.new(self, a, fqn, :writer) #AttrPin.new(c)
+                          attribute_pins.push Solargraph::Pin::Attribute.new(self, a, fqn, :writer, docstring_for(c)) #AttrPin.new(c)
                         end
                       end
                     elsif c.type == :sclass and c.children[0].type == :self
@@ -198,10 +241,11 @@ module Solargraph
                     required.push c.children[2].children[0].to_s
                   end
                 end
-                inner_map_node c, tree, visibility, scope, fqn, stack
               end
+              inner_map_node c, tree, visibility, scope, fqn, stack
             end
           end
+          @node_stack.shift
         end
         stack.pop
       end
@@ -220,11 +264,13 @@ module Solargraph
           Source.virtual(filename, code)
         end
 
+        # @return [Solargraph::ApiMap::Source]
         def virtual filename, code
           node, comments = Parser::CurrentRuby.parse_with_comments(code)
           Source.new(code, node, comments, filename)
         end
 
+        # @return [Solargraph::ApiMap::Source]
         def fix filename, code, cursor = nil
           tries = 0
           code.gsub!(/\r/, '')
@@ -236,10 +282,6 @@ module Solargraph
             # incomplete trees resulting from short scripts (e.g., a lone variable
             # assignment).
             node, comments = Parser::CurrentRuby.parse_with_comments(tmp + "\n_")
-            #@node = self.api_map.append_node(node, @comments, filename)
-            #@parsed = tmp
-            #@code.freeze
-            #@parsed.freeze
             Source.new(code, node, comments, filename)
           rescue Parser::SyntaxError => e
             if tries < 10
@@ -247,10 +289,10 @@ module Solargraph
               if tries == 10 and e.message.include?('token $end')
                 tmp += "\nend"
               else
-                if !fixed_cursor and !cursor.nil? and e.message.include?('token $end') and cursor >= 2
+                if !fixed_cursor and !cursor.nil? and cursor >= 2 and (e.message.include?('token $end') or tmp[cursor - 1] == '$')
                   fixed_cursor = true
                   spot = cursor - 2
-                  if tmp[cursor - 1] == '.'
+                  if tmp[cursor - 1] == '.' or tmp[cursor - 1] == '$'
                     repl = ';'
                   else
                     repl = '#'

data/lib/solargraph/api_map.rb

@@ -9,8 +9,6 @@ module Solargraph
     autoload :Cache,     'solargraph/api_map/cache'
 
     @@source_cache = {}
-    @@yard_map_cache = {}
-    @@semaphore = Mutex.new
 
     KEYWORDS = [
       '__ENCODING__', '__LINE__', '__FILE__', 'BEGIN', 'END', 'alias', 'and',
@@ -27,10 +25,6 @@ module Solargraph
     include NodeMethods
     include YardMethods
 
-    # @todo Temp for testing
-    attr_reader :new_method_pins
-    attr_reader :new_ivar_pins
-
     # The root directory of the project. The ApiMap will search here for
     # additional files to parse and analyze.
     #
@@ -49,30 +43,42 @@ module Solargraph
         config = ApiMap::Config.new(@workspace)
         @workspace_files.concat (config.included - config.excluded)
         @workspace_files.each do |wf|
-          @@source_cache[wf] ||= Source.load(wf)
+          begin
+            @@source_cache[wf] ||= Source.load(wf)
+          rescue
+            STDERR.puts "Failed to load #{wf}"
+          end
         end
       end
       @sources = {}
       @virtual_source = nil
       @virtual_filename = nil
-      @stale = false
-      @new_method_pins = []
-      @new_ivar_pins = []
+      @stale = true
+      refresh
     end
 
     # @return [Solargraph::YardMap]
     def yard_map
-      @@semaphore.synchronize {
-        @@yard_map_cache[[required, workspace]] ||= Solargraph::YardMap.new(required: required, workspace: workspace)
-      }
+      refresh
+      if @yard_map.nil? || @yard_map.required != required
+        @yard_map = Solargraph::YardMap.new(required: required, workspace: workspace)
+      end
+      @yard_map
     end
 
+    # @return [Solargraph::ApiMap::Source]
     def virtualize filename, code, cursor = nil
-      @stale = true
+      unless @virtual_source.nil? or @virtual_filename == filename or @workspace_files.include?(@virtual_filename)
+        eliminate @virtual_filename
+      end
+      refresh
       @virtual_filename = filename
       @virtual_source = Source.fix(filename, code, cursor)
+      process_virtual
+      @virtual_source
     end
 
+    # @return [Solargraph::ApiMap::Source]
     def append_source code, filename
       virtualize filename, code
     end
@@ -115,18 +121,26 @@ module Solargraph
       result
     end
 
+    # @return [Array<Solargraph::Pin::Constant>]
+    def get_constant_pins namespace, root
+      fqns = find_fully_qualified_namespace(namespace, root)
+      @const_pins[fqns] || []
+    end
+
+    # @return [Array<Solargraph::Suggestion>]
     def get_constants namespace, root
       result = []
       fqns = find_fully_qualified_namespace(namespace, root)
       cp = @const_pins[fqns]
       unless cp.nil?
         cp.each do |pin|
-          result.push Suggestion.pull(pin, resolve_pin_return_type(pin))
+          result.push pin_to_suggestion(pin)
         end
       end
       result.concat yard_map.get_constants(namespace, root)
     end
 
+    # @return [String]
     def find_fully_qualified_namespace name, root = '', skip = []
       refresh
       return nil if skip.include?(root)
@@ -168,40 +182,51 @@ module Solargraph
       @namespace_map[fqns] || []
     end
 
+    # @return [Array<Solargraph::Pin::InstanceVariable>]
+    def get_instance_variable_pins(namespace, scope = :instance)
+      refresh
+      (@ivar_pins[namespace] || []).select{ |pin| pin.scope == scope }
+    end
+
+    # @return [Array<Solargraph::Suggestion>]
     def get_instance_variables(namespace, scope = :instance)
       refresh
       result = []
       ip = @ivar_pins[namespace]
       unless ip.nil?
         ip.select{ |pin| pin.scope == scope }.each do |pin|
-          #result.push pin.suggestion
-          result.push Suggestion.pull(pin, resolve_pin_return_type(pin))
+          result.push pin_to_suggestion(pin)
         end
       end
       result
     end
 
+    # @return [Array<Solargraph::Pin::ClassVariable>]
+    def get_class_variable_pins(namespace)
+      refresh
+      @cvar_pins[namespace] || []
+    end
+
+    # @return [Array<Solargraph::Suggestion>]
     def get_class_variables(namespace)
       refresh
       result = []
       ip = @cvar_pins[namespace]
       unless ip.nil?
         ip.each do |pin|
-          result.push Suggestion.pull(pin, resolve_pin_return_type(pin))
+          result.push pin_to_suggestion(pin)
         end
       end
       result
     end
 
+    # @return [Array<Solargraph::Pin::Symbol>]
     def get_symbols
       refresh
-      result = []
-      @symbol_pins.each do |s|
-        result.push s
-      end
-      result
+      @symbol_pins.uniq(&:label)
     end
 
+    # @return [String]
     def get_filename_for(node)
       @sources.each do |filename, source|
         return source.filename if source.include?(node)
@@ -209,6 +234,7 @@ module Solargraph
       nil
     end
 
+    # @return [String]
     def infer_instance_variable(var, namespace, scope)
       refresh
       pins = @ivar_pins[namespace]
@@ -218,6 +244,7 @@ module Solargraph
       pin.return_type
     end
 
+    # @return [String]
     def infer_class_variable(var, namespace)
       refresh
       fqns = find_fully_qualified_namespace(namespace)
@@ -228,11 +255,18 @@ module Solargraph
       pin.return_type
     end
 
+    # @return [Array<Solargraph::Suggestion>]
     def get_global_variables
-      # TODO: Get them
-      []
+      result = []
+      @sources.values.each do |s|
+        s.global_variable_pins.each do |p|
+          result.push pin_to_suggestion(p)
+        end
+      end
+      result
     end
 
+    # @return [String]
     def infer_assignment_node_type node, namespace
       type = cache.get_assignment_node_type(node, namespace)
       if type.nil?
@@ -261,6 +295,7 @@ module Solargraph
       type
     end
 
+    # @return [String]
     def infer_signature_type signature, namespace, scope: :class
       if cache.has_signature_type?(signature, namespace, scope)
         return cache.get_signature_type(signature, namespace, scope)
@@ -322,16 +357,16 @@ module Solargraph
       refresh
       namespace = clean_namespace_string(namespace)
       meths = []
-      meths += inner_get_methods(namespace, root, []) #unless has_yardoc?
+      meths.concat inner_get_methods(namespace, root, []) #unless has_yardoc?
       yard_meths = yard_map.get_methods(namespace, root, visibility: visibility)
       if yard_meths.any?
         meths.concat yard_meths
       else
         type = get_namespace_type(namespace, root)
         if type == :class
-          meths += yard_map.get_instance_methods('Class')
+          meths.concat yard_map.get_instance_methods('Class')
         elsif type == :module
-          meths += yard_map.get_methods('Module')
+          meths.concat yard_map.get_methods('Module')
         end
       end
       news = meths.select{|s| s.label == 'new'}
@@ -341,7 +376,7 @@ module Solargraph
           inits = @method_pins[fqns].select{|p| p.name == 'initialize'}
           meths -= news unless inits.empty?
           inits.each do |pin|
-            meths.push Suggestion.new('new', kind: pin.kind, documentation: pin.docstring, detail: pin.namespace, arguments: pin.parameters, path: pin.path)
+            meths.push Suggestion.new('new', kind: pin.kind, docstring: pin.docstring, detail: pin.namespace, arguments: pin.parameters, path: pin.path)
           end
         end
       end
@@ -396,6 +431,27 @@ module Solargraph
       @sources.values
     end
 
+    def get_path_suggestions path
+      result = []
+      if path.include?('#')
+        # It's an instance method
+        parts = path.split('#')
+        result = get_instance_methods(parts[0], '', visibility: [:public, :private, :protected]).select{|s| s.label == parts[1]}
+      elsif path.include?('.')
+        # It's a class method
+        parts = path.split('.')
+        result = get_instance_methods(parts[0], '', visibility: [:public, :private, :protected]).select{|s| s.label == parts[1]}
+      else
+        # It's a class or module
+        get_namespace_nodes(path).each do |node|
+          # TODO This is way underimplemented
+          result.push Suggestion.new(path, kind: Suggestion::CLASS)
+        end
+        result.concat yard_map.objects(path)
+      end
+      result
+    end
+
     private
 
     def clear
@@ -409,8 +465,12 @@ module Solargraph
     def process_maps
       @sources.clear
       @workspace_files.each do |f|
-        @@source_cache[f] ||= Source.load(f)
-        @sources[f] = @@source_cache[f]
+        begin
+          @@source_cache[f] ||= Source.load(f)
+          @sources[f] = @@source_cache[f]
+        rescue
+          STDERR.puts "Failed to load #{f}"
+        end
       end
       cache.clear
       @ivar_pins = {}
@@ -425,6 +485,7 @@ module Solargraph
       @namespace_map = {}
       @namespace_tree = {}
       @required = []
+      @pin_suggestions = {}
       unless @virtual_source.nil?
         @sources[@virtual_filename] = @virtual_source
       end
@@ -442,6 +503,31 @@ module Solargraph
       @stale = false
     end
 
+    def process_virtual
+      unless @virtual_source.nil?
+        cache.clear
+        @sources[@virtual_filename] = @virtual_source
+        @sources.values.each do |s|
+          s.namespace_nodes.each_pair do |k, v|
+            @namespace_map[k] ||= []
+            @namespace_map[k].concat v
+            add_to_namespace_tree k.split('::')
+          end
+        end
+        eliminate @virtual_filename
+        map_source @virtual_source
+      end
+    end
+
+    def eliminate filename
+      [@ivar_pins.values, @cvar_pins.values, @const_pins.values, @method_pins.values, @attr_pins.values].each do |pinsets|
+        pinsets.each do |pins|
+          pins.delete_if{|pin| pin.filename == filename}
+        end
+      end
+      #@symbol_pins.delete_if{|pin| pin.filename == filename}
+    end
+
     # @param [Solargraph::ApiMap::Source]
     def map_source source
       source.method_pins.each do |pin|
@@ -484,7 +570,7 @@ module Solargraph
       @cache ||= Cache.new
     end
 
-    def inner_get_methods(namespace, root = '', skip = [])
+    def inner_get_methods(namespace, root = '', skip = [], visibility = [:public])
       meths = []
       return meths if skip.include?(namespace)
       skip.push namespace
@@ -493,7 +579,14 @@ module Solargraph
       mn = @method_pins[fqns]
       unless mn.nil?
         mn.select{ |pin| pin.scope == :class }.each do |pin|
-          meths.push Suggestion.pull(pin)
+          meths.push pin_to_suggestion(pin)
+        end
+      end
+      if visibility.include?(:public) or visibility.include?(:protected)
+        sc = @superclasses[fqns]
+        unless sc.nil?
+          meths.concat inner_get_methods(sc, fqns, skip, visibility - [:private])
+          meths.concat yard_map.get_methods(sc, fqns, visibility: visibility - [:private])
         end
       end
       meths.uniq
@@ -507,13 +600,13 @@ module Solargraph
       an = @attr_pins[fqns]
       unless an.nil?
         an.each do |pin|
-          meths.push Suggestion.pull(pin)
+          meths.push pin_to_suggestion(pin)
         end
       end
       mn = @method_pins[fqns]
       unless mn.nil?
         mn.select{|pin| visibility.include?(pin.visibility) and pin.scope == :instance }.each do |pin|
-          meths.push Suggestion.pull(pin)
+          meths.push pin_to_suggestion(pin)
         end
       end
       if visibility.include?(:public) or visibility.include?(:protected)
@@ -561,7 +654,7 @@ module Solargraph
             cp = @const_pins[fqns]
             unless cp.nil?
               cp.each do |pin|
-                result.push Suggestion.pull(pin, resolve_pin_return_type(pin))
+                result.push pin_to_suggestion(pin)
               end
             end
             inc = @namespace_includes[fqns]
@@ -582,85 +675,48 @@ module Solargraph
     #
     # @return [String] The fully qualified namespace for the signature's type
     #   or nil if a type could not be determined
-    def inner_infer_signature_type signature, namespace, scope: :instance
-      orig = namespace
-      namespace = clean_namespace_string(namespace)
+    def inner_infer_signature_type signature, namespace, scope: :instance, top: true
       return nil if signature.nil?
       signature.gsub!(/\.$/, '')
-      if signature.nil? or signature.empty?
+      if signature.empty?
         if scope == :class
-          return "#{namespace}#class"
+          return "Class<#{namespace}>"
         else
           return "#{namespace}"
         end
       end
-      if !namespace.nil? and namespace.end_with?('#class')
-        return inner_infer_signature_type signature, namespace[0..-7], scope: (scope == :class ? :instance : :class)
-      end
       parts = signature.split('.')
-      type = find_fully_qualified_namespace(namespace)
-      type ||= ''
-      top = true
-      while parts.length > 0 and !type.nil?
-        p = parts.shift
-        next if p.empty?
-        next if !type.nil? and !type.empty? and METHODS_RETURNING_SELF.include?(p)
-        if top and scope == :class
-          if p == 'self'
-            top = false
-            return "Class<#{type}>" if parts.empty?
-            sub = inner_infer_signature_type(parts.join('.'), type, scope: :class)
-            return sub unless sub.to_s == ''
-            next
-          end
-          if p == 'new'
-            scope = :instance
-            type = namespace
-            top = false
-            next
-          end
-          first_class = find_fully_qualified_namespace(p, namespace)
-          sub = nil
-          sub = inner_infer_signature_type(parts.join('.'), first_class, scope: :class) unless first_class.nil?
-          return sub unless sub.to_s == ''
+      type = namespace || ''
+      while (parts.length > 0)
+        part = parts.shift
+        if top == true and part == 'self'
+          top = false
+          next
         end
-        if top and scope == :instance and p == 'self'
-          return type if parts.empty?
-          sub = infer_signature_type(parts.join('.'), type, scope: :instance)
-          return sub unless sub.to_s == ''
+        cls_match = type.match(/^Class<([A-Za-z0-9_:]*?)>$/)
+        if cls_match
+          type = cls_match[1]
+          scope = :class
         end
-        if top and scope == :instance and p == '[]' and !orig.nil?
-          if orig.start_with?('Array<')
-            match = orig.match(/Array<([a-z0-9:_]*)/i)[1]
-            type = match
-            next
-          end
-        end
-        unless p == 'new' and scope != :instance
+        if scope == :class and part == 'new'
+          scope = :instance
+        elsif !METHODS_RETURNING_SELF.include?(part)
+          visibility = [:public]
+          visibility.concat [:private, :protected] if top
           if scope == :instance
-            visibility = [:public]
-            visibility.push :private, :protected if top
-            meths = get_instance_methods(type, visibility: visibility)
-            meths += get_methods('') if top or type.to_s == ''
+            meth = get_instance_methods(namespace, visibility: visibility).select{|s| s.label == part}.first
           else
-            meths = get_methods(type)
-          end
-          meths.delete_if{ |m| m.insert != p }
-          return nil if meths.empty?
-          type = nil
-          match = meths[0].return_type
-          unless match.nil?
-            cleaned = clean_namespace_string(match)
-            if cleaned.end_with?('#class')
-              return inner_infer_signature_type(parts.join('.'), cleaned.split('#').first, scope: :class)
-            else
-              type = find_fully_qualified_namespace(cleaned)
-            end
+            meth = get_methods(namespace, visibility: visibility).select{|s| s.label == part}.first            
           end
+          return nil if meth.nil? or meth.return_type.nil?
+          type = meth.return_type
+          scope = :instance
         end
-        scope = :instance
         top = false
       end
+      if scope == :class
+        type = "Class<#{type}>"
+      end
       type
     end
 
@@ -685,13 +741,10 @@ module Solargraph
       result
     end
 
-    def resolve_pin_return_type pin
-      return pin.return_type unless pin.return_type.nil?
-      return nil if pin.signature.nil?
-      # Avoid infinite loops from variable assignments that reference themselves
-      return nil if pin.name == pin.signature.split('.').first
-      infer_signature_type(pin.signature, pin.namespace)
+    # @param pin [Solargraph::Pin::Base]
+    # @return [Solargraph::Suggestion]
+    def pin_to_suggestion pin
+      @pin_suggestions[pin] ||= Suggestion.pull(pin)
     end
-
   end
 end