solargraph 0.61.0 → 0.62.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b386e8d7447871b7850f167cab1483351050f92debdc40bb4b2ee9538e820e1
-  data.tar.gz: 3b88afe53d55f28b96004941ff37c2c8c9254c7e83ed597d90122aa1b6e374c2
+  metadata.gz: 8b2496884d72c8abed7340388dc6bd09f8be728ba93724c6146366b51a12c595
+  data.tar.gz: b8f1be6afe684fc5a50349958937a12073dab1b7f5ff4574234e3ffaa57fc164
 SHA512:
-  metadata.gz: 97f94421c920c20c8c5e2d5d8deae43ef7559cd082cedc022041ebc22252c04cb713e25fb8d5e96af1c258fe7aecffbc527c88829876944868911e31f20990ee
-  data.tar.gz: ad5d661d4340531998b669b8d499922f2c05c2fc94d04f1cdb9c2ed3ce207d0aa08875fd18e9a63f6e5a9c0688354e8ea8ada6bd865f76eaaa5a92393d2c6917
+  metadata.gz: 3414b07c09f728a8418bf1fb97d58eeb57a8496819c4a8340595750e6f59d952f77ea0cc3ce2e44705894905f773d3073c793e987d5b0e92aeea8ed4c29e835d
+  data.tar.gz: eb38a46cf34401299101a91be9b1c113dd977784e6c17c25aae78e2554a932bb46ac7d822dd303753e353f2b1daba6cf8186d26807b418d2804e725f60dc2a14

data/.github/workflows/linting.yml

@@ -28,6 +28,12 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Install libjitterentropy.a for rugged
+        # Ubuntu 26.04's libcrypto.pc links it statically
+        run: |
+          if pkg-config --libs --static libcrypto | grep -q jitterentropy; then
+            sudo apt-get update && sudo apt-get install -y libjitterentropy3-dev
+          fi
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 3.4
@@ -66,6 +72,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Install libjitterentropy.a for rugged
+        # Ubuntu 26.04's libcrypto.pc links it statically
+        run: |
+          if pkg-config --libs --static libcrypto | grep -q jitterentropy; then
+            sudo apt-get update && sudo apt-get install -y libjitterentropy3-dev
+          fi
       - uses: ruby/setup-ruby@1a615958ad9d422dd932dc1d5823942ee002799f # v1.227.0
         with:
           ruby-version: '3.3'
@@ -86,6 +98,12 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+    - name: Install libjitterentropy.a for rugged
+      # Ubuntu 26.04's libcrypto.pc links it statically
+      run: |
+        if pkg-config --libs --static libcrypto | grep -q jitterentropy; then
+          sudo apt-get update && sudo apt-get install -y libjitterentropy3-dev
+        fi
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
@@ -97,14 +115,18 @@ jobs:
 
     - name: Run rbs validate
       run: bundle exec rbs validate
-      # @todo Temporary, expect to revert in 0.60
-      continue-on-error: true
   rubocop_todo:
     name: .rubocop_todo.yml
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v3
+    - name: Install libjitterentropy.a for rugged
+      # Ubuntu 26.04's libcrypto.pc links it statically
+      run: |
+        if pkg-config --libs --static libcrypto | grep -q jitterentropy; then
+          sudo apt-get update && sudo apt-get install -y libjitterentropy3-dev
+        fi
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/.github/workflows/plugins.yml

@@ -20,6 +20,12 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+    - name: Install libjitterentropy.a for rugged
+      # Ubuntu 26.04's libcrypto.pc links it statically
+      run: |
+        if pkg-config --libs --static libcrypto | grep -q jitterentropy; then
+          sudo apt-get update && sudo apt-get install -y libjitterentropy3-dev
+        fi
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
@@ -54,6 +60,12 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+    - name: Install libjitterentropy.a for rugged
+      # Ubuntu 26.04's libcrypto.pc links it statically
+      run: |
+        if pkg-config --libs --static libcrypto | grep -q jitterentropy; then
+          sudo apt-get update && sudo apt-get install -y libjitterentropy3-dev
+        fi
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
@@ -89,6 +101,12 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+    - name: Install libjitterentropy.a for rugged
+      # Ubuntu 26.04's libcrypto.pc links it statically
+      run: |
+        if pkg-config --libs --static libcrypto | grep -q jitterentropy; then
+          sudo apt-get update && sudo apt-get install -y libjitterentropy3-dev
+        fi
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/.github/workflows/rspec.yml

@@ -18,7 +18,8 @@ permissions:
 
 jobs:
   rspec:
-    runs-on: ubuntu-latest
+    # ruby/setup-ruby has no Ruby 3.1 build for Ubuntu 26.04
+    runs-on: ${{ matrix.ruby-version == '3.1' && 'ubuntu-24.04' || 'ubuntu-latest' }}
     strategy:
       matrix:
         # @todo Restore 'head' once ruby/setup-ruby publishes it for ubuntu-24.04.
@@ -35,6 +36,12 @@ jobs:
             rbs-version: '4.0.2'
     steps:
     - uses: actions/checkout@v3
+    - name: Install libjitterentropy.a for rugged
+      # Ubuntu 26.04's libcrypto.pc links it statically
+      run: |
+        if pkg-config --libs --static libcrypto | grep -q jitterentropy; then
+          sudo apt-get update && sudo apt-get install -y libjitterentropy3-dev
+        fi
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
@@ -65,6 +72,12 @@ jobs:
         # fetch all history for all branches and tags so we can
         # compare against origin/master
         fetch-depth: 0
+    - name: Install libjitterentropy.a for rugged
+      # Ubuntu 26.04's libcrypto.pc links it statically
+      run: |
+        if pkg-config --libs --static libcrypto | grep -q jitterentropy; then
+          sudo apt-get update && sudo apt-get install -y libjitterentropy3-dev
+        fi
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/.github/workflows/typecheck.yml

@@ -24,6 +24,12 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+    - name: Install libjitterentropy.a for rugged
+      # Ubuntu 26.04's libcrypto.pc links it statically
+      run: |
+        if pkg-config --libs --static libcrypto | grep -q jitterentropy; then
+          sudo apt-get update && sudo apt-get install -y libjitterentropy3-dev
+        fi
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/CHANGELOG.md

@@ -1,3 +1,41 @@
+## 0.62.0 - October 30, 2026
+- Fix false positive: Struct.new(keyword_init: true) members are optional (#1269)
+- Strip nil from or-expression fallbacks in conditional branch values (#1309)
+- Map Forwardable delegations to method pins (#1311)
+- Resolve a self return type per union member (#1314)
+- Read implicitly-returns-nil per RBS overload, not from the first one (#1316)
+- Make `rbs validate` a blocking CI check again (#1317)
+- Add nil protection to definition (#1427)
+- Index `X = Class.new(Super)` constant assignments as classes (#1306)
+- Map gems without YARD (#1378)
+- Loosen the Rubocop development dependency (#1428)
+- [regression fix] Build rugged on Ubuntu 26.04 CI runners (#1436)
+- Skip Diagnoser#tick when the queue is drained (#1426)
+- Stop flagging anonymous argument forwarding (#1400)
+- Resolve instance variable type when assigned only in an ancestor class's method (#1345)
+- Apply @!override to constants instead of crashing (#1305)
+- Resolve generic type variables against union @param types (#1299)
+- ensure clause breaks return type inference (#1285)
+- Improved RBS type alias support (#1281)
+- Bind reopened generic parameters by position (#1411)
+- Apply mixins from self.included hooks to includers (#1405)
+- Define Boolean so its operators resolve (#1351)
+- Stop reporting a duck type's own method as unresolved (#1280)
+- Keep the generic return type when a method takes a block (#1274)
+- [regression fix] Stop rerunning a gem cache command that failed (#1442)
+- Remove Dispatch#update's hidden assumption that self is a Host (#1440)
+- Default anonymous type shorthand names (#1454)
+- New Plugin architecture with ActiveSupport implementation (#1435)
+- Keep the adapter spec from hanging in Backport.run (#1449)
+- Stop mapping a gem's non-sig RBS as its API (#1453)
+- Type variables from rbs-inline #: assertions on assignments (#1444)
+- Resolve inline RBS names in enclosing namespace (#1447)
+- Enable pending clip spec (#1462)
+- Remove Convention::ActiveSupportConcern (#1469)
+- Move Class, Struct, and Data definition processors to NodeProcessors (#1468)
+- Preserve immutable completion item properties during resolve (#1471)
+- [regression fix] Cache gems that have a leftover YARD lock (#1465)
+
 ## 0.61.0 - October 7, 2026
 - Clips qualify constant pins for completion (#1368)
 - Unused spec tags (#1370)

data/lib/solargraph/api_map/index.rb

@@ -85,6 +85,13 @@ module Solargraph
         @prepend_references ||= Hash.new { |h, k| h[k] = [] }
       end
 
+      # @return [Hash{String => Array<Pin::Reference::IncludedMixin>}]
+      def included_mixin_references
+        # @param h [String]
+        # @param k [Array<Pin::Reference::IncludedMixin>]
+        @included_mixin_references ||= Hash.new { |h, k| h[k] = [] }
+      end
+
       # @return [Hash{String => Array<Pin::Reference::Superclass>}]
       def superclass_references
         # @param h [String]
@@ -107,7 +114,7 @@ module Solargraph
 
       attr_writer :pins, :pin_select_cache, :namespace_hash, :pin_class_hash, :path_pin_hash, :include_references,
                   :extend_references, :prepend_references, :superclass_references, :factory_parameter_hash,
-                  :macro_method_names, :macro_method_name_pins
+                  :macro_method_names, :macro_method_name_pins, :included_mixin_references
 
       # @return [self]
       def deep_clone
@@ -117,7 +124,7 @@ module Solargraph
           copy.macro_method_names = macro_method_names
           %i[
             namespace_hash pin_class_hash path_pin_hash include_references extend_references prepend_references
-            superclass_references macro_method_name_pins
+            superclass_references macro_method_name_pins included_mixin_references
           ].each do |sym|
             copy.send("#{sym}=", send(sym).clone)
             copy.send(sym)&.transform_values!(&:clone)
@@ -150,6 +157,7 @@ module Solargraph
         map_references Pin::Reference::Prepend, prepend_references
         map_references Pin::Reference::Extend, extend_references
         map_references Pin::Reference::Superclass, superclass_references
+        map_references Pin::Reference::IncludedMixin, included_mixin_references
         macro_pins = pins_by_class(Pin::Method).select { |pin| pin.macros.any? }
         @macro_method_names = macro_pins.to_set(&:name)
         @macro_method_name_pins = macro_pins.to_set.classify(&:name)
@@ -204,7 +212,7 @@ module Solargraph
         end
       end
 
-      # @param pin [Pin::Method]
+      # @param pin [Pin::Base]
       # @param tag [YARD::Tags::Tag]
       # @return [void]
       def redefine_return_type pin, tag
@@ -212,6 +220,9 @@ module Solargraph
         #   proxy() / proxy_with_signatures() instead?
         return unless pin && tag.tag_name == 'return'
         pin.instance_variable_set(:@return_type, ComplexType.try_parse(tag.type))
+        # Only methods carry signatures; constants and other pins have
+        # just the one return type set above.
+        return unless pin.is_a?(Pin::Method)
         pin.signatures.each do |sig|
           sig.instance_variable_set(:@return_type, ComplexType.try_parse(tag.type))
         end

data/lib/solargraph/api_map/store.rb

@@ -124,6 +124,12 @@ module Solargraph
         extend_references[fqns] || []
       end
 
+      # @param fqns [String]
+      # @return [Array<Pin::Reference::IncludedMixin>]
+      def get_included_mixins fqns
+        index.included_mixin_references[fqns] || []
+      end
+
       # @param path [String]
       # @return [Array<Solargraph::Pin::Base>]
       def get_path_pins path

data/lib/solargraph/api_map.rb

@@ -106,10 +106,20 @@ module Solargraph
       source_map_hash.each_value do |map|
         conventions_environ.merge map.conventions_environ
       end
+      addon = Plugin::Addon.new
+      Plugin.registry.each do |plugin|
+        panel ||= Plugin::Panel.new(source_maps: bench.source_maps, live_map: bench.live_map, gem_names: external.configured_gem_names)
+        added = plugin.new(panel).addon
+        addon.gem_names.concat added.gem_names
+        addon.pins.concat added.pins
+      rescue StandardError => e
+        Solargraph.logger.warn "#{plugin} failed - [#{e.class}] #{e.message}"
+      end
+
       # @todo Determine what needs to be sent to global conventions
       conventions_environ.merge Convention.for_global(nil)
-      external_changed = external.update(bench.external_requires.to_a + conventions_environ.requires)
-      store_changed = store.update(@@core_pins, external.pins.clone, conventions_environ.pins, iced_pins, live_pins) { process_macros }
+      external_changed = external.update(bench.external_requires.to_a + conventions_environ.requires, addon.gem_names)
+      store_changed = store.update(@@core_pins, external.pins.clone, conventions_environ.pins, addon.pins, iced_pins, live_pins) { process_macros }
       @cache.clear if external_changed || store_changed
       Solargraph.logger.info "Cataloging ApiMap finished in #{Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time} seconds"
       self
@@ -769,6 +779,22 @@ module Solargraph
       methods
     end
 
+    # Mixins that +self.included+ hooks of the modules included in fqns apply
+    # to it, e.g. +base.extend ClassMethods+
+    #
+    # @param fqns [String]
+    # @param keywords [Array<::Symbol>] which of :include, :prepend and :extend
+    # @return [Array<String>]
+    def included_hook_mixins fqns, keywords
+      store.get_includes(fqns).flat_map do |ref|
+        included = dereference(ref)
+        next [] if included.nil?
+        store.get_included_mixins(ComplexType.parse(included).namespace)
+             .select { |mixin| keywords.include?(mixin.keyword) }
+             .filter_map { |mixin| dereference(mixin) }
+      end
+    end
+
     # @param fq_sub_tag [String]
     # @return [String, nil]
     def qualify_superclass fq_sub_tag
@@ -841,6 +867,9 @@ module Solargraph
             result.concat inner_get_methods_from_reference(in_tag, namespace_pin, rooted_type, scope, visibility, deep,
                                                            skip, true)
           end
+          included_hook_mixins(fqns, %i[include prepend]).each do |mixin|
+            result.concat inner_get_methods(mixin, scope, visibility, deep, skip, true)
+          end
           rooted_sc_tag = qualify_superclass(rooted_tag)
           unless rooted_sc_tag.nil?
             result.concat inner_get_methods_from_reference(rooted_sc_tag, namespace_pin, rooted_type, scope,
@@ -854,6 +883,9 @@ module Solargraph
             fqem = dereference(em)
             result.concat inner_get_methods(fqem, :instance, visibility, deep, skip, true) unless fqem.nil?
           end
+          included_hook_mixins(fqns, [:extend]).each do |mixin|
+            result.concat inner_get_methods(mixin, :instance, visibility, deep, skip, true)
+          end
           rooted_sc_tag = qualify_superclass(rooted_tag)
           unless rooted_sc_tag.nil?
             result.concat inner_get_methods_from_reference(rooted_sc_tag, namespace_pin, rooted_type, scope,

data/lib/solargraph/collection/gem.rb

@@ -9,6 +9,8 @@ module Solargraph
 
       attr_reader :metagem
 
+      @@path_source_cache = {}
+
       # @param metagem [Metagem]
       def initialize metagem
         super()
@@ -20,16 +22,12 @@ module Solargraph
       end
 
       def load
-        return pins unless metagem.cacheable?
-        super
+        return super if metagem.cacheable?
+        @@path_source_cache[metagem.full_path] ||= pins
       end
 
       def pins
-        @pins ||= if metagem.cacheable?
-                    cacheable_pins
-                  else
-                    uncacheable_pins
-                  end
+        @pins ||= without_yard
       end
 
       def self.cached? metagem
@@ -38,17 +36,21 @@ module Solargraph
 
       private
 
-      def cacheable_pins
+      def with_yard
         code_objects = Yardoc.load!(metagem)
         yard_pins = YardMap::Mapper.new(code_objects, metagem).map
         rbs_pins = RbsMap::Gem.pins(metagem)
         RbsMap::Helpers.combine(yard_pins, rbs_pins)
       end
 
-      def uncacheable_pins
+      def without_yard
         files = metagem.require_paths.flat_map { |path| Dir.glob(File.join(metagem.full_path, path, '**', '*.rb')) }
         source_maps = files.map { |file| Solargraph::SourceMap.load(file) }
-        source_pins = source_maps.flat_map(&:pins)
+
+        # Generating an ApiMap is necessary for processing macros
+        bench = Bench.new(source_maps: source_maps)
+        source_pins = ApiMap.new.catalog(bench).pins.select { |pin| files.include?(pin.filename) }
+
         rbs_pins = RbsMap::Gem.pins(metagem)
         RbsMap::Helpers.combine(source_pins, rbs_pins)
       end

data/lib/solargraph/collection.rb

@@ -5,7 +5,6 @@ module Solargraph
     autoload :Base,   'solargraph/collection/base'
     autoload :Core,   'solargraph/collection/core'
     autoload :Gem,    'solargraph/collection/gem'
-    autoload :Rbs,    'solargraph/collection/rbs'
     autoload :Stdlib, 'solargraph/collection/stdlib'
 
     # A hash for storing pin collections in memory.

data/lib/solargraph/complex_type/unique_type.rb

@@ -11,6 +11,13 @@ module Solargraph
 
       attr_reader :all_params, :subtypes, :key_types
 
+      # @type [Hash{String => String}]
+      ANONYMOUS_NAME_BY_STARTING_TAG = {
+        '{' => 'Hash',
+        '(' => 'Array',
+        '<' => 'Array'
+      }.freeze
+
       # Create a UniqueType with the specified name and an optional substring.
       # The substring is the parameter section of a parametrized type, e.g.,
       # for the type `Array<String>`, the name is `Array` and the substring is
@@ -22,6 +29,9 @@ module Solargraph
       # @return [UniqueType]
       def self.parse name, substring = '', make_rooted: nil
         raise ComplexTypeError, "Illegal prefix: #{name}" if name.start_with?(':::')
+        # Anonymous shorthand (`<A>`, `(A)`, `{A=>B}`) defaults the
+        # omitted type name to Array or Hash, before the rooted check below.
+        name = ANONYMOUS_NAME_BY_STARTING_TAG.fetch(substring.chars.fetch(0)) if name.empty? && !substring.empty?
         if name.start_with?('::')
           name = name[2..]
           rooted = true
@@ -443,6 +453,9 @@ module Solargraph
       # @param context_type [ComplexType] The receiver type
       # @return [UniqueType, ComplexType]
       def resolve_generics definitions, context_type
+        # Method-scoped generics bind per call site via
+        # resolve_generics_from_context, not against a receiver's type params.
+        return self if definitions.is_a?(Pin::Callable)
         return self if definitions.nil? || definitions.generics.empty?
 
         transform(name) do |t|

data/lib/solargraph/complex_type.rb

@@ -50,9 +50,10 @@ module Solargraph
     def resolve_generics_from_context generics_to_resolve, context_type, resolved_generic_values: {}
       return self unless generic?
 
-      ComplexType.new(@items.map do |i|
-        i.resolve_generics_from_context(generics_to_resolve, context_type,
-                                        resolved_generic_values: resolved_generic_values)
+      ComplexType.new(@items.map do |unique_type|
+        unique_type.resolve_generics_from_context(generics_to_resolve,
+                                                  destructure_context_type(unique_type, context_type),
+                                                  resolved_generic_values: resolved_generic_values)
       end)
     end
 
@@ -561,6 +562,25 @@ module Solargraph
 
     private
 
+    # Narrows what a generic member binds against: context members this type
+    # already matches concretely are dropped. Nothing left over means no value
+    # can reach the generic, which is bot.
+    #
+    # @param unique_type [UniqueType] A member of @items
+    # @param context_type [ComplexType, UniqueType, nil]
+    # @return [ComplexType, UniqueType, nil]
+    def destructure_context_type unique_type, context_type
+      return context_type unless unique_type.generic? && context_type.is_a?(ComplexType) && @items.length > 1
+
+      concrete_items = @items.reject(&:generic?)
+      return context_type if concrete_items.empty?
+
+      remaining_items = context_type.items.reject { |ct| concrete_items.any? { |ci| ci.name == ct.name } }
+      return BOT if remaining_items.empty?
+
+      ComplexType.new(remaining_items)
+    end
+
     # @todo This is a quick and dirty hack that forces `self` keywords
     #   to reference an instance of their class and never the class itself.
     #   This behavior may change depending on which result is expected

data/lib/solargraph/convention.rb

@@ -9,9 +9,6 @@ module Solargraph
     autoload :Gemfile, 'solargraph/convention/gemfile'
     autoload :Gemspec, 'solargraph/convention/gemspec'
     autoload :Rakefile, 'solargraph/convention/rakefile'
-    autoload :StructDefinition, 'solargraph/convention/struct_definition'
-    autoload :DataDefinition,   'solargraph/convention/data_definition'
-    autoload :ActiveSupportConcern, 'solargraph/convention/active_support_concern'
 
     # @type [Set<Convention::Base>]
     @@conventions = Set.new
@@ -75,6 +72,5 @@ module Solargraph
     register Gemfile
     register Gemspec
     register Rakefile
-    register ActiveSupportConcern
   end
 end

data/lib/solargraph/diagnostics/type_check.rb

@@ -11,7 +11,6 @@ module Solargraph
         # return [] unless args.include?('always') || api_map.workspaced?(source.filename)
         severity = Diagnostics::Severities::ERROR
         level = args.reverse.find { |a| %w[normal typed strict strong].include?(a) } || :normal
-        # @sg-ignore sensitive typing needs to handle || on nil types
         checker = Solargraph::TypeChecker.new(source.filename, api_map: api_map, level: level.to_sym)
         checker.problems
                .sort { |a, b| a.location.range.start.line <=> b.location.range.start.line }

data/lib/solargraph/external.rb

@@ -13,15 +13,23 @@ module Solargraph
     # @return [Array<String>]
     attr_reader :requires
 
+    attr_reader :extra_gem_names
+
     # @param directory [String]
     # @param requires [Array<String>]
-    def initialize directory, requires
+    # @param extra_gem_names [Array<String>]
+    def initialize directory, requires, extra_gem_names = []
       @repo = Repo.new(directory)
       @directory = directory
       @requires = requires
+      @extra_gem_names = extra_gem_names
       update!
     end
 
+    def configured_gem_names
+      loaded_gems.map(&:name) + unloaded_gems.map(&:name) + extra_gem_names
+    end
+
     def unresolved_requires
       @unresolved_requires ||= []
     end
@@ -38,6 +46,14 @@ module Solargraph
       @unloaded_gems ||= Set.new
     end
 
+    def unfound_gem_names
+      @unfound_gem_names ||= []
+    end
+
+    def loaded_stdlibs
+      @loaded_stdlibs ||= Set.new
+    end
+
     def pins
       @pins ||= []
     end
@@ -49,10 +65,11 @@ module Solargraph
 
     # @param new_requires [Array<String>]
     # @return [Boolean]
-    def update new_requires
-      return false if requires == new_requires && !cache_changed?
+    def update new_requires, new_gem_names = []
+      return false if requires == new_requires && new_gem_names == extra_gem_names && !cache_changed?
 
       requires.replace new_requires
+      extra_gem_names.replace new_gem_names
       update!
       true
     end
@@ -77,7 +94,8 @@ module Solargraph
       @generation = generation + 1
       clear_all
       load_requires
-      load_rbs_collection
+      load_gem_names
+      # load_rbs_collection
     end
 
     def cache_changed?
@@ -92,7 +110,7 @@ module Solargraph
           bundler_require = true
         end
         if RbsMap::Stdlib.has?(path)
-          pins.concat Collection::Stdlib.load(path)
+          pins.concat Collection::Stdlib.load(path) if loaded_stdlibs.add?(path)
         else
           metagem = @repo.find_by_path(path)
           next unresolved_requires.push(path) unless metagem
@@ -105,9 +123,22 @@ module Solargraph
       @repo.find_by_group(:default).each { |metagem| process_gem metagem }
     end
 
-    def load_rbs_collection
-      rbs_collection_pins = rbs_collection_paths.flat_map { |path| Collection::Rbs.load(path) }
-      pins.replace RbsMap::Helpers.combine(pins, rbs_collection_pins)
+    def load_gem_names
+      extra_gem_names.uniq.each do |gem|
+        metagem = @repo.find_by_name(gem)
+        next unfound_gem_names.push(gem) unless metagem
+        process_gem metagem
+      end
+    end
+
+    def rbs_collection
+      @rbs_collection ||= RbsCollection.new(rbs_collection_lockfile)
+    end
+
+    def rbs_collection_lockfile
+      return if directory.nil? || directory.empty? || directory == '*'
+      lockfile = File.join(directory, 'rbs_collection.lock.yaml')
+      lockfile if File.file?(lockfile)
     end
 
     def clear_all
@@ -116,21 +147,30 @@ module Solargraph
       unresolved_dependencies.clear
       loaded_gems.clear
       unloaded_gems.clear
+      loaded_stdlibs.clear
+      unfound_gem_names.clear
     end
 
     def process_gem metagem
       return if loaded_gems.include?(metagem) || unloaded_gems.include?(metagem)
 
-      if metagem.cacheable?
-        if Collection::Gem.cached?(metagem)
-          loaded_gems.add metagem
-          pins.concat Collection::Gem.load(metagem)
-        else
-          unloaded_gems.add metagem
-        end
+      if metagem.cacheable? && !Collection::Gem.cached?(metagem)
+        unloaded_gems.add metagem
       else
         loaded_gems.add metagem
-        pins.concat Collection::Gem.load(metagem)
+        base_pins = Collection::Gem.load(metagem)
+        rbsc_pins = rbs_collection.load(metagem)
+        if rbsc_pins.empty?
+          pins.concat base_pins
+        else
+          pins.concat RbsMap::Helpers.combine(base_pins, rbsc_pins)
+        end
+        # Gems might not declare stdlib dependencies as gem dependencies
+        # (e.g., `activesupport` requires `date`)
+        base_pins.select { |pin| pin.is_a?(Pin::Reference::Require) && RbsMap::Stdlib.has?(pin.name) }
+                 .each do |pin|
+                   pins.concat Collection::Stdlib.load(pin.name) if loaded_stdlibs.add?(pin.name)
+                 end
       end
       load_dependencies metagem
     end
@@ -143,17 +183,5 @@ module Solargraph
         process_gem metagem
       end
     end
-
-    # @return [Array<String>]
-    def read_rbs_collection_paths
-      return [] unless rbs_collection_config_path
-
-      yaml = YAML.load_file(rbs_collection_config_path)
-      [File.expand_path(yaml.fetch('path'), directory)].concat(
-        yaml.fetch('sources', [])
-            .select { |source| source['type'] == 'local' && source['path'] }
-            .map { |source| File.expand_path(source['path'], directory) }
-      ).compact
-    end
   end
 end

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

@@ -61,7 +61,7 @@ module Solargraph
             return
           end
           current = mutex.synchronize { queue.shift }
-          return if queue.include?(current)
+          return if current.nil? || queue.include?(current)
           begin
             host.diagnose current
           rescue InvalidOffsetError