solargraph 0.43.2 → 0.43.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e671eddad2fe717ad573954a63154bd89adbc12c9899c3f8762bf38a93160657
-  data.tar.gz: 2224d1457b9e8f7279bfa89b2777fe3d60a0a2283de4047930bebb79034a1ac4
+  metadata.gz: ed5d2e054ff8eca78f0b4f2294eecd1018cb32f53bd43c241e803edefeb4fce1
+  data.tar.gz: c8161d2b732b03024d592a6db89a07c4cf27588d5a8b8d41c6cfcd63871c6796
 SHA512:
-  metadata.gz: 76ffe1331d8020eed92c39d2c4886ce7d01e4143a8b8264ac1bf4011335fabfd32a48f16a7099f889fed2e7c485e2e9cbf09714f677cd6e9396381032522f67a
-  data.tar.gz: 9c6da25c26ed209af38be4a0bc8d7a6ce826fb3012bce650089e982f829f4c8b14807ed0f7d1ecdeacd9b737bedd9d682440a9701a864313a83e60182771ade0
+  metadata.gz: 6b310e476d1f7434a5da52adeda1212994b5cfa9907a60475a1dbd230e2bdbf9619a5a16420524fb0542e13dd527010f437e032f39ccac3596543bc96c4b1c24
+  data.tar.gz: 65bd2f40560050fc92f79bb4450a122f61e9b5a80bf58703f8317bd86d50058d6834b07b02d699b9804ab803c228f77441a32e37049d95ea4364704b916cf908

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.43.3 - September 25, 2021
+- Avoid Dir.chdir in Bundler processes (#481)
+- Check stdlib for gems with empty yardocs
+- Library#maybe_map checks for source in workspace
+
 ## 0.43.2 - September 23, 2021
 - Synchronize server requests (#461)
 

data/lib/solargraph/documentor.rb

@@ -59,18 +59,16 @@ module Solargraph
     # @return [Hash]
     def self.specs_from_bundle directory
       Solargraph.with_clean_env do
-        Dir.chdir directory do
-          cmd = [
-            'bundle', 'exec', 'ruby', '-e',
-            "require 'bundler'; require 'json'; puts Bundler.definition.specs_for([:default]).map { |spec| [spec.name, spec.version] }.to_h.to_json"
-          ]
-          o, e, s = Open3.capture3(*cmd)
-          if s.success?
-            o && !o.empty? ? JSON.parse(o.split("\n").last) : {}
-          else
-            Solargraph.logger.warn e
-            raise BundleNotFoundError, "Failed to load gems from bundle at #{directory}"
-          end
+        cmd = [
+          'ruby', '-e',
+          "require 'bundler'; require 'json'; Dir.chdir('#{directory}') { puts Bundler.definition.specs_for([:default]).map { |spec| [spec.name, spec.version] }.to_h.to_json }"
+        ]
+        o, e, s = Open3.capture3(*cmd)
+        if s.success?
+          o && !o.empty? ? JSON.parse(o.split("\n").last) : {}
+        else
+          Solargraph.logger.warn e
+          raise BundleNotFoundError, "Failed to load gems from bundle at #{directory}"
         end
       end
     end

data/lib/solargraph/library.rb

@@ -518,6 +518,7 @@ module Solargraph
 
     def maybe_map source
       return unless source
+      return unless @current == source || workspace.has_file?(source.filename)
       if source_map_hash.key?(source.filename)
         return if source_map_hash[source.filename].code == source.code && 
           source_map_hash[source.filename].source.synchronized? &&

data/lib/solargraph/version.rb

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

data/lib/solargraph/workspace.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'open3'
+require 'rubygems'
+
 module Solargraph
   # A workspace consists of the files in a project's directory and the
   # project's configuration. It provides a Source for each file to be used
@@ -168,19 +171,20 @@ module Solargraph
         # HACK: Evaluating gemspec files violates the goal of not running
         #   workspace code, but this is how Gem::Specification.load does it
         #   anyway.
-        Dir.chdir base do
+        cmd = ['ruby', '-e', "require 'rubygems'; require 'json'; spec = eval(File.read('#{file}'), TOPLEVEL_BINDING, '#{file}'); return unless Gem::Specification === spec; puts({name: spec.name, paths: spec.require_paths}.to_json)"]
+        o, e, s = Open3.capture3(*cmd)
+        if s.success?
           begin
-            # @type [Gem::Specification]
-            spec = eval(File.read(file), TOPLEVEL_BINDING, file)
-            next unless Gem::Specification === spec
-            @gemnames.push spec.name
-            result.concat(spec.require_paths.map { |path| File.join(base, path) })
-          rescue RuntimeError, ScriptError, Errno::ENOENT => e
-            # Don't die if we have an error during eval-ing a gem spec.
-            # Concat the default lib directory instead.
+            hash = o && !o.empty? ? JSON.parse(o.split("\n").last) : {}
+            next if hash.empty?
+            @gemnames.push hash['name']
+            result.concat(hash['paths'].map { |path| File.join(base, path) })
+          rescue StandardError => e
             Solargraph.logger.warn "Error reading #{file}: [#{e.class}] #{e.message}"
-            result.push File.join(base, 'lib')
           end
+        else
+          Solargraph.logger.warn "Error reading #{file}"
+          Solargraph.logger.warn e
         end
       end
       result.concat(config.require_paths.map { |p| File.join(directory, p) })

data/lib/solargraph/yard_map.rb

@@ -10,6 +10,8 @@ module Solargraph
   # stdlib, and gems.
   #
   class YardMap
+    class NoYardocError < StandardError; end
+
     autoload :Cache,       'solargraph/yard_map/cache'
     autoload :CoreDocs,    'solargraph/yard_map/core_docs'
     autoload :CoreGen,     'solargraph/yard_map/core_gen'
@@ -224,7 +226,7 @@ module Solargraph
             result.concat process_yardoc yd, spec
             result.concat add_gem_dependencies(spec) if with_dependencies?
           end
-        rescue Gem::LoadError => e
+        rescue Gem::LoadError, NoYardocError => e
           base = r.split('/').first
           next if from_std.include?(base)
           from_std.push base
@@ -299,6 +301,7 @@ module Solargraph
             result = Marshal.load(dump)
             return result unless result.nil? || result.empty?
             Solargraph.logger.warn "Empty cache for #{spec.name} #{spec.version}. Reloading"
+            File.unlink ser
           rescue StandardError => e
             Solargraph.logger.warn "Error loading pin cache: [#{e.class}] #{e.message}"
             File.unlink ser
@@ -315,6 +318,7 @@ module Solargraph
       Solargraph.logger.info "Loading #{spec.name} #{spec.version} from #{y}"
       load_yardoc y
       result = Mapper.new(YARD::Registry.all, spec).map
+      raise NoYardocError, "Yardoc at #{y} is empty" if result.empty?
       if spec
         ser = File.join(CoreDocs.cache_dir, 'gems', "#{spec.name}-#{spec.version}.ser")
         file = File.open(ser, 'wb')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.43.2
+  version: 0.43.3
 platform: ruby
 authors:
 - Fred Snyder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-23 00:00:00.000000000 Z
+date: 2021-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport