solargraph 0.53.0 → 0.53.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea6f4539a04d35b759acc75c97b4af772a34877adf8dba07e0a9a109a75cb545
-  data.tar.gz: 3e6945e906e693884a19e3fb2504cf8508cdb9784fa015b27dd455fb2e4ddba7
+  metadata.gz: dd82572e0c8ca2d5e7477c4bbcd58fa66b318550a23b6944d8749f67913560e3
+  data.tar.gz: 79ba0becff2e00fbcc7139ec540e91db5dec195cf5ae557cdcf599026b11b964
 SHA512:
-  metadata.gz: 561c956490d3231c79cd89163c162364793baca6c1a86c0dddb3b4896b965d08e4e86e4a4766a297c7d71b5f1573336d3d9c99aa271d7fa9fbde3061a8b7d338
-  data.tar.gz: 683c8d6df19fbc1abcbc1420a4f78157d032ca91a1bbec9c2b77b3a429a88d6f2f754d0b1def057a807f90ea6e026ee11725eb22290c286e0019bc0aaba13d07
+  metadata.gz: 743c84f70a8d49f253f4fdf3e8b43a3061ad7cd6eec68fbbf592505d63d56666ae5654ca2664750a7963d43f5b131ff1c7bc52660266786d345c9a19b86856fa
+  data.tar.gz: 8accd71eec8ce6f5ccf3aa5efd692a3ff71ea35eabf125446fe533049df80bd84fb33bf73d0cdadd7914598d485ed1f013c7cc898575b1a34238c90e92d8318e

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.53.2 - March 27, 2025
+- Fix a self-type-related false-positive in strict typechecking (#834)
+- DocMap fetches gem dependencies (#835)
+- Use configured command path to spawn solargraph processes (#837)
+
+## 0.53.1 - March 26, 2025
+- Reject nil requires in live code (#831)
+- RbsMap adds mixins to current namespace (#832)
+
 ## 0.53.0 - March 25, 2025
 - Fix crash on generic methods (#762)
 - Add more type annotations to the codebase (#763 et al.)

data/lib/solargraph/api_map.rb

@@ -64,7 +64,7 @@ module Solargraph
         implicit.merge map.environ
       end
       unresolved_requires = (bench.external_requires + implicit.requires + bench.workspace.config.required).uniq
-      @doc_map = DocMap.new(unresolved_requires, []) # @todo Implement gem dependencies
+      @doc_map = DocMap.new(unresolved_requires, []) # @todo Implement gem preferences
       @store = Store.new(@@core_map.pins + @doc_map.pins + implicit.pins + pins)
       @unresolved_requires = @doc_map.unresolved_requires
       @missing_docs = [] # @todo Implement missing docs

data/lib/solargraph/bench.rb

@@ -21,6 +21,7 @@ module Solargraph
       @source_maps = source_maps.to_set
       @workspace = workspace
       @external_requires = external_requires.reject { |path| workspace.would_require?(path) }
+                                            .compact
                                             .to_set
     end
   end

data/lib/solargraph/doc_map.rb

@@ -8,7 +8,7 @@ module Solargraph
     attr_reader :requires
 
     # @return [Array<Gem::Specification>]
-    attr_reader :dependencies
+    attr_reader :preferences
 
     # @return [Array<Pin::Base>]
     attr_reader :pins
@@ -17,10 +17,10 @@ module Solargraph
     attr_reader :uncached_gemspecs
 
     # @param requires [Array<String>]
-    # @param dependencies [Array<Gem::Specification>]
-    def initialize(requires, dependencies)
-      @requires = requires
-      @dependencies = dependencies
+    # @param preferences [Array<Gem::Specification>]
+    def initialize(requires, preferences)
+      @requires = requires.compact
+      @preferences = preferences.compact
       generate
     end
 
@@ -39,17 +39,11 @@ module Solargraph
       @gems_in_memory ||= {}
     end
 
-    private
-
-    # @return [Hash{String => Gem::Specification, nil}]
-    def required_gem_map
-      @required_gem_map ||= requires.to_h { |path| [path, resolve_path_to_gemspec(path)] }
+    def dependencies
+      @dependencies ||= (gemspecs.flat_map { |spec| fetch_dependencies(spec) } - gemspecs).to_set
     end
 
-    # @return [Hash{String => Gem::Specification}]
-    def dependency_map
-      @dependency_map ||= dependencies.to_h { |gemspec| [gemspec.name, gemspec] }
-    end
+    private
 
     # @return [void]
     def generate
@@ -62,6 +56,17 @@ module Solargraph
           try_stdlib_map path
         end
       end
+      dependencies.each { |dep| try_cache dep }
+    end
+
+    # @return [Hash{String => Gem::Specification, nil}]
+    def required_gem_map
+      @required_gem_map ||= requires.to_h { |path| [path, resolve_path_to_gemspec(path)] }
+    end
+
+    # @return [Hash{String => Gem::Specification}]
+    def preference_map
+      @preference_map ||= preferences.to_h { |gemspec| [gemspec.name, gemspec] }
     end
 
     # @param gemspec [Gem::Specification]
@@ -105,6 +110,8 @@ module Solargraph
     # @param path [String]
     # @return [Gem::Specification, nil]
     def resolve_path_to_gemspec path
+      return nil if path.empty?
+
       gemspec = Gem::Specification.find_by_path(path)
       if gemspec.nil?
         gem_name_guess = path.split('/').first
@@ -121,16 +128,16 @@ module Solargraph
           nil
         end
       end
-      return gemspec if dependencies.empty? || gemspec.nil?
+      gemspec_or_preference gemspec
+    end
 
-      if dependency_map.key?(gemspec.name)
-        return gemspec if gemspec.version == dependency_map[gemspec.name].version
+    # @param gemspec [Gem::Specification, nil]
+    # @return [Gem::Specification, nil]
+    def gemspec_or_preference gemspec
+      return gemspec unless gemspec && preference_map.key?(gemspec.name)
+      return gemspec if gemspec.version == preference_map[gemspec.name].version
 
-        change_gemspec_version gemspec, dependency_map[by_path.name].version
-      else
-        Solargraph.logger.warn "Gem #{gemspec.name} is not an expected dependency"
-        gemspec
-      end
+      change_gemspec_version gemspec, preference_map[by_path.name].version
     end
 
     # @param gemspec [Gem::Specification]
@@ -142,5 +149,23 @@ module Solargraph
       Solargraph.logger.info "Gem #{gemspec.name} version #{version} not found. Using #{gemspec.version} instead"
       gemspec
     end
+
+    # @param gemspec [Gem::Specification]
+    # @return [Array<Gem::Specification>]
+    def fetch_dependencies gemspec
+      only_runtime_dependencies(gemspec).each_with_object(Set.new) do |spec, deps|
+        Solargraph.logger.info "Adding #{spec.name} dependency for #{gemspec.name}"
+        dep = Gem::Specification.find_by_name(spec.name, spec.requirement)
+        deps.merge fetch_dependencies(dep) if deps.add?(dep)
+      rescue Gem::MissingSpecError
+        Solargraph.logger.warn "Gem dependency #{spec.name} #{spec.requirements} for #{gemspec.name} not found."
+      end.to_a
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @return [Array<Gem::Dependency>]
+    def only_runtime_dependencies gemspec
+      gemspec.dependencies - gemspec.development_dependencies
+    end
   end
 end

data/lib/solargraph/language_server/host/dispatch.rb

@@ -95,6 +95,10 @@ module Solargraph
           nil
         end
 
+        def options
+          @options ||= {}.freeze
+        end
+
         # Get a generic library for the given URI and attach the corresponding
         # source.
         #
@@ -109,7 +113,7 @@ module Solargraph
 
         # @return [Library]
         def generic_library
-          @generic_library ||= Solargraph::Library.new
+          @generic_library ||= Solargraph::Library.new(Solargraph::Workspace.new('', nil, options), nil)
         end
       end
     end

data/lib/solargraph/language_server/host.rb

@@ -292,7 +292,8 @@ module Solargraph
         path = ''
         path = normalize_separators(directory) unless directory.nil?
         begin
-          lib = Solargraph::Library.load(path, name)
+          workspace = Solargraph::Workspace.new(path, nil, options)
+          lib = Solargraph::Library.new(workspace, name)
           libraries.push lib
           async_library_map lib
         rescue WorkspaceTooLargeError => e

data/lib/solargraph/library.rb

@@ -603,7 +603,7 @@ module Solargraph
 
       logger.info "Caching #{spec.name} #{spec.version}"
       Thread.new do
-        @cache_pid = Process.spawn('solargraph', 'cache', spec.name, spec.version.to_s)
+        @cache_pid = Process.spawn(workspace.command_path, 'cache', spec.name, spec.version.to_s)
         Process.wait(@cache_pid)
         logger.info "Cached #{spec.name} #{spec.version}"
         @synchronized = false

data/lib/solargraph/rbs_map/conversions.rb

@@ -173,7 +173,7 @@ module Solargraph
             name: decl.super_class.name.relative!.to_s
           )
         end
-        add_mixins decl, class_pin.closure
+        add_mixins decl, class_pin
         convert_members_to_pins decl, class_pin
       end
 
@@ -621,15 +621,15 @@ module Solargraph
       end
 
       # @param decl [RBS::AST::Declarations::Class, RBS::AST::Declarations::Module]
-      # @param closure [Pin::Closure]
+      # @param closure [Pin::Namespace]
       # @return [void]
-      def add_mixins decl, closure
+      def add_mixins decl, namespace
         decl.each_mixin do |mixin|
           klass = mixin.is_a?(RBS::AST::Members::Include) ? Pin::Reference::Include : Pin::Reference::Extend
           pins.push klass.new(
             name: mixin.name.relative!.to_s,
             location: rbs_location_to_location(mixin.location),
-            closure: closure
+            closure: namespace
           )
         end
       end

data/lib/solargraph/type_checker.rb

@@ -333,6 +333,7 @@ module Solargraph
                   next
                 else
                   ptype = params.key?(par.name) ? params[par.name][:qualified] : ComplexType::UNDEFINED
+                  ptype = ptype.self_to(par.context.namespace)
                   if ptype.nil?
                     # @todo Some level (strong, I guess) should require the param here
                   else

data/lib/solargraph/version.rb

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

data/lib/solargraph/workspace.rb

@@ -25,9 +25,11 @@ module Solargraph
 
     # @param directory [String]
     # @param config [Config, nil]
-    def initialize directory = '', config = nil
+    # @param server [Hash]
+    def initialize directory = '', config = nil, server = {}
       @directory = directory
       @config = config
+      @server = server
       load_sources
       @gemnames = []
       @require_paths = generate_require_paths
@@ -134,8 +136,19 @@ module Solargraph
       source_hash[updater.filename] = source_hash[updater.filename].synchronize(updater)
     end
 
+    # @return [String]
+    def command_path
+      server['commandPath'] || 'solargraph'
+    end
+
     private
 
+    # The language server configuration (or an empty hash if the workspace was
+    # not initialized from a server).
+    #
+    # @return [Hash]
+    attr_reader :server
+
     # @return [Hash{String => Solargraph::Source}]
     def source_hash
       @source_hash ||= {}

metadata

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