solargraph 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0d57ee417fd4007c31d34a555f76701a51a19be
-  data.tar.gz: 8b254f32899b99c3e2faa25361f043d05de235f2
+  metadata.gz: 10495d0e5d7c64f8529c0064a10c5a46de6618da
+  data.tar.gz: f96a938b6f90628d25221150b7bfbdca07a7bc39
 SHA512:
-  metadata.gz: 764e250b3ba7f52b0d4dbaaf4b7180cf4094bfc8b7dabf6e4054ddf342c02f9587470823c2629b3b132c83627ace4e8c738c10755e76c373a922d192f4fd6e43
-  data.tar.gz: 0abe5016eb85276abc4d2fc44a8f66c166986630b7dd5ba04878b19062e16b4fc45c2b6f195032cd73792964d1ae5dec3b1f0ff5607b6fb47404c6f31c8c6b74
+  metadata.gz: f072292781a9e234c51b2de18531cd00e350569a6a28b4fbe4e8041d0dbdadba5429032d2f93a11faa963c7b7665cdd56049a1a62173372aac16ecdad165103d
+  data.tar.gz: 8fd69162b003ddfaeb338c0369b8285cf2828e6b250dafb030ee0d8b6efddc0db8c3e94d1d313a4b00f15bf97d27d8dd7b6c57418450691029af308c8960570b

data/lib/solargraph/api_map.rb

@@ -15,9 +15,9 @@ module Solargraph
     ].freeze
 
     MAPPABLE_NODES = [
-      # @todo Add node.type :casgn (constant assignment)
-      :array, :hash, :str, :int, :float, :block, :class, :module, :def, :defs,
-      :ivasgn, :gvasgn, :lvasgn, :cvasgn, :or_asgn, :const, :lvar, :args, :kwargs
+      :array, :hash, :str, :int, :float, :block, :class, :sclass, :module,
+      :def, :defs, :ivasgn, :gvasgn, :lvasgn, :cvasgn, :casgn, :or_asgn,
+      :const, :lvar, :args, :kwargs
     ].freeze
 
     MAPPABLE_METHODS = [
@@ -25,6 +25,10 @@ module Solargraph
       :attr_accessor, :private, :public, :protected
     ].freeze
 
+    METHODS_RETURNING_SELF = [
+      'clone', 'dup', 'freeze', 'taint', 'untaint'
+    ]
+
     include NodeMethods
     include YardMethods
 
@@ -304,11 +308,13 @@ module Solargraph
       if type.nil?
         cmnt = get_comment_for(node)
         if cmnt.nil?
-          type = infer_literal_node_type(node.children[1])
+          name_i = (node.type == :casgn ? 1 : 0) 
+          sig_i = (node.type == :casgn ? 2 : 1)
+          type = infer_literal_node_type(node.children[sig_i])
           if type.nil?
-            sig = resolve_node_signature(node.children[1])
+            sig = resolve_node_signature(node.children[sig_i])
             # Avoid infinite loops from variable assignments that reference themselves
-            return nil if node.children[0].to_s == sig.split('.').first
+            return nil if node.children[name_i].to_s == sig.split('.').first
             type = infer_signature_type(sig, namespace)
           end
         else
@@ -570,31 +576,39 @@ module Solargraph
               s = unpack_name(n.children[1])
               meths += inner_get_methods(s, root, skip)
             end
-            meths += inner_get_methods_from_node(n, root, skip)
+            vis = [:public]
+            vis.push :private, :protected if namespace == root
+            meths += inner_get_methods_from_node(n, root, :class, skip, vis)
           end
         end
       }
       meths.uniq
     end
 
-    def inner_get_methods_from_node node, root, skip
+    def inner_get_methods_from_node node, root, scope, skip, visibility, current_visibility = :public
       meths = []
       node.children.each { |c|
         if c.kind_of?(AST::Node)
-          if c.type == :defs
+          if c.kind_of?(AST::Node) and c.type == :send and [:public, :protected, :private].include?(c.children[1])
+            current_visibility = c.children[1]
+          elsif (c.type == :defs and scope == :class) or (c.type == :def and scope == :instance)
+            next unless visibility.include?(current_visibility)
             docstring = get_comment_for(c)
-            label = "#{c.children[1]}"
+            child_index = (scope == :class ? 1 : 0)
+            label = "#{c.children[child_index]}"
             args = get_method_args(c)
-            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[child_index].to_s[0].match(/[a-z_]/i) and c.children[child_index] != :def)
+              meths.push Suggestion.new(label, insert: c.children[child_index].to_s.gsub(/=/, ' = '), kind: Suggestion::METHOD, detail: 'Method', documentation: docstring, arguments: args)
             end
+          elsif c.type == :sclass and scope == :class and c.children[0].type == :self
+            meths.concat inner_get_methods_from_node c, root, :instance, skip, visibility
           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.concat inner_get_methods(i, root, skip) unless i == 'Kernel'
           else
-            meths.concat inner_get_methods_from_node(c, root, skip)
+            meths.concat inner_get_methods_from_node(c, root, scope, skip, visibility, current_visibility)
           end
         end
       }
@@ -686,17 +700,30 @@ module Solargraph
               result.push Suggestion.new(k, kind: kind, detail: detail)
             }
             nodes = get_namespace_nodes(fqns)
-            nodes.each { |n|
+            nodes.each do |n|
+              result.concat get_constant_nodes(n, fqns)
               get_include_strings_from(n).each { |i|
                 result += inner_namespaces_in(i, fqns, skip)
               }
-            }
+            end
           end
         end
       end
       result
     end
 
+    def get_constant_nodes(node, fqns)
+      result = []
+      node.children.each do |n|
+        if n.kind_of?(AST::Node) and n.type == :casgn
+          cmnt = get_comment_for(n)
+          type = infer_assignment_node_type(n, fqns)
+          result.push Suggestion.new(n.children[1].to_s, kind: Suggestion::CONSTANT, documentation: cmnt, return_type: type)
+        end
+      end
+      result
+    end
+
     def inner_get_instance_variables(node, namespace, scope)
       arr = []
       if node.kind_of?(AST::Node)
@@ -756,6 +783,7 @@ module Solargraph
       while parts.length > 0 and !type.nil?
         p = parts.shift
         next if p.empty?
+        next if !type.nil? and !type.empty? and METHODS_RETURNING_SELF.include?(p)
         if top and scope == :class
           if p == 'self'
             top = false
@@ -843,7 +871,7 @@ module Solargraph
       return node if node.type == :args
       type = node.type
       children = []
-      if node.type == :class or node.type == :block
+      if node.type == :class or node.type == :block or node.type == :sclass
         children += node.children[0, 2]
         children += get_mappable_nodes(node.children[2..-1], comment_hash)
       elsif node.type == :const or node.type == :args or node.type == :kwargs
@@ -857,7 +885,7 @@ module Solargraph
       elsif node.type == :module
         children += node.children[0, 1]
         children += get_mappable_nodes(node.children[1..-1], comment_hash)
-      elsif node.type == :ivasgn or node.type == :gvasgn or node.type == :lvasgn or node.type == :cvasgn
+      elsif node.type == :ivasgn or node.type == :gvasgn or node.type == :lvasgn or node.type == :cvasgn or node.type == :casgn
         children += node.children
       elsif node.type == :send and node.children[1] == :include
         children += node.children[0,3]

data/lib/solargraph/code_map.rb

@@ -553,7 +553,7 @@ module Solargraph
       if local.type == :def
         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, scope, visibility: [:public, :private, :protected])
       end
       if local.type == :def or local.type == :defs
         result += get_method_arguments_from local
@@ -581,7 +581,7 @@ module Solargraph
         end
       end
       result = []
-      args = node.children[1]
+      args = node.children[(node.type == :def ? 1 : 2)]
       return result unless args.kind_of?(AST::Node) and args.type == :args
       args.children.each do |arg|
         name = arg.children[0].to_s

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.11.0'
+  VERSION = '0.11.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser