solargraph 0.14.3 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b19cc5d128d5ad59344c60240530466594888a3
-  data.tar.gz: db5e6a4c0f05e070c1b14d1c22d6ae32f1ac61e6
+  metadata.gz: a4f454b9e7f567d76ddc0b8902986eedbaa954be
+  data.tar.gz: 6c6717978be4f958dce42035ba8640cf332c9fe2
 SHA512:
-  metadata.gz: 12d90c3ac837e6a3669e91dbdcc3101edfac58010f1dde7471caf7f6808529c64fbfcb31cf28859e6f11d52b91040cbd4929124295016e999a03627f6e2295af
-  data.tar.gz: 3fe26bbd2699603487702b765734ae63df345d4afced95b1139e7bafdb2eef419fcd19e1778268b91b84193ea30da0b96ef609aabcb95a26abce46545f8e4e34
+  metadata.gz: 5db48477da0eb98a11a52b9f456d6bb693a79eb8efda1689b2b7cb1402c1011a84d099f4c29ffb6c35489a1937ed54da074ba2c07f198919f0534b06f555ed7f
+  data.tar.gz: 512f69ecf4dcd355e55cb5a5a9f44aa9af792273f3fb99e0fcf17944b0b7006bb338e4560795ca4cf33a0526b29c06b60ad8a0fd740ded92c906499dd371d8ed

data/lib/solargraph.rb

@@ -20,24 +20,4 @@ module Solargraph
   YARD_EXTENSION_FILE = File.join(File.realpath(File.dirname(__FILE__)), 'yard-solargraph.rb')
 end
 
-# Make sure the core and stdlib documentation is available
-cache_dir = File.join(Dir.home, '.solargraph', 'cache')
-version_dir = File.join(cache_dir, '2.0.0')
-unless File.exist?(version_dir)
-  FileUtils.mkdir_p cache_dir
-  FileUtils.cp File.join(Solargraph::YARDOC_PATH, '2.0.0.tar.gz'), cache_dir
-  tar_extract = Gem::Package::TarReader.new(Zlib::GzipReader.open(File.join(cache_dir, '2.0.0.tar.gz')))
-  tar_extract.rewind
-  tar_extract.each do |entry|
-    if entry.directory?
-      FileUtils.mkdir_p File.join(cache_dir, entry.full_name)
-    else
-      FileUtils.mkdir_p File.join(cache_dir, File.dirname(entry.full_name))
-      File.open(File.join(cache_dir, entry.full_name), 'wb') do |f|
-        f << entry.read
-      end
-    end
-  end
-  tar_extract.close
-  #FileUtils.rm File.join(cache_dir, '2.0.0.tar.gz')
-end
+Solargraph::YardMap::CoreDocs.require_minimum

data/lib/solargraph/api_map.rb

@@ -4,10 +4,10 @@ require 'thread'
 
 module Solargraph
   class ApiMap
-    autoload :Config,    'solargraph/api_map/config'
-    autoload :Source,    'solargraph/api_map/source'
-    autoload :Cache,     'solargraph/api_map/cache'
-
+    autoload :Config,       'solargraph/api_map/config'
+    autoload :Source,       'solargraph/api_map/source'
+    autoload :Cache,        'solargraph/api_map/cache'
+    autoload :SourceToYard, 'solargraph/api_map/source_to_yard'
     @@source_cache = {}
 
     KEYWORDS = [
@@ -23,6 +23,7 @@ module Solargraph
     ].freeze
 
     include NodeMethods
+    include Solargraph::ApiMap::SourceToYard
 
     # The root directory of the project. The ApiMap will search here for
     # additional files to parse and analyze.
@@ -40,7 +41,7 @@ module Solargraph
         workspace_files.each do |wf|
           begin
             @@source_cache[wf] ||= Source.load(wf)
-          rescue Exception => e
+          rescue Parser::SyntaxError => e
             STDERR.puts "Failed to load #{wf}: #{e.message}"
           end
         end
@@ -49,6 +50,7 @@ module Solargraph
       @virtual_source = nil
       @virtual_filename = nil
       @stale = true
+      @yard_stale = true
       refresh
       yard_map
     end
@@ -333,6 +335,14 @@ module Solargraph
       suggest_unique_variables globals
     end
 
+    def get_global_variable_pins
+      globals = []
+      @sources.values.each do |s|
+        globals.concat s.global_variable_pins
+      end
+      globals
+    end
+
     # @return [String]
     def infer_assignment_node_type node, namespace
       type = cache.get_assignment_node_type(node, namespace)
@@ -369,6 +379,13 @@ module Solargraph
         return cache.get_signature_type(signature, namespace, scope)
       end
       return nil if signature.nil? or signature.empty?
+      if !signature.include?('.')
+        fqns = find_fully_qualified_namespace(signature, namespace)
+        unless fqns.nil? or fqns.empty?
+          type = (get_namespace_type(fqns) == :class ? 'Class' : 'Module')
+          return "#{type}<#{fqns}>"
+        end
+      end
       result = nil
       if namespace.end_with?('#class')
         result = infer_signature_type signature, namespace[0..-7], scope: (scope == :class ? :instance : :class)
@@ -439,7 +456,7 @@ module Solargraph
         if type == :class
           meths.concat yard_map.get_instance_methods('Class')
         else
-          meths.concat yard_map.get_methods('Module')
+          meths.concat yard_map.get_instance_methods('Module')
         end
       end
       news = meths.select{|s| s.label == 'new'}
@@ -474,6 +491,8 @@ module Solargraph
       namespace = clean_namespace_string(namespace)
       if namespace.end_with?('#class')
         return get_methods(namespace.split('#').first, root, visibility: visibility)
+      elsif namespace.end_with?('#module')
+        return get_methods(namespace.split('#').first, root, visibility: visibility)
       end
       meths = []
       meths += inner_get_instance_methods(namespace, root, [], visibility) #unless has_yardoc?
@@ -489,6 +508,11 @@ module Solargraph
           meths += yard_map.get_instance_methods('Module')
         end
       end
+      if namespace == '' and root == ''
+        config.domains.each do |d|
+          meths.concat get_instance_methods(d)
+        end
+      end
       strings = meths.map(&:to_s)
       live_map.get_methods(namespace, root, 'instance', visibility.include?(:private)).each do |m|
         next if strings.include?(m) or !m.match(/^[a-z]/i)
@@ -513,6 +537,10 @@ module Solargraph
     def update filename
       filename.gsub!(/\\/, '/')
       if filename.end_with?('.rb')
+        if @virtual_filename == filename
+          @virtual_filename = nil
+          @virtual_source = nil
+        end
         if @workspace_files.include?(filename)
           eliminate filename
           @@source_cache[filename] = Source.load(filename)
@@ -556,6 +584,30 @@ module Solargraph
       result
     end
 
+    def search query
+      refresh
+      rake_yard(@sources.values) if @yard_stale
+      @yard_stale = false
+      found = []
+      code_object_paths.each do |k|
+        if found.empty? or (query.include?('.') or query.include?('#')) or !(k.include?('.') or k.include?('#'))
+          found.push k if k.downcase.include?(query.downcase)
+        end
+      end
+      found.concat(yard_map.search(query)).uniq.sort
+    end
+
+    # @return [Array<YARD::CodeObject::Base>]
+    def document path
+      refresh
+      rake_yard(@sources.values) if @yard_stale
+      @yard_stale = false
+      docs = []
+      docs.push code_object_at(path) unless code_object_at(path).nil?
+      docs.concat yard_map.document(path)
+      docs
+    end
+
     private
 
     # @return [Hash]
@@ -599,6 +651,7 @@ module Solargraph
       @required.uniq!
       live_map.refresh
       @stale = false
+      @yard_stale = true
     end
 
     def rebuild_local_yardoc
@@ -707,13 +760,9 @@ module Solargraph
       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])
-          strings = meths.map(&:to_s)
-          live_map.get_methods(sc, fqns, 'class', false).each do |m|
-            next if strings.include?(m) or !m.match(/^[a-z]/i)
-            meths.push Suggestion.new(m, kind: Suggestion::METHOD, docstring: YARD::Docstring.new('(defined at runtime)'), path: "#{fqns}##{m}")
-          end
+          sc_visi = [:public]
+          sc_visi.push :protected if root == fqns
+          meths.concat get_methods(sc, fqns, visibility: sc_visi)
         end
       end
       meths.uniq
@@ -739,13 +788,9 @@ module Solargraph
       if visibility.include?(:public) or visibility.include?(:protected)
         sc = @superclasses[fqns]
         unless sc.nil?
-          meths.concat inner_get_instance_methods(sc, fqns, skip, visibility - [:private])
-          meths.concat yard_map.get_instance_methods(sc, fqns, visibility: visibility - [:private])
-          strings = meths.map(&:to_s)
-          live_map.get_methods(sc, fqns, 'instance', false).each do |m|
-            next if strings.include?(m) or !m.match(/^[a-z]/i)
-            meths.push Suggestion.new(m, kind: Suggestion::METHOD, docstring: YARD::Docstring.new('(defined at runtime)'))
-          end
+          sc_visi = [:public]
+          sc_visi.push :protected if sc == fqns
+          meths.concat get_instance_methods(sc, fqns, visibility: sc_visi)
         end
       end
       im = @namespace_includes[fqns]
@@ -768,9 +813,12 @@ module Solargraph
       signature.gsub!(/\.$/, '')
       if signature.empty?
         if scope == :class
-          return "Class<#{namespace}>"
-        else
-          return "#{namespace}"
+          type = get_namespace_type(namespace)
+          if type == :class
+            return "Class<#{namespace}>"
+          else
+            return "Module<#{namespace}>"
+          end
         end
       end
       parts = signature.split('.')
@@ -846,6 +894,9 @@ module Solargraph
       if result == 'Class' and namespace.include?('<')
         subtype = namespace.match(/<([a-z0-9:_]*)/i)[1]
         result = "#{subtype}#class"
+      elsif result == 'Module' and namespace.include?('<')
+        subtype = namespace.match(/<([a-z0-9:_]*)/i)[1]
+        result = "#{subtype}#module"
       end
       result
     end

data/lib/solargraph/api_map/config.rb

@@ -32,6 +32,7 @@ module Solargraph
         @raw_data['exclude'] ||= exclude_globs
         @raw_data['domains'] ||= []
         @raw_data['required'] ||= []
+        @raw_data['plugins'] ||= []
       end
 
       # An array of files included in the workspace (before calculating excluded files).
@@ -66,6 +67,10 @@ module Solargraph
         raw_data['required']
       end
 
+      def plugins
+        raw_data['plugins']
+      end
+
       private
 
       def process_globs globs

data/lib/solargraph/api_map/source.rb

@@ -15,9 +15,12 @@ module Solargraph
       # @return [String]
       attr_reader :filename
 
+      # @return [Array<Integer>]
+      attr_reader :stubbed_lines
+
       include NodeMethods
 
-      def initialize code, node, comments, filename
+      def initialize code, node, comments, filename, stubbed_lines = []
         @code = code
         root = AST::Node.new(:source, [filename])
         root = root.append node
@@ -30,6 +33,7 @@ module Solargraph
         @all_nodes = []
         @node_stack = []
         @node_tree = {}
+        @stubbed_lines = stubbed_lines
         inner_map_node @node
         @directives.each_pair do |k, v|
           v.each do |d|
@@ -324,67 +328,62 @@ module Solargraph
           Source.new(code, node, comments, filename)
         end
 
-        # @return [Solargraph::ApiMap::Source]
-        def fix code, filename = nil, cursor = nil
+        def get_position_at(code, offset)
+          cursor = 0
+          line = 0
+          col = nil
+          code.each_line do |l|
+            if cursor + l.length >= offset
+              col = offset - cursor
+              break
+            end
+            cursor += l.length
+            line += 1
+          end
+          raise "Invalid offset" if col.nil?
+          [line, col]
+        end
+
+        def fix code, filename = nil, offset = nil
           tries = 0
           code.gsub!(/\r/, '')
+          offset = CodeMap.get_offset(code, offset[0], offset[1]) if offset.kind_of?(Array)
+          pos = nil
+          pos = get_position_at(code, offset) unless offset.nil?
+          stubs = []
+          fixed_position = false
           tmp = code
-          cursor = CodeMap.get_offset(code, cursor[0], cursor[1]) if cursor.kind_of?(Array)
-          fixed_cursor = false
           begin
-            # HACK: The current file is parsed with a trailing underscore to fix
-            # incomplete trees resulting from short scripts (e.g., an unfinished
-            # variable assignment).
-            node, comments = Parser::CurrentRuby.parse_with_comments(tmp + "\n_")
-            Source.new(code, node, comments, filename)
+            node, comments = Parser::CurrentRuby.parse_with_comments(tmp)
+            Source.new(code, node, comments, filename, stubs)
           rescue Parser::SyntaxError => e
             if tries < 10
               tries += 1
-              if tries == 10 and e.message.include?('token $end')
+              # Stub periods before the offset to retain the expected node tree
+              if !offset.nil? and tmp[offset-1] == '.'
+                tmp = tmp[0, offset-1] + '_' + tmp[offset..-1]
+              elsif !fixed_position and !offset.nil?
+                fixed_position = true
+                beg = beginning_of_line_from(tmp, offset)
+                tmp = tmp[0, beg] + '#' + tmp[beg+1..-1]
+                stubs.push(pos[0])
+              elsif e.message.include?('token $end')
                 tmp += "\nend"
-              else
-                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] == '.' or tmp[cursor - 1] == '$'
-                    repl = ';'
-                  else
-                    repl = '#'
-                  end
-                else
-                  spot = e.diagnostic.location.begin_pos
-                  repl = '_'
-                  if tmp[spot] == '@' or tmp[spot] == ':'
-                    # Stub unfinished instance variables and symbols
-                    spot -= 1
-                  elsif tmp[spot - 1] == '.'
-                    # Stub unfinished method calls
-                    repl = '#' if spot == tmp.length or tmp[spot] == '\n'
-                    spot -= 2
-                  else
-                    # Stub the whole line
-                    spot = beginning_of_line_from(tmp, spot)
-                    repl = '#'
-                    if tmp[spot+1..-1].rstrip == 'end'
-                      repl= 'end;end'
-                    end
-                  end
-                end
-                tmp = tmp[0..spot] + repl + tmp[spot+repl.length+1..-1].to_s
+              elsif e.message.include?("unexpected `@'")
+                tmp = tmp[0, e.diagnostic.location.begin_pos] + '_' + tmp[e.diagnostic.location.begin_pos+1..-1]
               end
               retry
             end
-            raise e
+            STDERR.puts "Unable to parse code: #{e.message}"
+            virt = Source.virtual('', filename)
+            Source.new(code, virt.node, virt.comments, filename)
           end
         end
 
         def beginning_of_line_from str, i
-          while i > 0 and str[i] != "\n"
+          while i > 0 and str[i-1] != "\n"
             i -= 1
           end
-          if i > 0 and str[i..-1].strip == ''
-            i = beginning_of_line_from str, i -1
-          end
           i
         end
       end

data/lib/solargraph/api_map/source_to_yard.rb

@@ -0,0 +1,66 @@
+module Solargraph
+  class ApiMap
+    module SourceToYard
+
+      # Get the YARD CodeObject at the specified path.
+      #
+      # @return [YARD::CodeObjects::Base]
+      def code_object_at path
+        code_object_map[path]
+      end
+
+      def code_object_paths
+        code_object_map.keys
+      end
+
+      private
+
+      def code_object_map
+        @code_object_map ||= {}
+      end
+
+      def rake_yard sources
+        code_object_map.clear
+        sources.each do |s|
+          s.namespace_pins.each do |pin|
+            if pin.kind == :class
+              code_object_map[pin.path] ||= YARD::CodeObjects::ClassObject.new(code_object_at(pin.namespace), pin.name)
+            else
+              code_object_map[pin.path] ||= YARD::CodeObjects::ModuleObject.new(code_object_at(pin.namespace), pin.name)
+            end
+            code_object_map[pin.path].docstring = pin.docstring unless pin.docstring.nil?
+          end
+          s.namespace_includes.each_pair do |n, i|
+            code_object_map[n].mixins.push code_object_map[i] unless code_object_map[i].nil?
+          end
+          s.attribute_pins.each do |pin|
+            STDERR.puts "Adding #{pin.name} attribute to #{pin.namespace}"
+            code_object_map[pin.path] ||= YARD::CodeObjects::MethodObject.new(code_object_at(pin.namespace), pin.name, :instance)
+            code_object_map[pin.path].docstring = pin.docstring unless pin.docstring.nil?
+            code_object_map[pin.parameters] = []
+            #code_object_map[pin.path].parameters = pin.parameters.map do |p|
+            #  n = p.match(/^[a-z0-9\-]*?:?/i)[0]
+            #  v = nil
+            #  if p.length > n.length
+            #    v = p[n.length..-1].gsub(/^ = /, '')
+            #  end
+            #  [n, v]
+            #end
+          end
+          s.method_pins.each do |pin|
+            code_object_map[pin.path] ||= YARD::CodeObjects::MethodObject.new(code_object_at(pin.namespace), pin.name, pin.scope)
+            code_object_map[pin.path].docstring = pin.docstring unless pin.docstring.nil?
+            code_object_map[pin.path].parameters = pin.parameters.map do |p|
+              n = p.match(/^[a-z0-9\-]*?:?/i)[0]
+              v = nil
+              if p.length > n.length
+                v = p[n.length..-1].gsub(/^ = /, '')
+              end
+              [n, v]
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/code_map.rb

@@ -23,18 +23,9 @@ module Solargraph
     # @return [String]
     attr_reader :filename
 
-    # The root directory of the project. The ApiMap will search here for
-    # additional files to parse and analyze.
-    # @deprecated CodeMap will be server-agnostic in a future version.
-    #
-    # @return [String]
-    attr_reader :workspace
-
     include NodeMethods
 
-    def initialize code: '', filename: nil, workspace: nil, api_map: nil, cursor: nil
-      STDERR.puts "WARNING: the `workspace` parameter in Solargraph::CodeMap#new is deprecated and will be removed in a future version." unless workspace.nil?
-      @workspace = workspace
+    def initialize code: '', filename: nil, api_map: nil, cursor: nil
       # HACK: Adjust incoming filename's path separator for yardoc file comparisons
       filename = filename.gsub(File::ALT_SEPARATOR, File::SEPARATOR) unless filename.nil? or File::ALT_SEPARATOR.nil?
       @filename = filename
@@ -50,7 +41,7 @@ module Solargraph
     #
     # @return [Solargraph::ApiMap]
     def api_map
-      @api_map ||= ApiMap.new(workspace)
+      @api_map ||= ApiMap.new(nil)
     end
 
     # Get the offset of the specified line and column.
@@ -107,6 +98,8 @@ module Solargraph
     #
     # @return [Boolean]
     def comment_at?(index)
+      line, col = Solargraph::ApiMap::Source.get_position_at(source.code, index)
+      return false if source.stubbed_lines.include?(line)
       @comments.each do |c|
         return true if index > c.location.expression.begin_pos and index <= c.location.expression.end_pos
       end
@@ -241,9 +234,9 @@ module Solargraph
                 parts.pop
               end
               result += api_map.get_constants('')
-              result += api_map.get_instance_methods('Kernel')
-              result += api_map.get_methods('')
-              result += api_map.get_instance_methods('')
+              result += api_map.get_instance_methods('Kernel', namespace)
+              result += api_map.get_methods('', namespace)
+              #result += api_map.get_instance_methods('', namespace)
             else
               result.concat api_map.get_instance_methods(type)
             end
@@ -333,7 +326,7 @@ module Solargraph
       end
       type = infer_literal_node_type(literal)
       if type.nil?
-        node = parent_node_from(index, :class, :module, :def, :defs) || @node
+        node = parent_node_from(index, :class, :module, :def, :defs, :block) || @node
         result = infer_signature_from_node signature, node
         if result.nil? or result.empty?
           # The rest of this routine is dedicated to method and block parameters
@@ -428,6 +421,9 @@ module Solargraph
         scope = (node.type == :def ? :instance : :class)
         iv = api_map.get_instance_variable_pins(ns_here, scope).select{|s| s.name == start}.first
         return (iv.return_type || api_map.infer_assignment_node_type(iv.node, iv.namespace)) unless iv.nil?
+      elsif start.start_with?('$')
+        gv = api_map.get_global_variable_pins.select{|s| s.name == start}.first
+        return (gv.return_type || api_map.infer_assignment_node_type(gv.node, gv.namespace)) unless gv.nil?
       end
       var = find_local_variable_node(start, node)
       if var.nil?
@@ -458,6 +454,19 @@ module Solargraph
           inferred = api_map.infer_signature_type(remainder.join('.'), type, scope: :instance)
         end
       end
+      if inferred.nil? and node.respond_to?(:loc)
+        index = node.loc.expression.begin_pos
+        block_node = parent_node_from(index, :block, :class, :module, :sclass, :def, :defs)
+        unless block_node.nil? or block_node.type != :block or block_node.children[0].nil?
+          scope_node = parent_node_from(index, :class, :module, :def, :defs) || @node
+          meth = get_yielding_method_with_yieldself(block_node, scope_node)
+          unless meth.nil?
+            match = meth.docstring.all.match(/@yieldself \[([a-z0-9:_]*)/i)
+            self_yield = match[1]
+            inferred = api_map.infer_signature_type(signature, self_yield, scope: :instance)
+          end
+        end
+      end
       inferred
     end
 
@@ -516,9 +525,7 @@ module Solargraph
       if local.type == :def or local.type == :defs
         result += get_method_arguments_from local
       end
-      result += get_yieldparams_at(index)
-      # @todo This might not be necessary.
-      #result += api_map.get_methods('Kernel')
+      result.concat get_yieldparams_at(index)
       result
     end
 
@@ -590,7 +597,8 @@ module Solargraph
     end
 
     def get_yieldparams_at index
-      block_node = parent_node_from(index, :block)
+      block_node = parent_node_from(index, :block, :class, :module, :def, :defs)
+      return [] if block_node.nil? or block_node.type != :block
       scope_node = parent_node_from(index, :class, :module, :def, :defs) || @node
       return [] if block_node.nil?
       get_yieldparams_from block_node, scope_node
@@ -600,32 +608,63 @@ module Solargraph
       return [] unless block_node.kind_of?(AST::Node) and block_node.type == :block
       result = []
       unless block_node.nil? or block_node.children[1].nil?
-        recv = resolve_node_signature(block_node.children[0].children[0])
-        fqns = namespace_from(block_node)
-        lvarnode = find_local_variable_node(recv, scope_node)
-        if lvarnode.nil?
-          sig = api_map.infer_signature_type(recv, fqns)
-        else
-          tmp = resolve_node_signature(lvarnode.children[1])
-          sig = infer_signature_from_node tmp, scope_node
-        end
-        meths = api_map.get_instance_methods(sig, fqns)
-        meths += api_map.get_methods('')
-        meth = meths.keep_if{ |s| s.to_s == block_node.children[0].children[1].to_s }.first
+        meth = get_yielding_method(block_node, scope_node)
         yps = []
         unless meth.nil? or meth.docstring.nil?
           yps = meth.docstring.tags(:yieldparam) || []
         end
+        self_yield = nil
+        meth = get_yielding_method_with_yieldself(block_node, scope_node)
+        unless meth.nil?
+          match = meth.docstring.all.match(/@yieldself \[([a-z0-9:_]*)/i)
+          self_yield = match[1]
+        end
         i = 0
         block_node.children[1].children.each do |a|
           rt = (yps[i].nil? ? nil : yps[i].types[0])
           result.push Suggestion.new(a.children[0], kind: Suggestion::PROPERTY, return_type: rt)
           i += 1
         end
+        result.concat api_map.get_instance_methods(self_yield, namespace_from(scope_node)) unless self_yield.nil?
       end
       result
     end
 
+    def get_yielding_method block_node, scope_node
+      recv = resolve_node_signature(block_node.children[0].children[0])
+      fqns = namespace_from(block_node)
+      lvarnode = find_local_variable_node(recv, scope_node)
+      if lvarnode.nil?
+        sig = api_map.infer_signature_type(recv, fqns)
+      else
+        tmp = resolve_node_signature(lvarnode.children[1])
+        sig = infer_signature_from_node tmp, scope_node
+      end
+      if sig.nil?
+        meths = api_map.get_methods(fqns, fqns)
+      else
+        meths = api_map.get_instance_methods(sig, fqns)
+      end
+      meths += api_map.get_methods('')
+      meth = meths.keep_if{ |s| s.to_s == block_node.children[0].children[1].to_s }.first
+      meth
+    end
+
+    def get_yielding_method_with_yieldself block_node, scope_node
+      meth = get_yielding_method block_node, scope_node
+      if meth.nil? or meth.docstring.nil? or !meth.docstring.all.include?('@yieldself')
+        meth = nil
+        tree = @source.tree_for(block_node)
+        unless tree.nil?
+          tree.each do |p|
+            break if [:def, :defs, :class, :module, :sclass].include?(p.type)
+            return get_yielding_method_with_yieldself(p, scope_node) if p.type == :block
+          end
+        end
+      end
+      meth
+    end
+
     # @param suggestions [Array<Solargraph::Suggestion>]
     # @param word [String]
     def reduce_starting_with(suggestions, word)
@@ -661,7 +700,7 @@ module Solargraph
 
     def inner_node_at(index, node, arr)
       node.children.each do |c|
-        if c.kind_of?(AST::Node)
+        if c.kind_of?(AST::Node) and c.respond_to?(:loc)
           unless c.loc.expression.nil?
             if index >= c.loc.expression.begin_pos
               if c.respond_to?(:end)

data/lib/solargraph/live_map.rb

@@ -4,7 +4,7 @@ module Solargraph
   class LiveMap
     autoload :Cache, 'solargraph/live_map/cache'
 
-    @@plugins = []
+    @@plugin_registry = {}
 
     # @return [Solargraph::ApiMap]
     attr_reader :api_map
@@ -68,19 +68,28 @@ module Solargraph
       nil
     end
 
+    def self.register name, klass
+      raise ArgumentError.new("A Solargraph plugin named #{name} already exists") if @@plugin_registry.has_key?(name)
+      @@plugin_registry[name] = klass
+    end
+
     # Register a plugin for LiveMap to use when generating suggestions.
+    # @deprecated See Solargraph::LiveMap.register instead
     #
     # @param cls [Class<Solargraph::Plugin::Base>]
     def self.install cls
-      @@plugins.push cls unless @@plugins.include?(cls)
+      STDERR.puts "WARNING: The Solargraph::LiveMap.install procedure for installing plugins is no longer used. This operation will be ignored."
     end
 
+    # @deprecated
     def self.uninstall cls
-      @@plugins.delete cls
+      STDERR.puts "WARNING: The Solargraph::LiveMap.uninstall procedure for uninstalling plugins is no longer used. This operation will be ignored."
     end
 
+    # @deprecated
     def self.plugins
-      @@plugins.clone
+      STDERR.puts "WARNING: Plugins have changed. The Solargraph::LiveMap.plugins attribute is no longer used."
+      []
     end
 
     def refresh
@@ -114,14 +123,13 @@ module Solargraph
     # @return [Array<Solargraph::Plugin::Base>]
     def load_runners
       result = []
-      has_runtime = false
-      @@plugins.each do |p|
-        r = p.new(api_map)
-        result.push r if !has_runtime or !r.runtime?
-        has_runtime = true if r.runtime?
+      api_map.config.plugins.each do |name|
+        r = @@plugin_registry[name].new(api_map)
+        result.push r
       end
-      #result.push Solargraph::Plugin::Runtime.new(api_map) unless has_runtime
       result
     end
   end
 end
+
+Solargraph::LiveMap.register 'runtime', Solargraph::Plugin::Runtime

data/lib/solargraph/plugin/process.rb

@@ -64,20 +64,14 @@ module Solargraph
         con = find_constant(args['namespace'], args['root'])
         unless con.nil?
           if (args['scope'] == 'class')
-            if args['with_private']
-              result.concat con.methods(false)
-            else
-              result.concat con.public_methods(false)
-            end
+            result.concat con.methods(false) if args['with_private']
+            result.concat con.public_methods(false)
           elsif (args['scope'] == 'instance')
-            if args['with_private']
-              result.concat con.instance_methods(false)
-            else
-              result.concat con.public_instance_methods(false)
-            end
+            result.concat con.instance_methods(false) if args['with_private']
+            result.concat con.public_instance_methods(false)
           end
         end
-        respond_ok result
+        respond_ok result.uniq
       end
 
       def get_constants args
@@ -103,11 +97,13 @@ module Solargraph
 
       def find_constant(namespace, root)
         result = nil
-        parts = root.split('::')
-        until parts.empty?
-          result = inner_find_constant("#{parts.join('::')}::#{namespace}")
-          parts.pop
-          break unless result.nil?
+        unless root.empty?
+          parts = root.split('::')
+          until parts.empty?
+            result = inner_find_constant("#{parts.join('::')}::#{namespace}")
+            parts.pop
+            break unless result.nil?
+          end
         end
         result = inner_find_constant(namespace) if result.nil?
         result

data/lib/solargraph/plugin/runtime.rb

@@ -124,7 +124,9 @@ module Solargraph
         @io.puts cmd.to_json
         @io.flush
         result = @io.gets
-        JSON.parse(result)
+        obj = JSON.parse(result)
+        STDERR.puts obj['message'] if obj['status'] == 'err'
+        obj
       end
     end
   end

data/lib/solargraph/server.rb

@@ -121,25 +121,15 @@ module Solargraph
 
     get '/search' do
       workspace = params['workspace']
-      api_map = get_api_map(workspace)
-      required = []
-      unless api_map.nil?
-        required.concat api_map.required
-      end
-      yard = YardMap.new(required: required, workspace: workspace)
-      @results = yard.search(params['query'])
+      api_map = get_api_map(workspace) || Solargraph::ApiMap.new
+      @results = api_map.search(params['query'])
       erb :search
     end
 
     get '/document' do
       workspace = params['workspace']
-      api_map = get_api_map(workspace)
-      required = []
-      unless api_map.nil?
-        required.concat api_map.required
-      end
-      yard = YardMap.new(required: required, workspace: workspace)
-      @objects = yard.document(params['query'])
+      api_map = get_api_map(workspace) || Solargraph::ApiMap.new
+      @objects = api_map.document(params['query'])
       erb :document
     end
 

data/lib/solargraph/shell.rb

@@ -15,41 +15,6 @@ module Solargraph
       puts Solargraph::VERSION
     end
 
-    desc 'prepare', 'Cache YARD files for the current environment'
-    option :force, type: :boolean, aliases: :f, desc: 'Force download of YARDOC files if they already exist'
-    option :host, type: :string, aliases: :h, desc: 'The host that provides YARDOC files for download', default: 'yardoc.solargraph.org'
-    def prepare
-      cache_dir = File.join(Dir.home, '.solargraph', 'cache')
-      version_dir = File.join(cache_dir, '2.0.0')
-      unless File.exist?(version_dir) or options[:force]
-        FileUtils.mkdir_p cache_dir
-        puts 'Downloading 2.0.0...'
-        Net::HTTP.start(options[:host]) do |http|
-            resp = http.get("/2.0.0.tar.gz")
-            open(File.join(cache_dir, '2.0.0.tar.gz'), "wb") do |file|
-                file.write(resp.body)
-            end
-            puts 'Uncompressing archives...'
-            FileUtils.rm_rf version_dir if File.exist?(version_dir)
-            tar_extract = Gem::Package::TarReader.new(Zlib::GzipReader.open(File.join(cache_dir, '2.0.0.tar.gz')))
-            tar_extract.rewind
-            tar_extract.each do |entry|
-              if entry.directory?
-                FileUtils.mkdir_p File.join(cache_dir, entry.full_name)
-              else
-                FileUtils.mkdir_p File.join(cache_dir, File.dirname(entry.full_name))
-                File.open(File.join(cache_dir, entry.full_name), 'wb') do |f|
-                  f << entry.read
-                end
-              end
-            end
-            tar_extract.close
-            FileUtils.rm File.join(cache_dir, '2.0.0.tar.gz')
-            puts 'Done.'
-        end
-      end
-    end
-    
     desc 'server', 'Start a Solargraph server'
     option :port, type: :numeric, aliases: :p, desc: 'The server port', default: 7657
     option :views, type: :string, aliases: :v, desc: 'The view template directory', default: nil
@@ -74,18 +39,6 @@ module Solargraph
         end
       end
     end
-    
-
-    desc 'plugin PLUGIN_NAME', 'Run a Solargraph runtime plugin'
-    option :workspace, type: :string, aliases: :w, desc: 'The workspace'
-    option :port, type: :numeric, aliases: :p, desc: 'The server port', required: true
-    option :ppid, type: :numeric, desc: 'ppid'
-    def plugin plugin_name
-      # @todo Find the correct plugin based on the provided name
-      cls = Solargraph::Plugin::Runtime
-      #SolargraphRailsExt::Server.new(options[:workspace], options[:port]).run
-      cls.serve options[:workspace], options[:port], options[:ppid]
-    end
 
     desc 'suggest', 'Get code suggestions for the provided input'
     long_desc <<-LONGDESC
@@ -95,6 +48,7 @@ module Solargraph
     option :column, type: :numeric, aliases: [:c, :col], desc: 'Zero-based column number', required: true
     option :filename, type: :string, aliases: :f, desc: 'File name', required: false
     def suggest(*filenames)
+      STDERR.puts "WARNING: The `solargraph suggest` command is a candidate for deprecation. It will either change drastically or not exist in a future version."
       # HACK: The ARGV array needs to be manipulated for ARGF.read to work
       ARGV.clear
       ARGV.concat filenames
@@ -138,5 +92,27 @@ module Solargraph
       end
       STDOUT.puts "Configuration file initialized."
     end
+
+    desc 'download-core [VERSION]', 'Download core documentation'
+    def download_core version = nil
+      ver = version || Solargraph::YardMap::CoreDocs.best_download
+      puts "Downloading docs for #{ver}..."
+      Solargraph::YardMap::CoreDocs.download ver
+    end
+
+    desc 'list-cores', 'List the local documentation versions'
+    def list_cores
+      puts Solargraph::YardMap::CoreDocs.versions.join("\n")
+    end
+
+    desc 'available-cores', 'List available documentation versions'
+    def available_cores
+      puts Solargraph::YardMap::CoreDocs.available.join("\n")
+    end
+
+    desc 'clear-cores', 'Clear the cached core documentation'
+    def clear_cores
+      Solargraph::YardMap::CoreDocs.clear
+    end
   end
 end

data/lib/solargraph/suggestion.rb

@@ -26,7 +26,7 @@ module Solargraph
     attr_reader :detail
 
     # @return [YARD::CodeObjects::Base]
-    attr_reader :code_object
+    #attr_reader :code_object
 
     # @return [String]
     attr_reader :location
@@ -34,6 +34,9 @@ module Solargraph
     # @return [Array<String>]
     attr_reader :arguments
 
+    # @return [YARD::CodeObjects::Base]
+    attr_reader :code_object
+
     def initialize label, kind: KEYWORD, insert: nil, detail: nil, docstring: nil, code_object: nil, location: nil, arguments: [], return_type: nil, path: nil
       @helper = Server::Helpers.new
       @label = label.to_s

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.14.3'
+  VERSION = '0.15.0'
 end

data/lib/solargraph/yard_map.rb

@@ -1,17 +1,17 @@
-require 'parser/current'
 require 'yard'
 
 module Solargraph
   class YardMap
-    @@stdlib_yardoc = File.join(Dir.home, '.solargraph', 'cache', '2.0.0', 'yardoc-stdlib')
+    autoload :Cache, 'solargraph/yard_map/cache'
+    autoload :CoreDocs, 'solargraph/yard_map/core_docs'
+
+    @@stdlib_yardoc = CoreDocs.yard_stdlib_file
     @@stdlib_namespaces = []
     YARD::Registry.load! @@stdlib_yardoc
     YARD::Registry.all(:class, :module).each do |ns|
       @@stdlib_namespaces.push ns.path
     end
 
-    autoload :Cache, 'solargraph/yard_map/cache'
-
     attr_reader :workspace
     attr_reader :required
 
@@ -20,28 +20,22 @@ module Solargraph
       used = []
       @required = required
       @namespace_yardocs = {}
-      #if @required.include?('bundler/setup') or @required.include?('bundler/require')
-      #  yardocs.concat bundled_gem_yardocs
-      #else
-        @required.each do |r|
-          if workspace.nil? or !File.exist?(File.join workspace, 'lib', "#{r}.rb")
-            g = r.split('/').first
-            unless used.include?(g)
-              used.push g
-              gy = YARD::Registry.yardoc_file_for_gem(g)
-              if gy.nil?
-                STDERR.puts "Required path not found: #{r}"
-              else
-                #STDERR.puts "Adding #{gy}"
-                yardocs.unshift gy
-                add_gem_dependencies g
-              end
+      @required.each do |r|
+        if workspace.nil? or !File.exist?(File.join workspace, 'lib', "#{r}.rb")
+          g = r.split('/').first
+          unless used.include?(g)
+            used.push g
+            gy = YARD::Registry.yardoc_file_for_gem(g)
+            if gy.nil?
+              STDERR.puts "Required path not found: #{r}"
+            else
+              yardocs.unshift gy
+              add_gem_dependencies g
             end
           end
         end
-      #end
-      yardocs.push File.join(Dir.home, '.solargraph', 'cache', '2.0.0', 'yardoc')
-      #yardocs.push File.join(Dir.home, '.solargraph', 'cache', '2.0.0', 'yardoc-stdlib')
+      end
+      yardocs.push CoreDocs.yardoc_file
       yardocs.uniq!
       yardocs.each do |y|
         load_yardoc y
@@ -83,12 +77,14 @@ module Solargraph
       (yardocs + [@@stdlib_yardoc]).each { |y|
         yard = load_yardoc(y)
         unless yard.nil?
-          yard.paths.each { |p|
-            found.push p if p.downcase.include?(query.downcase)
-          }
+          yard.paths.each do |p|
+            if found.empty? or (query.include?('.') or query.include?('#')) or !(p.include?('.') or p.include?('#'))
+              found.push p if p.downcase.include?(query.downcase)
+            end
+          end
         end
       }
-      found.sort
+      found.uniq
     end
 
     # @param query [String]
@@ -227,13 +223,15 @@ module Solargraph
     end
 
     def find_fully_qualified_namespace namespace, scope
-      yardocs.each { |y|
-        yard = load_yardoc(y)
-        unless yard.nil?
-          obj = find_first_resolved_namespace(yard, namespace, scope)
-          return obj.path unless obj.nil? or !obj.kind_of?(YARD::CodeObjects::NamespaceObject)
+      unless scope.empty?
+        parts = scope.split('::')
+        while parts.length > 0
+          here = "#{parts.join('::')}::#{namespace}"
+          return here unless yardocs_documenting(here).empty?
+          parts.pop
         end
-      }
+      end
+      return namespace unless yardocs_documenting(namespace).empty?
       nil
     end
 

data/lib/solargraph/yard_map/core_docs.rb

@@ -0,0 +1,111 @@
+require 'net/http'
+require 'uri'
+require 'json'
+require 'fileutils'
+
+module Solargraph
+  class YardMap
+    module CoreDocs
+      class SourceNotAvailableError < StandardError;end
+      
+      SOURCE = 'http://solargraph.org/download'
+
+      class << self
+        def cache_dir
+          @cache_dir ||= File.join(Dir.home, '.solargraph', 'cache')
+        end
+
+        # Solargraph installs Ruby 2.2.2 documentation to ensure minimum functionality.
+        def require_minimum
+          FileUtils.mkdir_p cache_dir
+          version_dir = File.join(cache_dir, '2.2.2')
+          unless File.exist?(version_dir)
+            FileUtils.cp File.join(Solargraph::YARDOC_PATH, '2.2.2.tar.gz'), cache_dir
+            install_archive File.join(cache_dir, '2.2.2.tar.gz')
+          end
+        end
+
+        def valid?(ver)
+          dir = File.join(cache_dir, ver)
+          return false unless File.directory?(dir)
+          return false unless File.directory?(File.join(dir, 'yardoc'))
+          return false unless File.directory?(File.join(dir, 'yardoc-stdlib'))
+          true
+        end
+
+        def versions
+          dirs = Dir[File.join(cache_dir, '*')].map{|d| File.basename(d)}
+          dirs.keep_if{|d| valid?(d)}
+          dirs.sort!{|a, b| Gem::Version.new(b) <=> Gem::Version.new(a)}
+          dirs
+        end
+
+        def best_match
+          available = versions
+          available.each do |v|
+            return v if Gem::Version.new(v) <= Gem::Version.new(RUBY_VERSION)
+          end
+          return available.last
+        end
+
+        def available
+          uri = URI.parse("#{SOURCE}/versions.json")
+          response = Net::HTTP.get_response(uri)
+          obj = JSON.parse(response.body)
+          raise SourceNotAvailableError.new("Error connecting to #{SOURCE}") unless obj['status'] == 'ok'
+          obj['cores']
+        end
+
+        def best_download
+          rv = Gem::Version.new(RUBY_VERSION)
+          available.each do |ver|
+            return ver if Gem::Version.new(ver) <= rv
+          end
+          obj['cores'].last
+        end
+
+        def yardoc_file(ver = best_match)
+          raise ArgumentError.new("Invalid core yardoc version #{ver}") unless valid?(ver)
+          File.join(cache_dir, ver, 'yardoc')
+        end
+
+        def yard_stdlib_file(ver = best_match)
+          raise ArgumentError.new("Invalid core yardoc version #{ver}") unless valid?(ver)
+          File.join(cache_dir, ver, 'yardoc-stdlib')
+        end
+
+        def download version
+          FileUtils.mkdir_p cache_dir
+          uri = URI.parse("http://solargraph.org/download/#{version}.tar.gz")
+          response = Net::HTTP.get_response(uri)
+          zipfile = File.join(cache_dir, "#{version}.tar.gz")
+          File.binwrite zipfile, response.body
+          install_archive zipfile
+        end
+
+        def clear
+          FileUtils.rm_rf cache_dir, secure: true
+          require_minimum
+        end
+
+        private
+
+        def install_archive filename
+          tar_extract = Gem::Package::TarReader.new(Zlib::GzipReader.open(filename))
+          tar_extract.rewind
+          tar_extract.each do |entry|
+            if entry.directory?
+              FileUtils.mkdir_p File.join(cache_dir, entry.full_name)
+            else
+              FileUtils.mkdir_p File.join(cache_dir, File.dirname(entry.full_name))
+              File.open(File.join(cache_dir, entry.full_name), 'wb') do |f|
+                f << entry.read
+              end
+            end
+          end
+          tar_extract.close
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.15.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-30 00:00:00.000000000 Z
+date: 2017-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -177,6 +177,7 @@ files:
 - lib/solargraph/api_map/cache.rb
 - lib/solargraph/api_map/config.rb
 - lib/solargraph/api_map/source.rb
+- lib/solargraph/api_map/source_to_yard.rb
 - lib/solargraph/code_map.rb
 - lib/solargraph/live_map.rb
 - lib/solargraph/live_map/cache.rb
@@ -215,8 +216,9 @@ files:
 - lib/solargraph/views/search.erb
 - lib/solargraph/yard_map.rb
 - lib/solargraph/yard_map/cache.rb
+- lib/solargraph/yard_map/core_docs.rb
 - lib/yard-solargraph.rb
-- yardoc/2.0.0.tar.gz
+- yardoc/2.2.2.tar.gz
 homepage: http://solargraph.org
 licenses:
 - MIT