solargraph 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4d07f475a599b0f7f65563328f9154bbc4aad57
-  data.tar.gz: 2f5eeb896120355cd001ec31581f0cef5680fea1
+  metadata.gz: 8c06a568d53f3c10d270e3bde6f54a675654ae12
+  data.tar.gz: 788a257e6d80a0a8587eebd539bf1cebed2afedc
 SHA512:
-  metadata.gz: 2448dfeac5a8f5db6b65ad949d762edcfe02c6c5e7184447ebfbc4352d1fd681636dd57cbaec4ea43b2819cdb1bf10cbae17737a76797ee559d180da30374294
-  data.tar.gz: 062f9ba1b5efbd026c1019cfda465e19b9d60e5cb6adf689dc876888e1a03522ab8ad4818f4a455b573c9636d9a31212c454bc3d50c7c513bd23ab60e04b8284
+  metadata.gz: f7046e14bce46e04439da78451b6f7a3351fa97d5b184d2b55d67379b7d70c16ef1b699a8cec2bc194ffbfb3f8b6eb73d9bf7272b14698051b51250c8b74dbb2
+  data.tar.gz: ee12ed39ebaa7dc39104c12171ef80e92fb7a8984ec96cbf3f87d8ef6420299bfd5867ad01e461d378bb27485105878734bb909ca8c33554b5d635e0e468849a

data/lib/solargraph/api_map.rb

@@ -537,10 +537,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])
+        @required.push(node.children[2].children[0]) if node.children[2].children[0].kind_of?(String)
         children += node.children[0, 3]
       elsif node.type == :send and node.children[1] == :autoload
-        @required.push(node.children[3].children[0])
+        @required.push(node.children[3].children[0]) if node.children[3].children[0].kind_of?(String)
         type = :require
         children += node.children[1, 3]
       elsif node.type == :send

data/lib/solargraph/code_map.rb

@@ -193,6 +193,7 @@ module Solargraph
           parts.pop
         end
         result += @api_map.namespaces_in('')
+        result += @api_map.get_instance_methods('Kernel')
       end
       result = reduce_starting_with(result, word_at(index)) if filtered
       result
@@ -206,14 +207,21 @@ module Solargraph
       scope = parent_node_from(index, :class, :module, :def, :defs) || @node
       var = find_local_variable_node(first, scope)
       if var.nil?
-        if parts.length == 0
-          return @api_map.get_methods(first, ns_here)
-        end
-        meth = parts.shift
-        if meth == 'new'
-          obj = first
+        if ['STDERR','STDOUT','STDIN'].include?(first)
+          obj = 'IO'
+          if parts.length == 0
+            return @api_map.get_instance_methods('IO')
+          end
         else
-          obj = get_method_return_value first, ns_here, meth
+          if parts.length == 0
+            return @api_map.get_methods(first, ns_here)
+          end
+          meth = parts.shift
+          if meth == 'new'
+            obj = first
+          else
+            obj = get_method_return_value first, ns_here, meth
+          end
         end
         while parts.length > 0
           obj = get_instance_method_return_value obj, ns_here, parts.shift

data/lib/solargraph/shell.rb

@@ -3,6 +3,7 @@ require 'json'
 require 'fileutils'
 require 'rubygems/package'
 require 'zlib'
+require 'net/http'
 
 module Solargraph
   class Shell < Thor
@@ -14,7 +15,6 @@ module Solargraph
       version_dir = File.join(cache_dir, '2.0.0')
       unless File.exist?(version_dir) or options[:force]
         FileUtils.mkdir_p cache_dir
-        require 'net/http'
         puts 'Downloading 2.0.0...'
         Net::HTTP.start(options[:host]) do |http|
             resp = http.get("/2.0.0.tar.gz")

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/lib/solargraph/yard_map.rb

@@ -21,6 +21,14 @@ module Solargraph
           end
         end
       }
+      # TODO: Experimental loading of all gems
+      #Bundler.load.specs.each { |s|
+      #  unless used.include?(s.name)
+      #    used.push s.name
+      #    gy = YARD::Registry.yardoc_file_for_gem(s.name)
+      #    yardocs.push gy unless gy.nil?
+      #  end
+      #}
       yardocs.push File.join(Dir.home, '.solargraph', 'cache', '2.0.0', 'yardoc')
       #yardocs.push File.join(Dir.home, '.solargraph', 'cache', '2.0.0', 'yardoc-stdlib')
       yardocs.uniq!
@@ -93,9 +101,9 @@ module Solargraph
           else
             ns = yard.resolve(P(scope), namespace)
           end
-          unless ns.nil?
+          unless ns.nil? or !ns.kind_of?(YARD::CodeObjects::NamespaceObject)
             ns.meths(scope: :class, visibility: [:public]).each { |m|
-              n = m.to_s.split('.').last
+              n = m.to_s.split(/[\.#]/).last
               label = "#{n}"
               args = get_method_args(m)
               label += " #{args.join(', ')}" unless args.empty?
@@ -123,8 +131,8 @@ module Solargraph
           end
           unless ns.nil?
             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:')
+              n = m.to_s.split(/[\.#]/).last
+              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)
                 label += " #{args.join(', ')}" unless args.empty?

metadata

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