solargraph 0.10.1 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41e2a41af1ef29061e085cd34a1666aa8e962327
-  data.tar.gz: 8f785cd7a3a8113b47633c07e5b3816f028e1618
+  metadata.gz: 7fca7cec06944baee613ea512c26052d002badf1
+  data.tar.gz: 56b786723a5f0b33ae2612d110977f74f1d4bb7f
 SHA512:
-  metadata.gz: adcca5889793480021d29af723d2d83062b5578ccf083f36555b6bd311d620981d671999c6df52a57618a22fa18842ac7d5b0dacb3fd7880efd38c27a2752456
-  data.tar.gz: 630beb7fabb5a5c7d59ab30da28f72863f36d1111eca3f7a4b6f65e5d2cd91d3573f495b669964e77e02bac67ae95bb741b9f37a6ac08f109c00e3f2812f594c
+  metadata.gz: 3e8e40663cd4629b55a4436a33d8c8606b1087dbabbdd21d0180f1ca8b4cb26b563bd2f4f8076701ccf1fa7148513df4d01a063a04366bbd137df8b6cac5dcf9
+  data.tar.gz: d7bf1113b69a08d74805319918a756f6894810c5397912f68340cf15fb050fac2e989a292b89efb8f7899f56fd5c5d2e502c8d3d35d7a4b042a905993b8dd7bf

data/lib/solargraph/api_map.rb

@@ -5,6 +5,7 @@ require 'yaml'
 module Solargraph
   class ApiMap
     autoload :Config, 'solargraph/api_map/config'
+    autoload :Cache,  'solargraph/api_map/cache'
 
     KEYWORDS = [
       '__ENCODING__', '__LINE__', '__FILE__', 'BEGIN', 'END', 'alias', 'and',
@@ -179,7 +180,7 @@ module Solargraph
       nodes = get_namespace_nodes(namespace) || @file_nodes.values
       arr = []
       nodes.each { |n|
-        arr += inner_get_instance_variables(n, scope)
+        arr += inner_get_instance_variables(n, namespace, scope)
       }
       arr
     end
@@ -188,7 +189,7 @@ module Solargraph
       nodes = get_namespace_nodes(namespace) || @file_nodes.values
       arr = []
       nodes.each { |n|
-        arr += inner_get_class_variables(n)
+        arr += inner_get_class_variables(n, namespace)
       }
       arr
     end
@@ -314,27 +315,45 @@ module Solargraph
     end
 
     def infer_signature_type signature, namespace, scope: :class
+      cached = cache.get_signature_type(signature, namespace, scope)
+      return cached unless cached.nil?
       return nil if signature.nil? or signature.empty?
+      result = nil
       if namespace.end_with?('#class')
-        return infer_signature_type signature, namespace[0..-7], scope: (scope == :class ? :instance : :class)
-      end
-      parts = signature.split('.', 2)
-      if parts[0].start_with?('@@')
-        type = infer_class_variable(parts[0], namespace)
-        inner_infer_signature_type parts[1], type, scope: :instance
-      elsif parts[0].start_with?('@')
-        type = infer_instance_variable(parts[0], namespace, scope)
-        inner_infer_signature_type parts[1], type, scope: :instance
+        result = infer_signature_type signature, namespace[0..-7], scope: (scope == :class ? :instance : :class)
       else
-        type = find_fully_qualified_namespace(parts[0], namespace)
-        if type.nil?
-          # It's a method call
-          type = inner_infer_signature_type(parts[0], namespace, scope: scope)
-          inner_infer_signature_type(parts[1], type, scope: :instance)
+        parts = signature.split('.', 2)
+        if parts[0].start_with?('@@')
+          type = infer_class_variable(parts[0], namespace)
+          if type.nil? or parts.empty?
+            result = inner_infer_signature_type(parts[1], type, scope: :instance)
+          else
+            result = type
+          end
+        elsif parts[0].start_with?('@')
+          type = infer_instance_variable(parts[0], namespace, scope)
+          if type.nil? or parts.empty?
+            result = inner_infer_signature_type(parts[1], type, scope: :instance)
+          else
+            result = type
+          end
         else
-          inner_infer_signature_type(parts[1], type, scope: :class)
+          type = find_fully_qualified_namespace(parts[0], namespace)
+          if type.nil?
+            # It's a method call
+            type = inner_infer_signature_type(parts[0], namespace, scope: scope)
+            if parts[1].nil?
+              result = type
+            else
+              result = inner_infer_signature_type(parts[1], type, scope: :instance)
+            end
+          else
+            result = inner_infer_signature_type(parts[1], type, scope: :class)
+          end
         end
       end
+      cache.set_signature_type signature, namespace, scope, result
+      result
     end
 
     def get_namespace_type namespace, root = ''
@@ -474,6 +493,10 @@ module Solargraph
 
     private
 
+    def cache
+      @cache ||= Cache.new
+    end
+
     def associate_comments node, comments
       comment_hash = Parser::Source::Comment.associate_locations(node, comments)
       yard_hash = {}
@@ -641,31 +664,59 @@ module Solargraph
       result
     end
 
-    def inner_get_instance_variables(node, scope)
+    def inner_get_instance_variables(node, namespace, scope)
       arr = []
       if node.kind_of?(AST::Node)
         node.children.each { |c|
           if c.kind_of?(AST::Node)
             is_inst = !find_parent(c, :def).nil?
             if c.type == :ivasgn and c.children[0] and ( (scope == :instance and is_inst) or (scope != :instance and !is_inst) )
-              arr.push Suggestion.new(c.children[0], kind: Suggestion::VARIABLE, documentation: get_comment_for(c))
+              type = nil
+              cmnt = get_comment_for(c)
+              if cmnt.nil?
+                sig = resolve_node_signature(c.children[1])
+                type = infer_signature_type(sig, namespace)
+              else
+                t = cmnt.tag(:type)
+                if t.nil?
+                  sig = resolve_node_signature(c.children[1])
+                  type = infer_signature_type(sig, namespace)
+                else
+                  type = t.types[0]
+                end
+              end
+              arr.push Suggestion.new(c.children[0], kind: Suggestion::VARIABLE, documentation: cmnt, return_type: type)
             end
-            arr += inner_get_instance_variables(c, scope) unless [:class, :module].include?(c.type)
+            arr += inner_get_instance_variables(c, namespace, scope) unless [:class, :module].include?(c.type)
           end
         }
       end
       arr
     end
 
-    def inner_get_class_variables(node)
+    def inner_get_class_variables(node, namespace)
       arr = []
       if node.kind_of?(AST::Node)
         node.children.each { |c|
           next unless c.kind_of?(AST::Node)
           if c.type == :cvasgn
-            arr.push Suggestion.new(c.children[0], kind: Suggestion::VARIABLE, documentation: get_comment_for(c))              
+            type = nil
+            cmnt = get_comment_for(c)
+            if cmnt.nil?
+              sig = resolve_node_signature(c.children[1])
+              type = infer_signature_type(sig, namespace)
+            else
+              t = cmnt.tag(:type)
+              if t.nil?
+                sig = resolve_node_signature(c.children[1])
+                type = infer_signature_type(sig, namespace)
+              else
+                type = t.types[0]
+              end
+            end
+          arr.push Suggestion.new(c.children[0], kind: Suggestion::VARIABLE, documentation: cmnt, return_type: type)
           end
-          arr += inner_get_class_variables(c) unless [:class, :module].include?(c.type)
+          arr += inner_get_class_variables(c, namespace) unless [:class, :module].include?(c.type)
         }
       end
       arr
@@ -678,6 +729,8 @@ module Solargraph
     # @return [String] The fully qualified namespace for the signature's type
     #   or nil if a type could not be determined
     def inner_infer_signature_type signature, namespace, scope: :instance
+      return nil if signature.nil?
+      signature.gsub!(/\.$/, '')
       if signature.nil? or signature.empty?
         if scope == :class
           return "#{namespace}#class"
@@ -694,6 +747,7 @@ module Solargraph
       top = true
       while parts.length > 0 and !type.nil?
         p = parts.shift
+        next if p.empty?
         if top and scope == :class
           #next if p == 'new'
           if p == 'new'

data/lib/solargraph/api_map/cache.rb

@@ -0,0 +1,15 @@
+module Solargraph
+  class ApiMap
+    class Cache
+      def initialize
+        @signature_types = {}
+      end
+      def get_signature_type signature, namespace, scope
+        @signature_types[[signature, namespace, scope]]
+      end
+      def set_signature_type signature, namespace, scope, value
+        @signature_types[[signature, namespace, scope]] = value
+      end
+    end
+  end
+end

data/lib/solargraph/code_map.rb

@@ -10,7 +10,7 @@ module Solargraph
 
     include NodeMethods
 
-    def initialize code: '', filename: nil, workspace: nil, api_map: nil
+    def initialize code: '', filename: nil, workspace: nil, api_map: nil, cursor: nil
       @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?
@@ -19,6 +19,8 @@ module Solargraph
       @code = code.gsub(/\r/, '')
       tries = 0
       tmp = @code
+      cursor = CodeMap.get_offset(@code, cursor[0], cursor[1]) if cursor.kind_of?(Array)
+      fixed_cursor = false
       begin
         # HACK: The current file is parsed with a trailing underscore to fix
         # incomplete trees resulting from short scripts (e.g., a lone variable
@@ -34,21 +36,27 @@ module Solargraph
           if tries == 10 and e.message.include?('token $end')
             tmp += "\nend"
           else
-            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 !fixed_cursor and !cursor.nil? and e.message.include?('token $end') and cursor >= 2
+              fixed_cursor = true
+              spot = cursor - 2
+              repl = '_'
             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
             end
             tmp = tmp[0..spot] + repl + tmp[spot+repl.length+1..-1].to_s
@@ -75,13 +83,17 @@ module Solargraph
     # @param col [Integer]
     # @return [Integer]
     def get_offset line, col
+      CodeMap.get_offset @code, line, col
+    end
+
+    def self.get_offset text, line, col
       offset = 0
       if line > 0
-        @code.lines[0..line - 1].each { |l|
+        text.lines[0..line - 1].each { |l|
           offset += l.length
         }
       end
-      offset + col
+      offset + col      
     end
 
     # Get an array of nodes containing the specified index, starting with the
@@ -358,7 +370,8 @@ module Solargraph
             if parts[1].nil? or parts[1].empty?
               result = yp.return_type
             else
-              result = api_map.infer_signature_type(parts[1], yp.return_type, scope: :instance)
+              newsig = parts[1..-1].join('.')
+              result = api_map.infer_signature_type(newsig, yp.return_type, scope: :instance)
             end
           end
         end
@@ -382,9 +395,23 @@ module Solargraph
       start = parts[0]
       return nil if start.nil?
       remainder = parts[1..-1]
+      if start.start_with?('@@')
+        type = api_map.infer_class_variable(start, ns_here)
+        return nil if type.nil?
+        return type if remainder.empty?
+        return api_map.infer_signature_type(remainder.join('.'), type, scope: :instance)
+      elsif start.start_with?('@')
+        scope = (node.type == :def ? :instance : :scope)
+        type = api_map.infer_instance_variable(start, ns_here, scope: :instance)
+        return nil if type.nil?
+        return type if remainder.empty?
+        return api_map.infer_signature_type(remainder.join('.'), type, scope: :instance)
+      end
       var = find_local_variable_node(start, node)
       if var.nil?
-        return api_map.infer_signature_type(signature, ns_here)
+        scope = (node.type == :def ? :instance : :class)
+        type = api_map.infer_signature_type(signature, ns_here, scope: scope)
+        return type unless type.nil?
       else
         # Signature starts with a local variable
         type = get_type_comment(var)
@@ -395,7 +422,14 @@ module Solargraph
         end
       end
       unless type.nil?
-        if remainder.empty?
+        if remainder[0] == 'new'
+          remainder.shift
+          if remainder.empty?
+            inferred = type
+          else
+            inferred = api_map.infer_signature_type(remainder.join('.'), type, scope: :instance)
+          end
+        elsif remainder.empty?
           inferred = type
         else
           inferred = api_map.infer_signature_type(remainder.join('.'), type, scope: :instance)
@@ -572,7 +606,9 @@ module Solargraph
           tmp = resolve_node_signature(lvarnode.children[1])
           sig = infer_signature_from_node tmp, scope_node
         end
-        meth = api_map.get_instance_methods(sig, fqns).keep_if{ |s| s.to_s == block_node.children[0].children[1].to_s }.first
+        meths = api_map.get_instance_methods(sig, fqns)
+        meths += api_map.get_methods('')
+        meth = meths.keep_if{ |s| s.to_s == block_node.children[0].children[1].to_s }.first
         yps = []
         unless meth.nil? or meth.documentation.nil?
           yps = meth.documentation.tags(:yieldparam) || []

data/lib/solargraph/server.rb

@@ -65,7 +65,7 @@ module Solargraph
         workspace = params['workspace'] || nil
         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])
+          code_map = CodeMap.new(code: params['text'], filename: params['filename'], api_map: @@api_hash[workspace], cursor: [params['line'].to_i, params['column'].to_i])
           offset = code_map.get_offset(params['line'].to_i, params['column'].to_i)
           sugg = code_map.resolve_object_at(offset)
         }

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.10.1'
+  VERSION = '0.10.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.3
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-11 00:00:00.000000000 Z
+date: 2017-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -130,6 +130,7 @@ files:
 - bin/solargraph
 - lib/solargraph.rb
 - lib/solargraph/api_map.rb
+- lib/solargraph/api_map/cache.rb
 - lib/solargraph/api_map/config.rb
 - lib/solargraph/code_map.rb
 - lib/solargraph/mapper.rb