solargraph 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c7aa0f4315160d35f462c40d61d8118022b9f94
-  data.tar.gz: 7ee49c7852037b59c9652a37bfeb8c6622920e5a
+  metadata.gz: fb228dbd2c050d2937573b2e4a4249fb951da217
+  data.tar.gz: 1af21e85d38cc159b53fc69ba05aeb4011d41a4a
 SHA512:
-  metadata.gz: 30406ab1d590dde9f8f0f425ac535e7773f1c8d651dbe904472ac11f04323a6e0ef6c1c1951e5f72b1e5d44a90393cc916a656c243f0131619a203048e28bec5
-  data.tar.gz: 8df3a01fafa6cf010913794b0aaa9967bd7373efc8c4c5a041c7bebaf386690612648f05cb3cf0a45a79404efd5d947aaf80662d39903cd47b7579734e3d3e5f
+  metadata.gz: 8804b2ea16a1e6b5e1568a683af153a89da87f219ba00cd6b4338d4044c97f92486cfdc7c3f13009c6547b1750d98f1e5574a40f6f97c73435ab314368f6e48b
+  data.tar.gz: 45928e94fefe7fc5a78609b808666e6805e6a654dabe9b91a964b0c57155641544671848922e1c73434e63fac1e67418beefffebea1da59ec8f58c72efb80b6c

data/lib/solargraph.rb

@@ -1,4 +1,5 @@
 require 'solargraph/version'
+require 'rubygems/package'
 
 module Solargraph
   autoload :Analyzer,    'solargraph/analyzer'
@@ -21,7 +22,7 @@ cache_dir = File.join(Dir.home, '.solargraph', 'cache')
 version_dir = File.join(cache_dir, '2.0.0')
 unless File.exist?(version_dir)
   FileUtils.mkdir_p cache_dir
-  FileUtils.cp File.join(Solargraph::YARDOC_PATH, '2.0.0.tar.gz')
+  FileUtils.cp File.join(Solargraph::YARDOC_PATH, '2.0.0.tar.gz'), cache_dir
   tar_extract = Gem::Package::TarReader.new(Zlib::GzipReader.open(File.join(cache_dir, '2.0.0.tar.gz')))
   tar_extract.rewind
   tar_extract.each do |entry|
@@ -35,5 +36,5 @@ unless File.exist?(version_dir)
     end
   end
   tar_extract.close
-  FileUtils.rm File.join(cache_dir, '2.0.0.tar.gz')
+  #FileUtils.rm File.join(cache_dir, '2.0.0.tar.gz')
 end

data/lib/solargraph/api_map.rb

@@ -24,7 +24,7 @@ module Solargraph
       @workspace = workspace
       clear
       unless @workspace.nil?
-        files = Dir[File.join workspace, 'lib', '**', '*.rb'] + Dir[File.join workspace, 'app', '**', '*.rb']
+        files = Dir[File.join @workspace, 'lib', '**', '*.rb'] + Dir[File.join @workspace, 'app', '**', '*.rb']
         files.each { |f|
           append_file f
         }
@@ -44,6 +44,15 @@ module Solargraph
       workspace and File.exist?(File.join(workspace, '.yardoc'))
     end
 
+    def yardoc_has_file?(filename)
+      return false unless has_yardoc?
+      return false if filename.nil?
+      if filename.start_with?(File.join(workspace, 'lib'), File.join(workspace, 'app'))
+        return true
+      end
+      false
+    end
+
     def append_file filename
       append_source File.read(filename), filename
     end
@@ -136,6 +145,9 @@ module Solargraph
       else
         return result if skip.include?(fqns)
         skip.push fqns
+        nodes = get_namespace_nodes(fqns)
+        nodes.delete_if { |n| yardoc_has_file?(get_filename_for(n))}
+        return result if nodes.empty?
         cursor = @namespace_tree
         parts = fqns.split('::')
         parts.each { |p|
@@ -223,12 +235,15 @@ module Solargraph
     end
     
     def get_root_for(node)
-      @parent_stack[node].last unless @parent_stack[node].nil?
+      s = @parent_stack[node]
+      return nil if s.nil?
+      return node if s.empty?
+      s.last
     end
 
     def get_filename_for(node)
       root = get_root_for(node)
-      root.children[0]
+      root.nil? ? nil : root.children[0]
     end
 
     def inner_get_instance_variables(node, scope)
@@ -294,14 +309,18 @@ module Solargraph
       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)
-      if type == :class
-        meths += yard.get_instance_methods('Class')
-      elsif type == :module
-        meths += yard.get_methods('Module')
+      yard_meths = yard.get_methods(namespace, root)
+      if yard_meths.any?
+        meths.concat yard_meths
+      else
+        type = get_namespace_type(namespace, root)
+        if type == :class
+          meths += yard.get_instance_methods('Class')
+        elsif type == :module
+          meths += yard.get_methods('Module')
+        end
+        meths
       end
-      meths
     end
     
     def get_method_args node
@@ -389,25 +408,27 @@ module Solargraph
       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'
+        unless yardoc_has_file?(get_filename_for(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
         end
       }
       meths.uniq
@@ -420,43 +441,45 @@ module Solargraph
       skip.push fqns
       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_instance_methods(s, namespace, skip)
-          end
-          current_scope = :public
-          n.children.each { |c|
-            if c.kind_of?(AST::Node) and c.type == :send and [:public, :protected, :private].include?(c.children[1])
-            # TODO: Determine the current scope so we can decide whether to
-            # exclude protected or private methods. Right now we're just
-            # assuming public only
-            elsif current_scope == :public
-              if c.kind_of?(AST::Node) and c.type == :def
-                cmnt = get_comment_for(c)
-                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
-                }
-              elsif c.kind_of?(AST::Node) and c.type == :send and c.children[1] == :attr_writer
-                c.children[2..-1].each { |x|
-                  meths.push Suggestion.new("#{x.children[0]}=", kind: Suggestion::METHOD) if x.type == :sym
-                }
-              elsif c.kind_of?(AST::Node) and c.type == :send and c.children[1] == :attr_accessor
-                c.children[2..-1].each { |x|
-                  meths.push Suggestion.new(x.children[0], kind: Suggestion::METHOD) if x.type == :sym
-                  meths.push Suggestion.new("#{x.children[0]}=", kind: Suggestion::METHOD) if x.type == :sym
-                }
-              end
+        unless yardoc_has_file?(get_filename_for(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_instance_methods(s, namespace, skip)
             end
-            get_include_strings_from(n).each { |i|
-              meths += inner_get_instance_methods(i, fqns, skip)
+            current_scope = :public
+            n.children.each { |c|
+              if c.kind_of?(AST::Node) and c.type == :send and [:public, :protected, :private].include?(c.children[1])
+              # TODO: Determine the current scope so we can decide whether to
+              # exclude protected or private methods. Right now we're just
+              # assuming public only
+              elsif current_scope == :public
+                if c.kind_of?(AST::Node) and c.type == :def
+                  cmnt = get_comment_for(c)
+                  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
+                  }
+                elsif c.kind_of?(AST::Node) and c.type == :send and c.children[1] == :attr_writer
+                  c.children[2..-1].each { |x|
+                    meths.push Suggestion.new("#{x.children[0]}=", kind: Suggestion::METHOD) if x.type == :sym
+                  }
+                elsif c.kind_of?(AST::Node) and c.type == :send and c.children[1] == :attr_accessor
+                  c.children[2..-1].each { |x|
+                    meths.push Suggestion.new(x.children[0], kind: Suggestion::METHOD) if x.type == :sym
+                    meths.push Suggestion.new("#{x.children[0]}=", kind: Suggestion::METHOD) if x.type == :sym
+                  }
+                end
+              end
+              get_include_strings_from(n).each { |i|
+                meths += inner_get_instance_methods(i, fqns, skip)
+              }
             }
-          }
+          end
         end
       }
       meths.uniq

data/lib/solargraph/code_map.rb

@@ -8,6 +8,9 @@ module Solargraph
     include NodeMethods
     
     def initialize code: '', filename: nil, workspace: nil
+      unless workspace.nil?
+        workspace = workspace.gsub(File::ALT_SEPARATOR, File::SEPARATOR) unless File::ALT_SEPARATOR.nil?
+      end
       if workspace.nil? and !filename.nil?
         filename = filename.gsub(File::ALT_SEPARATOR, File::SEPARATOR) unless File::ALT_SEPARATOR.nil?
         workspace = CodeMap.find_workspace(filename)

data/lib/solargraph/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Fred Snyder