solargraph 0.13.2 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed95e7c0676d9b744be9c8c006104ae42fdce15f
-  data.tar.gz: b67a658208dd50359c7b0aa0118c646b89696f93
+  metadata.gz: 613c6ae706229464a6f918aef5f093a97e0ff569
+  data.tar.gz: b68e4d8abbf2b884d78f9af364e34e5cbcde6f2f
 SHA512:
-  metadata.gz: b28a0447fd5d9f555ab0a94fbabb0e08df008107f882e1f6d993de857012d3b8c243d0c34fdbb133f9c3e20393534c683dfd10be485beb32d068f18c7a654c77
-  data.tar.gz: ee15faa36e173dfd9ca12f0b2eddc5225cf420136db7831adafea1303e585e49786b6e3b74ddc0618a22f6837381e93049a5319b1a14b1ec6e9e1f4dd089b3a7
+  metadata.gz: 843ff75f0ccf680f311a3e42ba4e5ff18810ff1beb048638503c3e7b794883b1bd419c2dd2b6bb3d56bc17a3a06e8e5a7d392f9abf458c57affe0f219ae2ad7a
+  data.tar.gz: a3b5f6d57c62b1d35e940e29b6c8e9b70594a73f1f6f37021a31cfee11eefc3495cb1d09f13de70b1722a9d42bfde9ce827682df898198c6dad5b59918c76419

data/lib/solargraph/api_map/config.rb

@@ -4,33 +4,44 @@ module Solargraph
   class ApiMap
     class Config
       attr_reader :workspace
-      attr_reader :included
-      attr_reader :excluded
+      attr_reader :raw_data
 
       def initialize workspace = nil
         @workspace = workspace
-        @included = []
-        @excluded = []
         include_globs = ['**/*.rb']
         exclude_globs = ['spec/**/*', 'test/**/*']
         unless @workspace.nil?
           sfile = File.join(@workspace, '.solargraph.yml')
           if File.file?(sfile)
-            conf = YAML.load(File.read(sfile))
-            include_globs = conf['include'] || include_globs
-            exclude_globs = conf['exclude'] || []
+            @raw_data = YAML.load(File.read(sfile))
           end
         end
-        include_globs.each { |g| @included.concat process_glob(g) }
-        exclude_globs.each { |g| @excluded.concat process_glob(g) }
+        @raw_data ||= {}
+        @raw_data['include'] = @raw_data['include'] || include_globs
+        @raw_data['exclude'] = @raw_data['exclude'] || exclude_globs
+        @raw_data['extensions'] = @raw_data['extensions'] || []
+      end
+
+      def included
+        process_globs @raw_data['include']
+      end
+
+      def excluded
+        process_globs @raw_data['exclude']
+      end
+
+      def extensions
+        @raw_data['extensions']
       end
 
       private
 
-      def process_glob glob
+      def process_globs globs
         result = []
-        Dir[File.join workspace, glob].each do |f|
-          result.push File.realdirpath(f)
+        globs.each do |glob|
+          Dir[File.join workspace, glob].each do |f|
+            result.push File.realdirpath(f)
+          end
         end
         result
       end

data/lib/solargraph/api_map/source.rb

@@ -23,6 +23,7 @@ module Solargraph
         root = root.append node
         @node = root
         @comments = comments
+        @directives = {}
         @docstring_hash = associate_comments(node, comments)
         @filename = filename
         @namespace_nodes = {}
@@ -30,6 +31,27 @@ module Solargraph
         @node_stack = []
         @node_tree = {}
         inner_map_node @node
+        @directives.each_pair do |k, v|
+          v.each do |d|
+            ns = namespace_for(k.node)
+            docstring = YARD::Docstring.parser.parse(d.tag.text).to_docstring
+            if d.tag.tag_name == 'attribute'
+              t = (d.tag.types.nil? || d.tag.types.empty?) ? nil : d.tag.types.flatten.join('')
+              if t.nil? or t.include?('r')
+                attribute_pins.push Solargraph::Pin::Directed::Attribute.new(self, k.node, ns, :reader, docstring, d.tag.name)
+              end
+              if t.nil? or t.include?('w')
+                attribute_pins.push Solargraph::Pin::Directed::Attribute.new(self, k.node, ns, :writer, docstring, "#{d.tag.name}=")
+              end
+            elsif d.tag.tag_name == 'method'
+              gen_src = Source.virtual(filename, "def #{d.tag.name};end")
+              gen_pin = gen_src.method_pins.first
+              method_pins.push Solargraph::Pin::Directed::Method.new(gen_src, gen_pin.node, ns, :instance, :public, docstring, gen_pin.name)
+            else
+              STDERR.puts "Nothing to do for directive: #{d}"
+            end
+          end
+        end
       end
 
       def namespaces
@@ -99,6 +121,16 @@ module Solargraph
         @node_tree[node] || []
       end
 
+      def namespace_for node
+        parts = []
+        ([node] + (@node_tree[node] || [])).each do |n|
+          if n.type == :class or n.type == :module
+            parts.unshift unpack_name(n.children[0])
+          end
+        end
+        parts.join('::')
+      end
+
       def include? node
         @all_nodes.include? node
       end
@@ -126,7 +158,12 @@ module Solargraph
               ctxt += "#{p[num..-1]}\n"
             end
           }
-          yard_hash[k] = YARD::Docstring.parser.parse(ctxt).to_docstring
+          parse = YARD::Docstring.parser.parse(ctxt)
+          unless parse.directives.empty?
+            @directives[k] ||= []
+            @directives[k].concat parse.directives
+          end
+          yard_hash[k] = parse.to_docstring
         }
         yard_hash
       end
@@ -204,14 +241,14 @@ module Solargraph
               elsif c.type == :casgn
                 constant_pins.push Solargraph::Pin::Constant.new(self, c, fqn)
               else
-                unless fqn.nil?
+                #unless fqn.nil?
                   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)
+                      method_pins.push Solargraph::Pin::Method.new(source, c, fqn || '', scope, visibility)
                       #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)
+                      method_pins.push Solargraph::Pin::Method.new(source, c, fqn || '', :class, :public)
                       inner_map_node c, tree, :public, :class, fqn, stack
                       next
                     elsif c.type == :send and [:public, :protected, :private].include?(c.children[1])
@@ -224,18 +261,18 @@ 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, docstring_for(c)) #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, docstring_for(c)) #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
-                      inner_map_node c, tree, :public, :class, fqn, stack
+                      inner_map_node c, tree, :public, :class, fqn || '', stack
                       next
                     end
                   end
-                end
+                #end
                 if c.type == :send and c.children[1] == :require
                   if c.children[2].kind_of?(AST::Node) and c.children[2].type == :str
                     required.push c.children[2].children[0].to_s

data/lib/solargraph/api_map.rb

@@ -38,10 +38,15 @@ module Solargraph
     def initialize workspace = nil
       @workspace = workspace.gsub(/\\/, '/') unless workspace.nil?
       clear
+      # @todo Instead of requiring extensions to be listed in the config,
+      # we're experimenting with automatically loading them.
+      #self.config.extensions.each do |ext|
+      #  require ext
+      #end
+      require_extensions
       @workspace_files = []
       unless @workspace.nil?
-        config = ApiMap::Config.new(@workspace)
-        @workspace_files.concat (config.included - config.excluded)
+        @workspace_files.concat (self.config.included - self.config.excluded)
         @workspace_files.each do |wf|
           begin
             @@source_cache[wf] ||= Source.load(wf)
@@ -54,9 +59,14 @@ module Solargraph
       @virtual_source = nil
       @virtual_filename = nil
       @stale = true
+      live_map
       refresh
     end
 
+    def config
+      @config ||= ApiMap::Config.new(@workspace)
+    end
+
     # @return [Solargraph::YardMap]
     def yard_map
       refresh
@@ -66,6 +76,11 @@ module Solargraph
       @yard_map
     end
 
+    # @return [Solargraph::LiveMap]
+    def live_map
+      @live_map ||= Solargraph::LiveMap.new(workspace)
+    end
+
     # @return [Solargraph::ApiMap::Source]
     def virtualize filename, code, cursor = nil
       unless @virtual_source.nil? or @virtual_filename == filename or @workspace_files.include?(@virtual_filename)
@@ -356,6 +371,7 @@ module Solargraph
     def get_methods(namespace, root = '', visibility: [:public])
       refresh
       namespace = clean_namespace_string(namespace)
+      fqns = find_fully_qualified_namespace(namespace, root)
       meths = []
       meths.concat inner_get_methods(namespace, root, []) #unless has_yardoc?
       yard_meths = yard_map.get_methods(namespace, root, visibility: visibility)
@@ -371,7 +387,6 @@ module Solargraph
       end
       news = meths.select{|s| s.label == 'new'}
       unless news.empty?
-        fqns = find_fully_qualified_namespace(namespace, root)
         if @method_pins[fqns]
           inits = @method_pins[fqns].select{|p| p.name == 'initialize'}
           meths -= news unless inits.empty?
@@ -380,7 +395,12 @@ module Solargraph
           end
         end
       end
-      meths
+      strings = meths.map(&:to_s)
+      live_map.get_methods(namespace, root, visibility.include?(:private)).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
+    meths
     end
 
     # Get an array of instance methods that are available in the specified
@@ -407,6 +427,11 @@ module Solargraph
           meths += yard_map.get_instance_methods('Module')
         end
       end
+      strings = meths.map(&:to_s)
+      live_map.get_instance_methods(namespace, root, visibility.include?(:private)).each do |m|
+        next if strings.include?(m) or !m.match(/^[a-z]/i)
+        meths.push Suggestion.new(m, kind: Suggestion::METHOD)
+      end
       meths
     end
 
@@ -424,7 +449,8 @@ module Solargraph
 
     def update filename
       @@source_cache[filename] ||= Source.load(filename)
-      cache.clear
+      #cache.clear
+      @stale = true
     end
 
     def sources
@@ -511,6 +537,8 @@ module Solargraph
         map_source s
       }
       @required.uniq!
+      #live_map.update self
+      live_map.reload
       @stale = false
     end
 
@@ -600,6 +628,11 @@ module Solargraph
         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, 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
         end
       end
       meths.uniq
@@ -627,6 +660,11 @@ module Solargraph
         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_instance_methods(sc, fqns, 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
         end
       end
       im = @namespace_includes[fqns]
@@ -716,7 +754,7 @@ module Solargraph
         elsif !METHODS_RETURNING_SELF.include?(part)
           visibility = [:public]
           visibility.concat [:private, :protected] if top
-          if scope == :instance
+          if scope == :instance || namespace == ''
             meth = get_instance_methods(namespace, visibility: visibility).select{|s| s.label == part}.first
           else
             meth = get_methods(namespace, visibility: visibility).select{|s| s.label == part}.first            
@@ -759,5 +797,12 @@ module Solargraph
     def pin_to_suggestion pin
       @pin_suggestions[pin] ||= Suggestion.pull(pin)
     end
+
+    def require_extensions
+      Gem::Specification.all_names.select{|n| n.match(/^solargraph\-[a-z0-9_\-]*?\-ext\-[0-9\.]*$/)}.each do |n|
+        STDERR.puts "Loading extension #{n}"
+        require n.match(/^(solargraph\-[a-z0-9_\-]*?\-ext)\-[0-9\.]*$/)[1]
+      end
+    end
   end
 end

data/lib/solargraph/code_map.rb

@@ -13,6 +13,11 @@ module Solargraph
     # @return [String]
     attr_reader :code
 
+    # The source object generated from the code.
+    #
+    # @return [Solargraph::ApiMap::Source]
+    attr_reader :source
+
     # The filename for the source code.
     #
     # @return [String]
@@ -236,6 +241,8 @@ module Solargraph
               end
               result += api_map.namespaces_in('')
               result += api_map.get_instance_methods('Kernel')
+              result += api_map.get_methods('')
+              result += api_map.get_instance_methods('')
             else
               result.concat api_map.get_instance_methods(type)
             end

data/lib/solargraph/live_map/cache.rb

@@ -0,0 +1,31 @@
+module Solargraph
+  class LiveMap
+    class Cache
+      def initialize
+        @method_cache = {}
+        @instance_method_cache = {}
+      end
+
+      def get_methods options
+        @method_cache[options]
+      end
+
+      def set_methods options, values
+        @method_cache[options] = values
+      end
+
+      def get_instance_methods options
+        @instance_method_cache[options]
+      end
+
+      def set_instance_methods options, values
+        @instance_method_cache[options] = values
+      end
+
+      def clear
+        @method_cache.clear
+        @instance_method_cache.clear
+      end
+    end
+  end
+end

data/lib/solargraph/live_map.rb

@@ -0,0 +1,96 @@
+module Solargraph
+  # The LiveMap allows extensions to add their own completion suggestions.
+  #
+  class LiveMap
+    @@plugins = []
+    
+    attr_reader :workspace
+
+    def initialize workspace
+      @workspace = workspace
+      @runners = []
+      at_exit { stop }
+    end
+
+    def start
+      unless workspace.nil?
+        @@plugins.each do |p|
+          r = p.new(workspace)
+          r.start
+          @runners.push r
+        end
+      end
+    end
+
+    def reload
+      restart
+    end
+
+    def restart
+      stop
+      start
+    end
+
+    def stop
+      @runners.each do |p|
+        p.stop
+      end
+      @runners.clear
+    end
+
+    def get_instance_methods(namespace, root = '', with_private = false)
+      result = []
+      @runners.each do |p|
+        resp = p.get_methods(namespace: namespace, root: root, scope: 'instance', with_private: with_private)
+        STDERR.puts resp.message unless resp.ok?
+        result.concat(resp.data)
+      end
+      result
+    end
+
+    def get_methods(namespace, root = '', with_private = false)
+      result = []
+      @runners.each do |p|
+        resp = p.get_methods(namespace: namespace, root: root, scope: 'class', with_private: with_private)
+        STDERR.puts resp.message unless resp.ok?
+        result.concat(resp.data)
+      end
+      result
+    end
+
+    def self.install cls
+      @@plugins.push cls
+    end
+
+    private
+
+    def find_constant(namespace, root)
+      result = nil
+      parts = root.split('::')
+      if parts.empty?
+        result = inner_find_constant(namespace)
+      else
+        until parts.empty?
+          result = inner_find_constant("#{parts.join('::')}::#{namespace}")
+          break unless result.nil?
+          parts.pop
+        end
+      end
+      result
+    end
+
+    def inner_find_constant(namespace)
+      cursor = Object
+      parts = namespace.split('::')
+      until parts.empty?
+        here = parts.shift
+        begin
+          cursor = cursor.const_get(here)
+        rescue NameError
+          return nil
+        end
+      end
+      cursor
+    end
+  end
+end

data/lib/solargraph/pin/directed/attribute.rb

@@ -0,0 +1,16 @@
+module Solargraph
+  module Pin
+    module Directed
+      class Attribute < Solargraph::Pin::Attribute
+        def initialize source, node, namespace, access, docstring, name
+          super(source, node, namespace, access, docstring)
+          @name = name
+        end
+
+        def name
+          @name
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/pin/directed/method.rb

@@ -0,0 +1,17 @@
+module Solargraph
+  module Pin
+    module Directed
+      class Method < Solargraph::Pin::Method
+        def initialize source, node, namespace, scope, visibility, docstring, name
+          super(source, node, namespace, scope, visibility)
+          @docstring = docstring
+          @name = name
+        end
+
+        def name
+          @name
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/pin/directed.rb

@@ -0,0 +1,9 @@
+module Solargraph
+  module Pin
+    # Directed pins are defined by YARD directives instead of code.
+    module Directed
+      autoload :Attribute, 'solargraph/pin/directed/attribute'
+      autoload :Method,    'solargraph/pin/directed/method'
+    end
+  end
+end

data/lib/solargraph/pin.rb

@@ -10,5 +10,6 @@ module Solargraph
     autoload :GlobalVariable, 'solargraph/pin/global_variable'
     autoload :Constant, 'solargraph/pin/constant'
     autoload :Symbol, 'solargraph/pin/symbol'
+    autoload :Directed, 'solargraph/pin/directed'
   end
 end

data/lib/solargraph/plugin/base.rb

@@ -0,0 +1,38 @@
+module Solargraph
+  module Plugin
+    class Base
+
+      def initialize workspace
+        # @!attribute [r] workspace
+        #   @return [String]
+        define_singleton_method(:workspace) { workspace }
+        post_initialize
+      end
+
+      def post_initialize
+      end
+
+      def start
+        raise "#{self.class} needs to implement the start method"
+      end
+
+      def stop
+        raise "#{self.class} needs to implement the stop method"
+      end
+
+      def get_methods namespace:, root:, scope:, with_private: false
+        raise "#{self.class} needs to implement the get_methods method"
+      end
+
+      protected
+
+      def respond_ok data
+        Solargraph::Plugin::Response.new('ok', data)
+      end
+
+      def respond_err exception
+        Solargraph::Plugin::Response.new('err', [], exception.message)
+      end
+    end
+  end
+end

data/lib/solargraph/plugin/response.rb

@@ -0,0 +1,19 @@
+module Solargraph
+  module Plugin
+    class Response
+      attr_reader :status
+      attr_reader :data
+      attr_reader :message
+
+      def initialize status = 'ok', data = [], message = nil
+        @status = status
+        @data = data
+        @message = message
+      end
+
+      def ok?
+        status == 'ok'
+      end
+    end
+  end
+end

data/lib/solargraph/plugin/runtime.rb

@@ -0,0 +1,15 @@
+module Solargraph
+  module Plugin
+    class Runtime < Base
+      def start
+      end
+
+      def stop
+      end
+
+      def get_methods namespace:, root:, scope:, with_private: false
+        raise "#{self.class} needs to implement the get_methods method"
+      end
+    end
+  end
+end

data/lib/solargraph/plugin.rb

@@ -0,0 +1,7 @@
+module Solargraph
+  module Plugin
+    autoload :Base, 'solargraph/plugin/base'
+    autoload :Runtime, 'solargraph/plugin/runtime'
+    autoload :Response, 'solargraph/plugin/response'
+  end
+end

data/lib/solargraph/server.rb

@@ -50,7 +50,7 @@ module Solargraph
         code_map = CodeMap.new(code: params['text'], filename: params['filename'], api_map: api_map, cursor: [params['line'].to_i, params['column'].to_i])
         offset = code_map.get_offset(params['line'].to_i, params['column'].to_i)
         sugg = code_map.suggest_at(offset, with_snippets: params['with_snippets'] == '1' ? true : false, filtered: true)
-        { "status" => "ok", "suggestions" => sugg }.to_json
+        JSON.generate({ "status" => "ok", "suggestions" => sugg.map(&:as_json) })
       rescue Exception => e
         STDERR.puts e
         STDERR.puts e.backtrace.join("\n")

data/lib/solargraph/server_methods.rb

@@ -0,0 +1,11 @@
+module Solargraph
+  module ServerMethods
+    def available_port
+      socket = Socket.new(:INET, :STREAM, 0)
+      socket.bind(Addrinfo.tcp("127.0.0.1", 0))
+      port = socket.local_address.ip_port
+      socket.close
+      port
+    end
+  end
+end

data/lib/solargraph/shell.rb

@@ -5,9 +5,12 @@ require 'rubygems/package'
 require 'zlib'
 require 'net/http'
 require 'socket'
+require 'bundler'
 
 module Solargraph
   class Shell < Thor
+    include Solargraph::ServerMethods
+
     map %w[--version -v] => :version
 
     desc "--version, -v", "Print the version"
@@ -93,25 +96,28 @@ module Solargraph
     end
 
     desc 'config [DIRECTORY]', 'Create or overwrite a default configuration file'
+    option :extensions, type: :boolean, aliases: :e, desc: 'Add installed extensions', default: true
     def config(directory = '.')
+      matches = []
+      if options[:extensions]
+        Gem::Specification.each do |g|
+          puts g.name
+          if g.name.match(/^solargraph\-[A-Za-z0-9_\-]*?\-ext/)
+            require g.name
+            matches.push g.name
+          end
+        end
+      end
+      conf = Solargraph::ApiMap::Config.new.raw_data
+      unless matches.empty?
+        matches.each do |m|
+          conf['extensions'].push m
+        end
+      end
       File.open(File.join(directory, '.solargraph.yml'), 'w') do |file|
-        file.puts "include:",
-          "  - ./**/*.rb",
-          "exclude:",
-          "  - spec/**/*",
-          "  - test/**/*"
+        file.puts conf.to_yaml
       end
       STDOUT.puts "Configuration file initialized."
     end
-
-    private
-
-    def available_port
-      socket = Socket.new(:INET, :STREAM, 0)
-      socket.bind(Addrinfo.tcp("127.0.0.1", 0))
-      port = socket.local_address.ip_port
-      socket.close
-      port
-    end
   end
 end

data/lib/solargraph/suggestion.rb

@@ -61,7 +61,8 @@ module Solargraph
     # @return [String]
     def return_type
       if @return_type.nil? and !docstring.nil?
-        t = docstring.tag(:overload)&.tag(:return) || docstring.tag(:return)
+        ol = docstring.tag(:overload)
+        t = ol.nil? ? docstring.tag(:return) : ol.tag(:return)
         @return_type = t.types[0] unless t.nil? or t.types.nil?
       end
       @return_type
@@ -69,7 +70,7 @@ module Solargraph
 
     # @return [YARD::Docstring]
     def docstring
-      @docstring ||= @code_object&.docstring
+      @docstring ||= @code_object.nil? ? nil : @code_object.docstring
     end
 
     # @return [String]
@@ -95,8 +96,8 @@ module Solargraph
       @params
     end
 
-    def to_json args={}
-      obj = {
+    def as_json args = {}
+      {
         label: @label,
         kind: @kind,
         insert: @insert,
@@ -108,7 +109,10 @@ module Solargraph
         return_type: return_type,
         documentation: documentation
       }
-      obj.to_json(args)
+    end
+
+    def to_json args = {}
+      as_json.to_json(args)
     end
 
     def self.pull pin, return_type = nil

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.13.2'
+  VERSION = '0.13.3'
 end

data/lib/solargraph/yard_map.rb

@@ -1,6 +1,5 @@
 require 'parser/current'
 require 'yard'
-require 'bundler'
 
 module Solargraph
 
@@ -27,7 +26,7 @@ module Solargraph
               if gy.nil?
                 STDERR.puts "Required path not found: #{r}"
               else
-                STDERR.puts "Adding #{gy}"
+                #STDERR.puts "Adding #{gy}"
                 yardocs.unshift gy
                 add_gem_dependencies g
               end
@@ -47,6 +46,11 @@ module Solargraph
       #cache_core
     end
 
+    # @return [Solargraph::LiveMap]
+    def live_map
+      @live_map ||= Solargraph::LiveMap.new
+    end
+
     # @return [Array<String>]
     def yardocs
       @yardocs ||= []
@@ -255,15 +259,28 @@ module Solargraph
     def bundled_gem_yardocs
       result = []
       unless workspace.nil?
-        gl = File.join(workspace, 'Gemfile.lock')
-        if File.file?(gl)
-          lockfile = Bundler::LockfileParser.new(Bundler.read_file(gl))
-          lockfile.specs.each do |s|
-            y = YARD::Registry.yardoc_file_for_gem(s.name, s.version.to_s)
-            if y.nil?
-              STDERR.puts "Bundled gem not found: #{s.name} #{s.version}"
-            else
-              result.push y
+        Bundler.with_clean_env do
+          Bundler.environment.chdir(workspace) do
+            glfn = File.join(workspace, 'Gemfile.lock')
+            spec_versions = {}
+            if File.file?(glfn)
+              lockfile = Bundler::LockfileParser.new(Bundler.read_file(glfn))
+              lockfile.specs.each do |s|
+                spec_versions[s.name] = s.version.to_s
+              end
+            end
+            Bundler.environment.dependencies.each do |s|
+              if s.type == :runtime
+                ver = spec_versions[s.name]
+                y = YARD::Registry.yardoc_file_for_gem(s.name, ver)
+                if y.nil?
+                  STDERR.puts "Bundled gem not found: #{s.name}, #{ver}"
+                else
+                  #STDERR.puts "Adding #{y}"
+                  result.push y
+                  add_gem_dependencies(s.name)
+                end
+              end
             end
           end
         end
@@ -325,7 +342,7 @@ module Solargraph
         if gy.nil?
           STDERR.puts "Required path not found: #{r}"
         else
-          STDERR.puts "Adding #{gy}"
+          #STDERR.puts "Adding #{gy}"
           yardocs.unshift gy
         end
       end

data/lib/solargraph.rb

@@ -3,18 +3,21 @@ require 'rubygems/package'
 require 'yard-solargraph'
 
 module Solargraph
-  autoload :Analyzer,    'solargraph/analyzer'
-  autoload :Shell,       'solargraph/shell'
-  autoload :LiveParser,  'solargraph/live_parser'
-  autoload :ApiMap,      'solargraph/api_map'
-  autoload :CodeMap,     'solargraph/code_map'
-  autoload :NodeMethods, 'solargraph/node_methods'
-  autoload :Suggestion,  'solargraph/suggestion'
-  autoload :Snippets,    'solargraph/snippets'
-  autoload :Server,      'solargraph/server'
-  autoload :YardMap,     'solargraph/yard_map'
-  autoload :YardMethods, 'solargraph/yard_methods'
-  autoload :Pin,         'solargraph/pin'
+  autoload :Analyzer,      'solargraph/analyzer'
+  autoload :Shell,         'solargraph/shell'
+  autoload :LiveParser,    'solargraph/live_parser'
+  autoload :ApiMap,        'solargraph/api_map'
+  autoload :CodeMap,       'solargraph/code_map'
+  autoload :NodeMethods,   'solargraph/node_methods'
+  autoload :Suggestion,    'solargraph/suggestion'
+  autoload :Snippets,      'solargraph/snippets'
+  autoload :Server,        'solargraph/server'
+  autoload :YardMap,       'solargraph/yard_map'
+  autoload :YardMethods,   'solargraph/yard_methods'
+  autoload :Pin,           'solargraph/pin'
+  autoload :LiveMap,       'solargraph/live_map'
+  autoload :ServerMethods, 'solargraph/server_methods'
+  autoload :Plugin,        'solargraph/plugin'
 
   YARDOC_PATH = File.join(File.realpath(File.dirname(__FILE__)), '..', 'yardoc')
   YARD_EXTENSION_FILE = File.join(File.realpath(File.dirname(__FILE__)), 'yard-solargraph.rb')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-01 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -76,30 +76,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -190,6 +190,8 @@ files:
 - lib/solargraph/api_map/config.rb
 - lib/solargraph/api_map/source.rb
 - lib/solargraph/code_map.rb
+- lib/solargraph/live_map.rb
+- lib/solargraph/live_map/cache.rb
 - lib/solargraph/node_methods.rb
 - lib/solargraph/pin.rb
 - lib/solargraph/pin/attribute.rb
@@ -197,12 +199,20 @@ files:
 - lib/solargraph/pin/base_variable.rb
 - lib/solargraph/pin/class_variable.rb
 - lib/solargraph/pin/constant.rb
+- lib/solargraph/pin/directed.rb
+- lib/solargraph/pin/directed/attribute.rb
+- lib/solargraph/pin/directed/method.rb
 - lib/solargraph/pin/global_variable.rb
 - lib/solargraph/pin/instance_variable.rb
 - lib/solargraph/pin/local_variable.rb
 - lib/solargraph/pin/method.rb
 - lib/solargraph/pin/symbol.rb
+- lib/solargraph/plugin.rb
+- lib/solargraph/plugin/base.rb
+- lib/solargraph/plugin/response.rb
+- lib/solargraph/plugin/runtime.rb
 - lib/solargraph/server.rb
+- lib/solargraph/server_methods.rb
 - lib/solargraph/shell.rb
 - lib/solargraph/snippets.rb
 - lib/solargraph/suggestion.rb
@@ -237,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Solargraph for Ruby