solargraph 0.38.5 → 0.38.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f5704121cc7b82b0999302bb964ff7d2a0973e724fcbff4f0c2be6b3d800848
-  data.tar.gz: b7341f99fa186eebc3803955912c34a841b0be13b77e4725a9f16f5af5b009d2
+  metadata.gz: 061561cbbc7728685d8db8a482d16004254b6abcefde23ad1c8666f1dc8d37fb
+  data.tar.gz: 5c2a8991b9b2a7264a63337fb2d427b0c62c96843c6014202b2247d6c727558b
 SHA512:
-  metadata.gz: 9abc64fe7dff520bf58f3cb526013c9d2250adbae6ecd7eca22294d7eba4365c548bcd191c08974275186d13cbac421c9cc32cc53ddbe7fdedc549b00eacddd7
-  data.tar.gz: db55ce70f037c55a3da7b5f6b060f2bf51d996e78aa51c701e987de9eb1227dc30a99d06248ee88d1f318632d050e9a07cca4435bf8e91f60a21c630a6f27a31
+  metadata.gz: fc5d80cf77ad1c3b505ea3ecfbaaf514d2c49c7b93654b1e1fbd3b692266e045f4578e7bb15f5594842f677709f0a91b568379950648141012c694597b969686
+  data.tar.gz: '09e24fd600309f0b4f76391d33ba929bc6d153224acef25c384639f1072b5f9cd999102bdcd63b46e4238ee4089423068ff25d5b93af57c64d40d425cf884008'

data/.travis.yml

@@ -19,9 +19,8 @@ matrix:
   allow_failures:
     - rvm: 2.7
       os: osx
+    - rvm: jruby-head
       
-# Update RubyGems and Bundler due to error with Bundler 1.16.1 and RubyGems 2.7.3
-# See https://github.com/travis-ci/travis-ci/issues/8978
 before_install:
 - ruby ./travis-bundler.rb
 - bundle install

data/lib/solargraph/api_map.rb

@@ -513,7 +513,7 @@ module Solargraph
       cls = qualify(sub)
       until fqsup.nil? || cls.nil?
         return true if cls == fqsup
-        cls = qualify(store.get_superclass(cls), cls)
+        cls = qualify_superclass(cls)
       end
       false
     end
@@ -567,9 +567,8 @@ module Solargraph
             fqim = qualify(im, fqns)
             result.concat inner_get_methods(fqim, scope, visibility, deep, skip, true) unless fqim.nil?
           end
-          sc = store.get_superclass(fqns)
-          unless sc.nil?
-            fqsc = qualify(sc, fqns.split('::')[0..-2].join('::'))
+          fqsc = qualify_superclass(fqns)
+          unless fqsc.nil?
             result.concat inner_get_methods(fqsc, scope, visibility, true, skip, no_core) unless fqsc.nil?
           end
         else
@@ -577,9 +576,8 @@ module Solargraph
             fqem = qualify(em, fqns)
             result.concat inner_get_methods(fqem, :instance, visibility, deep, skip, true) unless fqem.nil?
           end
-          sc = store.get_superclass(fqns)
-          unless sc.nil?
-            fqsc = qualify(sc, fqns.split('::')[0..-2].join('::'))
+          fqsc = qualify_superclass(fqns)
+          unless fqsc.nil?
             result.concat inner_get_methods(fqsc, scope, visibility, true, skip, true) unless fqsc.nil?
           end
           unless no_core || fqns.empty?
@@ -608,9 +606,9 @@ module Solargraph
       store.get_includes(fqns).each do |is|
         result.concat inner_get_constants(qualify(is, fqns), [:public], skip)
       end
-      sc = store.get_superclass(fqns)
-      unless %w[Object BasicObject].include?(sc)
-        result.concat inner_get_constants(store.get_superclass(fqns), [:public], skip)
+      fqsc = qualify_superclass(fqns)
+      unless %w[Object BasicObject].include?(fqsc)
+        result.concat inner_get_constants(fqsc, [:public], skip)
       end
       result
     end
@@ -627,6 +625,15 @@ module Solargraph
       qualify namespace, context.split('::')[0..-2].join('::')
     end
 
+    def qualify_superclass fqsub
+      sup = store.get_superclass(fqsub)
+      return nil if sup.nil?
+      parts = fqsub.split('::')
+      last = parts.pop
+      parts.pop if last == sup
+      qualify(sup, parts.join('::'))
+    end
+
     # @param name [String]
     # @param root [String]
     # @param skip [Array<String>]

data/lib/solargraph/documentor.rb

@@ -28,7 +28,8 @@ module Solargraph
           @out.puts "Documenting #{name} #{version}"
           `yard gems #{name} #{version} #{@rebuild ? '--rebuild' : ''}`
           yd = YARD::Registry.yardoc_file_for_gem(name, "= #{version}")
-          if !yd
+          # HACK: Ignore errors documenting bundler
+          if !yd && name != 'bundler'
             @out.puts "#{name} #{version} YARD documentation failed"
             failures += 1
           end
@@ -61,7 +62,7 @@ module Solargraph
           ]
           o, e, s = Open3.capture3(*cmd)
           if s.success?
-            o && !o.empty? ? JSON.parse(o) : {}
+            o && !o.empty? ? JSON.parse(o.split("\n").last) : {}
           else
             Solargraph.logger.warn e
             raise BundleNotFoundError, "Failed to load gems from bundle at #{directory}"

data/lib/solargraph/source/chain.rb

@@ -105,22 +105,21 @@ module Solargraph
       def infer_first_defined pins, context, api_map
         type = ComplexType::UNDEFINED
         pins.each do |pin|
+          # Avoid infinite recursion
+          next if @@inference_stack.include?(pin.identity)
+          @@inference_stack.push pin.identity
           type = pin.typify(api_map)
+          @@inference_stack.pop
           break if type.defined?
         end
         if type.undefined?
           # Limit method inference recursion
           return type if @@inference_depth >= 2 && pins.first.is_a?(Pin::BaseMethod)
           @@inference_depth += 1
-          name_count = {}
           pins.each do |pin|
-            # Limit pin name hits for, e.g., variables with insane amounts of definitions
-            name_count[pin.identity] ||= 0
-            name_count[pin.identity] += 1
-            next if name_count[pin.identity] >= 10
             # Avoid infinite recursion
-            next if @@inference_stack.include?(pin)
-            @@inference_stack.push pin
+            next if @@inference_stack.include?(pin.identity)
+            @@inference_stack.push pin.identity
             type = pin.probe(api_map)
             @@inference_stack.pop
             break if type.defined?

data/lib/solargraph/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Solargraph
-  VERSION = '0.38.5'
+  VERSION = '0.38.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.38.5
+  version: 0.38.6
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport