solargraph 0.15.3 → 0.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 973c57ed92c49cbc1c242f26d30660a0260329c3
-  data.tar.gz: 0f4313ae7372cac8995a78f23992cc2c91c58d85
+  metadata.gz: 24b597ba06561ddd1bc1a8b4552b7d3bb1ee3867
+  data.tar.gz: 37bc48eabc24b26b736b64f451402faa0cce7624
 SHA512:
-  metadata.gz: 28dad009825df7ce472a842b134f47eb6341171a176c4ebf88c01f092819d7e1cdf3645c88142e18fbe35c9c811ff022eee4715df47b8a053382158b426fa987
-  data.tar.gz: 86d7d8120d867c48cd2a480b71cc4ee0fd72f39bd2c70cc34ae8a73bbd9706fc031e4b39d522387865f107bba1b43fdd8fae7f9bb3e1a6f849ca0c38077f06ce
+  metadata.gz: 9bdf2c98784584111834a166a87daab38c94aa9158db3efd05e655651b5b050afdcf488a7d33b78704f9cb04274a137ca047855df93dd1e91a9b010ce69b0b4a
+  data.tar.gz: e7de68f3751c3a86cd7ed7c3ea3003a902ad72cf6fab8cac6f05a13190118b360e0da4926c707ffdaf5a7075a54a23c12e5e6b665d82279653cb3d5335020c80

data/lib/solargraph/api_map.rb

@@ -187,7 +187,7 @@ module Solargraph
         resolved = find_namespace_pins(parts.join('::'))
         resolved.each do |pin|
           visi = :public
-          visi = :private if root != '' and pin.path == fqns
+          visi = :private if namespace == '' and root != '' and pin.path == fqns
           result.concat inner_get_constants(pin.path, skip, true, visi)
         end
       end
@@ -338,6 +338,7 @@ module Solargraph
       suggest_unique_variables globals
     end
 
+    # @return [Array<Solargraph::Pin::GlobalVariable>]
     def get_global_variable_pins
       globals = []
       @sources.values.each do |s|
@@ -366,7 +367,9 @@ module Solargraph
       if cache.has_signature_type?(signature, namespace, scope)
         return cache.get_signature_type(signature, namespace, scope)
       end
-      return nil if signature.nil? or signature.empty?
+      return nil if signature.nil?
+      return namespace if signature.empty? and scope == :instance
+      return nil if signature.empty? # @todo This might need to return Class<namespace>
       if !signature.include?('.')
         fqns = find_fully_qualified_namespace(signature, namespace)
         unless fqns.nil? or fqns.empty?
@@ -412,6 +415,8 @@ module Solargraph
       result
     end
 
+    # @param [String] A fully qualified namespace
+    # @return [Symbol] :class, :module, or nil
     def get_namespace_type fqns
       return nil if fqns.nil?
       type = nil
@@ -435,7 +440,7 @@ module Solargraph
       fqns = find_fully_qualified_namespace(namespace, root)
       meths = []
       skip = []
-      meths.concat inner_get_methods(namespace, root, skip)
+      meths.concat inner_get_methods(namespace, root, skip, visibility)
       yard_meths = yard_map.get_methods(fqns, '', visibility: visibility)
       if yard_meths.any?
         meths.concat yard_meths
@@ -522,6 +527,8 @@ module Solargraph
       arr
     end
 
+    # Update the ApiMap with the most recent version of the specified file.
+    #
     def update filename
       filename.gsub!(/\\/, '/')
       if filename.end_with?('.rb')
@@ -544,11 +551,12 @@ module Solargraph
       end
     end
 
+    # @return [Array<Solargraph::ApiMap::Source>]
     def sources
       @sources.values
     end
 
-    # @return [Array<String>]
+    # @return [Array<Solargraph::Suggestion>]
     def get_path_suggestions path
       refresh
       result = []
@@ -572,6 +580,7 @@ module Solargraph
       result
     end
 
+    # @return [Array<String>]
     def search query
       refresh
       rake_yard(@sources.values) if @yard_stale
@@ -619,6 +628,7 @@ module Solargraph
       @symbol_pins = []
       @attr_pins = {}
       @namespace_includes = {}
+      @namespace_extends = {}
       @superclasses = {}
       @namespace_pins = {}
       namespace_map.clear
@@ -716,6 +726,10 @@ module Solargraph
         @namespace_includes[ns] ||= []
         @namespace_includes[ns].concat(i).uniq!
       end
+      source.namespace_extends.each_pair do |ns, e|
+        @namespace_extends[ns] ||= []
+        @namespace_extends[ns].concat(e).uniq!
+      end
       source.superclasses.each_pair do |cls, sup|
         @superclasses[cls] = sup
       end
@@ -742,7 +756,7 @@ module Solargraph
       mn = @method_pins[fqns]
       unless mn.nil?
         mn.select{ |pin| pin.scope == :class }.each do |pin|
-          meths.push pin_to_suggestion(pin)
+          meths.push pin_to_suggestion(pin) if visibility.include?(pin.visibility)
         end
       end
       if visibility.include?(:public) or visibility.include?(:protected)
@@ -753,6 +767,12 @@ module Solargraph
           meths.concat get_methods(sc, fqns, visibility: sc_visi)
         end
       end
+      em = @namespace_extends[fqns]
+      unless em.nil?
+        em.each do |e|
+          meths.concat get_instance_methods(e, fqns, visibility: visibility)
+        end
+      end
       meths.uniq
     end
 
@@ -875,10 +895,13 @@ module Solargraph
       result
     end
 
+    # @return [AST::Node]
     def file_nodes
       @sources.values.map(&:node)
     end
 
+    # @param namespace [String]
+    # @return [String]
     def clean_namespace_string namespace
       result = namespace.to_s.gsub(/<.*$/, '')
       if result == 'Class' and namespace.include?('<')
@@ -894,7 +917,18 @@ module Solargraph
     # @param pin [Solargraph::Pin::Base]
     # @return [Solargraph::Suggestion]
     def pin_to_suggestion pin
-      @pin_suggestions[pin] ||= Suggestion.pull(pin)
+      return_type = pin.return_type
+      if return_type.nil? and pin.is_a?(Solargraph::Pin::Method)
+        sc = @superclasses[pin.namespace]
+        while return_type.nil? and !sc.nil?
+          sc_path = "#{sc}#{pin.scope == :instance ? '#' : '.'}#{pin.name}"
+          sugg = get_path_suggestions(sc_path).first
+          break if sugg.nil?
+          return_type = sugg.return_type
+          sc = @superclasses[sc]
+        end
+      end
+      @pin_suggestions[pin] ||= Suggestion.pull(pin, return_type)
     end
 
     def require_extensions

data/lib/solargraph/api_map/source.rb

@@ -70,6 +70,10 @@ module Solargraph
         @namespace_includes ||= {}
       end
 
+      def namespace_extends
+        @namespaces_extends ||= {}
+      end
+
       def superclasses
         @superclasses ||= {}
       end
@@ -304,11 +308,16 @@ module Solargraph
                       end
                     end
                     next
-                  elsif c.type == :send and c.children[1] == :include #and node.type == :class
+                  elsif c.type == :send and c.children[1] == :include
                     namespace_includes[fqn] ||= []
                     c.children[2..-1].each do |i|
                       namespace_includes[fqn].push unpack_name(i)
                     end
+                  elsif c.type == :send and c.children[1] == :extend
+                    namespace_extends[fqn] ||= []
+                    c.children[2..-1].each do |i|
+                      namespace_extends[fqn].push unpack_name(i)
+                    end
                   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

data/lib/solargraph/api_map/source_to_yard.rb

@@ -49,7 +49,7 @@ module Solargraph
             code_object_map[pin.path].docstring = pin.docstring unless pin.docstring.nil?
             code_object_map[pin.path].files.push pin.source.filename
             code_object_map[pin.path].parameters = pin.parameters.map do |p|
-              n = p.match(/^[a-z0-9\-]*?:?/i)[0]
+              n = p.match(/^[a-z0-9_]*:?/i)[0]
               v = nil
               if p.length > n.length
                 v = p[n.length..-1].gsub(/^ = /, '')

data/lib/solargraph/code_map.rb

@@ -224,15 +224,10 @@ module Solargraph
           else
             type = infer_literal_node_type(node_at(index - 2))
             if type.nil?
-              parts = namespace.to_s.split('::')
               result += get_snippets_at(index) if with_snippets
               result += get_local_variables_and_methods_at(index)
               result += ApiMap.get_keywords
-              while parts.length > 0
-                ns = parts.join('::')
-                result += api_map.get_constants(ns, namespace)
-                parts.pop
-              end
+              result += api_map.get_constants('', namespace)
               result += api_map.get_constants('')
               result += api_map.get_instance_methods('Kernel', namespace)
               result += api_map.get_methods('', namespace)
@@ -417,14 +412,23 @@ module Solargraph
       remainder = parts[1..-1]
       if start.start_with?('@@')
         cv = api_map.get_class_variable_pins(ns_here).select{|s| s.name == start}.first
-        return (cv.return_type || api_map.infer_assignment_node_type(cv.node, cv.namespace)) unless cv.nil?
+        unless cv.nil?
+          vartype = (cv.return_type || api_map.infer_assignment_node_type(cv.node, cv.namespace))
+          return api_map.infer_signature_type(remainder.join('.'), vartype, scope: :instance)
+        end
       elsif start.start_with?('@')
         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?
+        unless iv.nil?
+          vartype = (iv.return_type || api_map.infer_assignment_node_type(iv.node, iv.namespace))
+          return api_map.infer_signature_type(remainder.join('.'), vartype, scope: :instance)
+        end
       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?
+        unless gv.nil?
+          vartype = (gv.return_type || api_map.infer_assignment_node_type(gv.node, gv.namespace))
+          return api_map.infer_signature_type(remainder.join('.'), vartype, scope: :instance)
+        end
       end
       var = find_local_variable_node(start, node)
       if var.nil?

data/lib/solargraph/server.rb

@@ -76,7 +76,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.signatures_at(offset)
-        { "status" => "ok", "suggestions" => sugg }.to_json
+        { "status" => "ok", "suggestions" => sugg.map{|s| s.as_json(all: true)} }.to_json
       rescue Exception => e
         STDERR.puts e
         STDERR.puts e.backtrace.join("\n")

data/lib/solargraph/version.rb

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

metadata

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