solargraph 0.15.4 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24b597ba06561ddd1bc1a8b4552b7d3bb1ee3867
-  data.tar.gz: 37bc48eabc24b26b736b64f451402faa0cce7624
+  metadata.gz: b84e595d8f1d4042f81bbfb7c27dc56913a0de8c
+  data.tar.gz: 0ddfb700d7f1a8e10ec74f021954e1b9fa1375ce
 SHA512:
-  metadata.gz: 9bdf2c98784584111834a166a87daab38c94aa9158db3efd05e655651b5b050afdcf488a7d33b78704f9cb04274a137ca047855df93dd1e91a9b010ce69b0b4a
-  data.tar.gz: e7de68f3751c3a86cd7ed7c3ea3003a902ad72cf6fab8cac6f05a13190118b360e0da4926c707ffdaf5a7075a54a23c12e5e6b665d82279653cb3d5335020c80
+  metadata.gz: 171c19a787d30924b510b21d08c443c348d96d8c551fbefd03535dacc8e22fd289ace4f4f270e9469d61d813dc3c640e7ffed21d093826ef787173d0c80e5703
+  data.tar.gz: 88637fc48b37ef6bc2c7e3e5f4051fc87fa8901c829bf94bffc877d884f7e47fca750182241cb3d2cf539811e7c9275358a0792a42e6ea666815b59bb94a24c8

data/lib/solargraph/api_map.rb

@@ -34,16 +34,18 @@ module Solargraph
 
     # @param workspace [String]
     def initialize workspace = nil
+      @@source_cache.clear
       @workspace = workspace.gsub(/\\/, '/') unless workspace.nil?
       clear
       require_extensions
       unless @workspace.nil?
-        workspace_files.concat (self.config.included - self.config.excluded)
+        workspace_files.concat config.calculated
         workspace_files.each do |wf|
           begin
             @@source_cache[wf] ||= Source.load(wf)
           rescue Parser::SyntaxError => e
             STDERR.puts "Failed to load #{wf}: #{e.message}"
+            @@source_cache[wf] = Source.virtual('', wf)
           end
         end
       end
@@ -132,6 +134,21 @@ module Solargraph
       process_maps if @stale or force
     end
 
+    def changed?
+      current = config.calculated
+      unless (Set.new(current) ^ workspace_files).empty?
+        STDERR.puts "Change based on difference in file list"
+        return true
+      end
+      current.each do |f|
+        if !File.exist?(f) or File.mtime(f) != source_file_mtime(f)
+          STDERR.puts "Change based on file #{f}"
+          return true
+        end
+      end
+      false
+    end
+
     # Get the docstring associated with a node.
     #
     # @param node [AST::Node]
@@ -468,9 +485,9 @@ module Solargraph
         end
       end
       strings = meths.map(&:to_s)
-      live_map.get_methods(fqns, '', 'class', 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)'), path: "#{fqns}.#{m}")
+      live_map.get_methods(fqns, '', 'class', visibility.include?(:private)).each do |ls|
+        next if strings.include?(ls.to_s)
+        meths.push ls
       end
       meths
     end
@@ -507,9 +524,9 @@ module Solargraph
         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)
-        meths.push Suggestion.new(m, kind: Suggestion::METHOD, docstring: YARD::Docstring.new('(defined at runtime)'), path: "#{fqns}##{m}")
+      live_map.get_methods(fqns, '', 'class', visibility.include?(:private)).each do |ls|
+        next if strings.include?(ls.to_s)
+        meths.push ls
       end
       meths
     end
@@ -539,6 +556,8 @@ module Solargraph
         if @workspace_files.include?(filename)
           eliminate filename
           @@source_cache[filename] = Source.load(filename)
+          @sources.delete filename
+          @sources[filename] = @@source_cache[filename]
           rebuild_local_yardoc #if @workspace_files.include?(filename)
           @stale = true
         else
@@ -845,6 +864,7 @@ module Solargraph
         if scope == :class and part == 'new'
           scope = :instance
         elsif !METHODS_RETURNING_SELF.include?(part)
+          type = nil
           visibility = [:public]
           visibility.concat [:private, :protected] if top
           if scope == :instance || namespace == ''
@@ -860,7 +880,7 @@ module Solargraph
         end
         top = false
       end
-      if scope == :class
+      if scope == :class and !type.nil?
         type = "Class<#{type}>"
       end
       type
@@ -957,5 +977,13 @@ module Solargraph
       end
       result
     end
+
+    def source_file_mtime(filename)
+      # @todo This is naively inefficient.
+      sources.each do |s|
+        return s.mtime if s.filename == filename
+      end
+      nil
+    end
   end
 end

data/lib/solargraph/api_map/config.rb

@@ -40,7 +40,8 @@ module Solargraph
       # @return [Array<String>]
       def included
         return [] if workspace.nil?
-        @included ||= process_globs(@raw_data['include'])
+        #@included ||= process_globs(@raw_data['include'])
+        process_globs(@raw_data['include'])
       end
 
       # An array of files excluded from the workspace.
@@ -48,14 +49,16 @@ module Solargraph
       # @return [Array<String>]
       def excluded
         return [] if workspace.nil?
-        @excluded ||= process_globs(@raw_data['exclude'])
+        #@excluded ||= process_globs(@raw_data['exclude'])
+        process_globs(@raw_data['exclude'])
       end
 
       # The calculated array of (included - excluded) files in the workspace.
       #
       # @return [Array<String>]
       def calculated
-        @calculated ||= (included - excluded)
+        #@calculated ||= (included - excluded)
+        included - excluded
       end
 
       # @return [Array<String>]
@@ -77,7 +80,7 @@ module Solargraph
         result = []
         globs.each do |glob|
           Dir[File.join workspace, glob].each do |f|
-            result.push File.realdirpath(f)
+            result.push File.realdirpath(f).gsub(/\\/, '/')
           end
         end
         result

data/lib/solargraph/api_map/source.rb

@@ -15,6 +15,8 @@ module Solargraph
       # @return [String]
       attr_reader :filename
 
+      attr_reader :mtime
+
       # @return [Array<Integer>]
       attr_reader :stubbed_lines
 
@@ -29,6 +31,7 @@ module Solargraph
         @directives = {}
         @docstring_hash = associate_comments(node, comments)
         @filename = filename
+        @mtime = (!filename.nil? and File.exist?(filename) ? File.mtime(filename) : nil)
         @namespace_nodes = {}
         @all_nodes = []
         @node_stack = []
@@ -391,6 +394,11 @@ module Solargraph
           stubs = []
           fixed_position = false
           tmp = code
+          if !offset.nil? and offset > 0
+            if tmp[offset - 1] == '.'
+              tmp = tmp[0..offset-2] + '_' + tmp[offset..-1]
+            end
+          end
           begin
             node, comments = Parser::CurrentRuby.parse_with_comments(tmp)
             Source.new(code, node, comments, filename, stubs)

data/lib/solargraph/code_map.rb

@@ -25,6 +25,10 @@ module Solargraph
 
     include NodeMethods
 
+    METHODS_WITH_YIELDPARAM_SUBTYPES = %w[
+      Array#each Hash#each_pair Array#map
+    ]
+
     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?
@@ -346,7 +350,11 @@ module Solargraph
             yp = get_yieldparams_at(index).keep_if{|s| s.to_s == parts[0]}.first
             unless yp.nil?
               if parts[1].nil? or parts[1].empty?
-                result = yp.return_type
+                if yp.return_type.nil?
+                  STDERR.puts "Here is where we try to get the stupid, you know, the yieldparam type"
+                else
+                  result = yp.return_type
+                end
               else
                 newsig = parts[1..-1].join('.')
                 result = api_map.infer_signature_type(newsig, yp.return_type, scope: :instance)
@@ -405,7 +413,7 @@ module Solargraph
       end
       unless signature.include?('.')
         fqns = api_map.find_fully_qualified_namespace(signature, ns_here)
-        return "Class<#{fqns}>" unless fqns.nil?
+        return "Class<#{fqns}>" unless fqns.nil? or fqns.empty?
       end
       start = parts[0]
       return nil if start.nil?
@@ -626,7 +634,16 @@ module Solargraph
         end
         i = 0
         block_node.children[1].children.each do |a|
-          rt = (yps[i].nil? ? nil : yps[i].types[0])
+          rt = nil
+          if yps[i].nil? or yps[i].types.nil? or yps[i].types.empty?
+            zsig = api_map.resolve_node_signature(block_node.children[0])
+            vartype = infer_signature_from_node(zsig.split('.').first, scope_node)
+            subtypes = get_subtypes(vartype)
+            zpath = infer_path_from_signature_and_node(zsig, scope_node)
+            rt = subtypes[i] if METHODS_WITH_YIELDPARAM_SUBTYPES.include?(zpath)
+          else
+            rt = yps[i].types[0]
+          end
           result.push Suggestion.new(a.children[0], kind: Suggestion::PROPERTY, return_type: rt)
           i += 1
         end
@@ -777,5 +794,19 @@ module Solargraph
       cursor = nil if cursor < 0
       cursor
     end
+
+    def infer_path_from_signature_and_node signature, node
+      # @todo Improve this method
+      parts = signature.split('.')
+      last = parts.pop
+      type = infer_signature_from_node(parts.join('.'), node)
+      "#{type.gsub(/<[a-z0-9:, ]*>/i, '')}##{last}"
+    end
+
+    def get_subtypes type
+      match = type.match(/<([a-z0-9_:, ]*)>/i)
+      return [] if match.nil?
+      match[1].split(',').map(&:strip)
+    end
   end
 end

data/lib/solargraph/live_map.rb

@@ -15,6 +15,7 @@ module Solargraph
     end
 
     def get_methods(namespace, root = '', scope = 'instance', with_private = false)
+      fqns = api_map.find_fully_qualified_namespace(namespace, root)
       params = {
         namespace: namespace, root: root, scope: scope, with_private: with_private
       }
@@ -24,7 +25,9 @@ module Solargraph
       result = []
       runners.each do |p|
         next if did_runtime and p.runtime?
-        result.concat p.get_methods(namespace: namespace, root: root, scope: scope, with_private: with_private)
+        p.get_methods(namespace: namespace, root: root, scope: scope, with_private: with_private).each do |m|
+          result.push Suggestion.new(m['name'], kind: Suggestion::METHOD, docstring: YARD::Docstring.new('(defined at runtime)'), path: "#{fqns}.#{m['name']}", arguments: m['parameters'])
+        end
         did_runtime = true if p.runtime?
       end
       cache.set_methods(params, result)

data/lib/solargraph/plugin/process.rb

@@ -71,7 +71,14 @@ module Solargraph
             result.concat con.public_instance_methods(false)
           end
         end
-        respond_ok result.uniq
+        respond_ok (result.uniq.sort.map do |name|
+          # @type [Method]
+          meth = con.method(name)
+          {
+            name: name,
+            parameters: build_parameter_array(meth.parameters)
+          }
+        end)
       end
 
       def get_constants args
@@ -138,6 +145,26 @@ module Solargraph
           data: []
         }.to_json
       end
+
+      def build_parameter_array parameters
+        an = 1
+        parameters.map do |p|
+          if p[0] == :rest
+            str = (p[1] ? "*#{p[1]}" : "*args")
+          else
+            str = (p[1] ? p[1].to_s : "arg#{an}")
+            if p[0] == :opt
+              str += ' = ?'
+            elsif p[0] == :key
+              str += ':'
+            elsif p[0] == :keyreq
+              str += ': ?'
+            end
+          end
+          an += 1
+          str
+        end
+      end
     end
   end
 end

data/lib/solargraph/server.rb

@@ -172,6 +172,30 @@ module Solargraph
         end
       end
 
+      def run!
+        Thread.new do
+          while true
+            watch_workspaces
+            sleep 1
+          end
+        end
+        super
+      end
+
+      def watch_workspaces
+        @@semaphore.synchronize do
+          changed = {}
+          @@api_hash.each_pair do |w, a|
+            next unless a.changed?
+            STDERR.puts "Reloading changed workspace #{w}"
+            n = Solargraph::ApiMap.new(w)
+            changed[w] = n
+          end
+          changed.each_pair do |w, a|
+            @@api_hash[w] = a
+          end
+        end
+      end
     end
 
     class Helpers

data/lib/solargraph/shell.rb

@@ -21,8 +21,7 @@ module Solargraph
     option :files, type: :string, aliases: :f, desc: 'The public files directory', default: nil
     def server
       port = options[:port]
-      # This line should not be necessary with WEBrick
-      #port = available_port if port.zero?
+      port = available_port if port.zero?
       Solargraph::Server.set :port, port
       Solargraph::Server.set :views, options[:views] unless options[:views].nil?
       Solargraph::Server.set :public_folder, options[:files] unless options[:files].nil?

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.15.4'
+  VERSION = '0.16.0'
 end

data/lib/solargraph/yard_map.rb

@@ -225,7 +225,7 @@ module Solargraph
     end
 
     def find_fully_qualified_namespace namespace, scope
-      unless scope.empty?
+      unless scope.nil? or scope.empty?
         parts = scope.split('::')
         while parts.length > 0
           here = "#{parts.join('::')}::#{namespace}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.15.4
+  version: 0.16.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser