solargraph 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21f02d0452d23441efaec01059cb1ffe5acc68ab
-  data.tar.gz: ead5d212fc3df6ffa82ad23e3383da16dcb070d3
+  metadata.gz: 6777382978fc47bc58e60e5dba335340528371e5
+  data.tar.gz: eab7012670ddc8c018cac7d8a9eb2f65da37c7da
 SHA512:
-  metadata.gz: cae96d0292a7b26ea4abfd86493736200ad762124ddd2307c2c10b9b04c296b823143ce30acae69d1cc89a46832e35e74ab2ce1efb58de97c369beb263cd9f70
-  data.tar.gz: cb701ce9b87dc10528a9e80d8cc2db51aa6700361755580af72d63acc37ff0a5d7b5986868950696ce09cf2fb37305245204132938165bf34e485adeeed12b63
+  metadata.gz: e81fd6a61cc46763f3b12ac2130ad54dd1f3637632f9dd7fdc03c5b9313a2555b4ef06672c72193ff8a0ac7624a8106394250771782be24d40af1f9c0b5a5b4b
+  data.tar.gz: 91137dda081bb75b40e500966684c354c7ab9c4583cd56602d7d8e1cebec20cf9adb5ff7a4ae913100e5f801552a1afb940e0588a9a023ffb669831aee3f5067

data/lib/solargraph/api_map.rb

@@ -493,7 +493,7 @@ module Solargraph
             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
+            meths.push Suggestion.new(label, insert: c.children[1].to_s.gsub(/=/, ' = '), 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.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?
@@ -536,7 +536,7 @@ module Solargraph
                   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)
+                  meths.push Suggestion.new(label, insert: c.children[0].to_s.gsub(/=/, ' = '), 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

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.5.5'
+  VERSION = '0.6.0'
 end

data/lib/solargraph/yard_map.rb

@@ -5,6 +5,8 @@ require 'yard'
 module Solargraph
 
   class YardMap
+    autoload :Cache, 'solargraph/yard_map/cache'
+
     def initialize required: [], workspace: nil
       unless workspace.nil?
         wsy = File.join(workspace, '.yardoc')
@@ -32,6 +34,7 @@ module Solargraph
       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!
+      cache_core
     end
 
     def yardocs
@@ -63,7 +66,10 @@ module Solargraph
       found
     end
 
+    # @return [Array<Suggestion>]
     def get_constants namespace, scope = ''
+      cached = cache.get_constants(namespace, scope)
+      return cached unless cached.nil?
       consts = []
       result = []
       yardocs.each { |y|
@@ -90,6 +96,7 @@ module Solargraph
         end
         result.push Suggestion.new(c.to_s.split('::').last, detail: detail, kind: kind)
       }
+      cache.set_constants(namespace, scope, result)
       result
     end
 
@@ -115,20 +122,23 @@ module Solargraph
       nil
     end
 
+    # @return [Array<Suggestion>]
     def get_methods namespace, scope = '', visibility: [:public]
+      cached = cache.get_methods(namespace, scope, visibility)
+      return cached unless cached.nil?
       meths = []
       yardocs.each { |y|
         yard = YARD::Registry.load! y
         unless yard.nil?
           ns = nil
           ns = find_first_resolved_namespace(yard, namespace, scope)
-          unless ns.nil? or !ns.kind_of?(YARD::CodeObjects::NamespaceObject)
+          unless ns.nil?
             ns.meths(scope: :class, visibility: visibility).each { |m|
-              n = m.to_s.split(/[\.#]/).last
+              n = m.to_s.split(/[\.#]/).last.gsub(/=/, ' = ')
               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}")
+              meths.push Suggestion.new(label, insert: "#{n.gsub(/=/, ' = ')}", kind: Suggestion::METHOD, documentation: m.docstring, code_object: m, detail: "#{ns}", location: "#{m.file}:#{m.line}")
             }
             # Collect superclass methods
             if ns.kind_of?(YARD::CodeObjects::ClassObject) and !ns.superclass.nil?
@@ -140,10 +150,14 @@ module Solargraph
           end
         end
       }
+      cache.set_methods(namespace, scope, visibility, meths)
       meths
     end
 
+    # @return [Array<Suggestion>]
     def get_instance_methods namespace, scope = '', visibility: [:public]
+      cached = cache.get_instance_methods(namespace, scope, visibility)
+      return cached unless cached.nil?
       meths = []
       yardocs.each { |y|
         yard = YARD::Registry.load! y
@@ -157,7 +171,7 @@ module Solargraph
                 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}")
+                meths.push Suggestion.new(label, insert: "#{n.gsub(/=/, ' = ')}", 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'
@@ -166,6 +180,7 @@ module Solargraph
           end
         end
       }
+      cache.set_instance_methods(namespace, scope, visibility, meths)
       meths
     end
 
@@ -178,7 +193,7 @@ module Solargraph
         yard = YARD::Registry.load! y
         unless yard.nil?
           obj = find_first_resolved_namespace(yard, namespace, scope)
-          return obj.path unless obj.nil?
+          return obj.path unless obj.nil? or !obj.kind_of?(YARD::CodeObjects::NamespaceObject)
         end
       }
       nil
@@ -186,6 +201,10 @@ module Solargraph
 
     private
 
+    def cache
+      @cache ||= Cache.new
+    end
+
     def get_method_args meth
       args = []
       meth.parameters.each { |a|
@@ -208,6 +227,14 @@ module Solargraph
       end
       yard.at(namespace)
     end
+
+    def cache_core
+      c = get_constants '', ''
+      c.each { |n|
+        get_methods 'n', visibility: :public
+        get_instance_methods 'n', visibility: :public
+      }
+    end
   end
 
 end

data/lib/solargraph/yard_map/cache.rb

@@ -0,0 +1,33 @@
+module Solargraph
+  class YardMap::Cache
+    def initialize
+      @constants = {}
+      @methods = {}
+      @instance_methods = {}
+    end
+
+    def set_constants namespace, scope, suggestions
+      @constants[[namespace, scope]] = suggestions
+    end
+
+    def set_methods namespace, scope, visibility, suggestions
+      @methods[[namespace, scope, visibility]] = suggestions
+    end
+
+    def set_instance_methods namespace, scope, visibility, suggestions
+      @instance_methods[[namespace, scope, visibility]] = suggestions
+    end
+
+    def get_methods namespace, scope, visibility
+      @methods[[namespace, scope, visibility]]
+    end
+
+    def get_instance_methods namespace, scope, visibility
+      @instance_methods[[namespace, scope, visibility]]
+    end
+
+    def get_constants namespace, scope
+      @constants[[namespace, scope]]
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-22 00:00:00.000000000 Z
+date: 2017-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -96,14 +96,14 @@ dependencies:
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -149,6 +149,7 @@ files:
 - lib/solargraph/views/layout.erb
 - lib/solargraph/views/search.erb
 - lib/solargraph/yard_map.rb
+- lib/solargraph/yard_map/cache.rb
 - yardoc/2.0.0.tar.gz
 homepage: http://castwide.com
 licenses: