solargraph 0.8.0 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a80ad72c101042120c5ec349dd3fb19a98e794e7
-  data.tar.gz: 99d562e48985d5fa6e3d8dbaf93edafd165490c4
+  metadata.gz: 02c54193138513541a17e784338430260259b223
+  data.tar.gz: f464a3a964e88b6f82d250e065d92e0062c3a135
 SHA512:
-  metadata.gz: ee8a6a7d1d7cc1ec77727a81e7cd4db7e3da8c0d03baee7424ac2063d281bbc1ceb1863c37c489219f65735cc3adbb64f78b05b7a1ed29a9dfc2b73eb776c6ee
-  data.tar.gz: 34a309dcdb41c54a99ced46a8c51fe3b4372d8dc51a2620647f0b7d3f4331662f7fd3a263f4a99d6e45f3bfe899b965212e38adfb1e578daa89667914be50b98
+  metadata.gz: b548477ca4dc01db1785654d68d779a1ae3e29fb29c7702efc006ce2abfd8101df8735395328bb11db9a19abfc568d93896fadc392c8eb9af4126450fb7df162
+  data.tar.gz: dd27df9547f7dddfff89b98af23cf61d9dfaeb5937f790885c30607b7ccc7f3d5151132fb1affa8183b4f766d257731129b504a1dbcc43c1791deec07f719a7c

data/lib/solargraph/api_map.rb

@@ -10,7 +10,7 @@ module Solargraph
       'begin', 'break', 'case', 'class', 'def', 'defined?', 'do', 'else',
       'elsif', 'end', 'ensure', 'false', 'for', 'if', 'in', 'module', 'next',
       'nil', 'not', 'or', 'redo', 'rescue', 'retry', 'return', 'self', 'super',
-      'then', 'true', 'undef', 'unless', 'until', 'when', 'while', 'yield',
+      'then', 'true', 'undef', 'unless', 'until', 'when', 'while', 'yield'
     ]
 
     MAPPABLE_METHODS = [
@@ -39,7 +39,7 @@ module Solargraph
           files -= Dir[File.join @workspace, glob]
         }
         files.uniq.each { |f|
-          append_file f #unless yardoc_has_file?(f)
+          append_file f if File.file?(f)
         }
       end
     end
@@ -97,6 +97,7 @@ module Solargraph
       @file_comments[filename][node.loc]
     end
 
+
     def self.get_keywords
       result = []
       keywords = KEYWORDS + ['attr_reader', 'attr_writer', 'attr_accessor', 'private', 'public', 'protected']
@@ -337,6 +338,7 @@ module Solargraph
       while parts.length > 0 and !type.nil?
         p = parts.shift
         if top and scope == :class
+          next if p == 'new'
           first_class = find_fully_qualified_namespace(p, namespace)
           sub = nil
           sub = infer_signature_type(parts.join('.'), first_class, scope: :class) unless first_class.nil?
@@ -371,6 +373,10 @@ module Solargraph
       type
     end
 
+    # Get an array of singleton methods that are available in the specified
+    # namespace.
+    #
+    # @return [Array<Solargraph::Suggestion>]
     def get_methods(namespace, root = '', visibility: [:public])
       meths = []
       meths += inner_get_methods(namespace, root, []) #unless has_yardoc?
@@ -399,15 +405,24 @@ module Solargraph
       }
       return args if list.nil?
       list.children.each { |c|
+        STDERR.puts "Args child is #{c.type}"
         if c.type == :arg
           args.push c.children[0]
-        elsif c.type == :kwoptarg
+        elsif c.type == :optarg
+          args.push "#{c.children[0]} = _"
+        elsif c.type == :kwarg
           args.push "#{c.children[0]}:"
+        elsif c.type == :kwoptarg
+          args.push "#{c.children[0]}: _"
         end
       }
       args
     end
 
+    # Get an array of instance methods that are available in the specified
+    # namespace.
+    #
+    # @return [Array<Solargraph::Suggestion>]
     def get_instance_methods(namespace, root = '', visibility: [:public])
       meths = []
       meths += inner_get_instance_methods(namespace, root, []) #unless has_yardoc?
@@ -459,22 +474,23 @@ module Solargraph
       arr
     end
     
+    # Update the YARD documentation for the current workspace.
+    #
     def update_yardoc
       if workspace.nil?
         STDERR.puts "No workspace specified for yardoc update."
       else
-        Dir.chdir(workspace) do
-          Thread.new {
-            STDERR.puts "Updating the yardoc..."
-            globs = yard_options[:include] - yard_options[:exclude]
+        Thread.new {
+          Dir.chdir(workspace) do
+            STDERR.puts "Updating the yardoc for #{workspace}..."
             cmd = "yardoc -e #{Solargraph::YARD_EXTENSION_FILE}"
             STDERR.puts "Update yardoc with #{cmd}"
             STDERR.puts `#{cmd}`
             unless $?.success?
               STDERR.puts "There was an error processing the workspace yardoc."
             end
-          }
-        end
+          end
+        }
       end
     end
 
@@ -509,14 +525,16 @@ module Solargraph
             docstring = get_comment_for(c)
             label = "#{c.children[1]}"
             args = get_method_args(c)
-            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
+            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)
+            end
           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'
+            meths.concat inner_get_methods(i, root, skip) unless i == 'Kernel'
           else
-            meths += inner_get_methods_from_node(c, root, skip)
+            meths.concat inner_get_methods_from_node(c, root, skip)
           end
         end
       }
@@ -553,16 +571,16 @@ module Solargraph
                   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
+                    meths.push Suggestion.new(x.children[0], kind: Suggestion::FIELD) if x.type == :sym
                   }
                 elsif c.kind_of?(AST::Node) and c.type == :send and c.children[1] == :attr_writer
                   c.children[2..-1].each { |x|
-                    meths.push Suggestion.new("#{x.children[0]}=", kind: Suggestion::METHOD) if x.type == :sym
+                    meths.push Suggestion.new("#{x.children[0]}=", kind: Suggestion::FIELD) if x.type == :sym
                   }
                 elsif c.kind_of?(AST::Node) and c.type == :send and c.children[1] == :attr_accessor
                   c.children[2..-1].each { |x|
-                    meths.push Suggestion.new(x.children[0], kind: Suggestion::METHOD) if x.type == :sym
-                    meths.push Suggestion.new("#{x.children[0]}=", kind: Suggestion::METHOD) if x.type == :sym
+                    meths.push Suggestion.new(x.children[0], kind: Suggestion::FIELD) if x.type == :sym
+                    meths.push Suggestion.new("#{x.children[0]}=", kind: Suggestion::FIELD) if x.type == :sym
                   }
                 end
               end
@@ -580,7 +598,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 or node.type == :const or node.type == :lvar)
+      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 or node.type == :args or node.type == :kwargs)
         true
       elsif node.kind_of?(AST::Node) and node.type == :send and node.children[0] == nil and MAPPABLE_METHODS.include?(node.children[1])
         true
@@ -588,7 +606,7 @@ module Solargraph
         false
       end
     end
-    
+
     def reduce node, comment_hash
       return node unless node.kind_of?(AST::Node)
       mappable = get_mappable_nodes(node.children, comment_hash)
@@ -618,7 +636,7 @@ module Solargraph
         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
+      elsif node.type == :const or node.type == :args or node.type == :kwargs
         children += node.children
       elsif node.type == :def
         children += node.children[0, 2]
@@ -634,7 +652,10 @@ module Solargraph
       elsif node.type == :send and node.children[1] == :include
         children += node.children[0,3]
       elsif node.type == :send and node.children[1] == :require
-        @required.push(node.children[2].children[0]) if node.children[2].children[0].kind_of?(String)
+        if node.children[2].children[0].kind_of?(String)
+          path = node.children[2].children[0].to_s
+          @required.push(path) unless local_path?(path)
+        end
         children += node.children[0, 3]
       elsif node.type == :send and node.children[1] == :autoload
         @required.push(node.children[3].children[0]) if node.children[3].children[0].kind_of?(String)
@@ -653,6 +674,13 @@ module Solargraph
       result
     end
     
+    def local_path? path
+      return false if workspace.nil?
+      return true if File.exist?(File.join workspace, 'lib', path)
+      return true if File.exist?(File.join workspace, 'lib', "#{path}.rb")
+      false
+    end
+
     def map_parents node, tree = []
       if node.kind_of?(AST::Node)
         @parent_stack[node] = tree
@@ -669,7 +697,7 @@ module Solargraph
         cursor = cursor[t.to_s]
       }
     end
-    
+
     def map_namespaces node, tree = []
       if node.kind_of?(AST::Node)
         if node.type == :class or node.type == :module
@@ -687,6 +715,6 @@ module Solargraph
           map_namespaces c, tree
         }
       end
-    end    
+    end
   end
 end

data/lib/solargraph/code_map.rb

@@ -3,81 +3,73 @@ require 'parser/current'
 module Solargraph
   class CodeMap
     attr_accessor :node
-    attr_accessor :api_map
     attr_reader :code
     attr_reader :parsed
+    attr_reader :filename
+    attr_reader :workspace
 
     include NodeMethods
 
     def initialize code: '', filename: nil, workspace: nil, api_map: nil
-      unless workspace.nil?
-        workspace = workspace.gsub(File::ALT_SEPARATOR, File::SEPARATOR) unless File::ALT_SEPARATOR.nil?
-      end
-      if workspace.nil? and !filename.nil?
-        filename = filename.gsub(File::ALT_SEPARATOR, File::SEPARATOR) unless File::ALT_SEPARATOR.nil?
-        workspace = CodeMap.find_workspace(filename)
-      end
+      @workspace = workspace
+      # 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
       @api_map = api_map
-      if @api_map.nil?
-        @api_map = ApiMap.new(workspace)
-      end
       @code = code.gsub(/\r/, '')
       tries = 0
       tmp = @code
       begin
-        node, comments = Parser::CurrentRuby.parse_with_comments(tmp)
-        @node = @api_map.append_node(node, comments, filename)
+        # HACK: The current file is parsed with a trailing underscore to fix
+        # incomplete trees resulting from short scripts (e.g., a lone variable
+        # assignment).
+        node, comments = Parser::CurrentRuby.parse_with_comments(tmp + "\n_")
+        @node = self.api_map.append_node(node, comments, filename)
         @parsed = tmp
         @code.freeze
         @parsed.freeze
       rescue Parser::SyntaxError => e
         if tries < 10
-          STDERR.puts "Error parsing #{filename}: #{e.message}"
-          STDERR.puts "Retrying..."
           tries += 1
-          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
+          if tries == 10 and e.message.include?('token $end')
+            tmp += "\nend"
           else
-            # Stub the whole line
-            spot = beginning_of_line_from(tmp, spot)
-            repl = '#'
-            if tmp[spot+1..-1].rstrip == 'end'
-              repl= 'end;end'
+            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
+            tmp = tmp[0..spot] + repl + tmp[spot+repl.length+1..-1].to_s
           end
-          tmp = tmp[0..spot] + repl + tmp[spot+repl.length+1..-1].to_s
           retry
         end
         raise e
       end
     end
 
-    def self.find_workspace filename
-      return nil if filename.nil?
-      dirname = filename
-      lastname = nil
-      result = nil
-      until dirname == lastname
-        if File.file?("#{dirname}/Gemfile")
-          result = dirname
-          break
-        end
-        lastname = dirname
-        dirname = File.dirname(dirname)
-      end
-      result ||= File.dirname(filename)
-      result.gsub!(File::ALT_SEPARATOR, File::SEPARATOR) unless File::ALT_SEPARATOR.nil?
-      result
+    # @return [Solargraph::ApiMap]
+    def api_map
+      @api_map ||= ApiMap.new(workspace)
     end
 
+    # Get the offset of the specified line and column.
+    # The offset (also called the "index") is typically used to identify the
+    # cursor's location in the code when generating suggestions.
+    # The line and column numbers should start at zero.
+    #
+    # @return [Integer]
     def get_offset line, col
       offset = 0
       if line > 0
@@ -88,10 +80,6 @@ module Solargraph
       offset + col
     end
 
-    def merge node
-      api_map.merge node
-    end
-
     def tree_at(index)
       arr = []
       arr.push @node
@@ -103,6 +91,9 @@ module Solargraph
       tree_at(index).first
     end
 
+    # Determine if the specified index is inside a string.
+    #
+    # @return [Boolean]
     def string_at?(index)
       n = node_at(index)
       n.kind_of?(AST::Node) and n.type == :str
@@ -118,6 +109,11 @@ module Solargraph
       @node
     end
 
+    # Get the namespace at the specified location. For example, given the code
+    # `class Foo; def bar; end; end`, index 14 (the center) is in the
+    # "Foo" namespace.
+    #
+    # @return [String]
     def namespace_at(index)
       tree = tree_at(index)
       return nil if tree.length == 0
@@ -132,6 +128,19 @@ module Solargraph
       parts.join("::")
     end
 
+    # Get the namespace for the specified node. For example, given the code
+    # `class Foo; def bar; end; end`, the node for `def bar` is in the "Foo"
+    # namespace.
+    #
+    # @return [String]
+    def namespace_from(node)
+      if node.respond_to?(:loc)
+        namespace_at(node.loc.expression.begin_pos)
+      else
+        ''
+      end
+    end
+
     def phrase_at index
       word = ''
       cursor = index - 1
@@ -161,50 +170,48 @@ module Solargraph
     def get_instance_variables_at(index)
       node = parent_node_from(index, :def, :defs, :class, :module)
       ns = namespace_at(index) || ''
-      @api_map.get_instance_variables(ns, (node.type == :def ? :instance : :class))
+      api_map.get_instance_variables(ns, (node.type == :def ? :instance : :class))
     end
 
+    # Get suggestions for code completion at the specified location in the
+    # source.
+    #
+    # @return [Array<Suggestions>] The completion suggestions
     def suggest_at index, filtered: false, with_snippets: false
-      node = node_at(index - 2)
-      return [] if string_at?(index)
+      return [] if string_at?(index) or string_at?(index - 1)
       result = []
       phrase = phrase_at(index)
       signature = get_signature_at(index)
-      if (@code[index - 1] == '.')
+      namespace = namespace_at(index)
+      if signature.include?('.')
+        # Check for literals first
         type = infer(node_at(index - 2))
-        return @api_map.get_instance_methods(type) unless type.nil?
-      end
-      if signature.start_with?('@')
-        parts = signature.split('.')
-        var = parts.shift
-        if parts.length > 0 or signature.end_with?('.')
-          result = []
-          ns = namespace_at(index)
-          scope = :class
-          node = parent_node_from(index, :def, :defs, :class, :module)
-          scope = :instance if !node.nil? and node.type == :def
-          obj = @api_map.infer_instance_variable(var, ns, scope)
-          type = @api_map.infer_signature_type(parts.join('.'), obj, scope: :instance)
-          result = @api_map.get_instance_methods(type) unless type.nil?
+        if type.nil?
+          nearest = @code[0, index].rindex('.')
+          revised = signature[0..nearest-index-1]
+          type = infer_signature_at(nearest) unless revised.empty?
+          if !type.nil?
+            result.concat api_map.get_instance_methods(type) unless type.nil?
+          elsif !revised.include?('.')
+            fqns = api_map.find_fully_qualified_namespace(revised, namespace)
+            result.concat api_map.get_methods(fqns) unless fqns.nil?
+          end
         else
-          result = get_instance_variables_at(index)
+          result.concat api_map.get_instance_methods(type)
         end
+      elsif signature.start_with?('@')
+        result.concat get_instance_variables_at(index)
       elsif phrase.start_with?('$')
-        result += @api_map.get_global_variables
-      elsif phrase.start_with?(':') and !phrase.start_with?('::')
-        # TODO: It's a symbol. Nothing to do for now.
-        return []
+        result.concat api_map.get_global_variables
       elsif phrase.include?('::')
         parts = phrase.split('::', -1)
         ns = parts[0..-2].join('::')
         if parts.last.include?('.')
           ns = parts[0..-2].join('::') + '::' + parts.last[0..parts.last.index('.')-1]
-          result = @api_map.get_methods(ns)
+          result = api_map.get_methods(ns)
         else
-          result = @api_map.namespaces_in(ns)
+          result = api_map.namespaces_in(ns, namespace)
         end
-      elsif signature.include?('.')
-        result = resolve_signature_at @code[0, index].rindex('.')
       else
         current_namespace = namespace_at(index)
         parts = current_namespace.to_s.split('::')
@@ -213,20 +220,20 @@ module Solargraph
         result += ApiMap.get_keywords
         while parts.length > 0
           ns = parts.join('::')
-          result += @api_map.namespaces_in(ns)
+          result += api_map.namespaces_in(ns, namespace)
           parts.pop
         end
-        result += @api_map.namespaces_in('')
-        result += @api_map.get_instance_methods('Kernel')
-        unless @filename.nil? or @api_map.yardoc_has_file?(@filename)
-          m = @code.match(/# +@bind \[([a-z0-9_:]*)/i)
-          unless m.nil?
-            @api_map.get_instance_methods(m[1])
-          end
-        end
+        result += api_map.namespaces_in('')
+        result += api_map.get_instance_methods('Kernel')
+        #unless @filename.nil? or @api_map.yardoc_has_file?(@filename)
+        #  m = @code.match(/# +@bind \[([a-z0-9_:]*)/i)
+        #  unless m.nil?
+        #    @api_map.get_instance_methods(m[1])
+        #  end
+        #end
       end
       result = reduce_starting_with(result, word_at(index)) if filtered
-      result.uniq{|s| s.path}
+      result.uniq{|s| s.path}.sort{|a,b| a.label <=> b.label}
     end
 
     def signatures_at index
@@ -237,6 +244,7 @@ module Solargraph
     end
 
     def resolve_object_at index
+      return [] if string_at?(index)
       signature = get_signature_at(index)
       cursor = index
       while @code[cursor] =~ /[a-z0-9_\?]/i
@@ -245,149 +253,123 @@ module Solargraph
         break if cursor >= @code.length
       end
       return [] if signature.to_s == ''
+      path = nil
       ns_here = namespace_at(index)
-      scope = parent_node_from(index, :class, :module, :def, :defs) || @node
+      node = parent_node_from(index, :class, :module, :def, :defs) || @node
       parts = signature.split('.')
       if parts.length > 1
         beginner = parts[0..-2].join('.')
+        type = infer_signature_from_node(beginner, node)
         ender = parts.last
+        path = "#{type}##{ender}"
       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
+        if local_variable_in_node?(signature, node)
+          path = infer_signature_from_node(signature, node)
+        elsif signature.start_with?('@')
+          path = api_map.infer_instance_variable(signature, ns_here, (node.type == :def ? :instance : :class))
         else
-          path = beginner
-          path += "##{ender}" unless ender.nil?
-          return @api_map.yard_map.objects(path, ns_here)
+          path = signature
         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)
+        if path.nil?
+          path = api_map.find_fully_qualified_namespace(signature, ns_here)
         end
       end
-      return []
+      return [] if path.nil?
+      return api_map.yard_map.objects(path, ns_here)
     end
 
-    # Find the signature at the specified index and get suggestions based
-    # on its inferred type.
-    #
-    # @return [Array<Solargraph::Suggestion>]
-    def resolve_signature_at index
-      result = []
+    def infer_signature_at index
       signature = get_signature_at(index)
-      ns_here = namespace_at(index)
-      scope = parent_node_from(index, :class, :module, :def, :defs) || @node
+      node = parent_node_from(index, :class, :module, :def, :defs) || @node
+      infer_signature_from_node signature, node
+    end
+
+    def local_variable_in_node?(name, node)
+      return true unless find_local_variable_node(name, node).nil?
+      if node.type == :def or node.type == :defs
+        args = get_method_arguments_from(node).keep_if{|a| a.label == name}
+        return true unless args.empty?
+      end
+      false
+    end
+
+    def infer_signature_from_node signature, node
+      inferred = nil
       parts = signature.split('.')
-      var = find_local_variable_node(parts[0], scope)
+      ns_here = namespace_from(node)
+      start = parts[0]
+      return nil if start.nil?
+      remainder = parts[1..-1]
+      scope = :instance
+      var = find_local_variable_node(start, node)
       if var.nil?
-        # It's not a local variable
-        fqns = @api_map.find_fully_qualified_namespace(signature, ns_here)
-        if fqns.nil?
-          # It's a method call
-          sig_scope = (scope.type == :def ? :instance : :class)
-          type = @api_map.infer_signature_type(signature, ns_here, scope: sig_scope)
-          result.concat @api_map.get_instance_methods(type) unless type.nil?
+        if start.start_with?('@')
+          scope2 = (node.type == :def ? :instance : :class)
+          type = api_map.infer_instance_variable(start, ns_here, scope2)
         else
-          if fqns == ns_here
-            result.concat @api_map.get_methods(fqns, '', visibility: [:private, :protected, :public])
+          if node.type == :def or node.type == :defs
+            args = get_method_arguments_from(node).keep_if{|a| a.label == start}
+            if args.empty?
+              scope = :class
+              type = api_map.find_fully_qualified_namespace(start, ns_here)
+              if type.nil?
+                # It's a method call
+                sig_scope = (node.type == :def ? :instance : :class)
+                type = api_map.infer_signature_type(start, ns_here, scope: sig_scope)
+              else
+                return nil if remainder.empty?
+              end
+            else
+              cmnt = api_map.get_comment_for(node)
+              unless cmnt.nil?
+                params = cmnt.tags(:param)
+                unless params.nil?
+                  params.each do |p|
+                    if p.name == args[0].label
+                      type = p.types[0]
+                      break
+                    end
+                  end
+                end
+              end
+            end
           else
-            result.concat @api_map.get_methods(fqns)
+            scope = :class
+            type = api_map.find_fully_qualified_namespace(start, ns_here)
+            if type.nil?
+              # It's a method call
+              sig_scope = (node.type == :def ? :instance : :class)
+              type = api_map.infer_signature_type(start, ns_here, scope: sig_scope)
+            else
+              return nil if remainder.empty?
+            end
           end
         end
       else
-        # It's a local variable. Get the type from the node
+        # Signature starts with a local variable
         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?
-            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
-          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 = signature
-            ltype = @api_map.infer_signature_type(lsig, type, scope: :instance)
-            result.concat @api_map.get_instance_methods(ltype) unless ltype.nil?
-          else
-            result.concat @api_map.get_instance_methods(type)
-          end
+          type = infer_signature_from_node vsig, node
         end
       end
+      unless type.nil?
+        inferred = api_map.infer_signature_type(remainder.join('.'), type, scope: scope)
+      end
+      inferred
+    end
+
+    def suggest_for_signature_at index
+      result = []
+      type = infer_signature_at(index)
+      result.concat api_map.get_instance_methods(type) unless type.nil?
       result
     end
 
     def get_type_comment node
       obj = nil
-      cmnt = @api_map.get_comment_for(node)
+      cmnt = api_map.get_comment_for(node)
       unless cmnt.nil?
         tag = cmnt.tag(:type)
         obj = tag.types[0] unless tag.nil? or tag.types.empty?
@@ -395,6 +377,17 @@ module Solargraph
       obj
     end
 
+    # Get the signature at the specified index.
+    # A signature is a method call that can start with a constant, method, or
+    # variable and does not include any method arguments. Examples:
+    #
+    # Code                  Signature
+    # -----------------------------------------
+    # String.new            String.new
+    # @x.bar                @x.bar
+    # y.split(', ').length  y.split.length
+    #
+    # @return [String]
     def get_signature_at index
       brackets = 0
       squares = 0
@@ -427,6 +420,10 @@ module Solargraph
       signature
     end
 
+    # Build a signature from the specified node. This method returns the node
+    # as an array of strings.
+    #
+    # @return [Array<String>]
     def build_signature(node, parts)
       if node.kind_of?(AST::Node)
         if node.type == :send
@@ -457,22 +454,39 @@ module Solargraph
       result
     end
 
+    # Get an array of local variables and methods that can be accessed from
+    # the specified location in the code.
+    #
+    # @return [Array<Solargraph::Suggestion>]
     def get_local_variables_and_methods_at(index)
       result = []
       local = parent_node_from(index, :class, :module, :def, :defs) || @node
       result += get_local_variables_from(local)
       scope = namespace_at(index) || @node
       if local.type == :def
-        result += @api_map.get_instance_methods(scope, visibility: [:public, :private, :protected])
+        result += api_map.get_instance_methods(scope, visibility: [:public, :private, :protected])
       else
-        result += @api_map.get_methods(scope, visibility: [:public, :private, :protected])
+        result += api_map.get_methods(scope, visibility: [:public, :private, :protected])
+      end
+      if local.type == :def or local.type == :defs
+        result += get_method_arguments_from local
       end
-      result += @api_map.get_methods('Kernel')
+      result += api_map.get_methods('Kernel')
       result
     end
 
     private
 
+    def get_method_arguments_from node
+      result = []
+      args = node.children[1]
+      args.children.each do |arg|
+        name = arg.children[0].to_s
+        result.push Suggestion.new(name, kind: Suggestion::PROPERTY, insert: name)
+      end
+      result
+    end
+
     def reduce_starting_with(suggestions, word)
       suggestions.reject { |s|
         !s.label.start_with?(word)
@@ -485,7 +499,7 @@ module Solargraph
       node.children.each { |c|
         if c.kind_of?(AST::Node)
           if c.type == :lvasgn
-            arr.push Suggestion.new(c.children[0], kind: Suggestion::VARIABLE, documentation: @api_map.get_comment_for(c))
+            arr.push Suggestion.new(c.children[0], kind: Suggestion::VARIABLE, documentation: api_map.get_comment_for(c))
           else
             arr += get_local_variables_from(c) unless [:class, :module, :def, :defs].include?(c.type)
           end

data/lib/solargraph/node_methods.rb

@@ -39,27 +39,6 @@ module Solargraph
       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'
@@ -127,5 +106,28 @@ module Solargraph
       end
       @yard_options
     end
+
+    private
+
+    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
   end
 end

data/lib/solargraph/server.rb

@@ -6,6 +6,7 @@ module Solargraph
   class Server < Sinatra::Base
 
     set :port, 7657
+    set :server, :webrick
 
     @@api_hash = {}
     @@semaphore = Mutex.new
@@ -19,12 +20,12 @@ module Solargraph
       content_type :json
       begin
         sugg = []
-        workspace = params['workspace'] || CodeMap.find_workspace(params['filename'])
+        workspace = params['workspace']
         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.suggest_at(offset, with_snippets: params['with_snippets'] == '1' ? true : false)
+          sugg = code_map.suggest_at(offset, with_snippets: params['with_snippets'] == '1' ? true : false, filtered: (params['filtered'] || false))
         }
         { "status" => "ok", "suggestions" => sugg }.to_json
       rescue Exception => e

data/lib/solargraph/suggestion.rb

@@ -8,11 +8,14 @@ module Solargraph
     MODULE = 'Module'
     METHOD = 'Method'
     VARIABLE = 'Variable'
+    PROPERTY = 'Property'
+    FIELD = 'Field'
     SNIPPET = 'Snippet'
 
     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, arguments: []
+      @helper = Server::Helpers.new
       @label = label.to_s
       @kind = kind
       @insert = insert || @label
@@ -34,8 +37,14 @@ module Solargraph
     def return_type
       if code_object.nil?
         unless documentation.nil?
-          match = documentation.all.match(/@return \[([a-z0-9:_]*)/i)
-          return match[1]
+          if documentation.kind_of?(YARD::Docstring)
+            t = documentation.tag(:return)
+            return nil if t.nil?
+            return t.types[0]
+          else
+            match = documentation.match(/@return \[([a-z0-9:_]*)/i)
+            return match[1] unless match.nil?
+          end
         end
       else
         o = code_object.tag(:overload)
@@ -49,6 +58,15 @@ module Solargraph
       nil
     end
 
+    def documentation
+      if @documentation.nil?
+        unless @code_object.nil?
+          @documentation = @code_object.docstring unless @code_object.docstring.nil?
+        end
+      end
+      @documentation
+    end
+
     def to_json args={}
       obj = {
         label: @label,
@@ -57,13 +75,10 @@ module Solargraph
         detail: @detail,
         path: path,
         location: (@location.nil? ? nil : @location.to_s),
-        arguments: @arguments
+        arguments: @arguments,
+        return_type: return_type,
+        documentation: @helper.html_markup_rdoc(documentation.to_s)
       }
-      if @code_object.nil?
-        obj[:documentation] = @documentation.to_s unless @documentation.nil?
-      else
-        obj[:documentation] = @code_object.docstring.to_s unless @code_object.docstring.nil?
-      end
       obj.to_json(args)
     end
   end

data/lib/solargraph/version.rb

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

data/lib/solargraph/yard_map.rb

@@ -148,7 +148,8 @@ module Solargraph
               n = m.to_s.split(/[\.#]/).last.gsub(/=/, ' = ')
               label = "#{n}"
               args = get_method_args(m)
-              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)
+              kind = (m.is_attribute? ? Suggestion::FIELD : Suggestion::METHOD)
+              meths.push Suggestion.new(label, insert: "#{n.gsub(/=/, ' = ')}", kind: kind, 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?
@@ -191,14 +192,19 @@ 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)
-                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)
+                kind = (m.is_attribute? ? Suggestion::FIELD : Suggestion::METHOD)
+                meths.push Suggestion.new(label, insert: "#{n.gsub(/=/, ' = ')}", kind: kind, 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'
-              if ns.superclass.kind_of?(YARD::CodeObjects::Proxy)
+              #if ns.superclass.kind_of?(YARD::CodeObjects::Proxy)
+              unless ns.nil?
                 meths += get_instance_methods(ns.superclass.to_s)
               end
             end
+            ns.instance_mixins.each do |m|
+              meths += get_instance_methods(m.to_s) unless m.to_s == 'Kernel'
+            end
           end
         end
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.6
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -137,7 +137,6 @@ files:
 - lib/solargraph.rb
 - lib/solargraph/api_map.rb
 - lib/solargraph/code_map.rb
-- lib/solargraph/live_parser.rb
 - lib/solargraph/mapper.rb
 - lib/solargraph/node_methods.rb
 - lib/solargraph/server.rb
@@ -145,7 +144,6 @@ files:
 - lib/solargraph/snippets.rb
 - lib/solargraph/suggestion.rb
 - lib/solargraph/version.rb
-- lib/solargraph/views/foo.erb
 - lib/solargraph/views/layout.erb
 - lib/solargraph/views/search.erb
 - lib/solargraph/yard_map.rb

data/lib/solargraph/live_parser.rb

@@ -1,265 +0,0 @@
-# Solargraph Ruby Parser
-# Copyright (c) 2015 by Fred Snyder for Castwide Technologies LLC
-#
-# Solargraph::Parser builds a code representation of existing Ruby interfaces
-# for use in the Solargraph IDE.
-#
-# Example use:
-#
-#    parser = Solargraph::Parser.new
-#    parser.parse            #=> String with the entire Ruby interface
-#    parser.parse("Fixnum")  #=> String with the Fixnum interface
-#require 'yard'
-#require 'yard/registry'
-
-module Solargraph
-  class LiveParser
-    def get_yard_return(path)
-      objects = []
-      yardocs = ['yard/2.2.0/.yardoc', 'ruby/yard/2.2.0/.yardoc-stdlib']
-      yardocs.each { |y|
-        YARD::Registry.load!(y)
-        o = YARD::Registry.at(path)
-        if !o.nil?
-          objects.push o
-        end
-      }
-      result = nil
-      objects.each { |x|
-        meth = x
-        if !meth.tag(:return) and meth.tag(:overload) and meth.tag(:overload).tag(:return)
-          meth = meth.tag(:overload)
-        end
-        meth.tags(:return).each { |r|
-          result = "#{r.types[0]}"
-          break
-        }
-        break if !result.nil?
-      }
-      result
-    end
-    def initialize
-
-    end
-    def parse namespace = nil
-      #puts "Namespace: #{namespace}"
-      @parsed = []
-      code = ""
-      fqns = namespace
-      if fqns.nil?
-        #code += parse("BasicObject")
-        #code += parse("Object")
-        #code += parse("Kernel")
-        code += parse("Module")
-        return code
-      end
-      mod = eval("#{fqns}")
-      if !mod.nil?
-        if mod.instance_of?(Class)
-          #puts "Parsing class #{mod} to #{fqns}"
-          code += parse_class mod, fqns
-        elsif mod.instance_of?(Module)
-          #puts "Parsing module #{mod} to #{fqns}"
-          code += parse_module mod, fqns
-        else
-          #raise "I don't know what a #{fqns} is."
-          code += "#{fqns} = nil\n"
-        end
-      else
-        #puts "NIL!"
-      end
-      code
-    end
-    def self.parse n
-      LiveParser.new.parse(n)
-    end
-    private
-    def parse_class cls, rel_name
-      return "" if @parsed.include?(cls)
-      @parsed.push cls
-      code = ""
-      #code += "class #{rel_name}"
-      code += "class #{cls}"
-      if !cls.superclass.nil? && cls.superclass != cls
-        code += " < #{cls.superclass}"
-      end
-      code += "\n"
-      code += parse_class_internals(cls)
-      code += "end\n"
-      cls.constants().each { |c|
-        #obj = cls.class_eval(c.to_s)
-        begin
-          obj = cls.const_get(c)
-          if obj.kind_of?(Class)
-            code += parse_class(obj, c)
-          elsif obj.kind_of?(Module)
-            code += parse_module(obj, c)
-          else
-            #code += subparse(obj)
-          end
-        #rescue NameError => e
-        #  #puts "NOPE! NOT #{c}"
-        #end
-        rescue Exception => e
-          # TODO: Ignoring all exceptions for now
-        end
-      }
-      code
-    end
-    def parse_module mod, rel_name
-      return "" if @parsed.include?(mod) or mod == Solargraph
-      @parsed.push mod
-      code = ""
-      #if (mod.to_s != "Kernel")
-        code = "module #{mod}\n"
-      #end
-      code += parse_module_internals(mod)
-      #if (mod.to_s != "Kernel")
-        code += "end\n"
-      #end
-      mod.constants().each { |c|
-        #obj = mod.class_eval(c.to_s)
-        begin
-          obj = mod.const_get(c)
-        rescue LoadError => e
-          code += "# @todo Failed to load #{c} from #{mod}\n"
-        end
-        if obj.kind_of?(Class)
-          code += parse_class(obj, c)
-        elsif obj.kind_of?(Module)
-          code += parse_module(obj, c)
-        else
-          #code += subparse(obj)
-        end
-      }
-      code
-    end
-    def parse_class_internals obj
-      code = ""
-      obj.included_modules.each { |inc|
-        #if (inc.to_s != "Kernel")
-          code += "include #{inc}\n"
-        #end
-      }
-      obj.public_methods(false).each { |m|
-        if !can_ignore?(obj, m)
-          args = build_args obj.method(m)
-          #ret = get_yard_return "#{obj}::#{m}"
-          #if !ret.nil?
-          #   code += "# @return [#{ret}]\n"
-          #end
-          code += "def self.#{m}#{args};end\n"
-        end
-      }
-      alloc = obj
-      obj.singleton_methods(false).each { |m|
-        if !can_ignore?(obj, m)
-          args = build_args obj.method(m)
-          #ret = get_yard_return "#{obj}::#{m}"
-          #if !ret.nil?
-          #   code += "# @return [#{ret}]\n"
-          #end
-          code += "def self.#{m}#{args};end\n"
-        end
-      }
-      obj.public_instance_methods(false).each { |m|
-        if !can_ignore?(obj, m)
-          begin
-            args = build_args obj.public_instance_method(m)
-          rescue TypeError => e
-            args = ""
-          end
-          #ret = get_yard_return "#{obj}##{m}"
-          #if !ret.nil?
-          #   code += "# @return [#{ret}]\n"
-          #end
-          code += "def #{m}#{args};end\n"
-        end
-      }
-      code
-    end
-    def parse_module_internals obj
-      code = ""
-      obj.included_modules.each { |inc|
-        #if (inc.to_s != "Kernel")
-          code += "include #{inc}\n"
-        #end
-      }
-      obj.public_methods(false).each { |m|
-        if obj == Kernel #and obj.singleton_methods.include?(m)
-          next
-        end
-        if !can_ignore?(obj, m)
-          args = build_args obj.method(m)
-          #ret = get_yard_return "#{obj}##{m}"
-          #if !ret.nil?
-          #   code += "# @return [#{ret}]\n"
-          #end
-          code += "def #{m}#{args};end\n"
-        end
-      }
-      obj.singleton_methods(false).each { |m|
-        if !can_ignore?(obj, m)
-          args = build_args obj.method(m)
-          #ret = get_yard_return "#{obj}::#{m}"
-          #if !ret.nil?
-          #   code += "# @return [#{ret}]\n"
-          #end
-          code += "def self.#{m}#{args};end\n"
-        end
-      }
-      #obj.public_instance_methods(false).each { |m|
-      obj.public_instance_methods(false).each { |m|
-        #if !can_ignore?(obj, m)
-          args = build_args obj.public_instance_method(m)
-          #ret = get_yard_return "#{obj}##{m}"
-          #if !ret.nil?
-          #   code += "# @return [#{ret}]\n"
-          #end
-          code += "def #{m}#{args};end\n"
-        #end
-      }
-      code
-    end
-    def can_ignore?(obj, sym)
-      #return false
-      basics = [Kernel, Module, Object, BasicObject]
-      return false if basics.include?(obj)
-      result = false
-      basics.each { |b|
-        if b.respond_to?(sym)
-          result = true
-          break
-        end
-      }
-      return result
-    end
-    def build_args method
-      args = ""
-      if (method.arity == -1)
-        args = "(*args)"
-      else
-        arr = []
-        num = 0
-        method.parameters.each { |p|
-          n = p[1]
-          if n.to_s == ""
-           n = "arg#{num}"
-          end
-          if p[0] == :req
-            arr.push "#{n}"
-          elsif p[0] == :opt
-            arr.push "#{n} = nil"
-          elsif p[0] == :rest
-            arr.push "*#{n}"
-          elsif p[0] == :block
-            arr.push "&#{n}"
-          end
-          num += 1
-        }
-        args = "(" + arr.join(", ") + ")"
-      end
-      args
-    end
-  end
-end

data/lib/solargraph/views/foo.erb

@@ -1 +0,0 @@
-<p>Foo!</p>