solargraph 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f72dae250986fdd9e99493e59b943859d84ae1b
-  data.tar.gz: 0a6844a9338265353973f84e9a2a69775be9d4be
+  metadata.gz: e47975025923e6fefaa775875a539c14a8ce263b
+  data.tar.gz: 253ceb89deba6b4a3e63a7861a167c7bd24e64eb
 SHA512:
-  metadata.gz: 6cff3eafa7608cce8cbd110751c5606beb2ebfadcb767665c244c2574f4a117a34d02522db82fd94288ce630822610b1136c97046dd1104447ccb107c382e1f6
-  data.tar.gz: a827be7bceaec34da8cae14642a8cde2f8f3da6276a9fc62be405ffc54b24e752d8cbabe7c01dd0c5703ee7fba7c6af305a0523757af338ef46de7a629100c2d
+  metadata.gz: b563880f6b352616b38c1accb2d0f07b189e23b25cbcc816c54bf1a3acae1b1e130b0f7f565110008bb4561234ff423bbb553843ffef1aba958164e61dd161a7
+  data.tar.gz: c6dbd8e28a73bf8ce205508b87146d6a189b8c216d42a2c72f1c5ce8d32796fb57a52f967278e36a07f89e8f5e3fa108ee6a0cbd048e8df858b9c032347ba19e

data/lib/solargraph/api_map.rb

@@ -337,6 +337,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?
@@ -580,7 +581,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
@@ -618,7 +619,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 +635,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 +657,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

data/lib/solargraph/code_map.rb

@@ -3,9 +3,9 @@ require 'parser/current'
 module Solargraph
   class CodeMap
     attr_accessor :node
-    attr_accessor :api_map
     attr_reader :code
     attr_reader :parsed
+    attr_reader :workspace
 
     include NodeMethods
 
@@ -17,49 +17,54 @@ module Solargraph
         filename = filename.gsub(File::ALT_SEPARATOR, File::SEPARATOR) unless File::ALT_SEPARATOR.nil?
         workspace = CodeMap.find_workspace(filename)
       end
+      @workspace = workspace
       @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)
+        @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
 
+    # @return [Solargraph::ApiMap]
+    def api_map
+      @api_map ||= ApiMap.new(workspace)
+    end
+
     def self.find_workspace filename
       return nil if filename.nil?
       dirname = filename
@@ -103,6 +108,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
@@ -132,6 +140,14 @@ module Solargraph
       parts.join("::")
     end
 
+    def namespace_from(node)
+      if node.respond_to?(:loc)
+        namespace_at(node.loc.expression.begin_pos)
+      else
+        namespace_at(0)
+      end
+    end
+
     def phrase_at index
       word = ''
       cursor = index - 1
@@ -161,50 +177,44 @@ 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
 
     def suggest_at index, filtered: false, with_snippets: false
-      node = node_at(index - 2)
       return [] if string_at?(index)
       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)
         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,17 +223,17 @@ 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)
           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}
@@ -237,6 +247,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 +256,117 @@ 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]
+      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?('@')
+          type = api_map.infer_instance_variable(start, ns_here, (node.type == :def ? :instance : :class))
         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)
+              params = cmnt.tags(:param)
+              params.each do |p|
+                if p.name == args[0].label
+                  type = p.types[0]
+                  break
+                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?
@@ -463,16 +442,29 @@ module Solargraph
       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
-      result += @api_map.get_methods('Kernel')
+      if local.type == :def or local.type == :defs
+        result += get_method_arguments_from local
+      end
+      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::VARIABLE, insert: name)
+      end
+      result
+    end
+
     def reduce_starting_with(suggestions, word)
       suggestions.reject { |s|
         !s.label.start_with?(word)
@@ -485,7 +477,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/suggestion.rb

@@ -35,7 +35,7 @@ module Solargraph
       if code_object.nil?
         unless documentation.nil?
           match = documentation.all.match(/@return \[([a-z0-9:_]*)/i)
-          return match[1]
+          return match[1] unless match.nil?
         end
       else
         o = code_object.tag(:overload)

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

metadata

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