solargraph 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12ba7fd6f2f9b2393c21aba8249cd43e7c69062f
-  data.tar.gz: c102835081a9b19b74180c1f75b7ebaea695e5f1
+  metadata.gz: 1ff8b6c3f8f03cacb73e9a6b398d3f984dc2e240
+  data.tar.gz: 58449ce1fd531e8426bcbad2733487a66a23ff3a
 SHA512:
-  metadata.gz: 0bd7974b55a00ec8a914e77dffe352af321bbe9e27d1a1c19c74417015bc6d7886077017313e3526489e6a12e2b0933dc586cae2252e31afb0332da75f5a9f76
-  data.tar.gz: cdc14d195c758dc1acd151e22155c41390026bb89e9a74756b9b28e24cd68f53fde8c1e8ce20f4c8a3bb1244f0bfa12f034fda91e0438a9c534483e8a61aed01
+  metadata.gz: dc8c5611342e2be6c3fbcd354663e611523b2aaf756f738a08f20bcd1a4ca8a9e6a278a64cb31541d09e8243be8170e2c7588de827ae6d36cf95253594eed3cc
+  data.tar.gz: a1d6666d9098e565b2d663a5d1ece4a617fb3ea1d0a97ca4703f4d114656afb831552b60345b9970abb6081028bc623ad65e117dfb98f20029f120e2a665f437

data/lib/solargraph/api_map.rb

@@ -872,7 +872,7 @@ module Solargraph
       }
     end
 
-    def map_namespaces node, tree = [], visibility = :public, scope = :instance, fqn = nil, local_scope = :class
+    def map_namespaces node, tree = [], visibility = :public, scope = :instance, fqn = nil
       if node.kind_of?(AST::Node)
         return if node.type == :str or node.type == :dstr
         if node.type == :class or node.type == :module
@@ -896,8 +896,10 @@ module Solargraph
         node.children.each do |c|
           if c.kind_of?(AST::Node)
             if c.type == :ivasgn
-              @ivar_pins[fqn] ||= []
-              @ivar_pins[fqn].push IvarPin.new(self, c, fqn, local_scope, get_comment_for(c))
+              @ivar_pins[fqn || ''] ||= []
+              par = find_parent(c, :class, :module, :def, :defs)
+              local_scope = ( (par.kind_of?(AST::Node) and par.type == :def) ? :instance : :class )
+              @ivar_pins[fqn || ''].push IvarPin.new(self, c, fqn || '', local_scope, get_comment_for(c))
             elsif c.type == :cvasgn
               @cvar_pins[fqn] ||= []
               @cvar_pins[fqn].push CvarPin.new(self, c, fqn, get_comment_for(c))
@@ -907,7 +909,7 @@ module Solargraph
                   if c.type == :def and c.children[0].to_s[0].match(/[a-z]/i)
                     @method_pins[fqn] ||= []
                     @method_pins[fqn].push MethodPin.new(c, fqn, scope, visibility, get_comment_for(c))
-                    map_namespaces c, tree, visibility, scope, fqn, :instance
+                    map_namespaces c, tree, visibility, scope, fqn
                     next
                   elsif c.type == :defs
                     @method_pins[fqn] ||= []

data/lib/solargraph/code_map.rb

@@ -478,6 +478,13 @@ module Solargraph
       inferred = nil
       parts = signature.split('.')
       ns_here = namespace_from(node)
+      if parts[0] and parts[0].include?('::')
+        sub = get_namespace_or_constant(parts[0], ns_here)
+        unless sub.nil?
+          return sub if signature.match(/^#{parts[0]}\.$/)
+          parts[0] = sub
+        end
+      end
       unless signature.include?('.')
         fqns = api_map.find_fully_qualified_namespace(signature, ns_here)
         return "Class<#{fqns}>" unless fqns.nil?
@@ -791,6 +798,30 @@ module Solargraph
       nil
     end
 
+    def get_namespace_or_constant con, namespace
+      parts = con.split('::')
+      conc = parts.shift
+      result = nil
+      is_constant = false
+      while parts.length > 0
+        result = api_map.find_fully_qualified_namespace("#{conc}::#{parts[0]}", namespace)
+        if result.nil? or result.empty?
+          sugg = api_map.namespaces_in(conc, namespace).select{ |s| s.label == parts[0] }.first
+          return nil if sugg.nil?
+          result = sugg.return_type
+          break if result.nil?
+          is_constant = true
+          conc = result
+          parts.shift
+        else
+          is_constant = false
+          conc += "::#{parts.shift}"
+        end
+      end
+      return result if is_constant
+      nil
+    end
+
     def beginning_of_line_from str, i
       while i > 0 and str[i] != "\n"
         i -= 1

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.12.1'
+  VERSION = '0.12.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-13 00:00:00.000000000 Z
+date: 2017-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser