solargraph 0.60.4 → 0.62.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c7397d5a9bbee07b12baa9372ce14f61216e5a310aa0f68605acabf8a9430e2
-  data.tar.gz: aeecf5c5d1ea7b1040fd3ae4bd9d1bff1685e468bd92b30dedfdd8ded2f1cd04
+  metadata.gz: 8b2496884d72c8abed7340388dc6bd09f8be728ba93724c6146366b51a12c595
+  data.tar.gz: b8f1be6afe684fc5a50349958937a12073dab1b7f5ff4574234e3ffaa57fc164
 SHA512:
-  metadata.gz: f4abae37c4fc8b57efe4a7b3550a2edbfc64455e8852f81660220f4a67facf101eafd058805b58cf0be6f9d5b9d16317cd21f6cd3b47f0c666c48418ee0d54c2
-  data.tar.gz: e14586769600dd63e2a96b8bcb4a5e4aa9bb045948e87e8c06b6606e711fed6816347051505eb756df55fed375a0419431dd02a44c2082d6d1ec0e2b13c6564f
+  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:
@@ -129,7 +147,7 @@ jobs:
     - name: clone https://github.com/lekemula/solargraph-rspec/
       run: |
        cd ..
-       git clone https://github.com/lekemula/solargraph-rspec.git
+       git clone https://github.com/lekemula/solargraph-rspec/
        cd solargraph-rspec
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1

data/.github/workflows/rspec.yml

@@ -18,14 +18,15 @@ 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.
         #   It currently 404s ("Unavailable version head for ruby"), failing CI:
         #   https://github.com/castwide/solargraph/actions/runs/25863741955/job/76000137015?pr=1187
         ruby-version: ['3.1', '3.2', '3.3', '3.4', '4.0']
-        rbs-version: ['3.10.0', '4.0.0', '4.0.1', '4.0.2']
+        rbs-version: ['3.10.4', '4.0.0', '4.0.1', '4.0.2']
         exclude:
           - ruby-version: '3.1'
             rbs-version: '4.0.0'
@@ -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:
@@ -48,6 +55,8 @@ jobs:
     #    starting from Ruby 3.6.0
     - name: Work around legacy rbs deprecation on ruby > 3.4
       run: echo "gem 'tsort'" >> .Gemfile
+    - name: Install bundle
+      run: bundle install
     - name: Update gems
       run: |
         bundle update rbs # use latest available for this Ruby version
@@ -63,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,57 @@
+## 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)
+- External gem dependency management (#1369)
+- Use a development branch of Solargraph::RSpec for plugin tests (#1371)
+- Pin::Base spec changes (#1372)
+- Consolidate cache and gems commands (#1373)
+- Sleep timeouts (#1375)
+- RbsMap loads minimal pins (#1377)
+- Fix 10x slowdown when analyzing projects with many gems (#1374)
+- Clone main solargraph-rspec repo in plugins workflow (#1388)
+- Add new Pin::FactoryParameter (#1063)
+- Support YARD `@!scope` directive (#1387)
+- Add nil guard to Hover (#1389)
+- Stop dropping union members that differ only by type parameter (#1273)
+
 ## 0.60.4 - August 30, 2026
 - Fix @yieldparam type lost on multi-overload block-form methods (#1289) (#1290)
 - Read inline RBS superclass params only on the class line (#1301)

data/Gemfile

@@ -4,9 +4,6 @@ source 'https://rubygems.org'
 
 gemspec name: 'solargraph'
 
-# Test fixture gems
-gem 'gem-with-yard-macros', path: 'spec/fixtures/gem-with-yard-macros'
-
 # Local gemfile for development tools, etc.
 local_gemfile = File.expand_path('.Gemfile', __dir__)
 instance_eval File.read local_gemfile if File.exist? local_gemfile

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]
@@ -92,6 +99,11 @@ module Solargraph
         @superclass_references ||= Hash.new { |h, k| h[k] = [] }
       end
 
+      # @return [Hash{String => Array<Pin::FactoryParameter>}]
+      def factory_parameter_hash
+        @factory_parameter_hash ||= Hash.new { |h, k| h[k] = [] }
+      end
+
       # @param pins [Enumerable<Pin::Base>]
       # @return [self]
       def merge pins
@@ -101,8 +113,8 @@ module Solargraph
       protected
 
       attr_writer :pins, :pin_select_cache, :namespace_hash, :pin_class_hash, :path_pin_hash, :include_references,
-                  :extend_references, :prepend_references, :superclass_references, :macro_method_names,
-                  :macro_method_name_pins
+                  :extend_references, :prepend_references, :superclass_references, :factory_parameter_hash,
+                  :macro_method_names, :macro_method_name_pins, :included_mixin_references
 
       # @return [self]
       def deep_clone
@@ -112,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)
@@ -145,9 +157,11 @@ 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)
+        map_factory_parameters
         map_overrides
         pins_by_class(Pin::Reference::TypeAlias).each { |pin| alias_hash[pin.name] = pin.return_type }
         self
@@ -198,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
@@ -206,10 +220,20 @@ 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
       end
+
+      # @return [void]
+      def map_factory_parameters
+        pins_by_class(Pin::FactoryParameter).each do |fp|
+          factory_parameter_hash[fp.method_path] << fp
+        end
+      end
     end
   end
 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
@@ -261,6 +267,14 @@ module Solargraph
         ancestors.compact.uniq
       end
 
+      # Get factory parameters for a method pin.
+      #
+      # @param method_pin [Pin::Method]
+      # @return [Array<Pin::FactoryParameter>]
+      def factory_parameters_for_method method_pin
+        factory_parameter_hash[method_pin.path] || []
+      end
+
       # @param fqns [String]
       #
       # @return [Array<Solargraph::Pin::Reference>]
@@ -358,6 +372,11 @@ module Solargraph
         index.extend_references
       end
 
+      # @return [Hash{String => Array<Pin::FactoryParameter>}]
+      def factory_parameter_hash
+        index.factory_parameter_hash
+      end
+
       # @param name [String]
       # @return [Enumerable<Solargraph::Pin::Base>]
       def namespace_children name

data/lib/solargraph/api_map.rb

@@ -15,13 +15,9 @@ module Solargraph
     autoload :Index,          'solargraph/api_map/index'
     autoload :Constants,      'solargraph/api_map/constants'
 
-    # @return [Array<String>]
-    attr_reader :unresolved_requires
-
-    @@core_map = RbsMap::CoreMap.new
+    include Equality
 
-    # @return [Array<String>]
-    attr_reader :missing_docs
+    @@core_pins = Collection::Core.load
 
     # @param pins [Array<Solargraph::Pin::Base>]
     # @param loose_unions [Boolean] if true, a potential type can be
@@ -38,12 +34,6 @@ module Solargraph
       index pins
     end
 
-    # @param out [StringIO, IO, nil] output stream for logging
-    # @return [void]
-    def self.reset_core out: nil
-      @@core_map = RbsMap::CoreMap.new
-    end
-
     #
     # This is a mutable object, which is cached in the Chain class -
     # if you add any fields which change the results of calls (not
@@ -86,7 +76,7 @@ module Solargraph
       @source_map_hash = {}
       conventions_environ.clear
       cache.clear
-      store.update @@core_map.pins, pins
+      store.update @@core_pins, pins
       self
     end
 
@@ -106,6 +96,8 @@ module Solargraph
     # @param bench [Bench]
     # @return [self]
     def catalog bench
+      start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      @workspace = bench.workspace
       @source_map_hash = bench.source_map_hash
       # @type [Array<Pin::Base>]
       iced_pins = bench.icebox.flat_map(&:pins)
@@ -114,24 +106,37 @@ module Solargraph
       source_map_hash.each_value do |map|
         conventions_environ.merge map.conventions_environ
       end
-      unresolved_requires = (bench.external_requires + conventions_environ.requires + bench.workspace.config.required).to_a.compact.uniq
-      recreate_docmap = @unresolved_requires != unresolved_requires ||
-                        # @sg-ignore Unresolved call to rbs_collection_path on Solargraph::Workspace, nil
-                        workspace.rbs_collection_path != bench.workspace.rbs_collection_path ||
-                        @doc_map.uncached_gemspecs.any?
-
-      if recreate_docmap
-        @doc_map = DocMap.new(unresolved_requires, bench.workspace, out: nil) # @todo Implement gem preferences
-        @unresolved_requires = @doc_map.unresolved_requires
+      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
-      start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      Solargraph.logger.info 'Cataloging ApiMap started'
-      @cache.clear if store.update(@@core_map.pins, @doc_map.pins, conventions_environ.pins, iced_pins, live_pins) { process_macros }
-      @missing_docs = [] # @todo Implement missing docs
+
+      # @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, 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
     end
 
+    def external
+      @external ||= External.new(workspace&.directory, [])
+    end
+
+    def unresolved_requires
+      external.unresolved_requires
+    end
+
+    def unloaded_gems
+      external.unloaded_gems
+    end
+
     # @return [Array<Pin::Base>]
     def process_macros
       macro_pins = []
@@ -144,45 +149,23 @@ module Solargraph
         method_candidates.each do |node|
           closure = source_map.locate_closure_pin(node.location.line, node.location.column)
           chain = Solargraph::Parser::ParserGem::NodeChainer.chain(node)
-          if node.children[0].nil? && store.macro_method_name_pins.key?(node.children[1].to_s)
-            match = store.macro_method_name_pins[node.children[1].to_s].find do |pin|
-              get_complex_type_methods(closure.return_type).include?(pin)
-            end
-            if match
-              match.macros.each do |macro|
-                macro_pins.concat macro.generate_pins_from(chain, match, source_map)
-              end
-              next
-            end
+          next unless node.children[0].nil? && store.macro_method_name_pins.key?(node.children[1].to_s)
+          match = store.macro_method_name_pins[node.children[1].to_s].find do |pin|
+            get_complex_type_methods(closure.return_type).include?(pin)
+          end
+          next unless match
+          match.macros.each do |macro|
+            macro_pins.concat macro.generate_pins_from(chain, match, source_map)
           end
+          next
         end
       end
       macro_pins
     end
 
-    # @return [DocMap]
-    def doc_map
-      @doc_map ||= DocMap.new([], Workspace.new('.'))
-    end
-
-    # @return [::Array<Gem::Specification>]
-    def uncached_gemspecs
-      doc_map.uncached_gemspecs || []
-    end
-
-    # @return [::Array<Gem::Specification>]
-    def uncached_rbs_collection_gemspecs
-      @doc_map.uncached_rbs_collection_gemspecs
-    end
-
-    # @return [::Array<Gem::Specification>]
-    def uncached_yard_gemspecs
-      @doc_map.uncached_yard_gemspecs
-    end
-
     # @return [Enumerable<Pin::Base>]
     def core_pins
-      @@core_map.pins
+      @@core_pins
     end
 
     # @param name [String, nil]
@@ -237,21 +220,6 @@ module Solargraph
       api_map
     end
 
-    # @param out [StringIO, IO, nil]
-    # @param rebuild [Boolean] whether to rebuild the pins even if they are cached
-    # @return [void]
-    def cache_all_for_doc_map! out: $stderr, rebuild: false
-      doc_map.cache_all!(out, rebuild: rebuild)
-    end
-
-    # @param gemspec [Gem::Specification]
-    # @param rebuild [Boolean]
-    # @param out [StringIO, IO, nil]
-    # @return [void]
-    def cache_gem gemspec, rebuild: false, out: nil
-      doc_map.cache(gemspec, rebuild: rebuild, out: out)
-    end
-
     class << self
       include Logging
     end
@@ -267,12 +235,12 @@ module Solargraph
     # @return [ApiMap]
     def self.load_with_cache directory, out = $stderr, loose_unions: true
       api_map = load(directory, loose_unions: loose_unions)
-      if api_map.uncached_gemspecs.empty?
-        logger.info { "All gems cached for #{directory}" }
-        return api_map
-      end
+      return api_map if api_map.external.unloaded_gems.empty?
 
-      api_map.cache_all_for_doc_map!(out: out)
+      api_map.external.unloaded_gems.each do |metagem|
+        out&.puts "Caching gem #{metagem.name} (#{metagem.cache_name})"
+        Collection::Gem.load metagem
+      end
       load(directory, loose_unions: loose_unions)
     end
 
@@ -288,6 +256,21 @@ module Solargraph
       store.pins_by_class(Pin::Keyword)
     end
 
+    # An array of pins based on factory parameters.
+    #
+    # @return [Enumerable<Solargraph::Pin::FactoryParameter>]
+    def factory_parameter_pins
+      store.pins_by_class(Pin::FactoryParameter)
+    end
+
+    # Get factory parameters for a method pin.
+    #
+    # @param method_pin [Solargraph::Pin::Method]
+    # @return [Array<Solargraph::Pin::FactoryParameter>]
+    def factory_parameters_for_method method_pin
+      store.factory_parameters_for_method(method_pin)
+    end
+
     # @param name [String]
     # @return [ComplexType, nil]
     def unalias name
@@ -609,6 +592,9 @@ module Solargraph
 
     # Get an array of pins that match the specified path.
     #
+    # @example
+    #   api_map.get_pins_by_path('String#split')
+    #
     # @param path [String]
     # @return [Array<Pin::Base>]
     def get_path_pins path
@@ -755,7 +741,7 @@ module Solargraph
 
     # @return [Workspace, nil]
     def workspace
-      doc_map.workspace
+      @workspace
     end
 
     # @param fq_reference_tag [String] A fully qualified whose method should be pulled in
@@ -793,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
@@ -865,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,
@@ -878,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,
@@ -1051,8 +1059,11 @@ module Solargraph
     #   that this overload of 'protected' will typecheck @sg-ignore
     # @sg-ignore
     def equality_fields
-      [self.class, @source_map_hash, conventions_environ, @doc_map, @unresolved_requires, @missing_docs,
-       @loose_unions]
+      # External is compared by identity and generation instead of by its pins:
+      # Chain#infer hashes the ApiMap on every inference, and Array#hash would
+      # walk every gem pin on each of those calls.
+      [@source_map_hash, conventions_environ, @external, @external&.generation,
+       @unresolved_requires, @loose_unions]
     end
   end
 end