solargraph 0.55.1 → 0.55.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2f834e0f42bbdee3defc50d5365e754c168a7ccfe9f5b9b059013dc2a5221b3
-  data.tar.gz: 67abd2be10bd9562c53db394d13da52ae76016814bc3d3d1b17cb2010c645851
+  metadata.gz: 8a2f6018173b0c7fb772fb29ddcfac606af3bdc3495793eb88c35573164ba64d
+  data.tar.gz: 622be262bbfda497e13caf68d769cd30d4de62ff1aa6ee04ec80f7627af1af43
 SHA512:
-  metadata.gz: dd2e5c2424a217ba140cee3561bf007fd71f0fbfb0810a00f4d45bbb03c95a98cb9a0f5efc43bc31166e5e68e8009ac15f3843ed4144c990d23811c6540c6207
-  data.tar.gz: 306eeaf5080e35f9ab04841e1b349c94bffcf56d183487b574718c3561fbfd74742667f839ad6cdc6971594ef16ff65b84851341b5ac92e606edb3898e9a6fbf
+  metadata.gz: 4c0f53c95bacfd15f7e1d90a160df31799777ebbfd6a5728dcef38cab0e9a88741b1ce4a392a5dd5ccbec0a395867b17c766b08fce4dadd9000c51bdb36edae3
+  data.tar.gz: '08298eef6f231bbf2379186b8d9a37885386774f164c16f45897d3d0c1347f44460b2eb997bbc5410b01a503b92bc141549724692a38414f9e4fc386177a22c6'

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.55.2 - June 21, 2025
+- Require external bundle (#972)
+
 ## 0.55.1 - June 8, 2025
 - Fix inline Struct definition (#962)
 - Ensure DocMap requires bundler when loading gemspecs (#963)

data/lib/solargraph/api_map.rb

@@ -94,7 +94,7 @@ module Solargraph
       end
       unresolved_requires = (bench.external_requires + implicit.requires + bench.workspace.config.required).to_a.compact.uniq
       if @unresolved_requires != unresolved_requires || @doc_map&.uncached_gemspecs&.any?
-        @doc_map = DocMap.new(unresolved_requires, [], bench.workspace.rbs_collection_path) # @todo Implement gem preferences
+        @doc_map = DocMap.new(unresolved_requires, [], bench.workspace) # @todo Implement gem preferences
         @unresolved_requires = unresolved_requires
       end
       @cache.clear if store.update(@@core_map.pins, @doc_map.pins, implicit.pins, iced_pins, live_pins)

data/lib/solargraph/doc_map.rb

@@ -18,13 +18,16 @@ module Solargraph
     # @return [Array<Gem::Specification>]
     attr_reader :uncached_gemspecs
 
+    # @return [Workspace, nil]
+    attr_reader :workspace
+
     # @param requires [Array<String>]
     # @param preferences [Array<Gem::Specification>]
-    # @param rbs_path [String, Pathname, nil]
-    def initialize(requires, preferences, rbs_path = nil)
+    # @param workspace [Workspace, nil]
+    def initialize(requires, preferences, workspace = nil)
       @requires = requires.compact
       @preferences = preferences.compact
-      @rbs_path = rbs_path
+      @workspace = workspace
       generate
     end
 
@@ -118,10 +121,10 @@ module Solargraph
 
     # @param gemspec [Gem::Specification]
     def update_from_collection gemspec, gempins
-      return gempins unless @rbs_path && File.directory?(@rbs_path)
+      return gempins unless workspace&.rbs_collection_path && File.directory?(workspace&.rbs_collection_path)
       return gempins if RbsMap.new(gemspec.name, gemspec.version).resolved?
 
-      rbs_map = RbsMap.new(gemspec.name, gemspec.version, directories: [@rbs_path])
+      rbs_map = RbsMap.new(gemspec.name, gemspec.version, directories: [workspace&.rbs_collection_path])
       return gempins unless rbs_map.resolved?
 
       Solargraph.logger.info "Updating #{gemspec.name} #{gemspec.version} from collection"
@@ -132,29 +135,7 @@ module Solargraph
     # @return [::Array<Gem::Specification>, nil]
     def resolve_path_to_gemspecs path
       return nil if path.empty?
-
-      if path == 'bundler/require'
-        # @todo Quick fix for cases when Solargraph is running without Bundler.
-        #   The next goal is to enable loading of external bundles, i.e.,
-        #   finding gems that are defined in the workspace's bundle when
-        #   Solargraph is running in a different environment.
-        #   See https://github.com/castwide/vscode-solargraph/issues/279
-        require 'bundler'
-
-        # find only the gems bundler is now using
-        gemspecs = Bundler.definition.locked_gems.specs.flat_map do |lazy_spec|
-          logger.info "Handling #{lazy_spec.name}:#{lazy_spec.version} from #{path}"
-          [Gem::Specification.find_by_name(lazy_spec.name, lazy_spec.version)]
-        rescue Gem::MissingSpecError => e
-          logger.info("Could not find #{lazy_spec.name}:#{lazy_spec.version} with find_by_name, falling back to guess")
-          # can happen in local filesystem references
-          specs = resolve_path_to_gemspecs lazy_spec.name
-          logger.info "Gem #{lazy_spec.name} #{lazy_spec.version} from bundle not found: #{e}" if specs.nil?
-          next specs
-        end.compact
-
-        return gemspecs
-      end
+      return gemspecs_required_from_bundler if path == 'bundler/require'
 
       gemspec = Gem::Specification.find_by_path(path)
       if gemspec.nil?
@@ -215,5 +196,53 @@ module Solargraph
     def only_runtime_dependencies gemspec
       gemspec.dependencies - gemspec.development_dependencies
     end
+
+    def gemspecs_required_from_bundler
+      if workspace&.directory && Bundler.definition&.lockfile&.to_s&.start_with?(workspace.directory)
+        # Find only the gems bundler is now using
+        Bundler.definition.locked_gems.specs.flat_map do |lazy_spec|
+          logger.info "Handling #{lazy_spec.name}:#{lazy_spec.version}"
+          [Gem::Specification.find_by_name(lazy_spec.name, lazy_spec.version)]
+        rescue Gem::MissingSpecError => e
+          logger.info("Could not find #{lazy_spec.name}:#{lazy_spec.version} with find_by_name, falling back to guess")
+          # can happen in local filesystem references
+          specs = resolve_path_to_gemspecs lazy_spec.name
+          logger.info "Gem #{lazy_spec.name} #{lazy_spec.version} from bundle not found: #{e}" if specs.nil?
+          next specs
+        end.compact
+      else
+        logger.info 'Fetching gemspecs required from Bundler (bundler/require)'
+        gemspecs_required_from_external_bundle
+      end
+    end
+
+    def gemspecs_required_from_external_bundle
+      logger.info 'Fetching gemspecs required from external bundle'
+      return [] unless workspace&.directory
+
+      Solargraph.with_clean_env do
+        cmd = [
+          'ruby', '-e',
+          "require 'bundler'; require 'json'; Dir.chdir('#{workspace&.directory}') { puts Bundler.definition.locked_gems.specs.map { |spec| [spec.name, spec.version] }.to_h.to_json }"
+        ]
+        o, e, s = Open3.capture3(*cmd)
+        if s.success?
+          Solargraph.logger.debug "External bundle: #{o}"
+          hash = o && !o.empty? ? JSON.parse(o.split("\n").last) : {}
+          hash.map do |name, version|
+            Gem::Specification.find_by_name(name, version)
+          rescue Gem::MissingSpecError => e
+            logger.info("Could not find #{name}:#{version} with find_by_name, falling back to guess")
+            # can happen in local filesystem references
+            specs = resolve_path_to_gemspecs name
+            logger.info "Gem #{name} #{version} from bundle not found: #{e}" if specs.nil?
+            next specs
+          end.compact
+        else
+          Solargraph.logger.warn e
+          raise BundleNotFoundError, "Failed to load gems from bundle at #{workspace&.directory}"
+        end
+      end
+    end
   end
 end

data/lib/solargraph/parser/flow_sensitive_typing.rb

@@ -152,7 +152,9 @@ module Solargraph
       # @param isa_node [Parser::AST::Node]
       # @return [Array(String, String)]
       def parse_isa(isa_node)
-        return unless isa_node.type == :send && isa_node.children[1] == :is_a?
+        # @todo A nil guard might be good enough here, but we might want to
+        #   see if the callers are checking for nils instead.
+        return unless isa_node&.type == :send && isa_node.children[1] == :is_a?
         # Check if conditional node follows this pattern:
         #   s(:send,
         #     s(:send, nil, :foo), :is_a?,

data/lib/solargraph/version.rb

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

data/lib/solargraph.rb

@@ -2,6 +2,7 @@
 
 Encoding.default_external = 'UTF-8'
 
+require 'bundler'
 require 'set'
 require 'yard-solargraph'
 require 'solargraph/yard_tags'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.55.1
+  version: 0.55.2
 platform: ruby
 authors:
 - Fred Snyder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-08 00:00:00.000000000 Z
+date: 2025-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport