solargraph 0.7.5 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc699f1c3abc5198bf2fde325bb4dfde8c6cb384
-  data.tar.gz: 6f676543082c9943d647772d3c4c7f04ab4caefe
+  metadata.gz: a80ad72c101042120c5ec349dd3fb19a98e794e7
+  data.tar.gz: 99d562e48985d5fa6e3d8dbaf93edafd165490c4
 SHA512:
-  metadata.gz: d519c282a68e56c063068d03a1d7067e98d544714e5b234b5f5da08c6b2e354fcc0067240bf6630eeeeb94b02cf57c1461715054b241febfe73217b53e6e3129
-  data.tar.gz: 57e7b7388f4aca96e654a1997cd8d236227f9ebb76f7b4d118ca2fe5e3e015955c583889693e683e81f37e978b5d8c5781d218b2e18af17e6d88262f7bde5f12
+  metadata.gz: ee8a6a7d1d7cc1ec77727a81e7cd4db7e3da8c0d03baee7424ac2063d281bbc1ceb1863c37c489219f65735cc3adbb64f78b05b7a1ed29a9dfc2b73eb776c6ee
+  data.tar.gz: 34a309dcdb41c54a99ced46a8c51fe3b4372d8dc51a2620647f0b7d3f4331662f7fd3a263f4a99d6e45f3bfe899b965212e38adfb1e578daa89667914be50b98

data/lib/solargraph/api_map.rb

@@ -15,7 +15,7 @@ module Solargraph
 
     MAPPABLE_METHODS = [
       :include, :extend, :require, :autoload, :attr_reader, :attr_writer, :attr_accessor, :private, :public, :protected
-    ] # @todo Not including solargraph_include_public_methods (an experimental thing)
+    ]
 
     include NodeMethods
 
@@ -99,7 +99,7 @@ module Solargraph
 
     def self.get_keywords
       result = []
-      keywords = KEYWORDS + MAPPABLE_METHODS
+      keywords = KEYWORDS + ['attr_reader', 'attr_writer', 'attr_accessor', 'private', 'public', 'protected']
       keywords.each { |k|
         result.push Suggestion.new(k, kind: Suggestion::KEYWORD, detail: 'Keyword')
       }
@@ -250,7 +250,6 @@ module Solargraph
       if @yardoc_files.nil?
         @yardoc_files = []
         yard_options[:include].each { |glob|
-          #@yardoc_files.concat Dir[File.join workspace, glob]
           Dir[File.join workspace, glob].each { |f|
             @yardoc_files.push File.absolute_path(f)
           }
@@ -349,7 +348,6 @@ module Solargraph
             meths += get_methods('') if top or type.to_s == ''
           else
             meths = get_methods(type)
-            #meths += get_methods('') if top
           end
           meths.delete_if{ |m| m.insert != p }
           return nil if meths.empty?
@@ -389,7 +387,7 @@ module Solargraph
         meths
       end
     end
-    
+
     def get_method_args node
       list = nil
       args = []
@@ -466,12 +464,9 @@ module Solargraph
         STDERR.puts "No workspace specified for yardoc update."
       else
         Dir.chdir(workspace) do
-          #YARD::Registry.load(yard_options[:include] - yard_options[:exclude], true)
-          #YARD::Registry.save
           Thread.new {
             STDERR.puts "Updating the yardoc..."
             globs = yard_options[:include] - yard_options[:exclude]
-            #cmd = "yardoc #{globs.join(' ')} -e #{Solargraph::YARD_EXTENSION_FILE} #{yard_options[:flags].join(' ')}"
             cmd = "yardoc -e #{Solargraph::YARD_EXTENSION_FILE}"
             STDERR.puts "Update yardoc with #{cmd}"
             STDERR.puts `#{cmd}`
@@ -514,16 +509,12 @@ module Solargraph
             docstring = get_comment_for(c)
             label = "#{c.children[1]}"
             args = get_method_args(c)
-            label += " #{args.join(', ')}" unless args.empty?
-            meths.push Suggestion.new(label, insert: c.children[1].to_s.gsub(/=/, ' = '), kind: Suggestion::METHOD, detail: 'Method', documentation: docstring) if c.children[1].to_s[0].match(/[a-z_]/i) and c.children[1] != :def
+            meths.push Suggestion.new(label, insert: c.children[1].to_s.gsub(/=/, ' = '), kind: Suggestion::METHOD, detail: 'Method', documentation: docstring, arguments: args) if c.children[1].to_s[0].match(/[a-z_]/i) and c.children[1] != :def
           elsif c.type == :send and c.children[1] == :include
             # TODO: This might not be right. Should we be getting singleton methods
             # from an include, or only from an extend?
             i = unpack_name(c.children[2])
             meths += inner_get_methods(i, root, skip) unless i == 'Kernel'
-          #elsif c.type == :send and c.children[1] == :solargraph_include_public_methods
-          #  i = unpack_name(c.children[2])
-          #  meths += get_instance_methods(i, root, visibility: [:public])
           else
             meths += inner_get_methods_from_node(c, root, skip)
           end
@@ -559,8 +550,7 @@ module Solargraph
                   cmnt = get_comment_for(c)
                   label = "#{c.children[0]}"
                   args = get_method_args(c)
-                  label += " #{args.join(', ')}" unless args.empty?
-                  meths.push Suggestion.new(label, insert: c.children[0].to_s.gsub(/=/, ' = '), kind: Suggestion::METHOD, documentation: cmnt, detail: fqns) if c.children[0].to_s[0].match(/[a-z]/i)
+                  meths.push Suggestion.new(label, insert: c.children[0].to_s.gsub(/=/, ' = '), kind: Suggestion::METHOD, documentation: cmnt, detail: fqns, arguments: args) if c.children[0].to_s[0].match(/[a-z]/i)
                 elsif c.kind_of?(AST::Node) and c.type == :send and c.children[1] == :attr_reader
                   c.children[2..-1].each { |x|
                     meths.push Suggestion.new(x.children[0], kind: Suggestion::METHOD) if x.type == :sym
@@ -590,7 +580,7 @@ module Solargraph
     def mappable?(node)
       return true if node.kind_of?(AST::Node) and [:array, :hash, :str, :int, :float].include?(node.type)
       # TODO Add node.type :casgn (constant assignment)
-      if node.kind_of?(AST::Node) and (node.type == :class or node.type == :module or node.type == :def or node.type == :defs or node.type == :ivasgn or node.type == :gvasgn or node.type == :lvasgn or node.type == :or_asgn)
+      if node.kind_of?(AST::Node) and (node.type == :class or node.type == :module or node.type == :def or node.type == :defs or node.type == :ivasgn or node.type == :gvasgn or node.type == :lvasgn or node.type == :or_asgn or node.type == :const or node.type == :lvar)
         true
       elsif node.kind_of?(AST::Node) and node.type == :send and node.children[0] == nil and MAPPABLE_METHODS.include?(node.children[1])
         true
@@ -627,6 +617,9 @@ module Solargraph
       if node.type == :class
         children += node.children[0, 2]
         children += get_mappable_nodes(node.children[2..-1], comment_hash)
+        #children += get_mappable_nodes(node.children, comment_hash)
+      elsif node.type == :const
+        children += node.children
       elsif node.type == :def
         children += node.children[0, 2]
         children += get_mappable_nodes(node.children[2..-1], comment_hash)
@@ -647,7 +640,7 @@ module Solargraph
         @required.push(node.children[3].children[0]) if node.children[3].children[0].kind_of?(String)
         type = :require
         children += node.children[1, 3]
-      elsif node.type == :send
+      elsif node.type == :send or node.type == :lvar
         children += node.children
       elsif node.type == :or_asgn
         # TODO: The api_map should ignore local variables.

data/lib/solargraph/code_map.rb

@@ -24,10 +24,6 @@ module Solargraph
       end
       @code = code.gsub(/\r/, '')
       tries = 0
-      # Hide incomplete code to avoid syntax errors
-      # @todo This might not be necessary given the corrected character
-      #   replacement in retries.
-      #tmp = "#{@code}\nX".gsub(/[\.@]([\s])/, '#\1').gsub(/([\A\s]?)def([\s]*?[\n\Z])/, '\1#ef\2')
       tmp = @code
       begin
         node, comments = Parser::CurrentRuby.parse_with_comments(tmp)
@@ -41,10 +37,6 @@ module Solargraph
           STDERR.puts "Retrying..."
           tries += 1
           spot = e.diagnostic.location.begin_pos
-          #STDERR.puts "CODE>>>>"
-          #STDERR.puts tmp
-          #STDERR.puts "<<<<CODE"
-          #STDERR.puts "Spot #{spot}: #{tmp[spot]}"
           repl = '_'
           if tmp[spot] == '@' or tmp[spot] == ':'
             # Stub unfinished instance variables and symbols
@@ -61,14 +53,7 @@ module Solargraph
               repl= 'end;end'
             end
           end
-          #if spot == 0
-          #  tmp = '#' + tmp[1..-1]
-          #else
-            tmp = tmp[0..spot] + repl + tmp[spot+repl.length+1..-1].to_s
-          #end
-          #STDERR.puts "CHNG>>>>"
-          #STDERR.puts tmp
-          #STDERR.puts "<<<<CHNG"
+          tmp = tmp[0..spot] + repl + tmp[spot+repl.length+1..-1].to_s
           retry
         end
         raise e
@@ -136,12 +121,12 @@ module Solargraph
     def namespace_at(index)
       tree = tree_at(index)
       return nil if tree.length == 0
-      node = parent_node_from(index, :module, :class)
-      slice = tree[(tree.index(node) || 0)..-1]
+      slice = tree
       parts = []
       slice.reverse.each { |n|
         if n.type == :class or n.type == :module
-          parts.push unpack_name(n.children[0])
+          c = const_from(n.children[0])
+          parts.push c
         end
       }
       parts.join("::")
@@ -179,7 +164,7 @@ module Solargraph
       @api_map.get_instance_variables(ns, (node.type == :def ? :instance : :class))
     end
 
-    def suggest_at index, filtered: true, with_snippets: false
+    def suggest_at index, filtered: false, with_snippets: false
       node = node_at(index - 2)
       return [] if string_at?(index)
       result = []
@@ -240,10 +225,88 @@ module Solargraph
           end
         end
       end
-      #result = reduce_starting_with(result, word_at(index)) if filtered
+      result = reduce_starting_with(result, word_at(index)) if filtered
       result.uniq{|s| s.path}
     end
 
+    def signatures_at index
+      sig = signature_index_before(index)
+      return [] if sig.nil?
+      word = word_at(sig)
+      suggest_at(sig).reject{|s| s.label != word}
+    end
+
+    def resolve_object_at index
+      signature = get_signature_at(index)
+      cursor = index
+      while @code[cursor] =~ /[a-z0-9_\?]/i
+        signature += @code[cursor]
+        cursor += 1
+        break if cursor >= @code.length
+      end
+      return [] if signature.to_s == ''
+      ns_here = namespace_at(index)
+      scope = parent_node_from(index, :class, :module, :def, :defs) || @node
+      parts = signature.split('.')
+      if parts.length > 1
+        beginner = parts[0..-2].join('.')
+        ender = parts.last
+      else
+        beginner = signature
+        ender = nil
+      end
+      var = find_local_variable_node(parts[0], scope)
+      if var.nil?
+        # It's not a local variable
+        fqns = @api_map.find_fully_qualified_namespace(beginner, ns_here)
+        if fqns.nil?
+          # It's a method call
+          if ender.nil?
+            return @api_map.yard_map.objects(beginner, ns_here)
+          else
+            sig_scope = (scope.type == :def ? :instance : :class)
+            type = @api_map.infer_signature_type(beginner, ns_here, scope: sig_scope)
+            return [] if type.nil?
+            path = type
+            path += "##{ender}" unless ender.nil?
+            return @api_map.yard_map.objects(path, ns_here)
+          end
+        else
+          path = beginner
+          path += "##{ender}" unless ender.nil?
+          return @api_map.yard_map.objects(path, ns_here)
+        end
+      else
+        # It's a local variable. Get the type from the node
+        type = get_type_comment(var)
+        type = infer(var.children[1]) if type.nil?
+        if type.nil?
+          vsig = resolve_node_signature(var.children[1])
+          vparts = vsig.split('.')
+          fqns = @api_map.find_fully_qualified_namespace(vparts[0], ns_here)
+          if fqns.nil?
+            vtype = @api_map.infer_signature_type(vsig, ns_here, scope: :instance)
+          else
+            vtype = @api_map.infer_signature_type(vparts[1..-1].join('.'), fqns, scope: :class)
+          end
+          return [] if vtype.nil?
+          fqns = @api_map.find_fully_qualified_namespace(vtype, ns_here)
+          if ender.nil?
+            signature = parts[1..-1].join('.')
+          else
+            signature = parts[1..-2].join('.')
+          end
+          type = @api_map.infer_signature_type(signature, fqns, scope: :instance)
+        end
+        unless type.nil?
+          path = type
+          path += "##{ender}" unless ender.nil?
+          return @api_map.yard_map.objects(path, ns_here)
+        end
+      end
+      return []
+    end
+
     # Find the signature at the specified index and get suggestions based
     # on its inferred type.
     #
@@ -274,23 +337,44 @@ module Solargraph
         # It's a local variable. Get the type from the node
         type = get_type_comment(var)
         type = infer(var.children[1]) if type.nil?
+        skipdat = false
         if type.nil?
           vsig = resolve_node_signature(var.children[1])
           vparts = vsig.split('.')
           fqns = @api_map.find_fully_qualified_namespace(vparts[0], ns_here)
           if fqns.nil?
-            vtype = @api_map.infer_signature_type(vsig, ns_here, scope: :instance)
+            lvar = find_local_variable_node(vparts[0], scope)
+            if lvar.nil?
+              vtype = @api_map.infer_signature_type(vsig, ns_here, scope: :instance)
+            else
+              type = get_type_comment(lvar)
+              type = infer(lvar.children[1]) if type.nil?
+              if type.nil?
+                type = @api_map.infer_signature_type(resolve_node_signature(lvar.children[1]), ns_here, scope: :class)
+              end
+              unless type.nil?
+                signature = "#{vparts[1..-1].join('.')}"
+                skipdat = true
+              end
+            end
           else
             vtype = @api_map.infer_signature_type(vparts[1..-1].join('.'), fqns, scope: :class)
+            type = fqns
+            signature = parts[1..-1].join('.')
+            skipdat = true
           end
-          fqns = @api_map.find_fully_qualified_namespace(vtype, ns_here)
-          signature = parts[1..-1].join('.')
-          type = @api_map.infer_signature_type(signature, fqns, scope: :instance)
+          unless skipdat
+            fqns = @api_map.find_fully_qualified_namespace(vtype, ns_here)
+            signature = parts[1..-1].join('.')
+            type = @api_map.infer_signature_type(signature, fqns, scope: :instance)
+          end
+        else
+          signature = signature.split('.')[1..-1].join('.')
         end
         unless type.nil?
           lparts = signature.split('.')
-          if lparts.length > 1
-            lsig = lparts[1..-1].join('.')
+          if lparts.length >= 1
+            lsig = signature
             ltype = @api_map.infer_signature_type(lsig, type, scope: :instance)
             result.concat @api_map.get_instance_methods(ltype) unless ltype.nil?
           else
@@ -454,5 +538,22 @@ module Solargraph
       end
       i
     end
+
+    def signature_index_before index
+      open_parens = 0
+      cursor = index - 1
+      while cursor >= 0
+        break if cursor < 0
+        if @code[cursor] == ')'
+          open_parens -= 1
+        elsif @code[cursor] == '('
+          open_parens += 1
+        end
+        break if open_parens == 1
+        cursor -= 1
+      end
+      cursor = nil if cursor < 0
+      cursor
+    end
   end
 end

data/lib/solargraph/node_methods.rb

@@ -22,6 +22,44 @@ module Solargraph
       parts
     end
 
+    def const_from node
+      if node.kind_of?(AST::Node) and node.type == :const
+        result = ''
+        unless node.children[0].nil?
+          result = const_from(node.children[0])
+        end
+        if result == ''
+          result = node.children[1].to_s
+        else
+          result = result + '::' + node.children[1].to_s
+        end
+        result
+      else
+        nil
+      end
+    end
+
+    def drill_signature node, signature
+      return signature unless node.kind_of?(AST::Node)
+      if node.type == :const or node.type == :cbase
+        unless node.children[0].nil?
+          signature += drill_signature(node.children[0], signature)
+        end
+        signature += '::' unless signature.empty?
+        signature += node.children[1].to_s
+      elsif node.type == :lvar
+        signature += '.' unless signature.empty?
+        signature += node.children[0].to_s
+      elsif node.type == :send
+        unless node.children[0].nil?
+          signature += drill_signature(node.children[0], signature)
+        end
+        signature += '.' unless signature.empty?
+        signature += node.children[1].to_s
+      end
+      signature
+    end
+
     def infer node
       if node.type == :str
         return 'String'
@@ -43,7 +81,8 @@ module Solargraph
     #
     # @return [String]
     def resolve_node_signature node
-      stack_node_signature(node).join('.')
+      #stack_node_signature(node).join('.')
+      drill_signature node, ''
     end
 
     def stack_node_signature node

data/lib/solargraph/server.rb

@@ -24,7 +24,45 @@ module Solargraph
         @@semaphore.synchronize {
           code_map = CodeMap.new(code: params['text'], filename: params['filename'], api_map: @@api_hash[workspace])
           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)
+          sugg = code_map.suggest_at(offset, with_snippets: params['with_snippets'] == '1' ? true : false)
+        }
+        { "status" => "ok", "suggestions" => sugg }.to_json
+      rescue Exception => e
+        STDERR.puts e
+        STDERR.puts e.backtrace.join("\n")
+        { "status" => "err", "message" => e.message + "\n" + e.backtrace.join("\n") }.to_json
+      end
+    end
+
+    post '/signify' do
+      content_type :json
+      begin
+        sugg = []
+        workspace = params['workspace'] || CodeMap.find_workspace(params['filename'])
+        Server.prepare_workspace workspace unless @@api_hash.has_key?(workspace)
+        @@semaphore.synchronize {
+          code_map = CodeMap.new(code: params['text'], filename: params['filename'], api_map: @@api_hash[workspace])
+          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
+      rescue Exception => e
+        STDERR.puts e
+        STDERR.puts e.backtrace.join("\n")
+        { "status" => "err", "message" => e.message + "\n" + e.backtrace.join("\n") }.to_json
+      end
+    end
+
+    post '/hover' do
+      content_type :json
+      begin
+        sugg = []
+        workspace = params['workspace'] || CodeMap.find_workspace(params['filename'])
+        Server.prepare_workspace workspace unless @@api_hash.has_key?(workspace)
+        @@semaphore.synchronize {
+          code_map = CodeMap.new(code: params['text'], filename: params['filename'], api_map: @@api_hash[workspace])
+          offset = code_map.get_offset(params['line'].to_i, params['column'].to_i)
+          sugg = code_map.resolve_object_at(offset)
         }
         { "status" => "ok", "suggestions" => sugg }.to_json
       rescue Exception => e
@@ -58,15 +96,22 @@ module Solargraph
       erb :document
     end
 
-    def htmlify object
+    def htmlify text
+      rdoc_to_html text
+    end
+
+    def rdoc_to_html text
+      h = Helpers.new
+      h.html_markup_rdoc(text)
+    end
+
+    def ruby_to_html code
       h = Helpers.new
-      h.object = object
-      h.htmlify object.docstring.all, :rdoc
+      h.html_markup_ruby(code)
     end
 
     class << self
       def run!
-        #constant_updates
         super
       end
 
@@ -75,22 +120,8 @@ module Solargraph
         @@semaphore.synchronize {
           @@api_hash[directory] = api_map
         }
-        #Thread.new {
-          api_map.update_yardoc
-        #}
-      end
-
-      def constant_updates
         Thread.new {
-          loop do
-            @@api_hash.keys.each { |k|
-              update = Solargraph::ApiMap.new(k)
-              @@semaphore.synchronize {
-                @@api_hash[k] = update
-              }
-            }
-            sleep 10
-          end
+          api_map.update_yardoc
         }
       end
     end

data/lib/solargraph/shell.rb

@@ -75,7 +75,6 @@ module Solargraph
       rescue Exception => e
         STDERR.puts e
         STDERR.puts e.backtrace.join("\n")
-        #result = { "status" => "err", "message" => e.message }.to_json
         result = { "status" => "err", "message" => e.message + "\n" + e.backtrace.join("\n") }.to_json
         STDOUT.puts result
       end

data/lib/solargraph/suggestion.rb

@@ -10,9 +10,9 @@ module Solargraph
     VARIABLE = 'Variable'
     SNIPPET = 'Snippet'
 
-    attr_reader :label, :kind, :insert, :detail, :documentation, :code_object, :location
+    attr_reader :label, :kind, :insert, :detail, :documentation, :code_object, :location, :arguments
 
-    def initialize label, kind: KEYWORD, insert: nil, detail: nil, documentation: nil, code_object: nil, location: nil
+    def initialize label, kind: KEYWORD, insert: nil, detail: nil, documentation: nil, code_object: nil, location: nil, arguments: []
       @label = label.to_s
       @kind = kind
       @insert = insert || @label
@@ -20,6 +20,7 @@ module Solargraph
       @code_object = code_object
       @documentation = documentation
       @location = location
+      @arguments = arguments
     end
     
     def path
@@ -55,12 +56,13 @@ module Solargraph
         insert: @insert,
         detail: @detail,
         path: path,
-        location: (@location.nil? ? nil : @location.to_s)
+        location: (@location.nil? ? nil : @location.to_s),
+        arguments: @arguments
       }
       if @code_object.nil?
-        obj[:documentation] = @documentation.all unless @documentation.nil?
+        obj[:documentation] = @documentation.to_s unless @documentation.nil?
       else
-        obj[:documentation] = @code_object.docstring.all unless @code_object.docstring.nil?
+        obj[:documentation] = @code_object.docstring.to_s unless @code_object.docstring.nil?
       end
       obj.to_json(args)
     end

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.7.5'
+  VERSION = '0.8.0'
 end

data/lib/solargraph/yard_map.rb

@@ -11,8 +11,6 @@ module Solargraph
       unless workspace.nil?
         wsy = File.join(workspace, '.yardoc')
         yardocs.push wsy if File.exist?(wsy)
-        #wsy = Dir[File.join workspace, '**/*.rb']
-        #yardocs.push(wsy)
       end
       used = []
       required.each { |r|
@@ -29,16 +27,7 @@ module Solargraph
           end
         end
       }
-      # TODO: Experimental loading of all gems
-      #Bundler.load.specs.each { |s|
-      #  unless used.include?(s.name)
-      #    used.push s.name
-      #    gy = YARD::Registry.yardoc_file_for_gem(s.name)
-      #    yardocs.push gy unless gy.nil?
-      #  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')
       yardocs.uniq!
       cache_core
     end
@@ -159,8 +148,7 @@ module Solargraph
               n = m.to_s.split(/[\.#]/).last.gsub(/=/, ' = ')
               label = "#{n}"
               args = get_method_args(m)
-              label += " #{args.join(', ')}" unless args.empty?
-              meths.push Suggestion.new(label, insert: "#{n.gsub(/=/, ' = ')}", kind: Suggestion::METHOD, documentation: m.docstring, code_object: m, detail: "#{ns}", location: "#{m.file}:#{m.line}")
+              meths.push Suggestion.new(label, insert: "#{n.gsub(/=/, ' = ')}", kind: Suggestion::METHOD, documentation: m.docstring, code_object: m, detail: "#{ns}", location: "#{m.file}:#{m.line}", arguments: args)
             }
             # Collect superclass methods
             if ns.kind_of?(YARD::CodeObjects::ClassObject) and !ns.superclass.nil?
@@ -168,6 +156,14 @@ module Solargraph
             end
             if ns.kind_of?(YARD::CodeObjects::ClassObject) and namespace != 'Class'
               meths += get_instance_methods('Class')
+              yard = load_yardoc(y)
+              i = yard.at("#{ns}#initialize")
+              unless i.nil?
+                meths.delete_if{|m| m.label == 'new'}
+                label = "#{i}"
+                args = get_method_args(i)
+                meths.push Suggestion.new('new', kind: Suggestion::METHOD, documentation: i.docstring, code_object: i, detail: "#{ns}", location: "#{i.file}:#{i.line}", arguments: args)
+              end
             end
           end
         end
@@ -195,8 +191,7 @@ module Solargraph
               if n.to_s.match(/^[a-z]/i) and (namespace == 'Kernel' or !m.to_s.start_with?('Kernel#')) and !m.docstring.to_s.include?(':nodoc:')
                 label = "#{n}"
                 args = get_method_args(m)
-                label += " #{args.join(', ')}" unless args.empty?
-                meths.push Suggestion.new(label, insert: "#{n.gsub(/=/, ' = ')}", kind: Suggestion::METHOD, documentation: m.docstring, code_object: m, detail: "#{ns}", location: "#{m.file}:#{m.line}")
+                meths.push Suggestion.new(label, insert: "#{n.gsub(/=/, ' = ')}", kind: Suggestion::METHOD, documentation: m.docstring, code_object: m, detail: m.namespace, location: "#{m.file}:#{m.line}", arguments: args)
               end
             }
             if ns.kind_of?(YARD::CodeObjects::ClassObject) and namespace != 'Object'
@@ -226,6 +221,35 @@ module Solargraph
       nil
     end
 
+    def objects path, space = ''
+      result = []
+      yardocs.each { |y|
+        yard = load_yardoc(y)
+        unless yard.nil?
+          obj = find_first_resolved_namespace(yard, path, space)
+          if obj.nil? and path.include?('#')
+            parts = path.split('#')
+            obj = yard.at(parts[0])
+            unless obj.nil?
+              meths = obj.meths(scope: [:instance]).keep_if{|m| m.name.to_s == parts[1]}
+              meths.each { |m|
+                args = get_method_args(m)
+                result.push Solargraph::Suggestion.new(m.name, kind: 'Method', detail: m.path, code_object: m, arguments: args)
+              }
+            end
+          else
+            unless obj.nil?
+              args = []
+              args = get_method_args(obj) if obj.kind_of?(YARD::CodeObjects::MethodObject)
+              kind = kind_of_object(obj)
+              result.push Solargraph::Suggestion.new(obj.name, kind: kind, detail: obj.path, code_object: obj, arguments: args)
+            end
+          end
+        end
+      }
+      result
+    end
+
     private
 
     def cache
@@ -257,10 +281,18 @@ module Solargraph
 
     def cache_core
       c = get_constants '', ''
-      c.each { |n|
-        #get_methods n.label, visibility: :public
-        #get_instance_methods n.label, visibility: :public
-      }
+    end
+
+    def kind_of_object obj
+      if obj.kind_of?(YARD::CodeObjects::MethodObject)
+        'Method'
+      elsif obj.kind_of?(YARD::CodeObjects::ClassObject)
+        'Class'
+      elsif obj.kind_of?(YARD::CodeObjects::ModuleObject)
+        'Module'
+      else
+        nil
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.8.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser