solargraph 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e99bdc143ca29ca298dc48668e2eab23a73fb338
-  data.tar.gz: a2c8fc45842f2d30f30c964f427962992223315e
+  metadata.gz: 6c7aa0f4315160d35f462c40d61d8118022b9f94
+  data.tar.gz: 7ee49c7852037b59c9652a37bfeb8c6622920e5a
 SHA512:
-  metadata.gz: e7eee90d32b54be8ed26faa90c55794c68981e90e6fae4dfafba8a226847bb06fe90485876a82be679d83bca3fac5eb33c63072d98a517418c6437ba91956873
-  data.tar.gz: c8b992d21569e07e36db02c08c332c7309ee206daf81ff5489ce440a308b50d1e6cdabc337b728ecd37403e745f1f6fc4ffbb1562e3d486908f8372b2cafcd5d
+  metadata.gz: 30406ab1d590dde9f8f0f425ac535e7773f1c8d651dbe904472ac11f04323a6e0ef6c1c1951e5f72b1e5d44a90393cc916a656c243f0131619a203048e28bec5
+  data.tar.gz: 8df3a01fafa6cf010913794b0aaa9967bd7373efc8c4c5a041c7bebaf386690612648f05cb3cf0a45a79404efd5d947aaf80662d39903cd47b7579734e3d3e5f

data/lib/solargraph/api_map.rb

@@ -23,7 +23,7 @@ module Solargraph
     def initialize workspace = nil
       @workspace = workspace
       clear
-      unless @workspace.nil? #or has_yardoc?
+      unless @workspace.nil?
         files = Dir[File.join workspace, 'lib', '**', '*.rb'] + Dir[File.join workspace, 'app', '**', '*.rb']
         files.each { |f|
           append_file f
@@ -291,7 +291,8 @@ module Solargraph
     end
 
     def get_methods(namespace, root = '')
-      meths = inner_get_methods(namespace, root, [])
+      meths = []
+      meths += inner_get_methods(namespace, root, []) #unless has_yardoc?
       yard = YardMap.new(required: @required, workspace: @workspace)
       meths += yard.get_methods(namespace, root)
       type = get_namespace_type(namespace, root)
@@ -302,39 +303,28 @@ module Solargraph
       end
       meths
     end
-
-    def inner_get_methods(namespace, root = '', skip = [])
-      meths = []
-      return meths if skip.include?(namespace)
-      skip.push namespace
-      fqns = find_fully_qualified_namespace(namespace, root)
-      return meths if fqns.nil?
-      nodes = get_namespace_nodes(fqns)
-      nodes.each { |n|
-        if n.kind_of?(AST::Node)
-          if n.type == :class and !n.children[1].nil?
-            s = unpack_name(n.children[1])
-            meths += inner_get_methods(s, root, skip)
-          end
-          n.children.each { |c|
-            if c.kind_of?(AST::Node) and c.type == :defs
-              docstring = get_comment_for(c)
-              meths.push Suggestion.new(c.children[1], kind: Suggestion::METHOD, documentation: docstring) if c.children[1].to_s[0].match(/[a-z_]/i) and c.children[1] != :def
-            elsif c.kind_of?(AST::Node) and 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'
-            end
-          }
+    
+    def get_method_args node
+      list = nil
+      args = []
+      node.children.each { |c|
+        if c.kind_of?(AST::Node) and c.type == :args
+          list = c
+          break
         end
       }
-      meths.uniq
+      return args if list.nil?
+      list.children.each { |c|
+        if c.type == :arg
+          args.push c.children[0]
+        end
+      }
+      args
     end
-    
+
     def get_instance_methods(namespace, root = '')
       meths = []
-      meths += inner_get_instance_methods(namespace, root, []) unless has_yardoc?
+      meths += inner_get_instance_methods(namespace, root, []) #unless has_yardoc?
       yard = YardMap.new(required: @required, workspace: @workspace)
       yard_meths = yard.get_instance_methods(namespace, root)
       if yard_meths.any?
@@ -368,6 +358,60 @@ module Solargraph
       }
       return nil
     end
+    
+    def self.current
+      if @current.nil?
+        @current = ApiMap.new
+        @current.merge(Parser::CurrentRuby.parse(File.read("#{Solargraph::STUB_PATH}/ruby/2.3.0/core.rb")))
+      end
+      @current
+    end
+    
+    def get_include_strings_from *nodes
+      arr = []
+      nodes.each { |node|
+        next unless node.kind_of?(AST::Node)
+        arr.push unpack_name(node.children[2]) if (node.type == :send and node.children[1] == :include)
+        node.children.each { |n|
+          arr += get_include_strings_from(n) if n.kind_of?(AST::Node) and n.type != :class and n.type != :module
+        }
+      }
+      arr
+    end
+    
+    private
+
+    def inner_get_methods(namespace, root = '', skip = [])
+      meths = []
+      return meths if skip.include?(namespace)
+      skip.push namespace
+      fqns = find_fully_qualified_namespace(namespace, root)
+      return meths if fqns.nil?
+      nodes = get_namespace_nodes(fqns)
+      nodes.each { |n|
+        if n.kind_of?(AST::Node)
+          if n.type == :class and !n.children[1].nil?
+            s = unpack_name(n.children[1])
+            meths += inner_get_methods(s, root, skip)
+          end
+          n.children.each { |c|
+            if c.kind_of?(AST::Node) and c.type == :defs
+              docstring = get_comment_for(c)
+              label = "#{c.children[1]}"
+              args = get_method_args(c)
+              label += " #{args.join(', ')}" unless args.empty?
+              meths.push Suggestion.new(label, insert: c.children[1].to_s, kind: Suggestion::METHOD, detail: 'Method', documentation: docstring) if c.children[1].to_s[0].match(/[a-z_]/i) and c.children[1] != :def
+            elsif c.kind_of?(AST::Node) and 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'
+            end
+          }
+        end
+      }
+      meths.uniq
+    end
 
     def inner_get_instance_methods(namespace, root, skip)
       fqns = find_fully_qualified_namespace(namespace, root)
@@ -390,7 +434,10 @@ module Solargraph
             elsif current_scope == :public
               if c.kind_of?(AST::Node) and c.type == :def
                 cmnt = get_comment_for(c)
-                meths.push Suggestion.new(c.children[0], kind: Suggestion::METHOD, documentation: cmnt, detail: fqns) if c.children[0].to_s[0].match(/[a-z]/i)
+                label = "#{c.children[0]}"
+                args = get_method_args(c)
+                label += " #{args.join(', ')}" unless args.empty?
+                meths.push Suggestion.new(label, insert: c.children[0].to_s, kind: Suggestion::METHOD, documentation: cmnt, detail: fqns) 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
@@ -414,29 +461,7 @@ module Solargraph
       }
       meths.uniq
     end
-    
-    def self.current
-      if @current.nil?
-        @current = ApiMap.new
-        @current.merge(Parser::CurrentRuby.parse(File.read("#{Solargraph::STUB_PATH}/ruby/2.3.0/core.rb")))
-      end
-      @current
-    end
-    
-    def get_include_strings_from *nodes
-      arr = []
-      nodes.each { |node|
-        next unless node.kind_of?(AST::Node)
-        arr.push unpack_name(node.children[2]) if (node.type == :send and node.children[1] == :include)
-        node.children.each { |n|
-          arr += get_include_strings_from(n) if n.kind_of?(AST::Node) and n.type != :class and n.type != :module
-        }
-      }
-      arr
-    end
-    
-    private
-    
+
     def mappable?(node)
       # 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 == :or_asgn)

data/lib/solargraph/code_map.rb

@@ -31,7 +31,6 @@ module Solargraph
       tries = 0
       # Hide incomplete code to avoid syntax errors
       tmp = "#{@code}\nX".gsub(/[\.@]([\s])/, '#\1').gsub(/([\A\s]?)def([\s]*?[\n\Z])/, '\1#ef\2')
-      #tmp = code
       begin
         @node, comments = Parser::CurrentRuby.parse_with_comments(tmp)
         @api_map.append_node(@node, comments, filename)
@@ -213,7 +212,12 @@ module Solargraph
         if parts.length == 0
           return @api_map.get_methods(first, ns_here)
         end
-        obj = get_method_return_value first, ns_here, parts.shift
+        meth = parts.shift
+        if meth == 'new'
+          obj = first
+        else
+          obj = get_method_return_value first, ns_here, meth
+        end
         while parts.length > 0
           obj = get_instance_method_return_value obj, ns_here, parts.shift
         end
@@ -263,7 +267,7 @@ module Solargraph
       parens = 0
       signature = ''
       index -=1
-      while index > 0
+      while index >= 0
         break if brackets > 0 or parens > 0 or squares > 0
         char = @code[index, 1]
         if char == ')'

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/lib/solargraph/yard_map.rb

@@ -96,7 +96,10 @@ module Solargraph
           unless ns.nil?
             ns.meths(scope: :class, visibility: [:public]).each { |m|
               n = m.to_s.split('.').last
-              meths.push Suggestion.new("#{n}", kind: Suggestion::METHOD, detail: "#{ns}") if n.to_s.match(/^[a-z]/i)
+              label = "#{n}"
+              args = get_method_args(m)
+              label += " #{args.join(', ')}" unless args.empty?
+              meths.push Suggestion.new(label, insert: "#{n}", kind: Suggestion::METHOD, detail: "#{ns}") if n.to_s.match(/^[a-z]/i)
             }
             if ns.kind_of?(YARD::CodeObjects::ClassObject) and namespace != 'Class'
               meths += get_instance_methods('Class')
@@ -122,7 +125,10 @@ module Solargraph
             ns.meths(scope: :instance, visibility: [:public]).each { |m|
               n = m.to_s.split('#').last
               if n.to_s.match(/^[a-z]/i) and !m.to_s.start_with?('Kernel#') and !m.docstring.to_s.include?(':nodoc:')
-                meths.push Suggestion.new("#{n}", kind: Suggestion::METHOD, documentation: m.docstring, code_object: m, detail: "#{ns}", location: "#{m.file}:#{m.line}")
+                label = "#{n}"
+                args = get_method_args(m)
+                label += " #{args.join(', ')}" unless args.empty?
+                meths.push Suggestion.new(label, insert: "#{n}", kind: Suggestion::METHOD, documentation: m.docstring, code_object: m, detail: "#{ns}", location: "#{m.file}:#{m.line}")
               end
             }
             if ns.kind_of?(YARD::CodeObjects::ClassObject) and namespace != 'Object'
@@ -133,6 +139,16 @@ module Solargraph
       }
       meths
     end
+
+    private
+
+    def get_method_args meth
+      args = []
+      meth.parameters.each { |a|
+        args.push a[0]
+      }
+      args
+    end
   end
 
 end

metadata

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