From 8b1107501abeb326df1f8fecf3030f8f4b632b9e Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 13 Jul 2025 12:44:19 -0400
Subject: [PATCH 001/172] Add 'solargraph method_pin' command for debugging

```sh
$ SOLARGRAPH_ASSERTS=on bundle exec solargraph method_pin --rbs 'RuboCop::AST::ArrayNode#values'
def values: () -> Array
$ bundle exec solargraph help method_pin
Usage:
  solargraph method_pin [PATH]

Options:
  [--rbs], [--no-rbs], [--skip-rbs]           # Output the pin as RBS
                                              # Default: false
  [--typify], [--no-typify], [--skip-typify]  # Output the calculated return type of the pin from annotations
                                              # Default: false
  [--probe], [--no-probe], [--skip-probe]     # Output the calculated return type of the pin from annotations and inference
                                              # Default: false
  [--stack], [--no-stack], [--skip-stack]     # Show entire stack by including definitions in superclasses
                                              # Default: false

Describe a method pin
$
```
---
 lib/solargraph/shell.rb | 48 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/lib/solargraph/shell.rb b/lib/solargraph/shell.rb
index 8f02f6ec9..938c31a11 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -239,6 +239,54 @@ def list
       puts "#{workspace.filenames.length} files total."
     end
 
+    desc 'method_pin [PATH]', 'Describe a method pin'
+    option :rbs, type: :boolean, desc: 'Output the pin as RBS', default: false
+    option :typify, type: :boolean, desc: 'Output the calculated return type of the pin from annotations', default: false
+    option :probe, type: :boolean, desc: 'Output the calculated return type of the pin from annotations and inference', default: false
+    option :stack, type: :boolean, desc: 'Show entire stack by including definitions in superclasses', default: false
+    # @param path [String] The path to the method pin, e.g. 'Class#method' or 'Class.method'
+    # @return [void]
+    def method_pin path
+      api_map = Solargraph::ApiMap.load_with_cache('.', STDERR)
+
+      pins = if options[:stack]
+               scope, ns, meth = if path.include? '#'
+                                   [:instance, *path.split('#', 2)]
+                                 else
+                                   [:class, *path.split('.', 2)]
+                                 end
+               api_map.get_method_stack(ns, meth, scope: scope)
+             else
+               api_map.get_path_pins path
+             end
+      if pins.empty?
+        STDERR.puts "Pin not found for path '#{path}'"
+        exit 1
+      end
+      pins.each do |pin|
+        if options[:typify] || options[:probe]
+          type = ComplexType::UNDEFINED
+          if options[:typify]
+            type = pin.typify(api_map)
+          end
+          if options[:probe] && type.undefined?
+            type = pin.probe(api_map)
+          end
+          if options[:rbs]
+            puts type.to_rbs
+          else
+            puts type.rooted_tag
+          end
+        else
+          if options[:rbs]
+            puts pin.to_rbs
+          else
+            puts pin.inspect
+          end
+        end
+      end
+    end
+
     private
 
     # @param pin [Solargraph::Pin::Base]

From bf612959ec8b43b888dac18b4ee6823af5e6ffc5 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 14 Jul 2025 07:27:58 -0400
Subject: [PATCH 002/172] RuboCop and Solargraph fixes

---
 lib/solargraph/shell.rb | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/lib/solargraph/shell.rb b/lib/solargraph/shell.rb
index 938c31a11..153e77f0e 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -272,18 +272,11 @@ def method_pin path
           if options[:probe] && type.undefined?
             type = pin.probe(api_map)
           end
-          if options[:rbs]
-            puts type.to_rbs
-          else
-            puts type.rooted_tag
-          end
-        else
-          if options[:rbs]
-            puts pin.to_rbs
-          else
-            puts pin.inspect
-          end
+          print_type(type)
+          next
         end
+
+        print_pin(pin)
       end
     end
 
@@ -312,5 +305,25 @@ def do_cache gemspec, api_map
       #   typecheck doesn't complain on the below line
       api_map.cache_gem(gemspec, rebuild: options.rebuild, out: $stdout)
     end
+
+    # @param type [ComplexType]
+    # @return [void]
+    def print_type(type)
+      if options[:rbs]
+        puts type.to_rbs
+      else
+        puts type.rooted_tag
+      end
+    end
+
+    # @param pin [Solargraph::Pin::Base]
+    # @return [void]
+    def print_pin(pin)
+      if options[:rbs]
+        puts pin.to_rbs
+      else
+        puts pin.inspect
+      end
+    end
   end
 end

From fdd3810f34eeaa81e4bbac956d9e8372da1c5c6c Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 3 Aug 2025 21:07:30 -0400
Subject: [PATCH 003/172] Linting fix

---
 lib/solargraph/shell.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/solargraph/shell.rb b/lib/solargraph/shell.rb
index 153e77f0e..92f8fed38 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -266,12 +266,8 @@ def method_pin path
       pins.each do |pin|
         if options[:typify] || options[:probe]
           type = ComplexType::UNDEFINED
-          if options[:typify]
-            type = pin.typify(api_map)
-          end
-          if options[:probe] && type.undefined?
-            type = pin.probe(api_map)
-          end
+          type = pin.typify(api_map) if options[:typify]
+          type = pin.probe(api_map) if options[:probe] && type.undefined?
           print_type(type)
           next
         end

From 30cdfc8b3091ff327c15d06eddb1c96315b2464c Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 3 Aug 2025 21:38:42 -0400
Subject: [PATCH 004/172] Add spec

---
 spec/shell_spec.rb  | 114 ++++++++++++++++++++++++++++++++++++++++++++
 spec/spec_helper.rb |  27 +++++++++++
 2 files changed, 141 insertions(+)
 create mode 100644 spec/shell_spec.rb

diff --git a/spec/shell_spec.rb b/spec/shell_spec.rb
new file mode 100644
index 000000000..1da2a98a9
--- /dev/null
+++ b/spec/shell_spec.rb
@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+require 'tmpdir'
+require 'open3'
+
+describe Solargraph::Shell do
+  let(:shell) { described_class.new }
+
+  # @type cmd [Array<String>]
+  # @return [String]
+  def bundle_exec(*cmd)
+    # run the command in the temporary directory with bundle exec
+    Bundler.with_unbundled_env do
+      output, status = Open3.capture2e("bundle exec #{cmd.join(' ')}")
+      expect(status.success?).to be(true), "Command failed: #{output}"
+      output
+    end
+  end
+
+  describe 'method_pin' do
+    let(:api_map) { instance_double(Solargraph::ApiMap) }
+    let(:to_s_pin) { instance_double(Solargraph::Pin::Method, return_type: Solargraph::ComplexType.parse('String')) }
+
+    before do
+      allow(Solargraph::ApiMap).to receive(:load_with_cache).and_return(api_map)
+      allow(api_map).to receive(:get_path_pins).with('String#to_s').and_return([to_s_pin])
+    end
+
+    context 'with no options' do
+      it 'prints a pin' do
+        allow(to_s_pin).to receive(:inspect).and_return('pin inspect result')
+
+        out = capture_both { shell.method_pin('String#to_s') }
+
+        expect(out).to eq("pin inspect result\n")
+      end
+    end
+
+    context 'with --rbs option' do
+      it 'prints a pin with RBS type' do
+        allow(to_s_pin).to receive(:to_rbs).and_return('pin RBS result')
+
+        out = capture_both do
+          shell.options = { rbs: true }
+          shell.method_pin('String#to_s')
+        end
+        expect(out).to eq("pin RBS result\n")
+      end
+    end
+
+    context 'with --stack option' do
+      it 'prints a pin using stack results' do
+        allow(to_s_pin).to receive(:to_rbs).and_return('pin RBS result')
+
+        allow(api_map).to receive(:get_method_stack).and_return([to_s_pin])
+        capture_both do
+          shell.options = { stack: true }
+          shell.method_pin('String#to_s')
+        end
+        expect(api_map).to have_received(:get_method_stack).with('String', 'to_s', scope: :instance)
+      end
+
+      it 'prints a static pin using stack results' do
+        # allow(to_s_pin).to receive(:to_rbs).and_return('pin RBS result')
+        string_new_pin = instance_double(Solargraph::Pin::Method, return_type: Solargraph::ComplexType.parse('String'))
+
+        allow(api_map).to receive(:get_method_stack).with('String', 'new', scope: :class).and_return([string_new_pin])
+        capture_both do
+          shell.options = { stack: true }
+          shell.method_pin('String.new')
+        end
+        expect(api_map).to have_received(:get_method_stack).with('String', 'new', scope: :class)
+      end
+    end
+
+    context 'with --typify option' do
+      it 'prints a pin with typify type' do
+        allow(to_s_pin).to receive(:typify).and_return(Solargraph::ComplexType.parse('::String'))
+
+        out = capture_both do
+          shell.options = { typify: true }
+          shell.method_pin('String#to_s')
+        end
+        expect(out).to eq("::String\n")
+      end
+    end
+
+    context 'with --typify --rbs options' do
+      it 'prints a pin with typify type' do
+        allow(to_s_pin).to receive(:typify).and_return(Solargraph::ComplexType.parse('::String'))
+
+        out = capture_both do
+          shell.options = { typify: true, rbs: true }
+          shell.method_pin('String#to_s')
+        end
+        expect(out).to eq("::String\n")
+      end
+    end
+
+    context 'with no pin' do
+      it 'prints error' do
+        allow(api_map).to receive(:get_path_pins).with('Not#found').and_return([])
+
+        out = capture_both do
+          shell.options = {}
+          shell.method_pin('Not#found')
+        rescue SystemExit
+          # Ignore the SystemExit raised by the shell when no pin is found
+        end
+        expect(out).to include("Pin not found for path 'Not#found'")
+      end
+    end
+  end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index faba8172e..b69e64097 100755
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -19,3 +19,30 @@ def with_env_var(name, value)
     ENV[name] = old_value  # Restore the old value
   end
 end
+
+
+def capture_stdout &block
+  original_stdout = $stdout
+  $stdout = StringIO.new
+  begin
+    block.call
+    $stdout.string
+  ensure
+    $stdout = original_stdout
+  end
+end
+
+def capture_both &block
+  original_stdout = $stdout
+  original_stderr = $stderr
+  stringio = StringIO.new
+  $stdout = stringio
+  $stderr = stringio
+  begin
+    block.call
+  ensure
+    $stdout = original_stdout
+    $stderr = original_stderr
+  end
+  stringio.string
+end

From a30d7904818b16a1a88eafbe9977b9e8598f534d Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 3 Aug 2025 21:53:24 -0400
Subject: [PATCH 005/172] Fix spec

---
 lib/solargraph/shell.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/solargraph/shell.rb b/lib/solargraph/shell.rb
index 92f8fed38..76f711552 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -247,7 +247,7 @@ def list
     # @param path [String] The path to the method pin, e.g. 'Class#method' or 'Class.method'
     # @return [void]
     def method_pin path
-      api_map = Solargraph::ApiMap.load_with_cache('.', STDERR)
+      api_map = Solargraph::ApiMap.load_with_cache('.', $stderr)
 
       pins = if options[:stack]
                scope, ns, meth = if path.include? '#'
@@ -260,7 +260,7 @@ def method_pin path
                api_map.get_path_pins path
              end
       if pins.empty?
-        STDERR.puts "Pin not found for path '#{path}'"
+        $stderr.puts "Pin not found for path '#{path}'"
         exit 1
       end
       pins.each do |pin|

From e4afaada19c69de9dfc574ae3bcfc66880a44be9 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 19 Aug 2025 08:21:34 -0400
Subject: [PATCH 006/172] Allow newer RBS gem versions, exclude incompatible
 ones (#995)

* Allow newer RBS gem versions

This allow users to upgrade to recent Tapioca versions.

Tapioca now requires newish versions of the spoom gem, which depends on 4.x
pre-releases of the rbs gem.

* Add RBS version to test matrix

* Add exclude rule

* Move to 3.6.1
---
 .github/workflows/rspec.yml | 10 +++++++++-
 solargraph.gemspec          |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index 94ef5771c..35f7a1d13 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -22,7 +22,13 @@ jobs:
     strategy:
       matrix:
         ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4', 'head']
-
+        rbs-version: ['3.6.1', '3.9.4', '4.0.0.dev.4']
+        # Ruby 3.0 doesn't work with RBS 3.9.4 or 4.0.0.dev.4
+        exclude:
+          - ruby-version: '3.0'
+            rbs-version: '3.9.4'
+          - ruby-version: '3.0'
+            rbs-version: '4.0.0.dev.4'
     steps:
     - uses: actions/checkout@v3
     - name: Set up Ruby
@@ -30,6 +36,8 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: false
+    - name: Set rbs version
+      run: echo "gem 'rbs', '${{ matrix.rbs-version }}'" >> .Gemfile
     #  /home/runner/.rubies/ruby-head/lib/ruby/gems/3.5.0+2/gems/rbs-3.9.4/lib/rbs.rb:11:
     #    warning: tsort was loaded from the standard library,
     #    but will no longer be part of the default gems
diff --git a/solargraph.gemspec b/solargraph.gemspec
index e4d30c537..e6bb9394a 100755
--- a/solargraph.gemspec
+++ b/solargraph.gemspec
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'ostruct', '~> 0.6'
   s.add_runtime_dependency 'parser', '~> 3.0'
   s.add_runtime_dependency 'prism', '~> 1.4'
-  s.add_runtime_dependency 'rbs', '~> 3.6.1'
+  s.add_runtime_dependency 'rbs', ['>= 3.6.1', '<= 4.0.0.dev.4']
   s.add_runtime_dependency 'reverse_markdown', '~> 3.0'
   s.add_runtime_dependency 'rubocop', '~> 1.76'
   s.add_runtime_dependency 'thor', '~> 1.0'

From a0a78785c23a2fa2f65865192fab961ee8a9a751 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 19 Aug 2025 08:55:48 -0400
Subject: [PATCH 007/172] Look for external requires before cataloging bench
 (#1021)

* Look for external requires before cataloging bench

It seems like sync_catalog will go through the motions but not
actually load pins from gems here due to passing an empty requires
array to ApiMap.

I'm sure those requires get pulled in eventually, but we go through at
least one catalog cycle without it happening.

Found while trying to test a different issue but not being able to get
completions from a gem in a spec.

* Ensure backport is pre-cached
---
 lib/solargraph/library.rb |  2 +-
 spec/library_spec.rb      | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/lib/solargraph/library.rb b/lib/solargraph/library.rb
index 0316a01b0..9eb171879 100644
--- a/lib/solargraph/library.rb
+++ b/lib/solargraph/library.rb
@@ -680,8 +680,8 @@ def sync_catalog
 
       mutex.synchronize do
         logger.info "Cataloging #{workspace.directory.empty? ? 'generic workspace' : workspace.directory}"
-        api_map.catalog bench
         source_map_hash.values.each { |map| find_external_requires(map) }
+        api_map.catalog bench
         logger.info "Catalog complete (#{api_map.source_maps.length} files, #{api_map.pins.length} pins)"
         logger.info "#{api_map.uncached_yard_gemspecs.length} uncached YARD gemspecs"
         logger.info "#{api_map.uncached_rbs_collection_gemspecs.length} uncached RBS collection gemspecs"
diff --git a/spec/library_spec.rb b/spec/library_spec.rb
index bd7cc25a0..bea0f2983 100644
--- a/spec/library_spec.rb
+++ b/spec/library_spec.rb
@@ -26,6 +26,28 @@
     expect(completion.pins.map(&:name)).to include('x')
   end
 
+  context 'with a require from an already-cached external gem' do
+    before do
+      Solargraph::Shell.new.gems('backport')
+    end
+
+    it "returns a Completion" do
+      library = Solargraph::Library.new(Solargraph::Workspace.new(Dir.pwd,
+                                                                  Solargraph::Workspace::Config.new))
+      library.attach Solargraph::Source.load_string(%(
+        require 'backport'
+
+        # @param adapter [Backport::Adapter]
+        def foo(adapter)
+          adapter.remo
+        end
+      ), 'file.rb', 0)
+      completion = library.completions_at('file.rb', 5, 19)
+      expect(completion).to be_a(Solargraph::SourceMap::Completion)
+      expect(completion.pins.map(&:name)).to include('remote')
+    end
+  end
+
   it "gets definitions from a file" do
     library = Solargraph::Library.new
     src = Solargraph::Source.load_string %(

From 0e86b883ee16ac764ed41f24e424a85954137736 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Tue, 19 Aug 2025 10:01:27 -0400
Subject: [PATCH 008/172] Remove Library#folding_ranges (#904)

---
 lib/solargraph/library.rb | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/lib/solargraph/library.rb b/lib/solargraph/library.rb
index 9eb171879..72224f672 100644
--- a/lib/solargraph/library.rb
+++ b/lib/solargraph/library.rb
@@ -437,17 +437,6 @@ def bench
       )
     end
 
-    # Get an array of foldable ranges for the specified file.
-    #
-    # @deprecated The library should not need to handle folding ranges. The
-    #   source itself has all the information it needs.
-    #
-    # @param filename [String]
-    # @return [Array<Range>]
-    def folding_ranges filename
-      read(filename).folding_ranges
-    end
-
     # Create a library from a directory.
     #
     # @param directory [String] The path to be used for the workspace

From c90f01684972682abfbd21da124f3d6c7b37f9a1 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 19 Aug 2025 10:29:27 -0400
Subject: [PATCH 009/172] Complain in strong type-checking if an @sg-ignore
 line is not needed (#1011)

* Complain in strong type-checking if an @sg-ignore line is not needed

* Fix return type

* Fix spec

* Linting/coverage fixes

* Coverage fix
---
 lib/solargraph/api_map.rb                     |  3 -
 lib/solargraph/complex_type.rb                |  1 -
 lib/solargraph/complex_type/unique_type.rb    |  4 --
 lib/solargraph/parser/comment_ripper.rb       |  2 +-
 .../parser/flow_sensitive_typing.rb           |  2 -
 .../parser/parser_gem/class_methods.rb        |  2 +-
 lib/solargraph/pin/base.rb                    |  2 -
 lib/solargraph/pin/base_variable.rb           |  1 -
 lib/solargraph/pin/method.rb                  |  1 -
 lib/solargraph/source.rb                      |  3 +-
 lib/solargraph/source/cursor.rb               |  1 -
 lib/solargraph/type_checker.rb                | 64 +++++++++++++++----
 lib/solargraph/type_checker/rules.rb          |  8 +++
 lib/solargraph/workspace/config.rb            |  2 -
 spec/type_checker/levels/strong_spec.rb       | 11 ++++
 15 files changed, 75 insertions(+), 32 deletions(-)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 9db37a166..eed02b4ef 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -211,9 +211,6 @@ class << self
     # any missing gems.
     #
     #
-    # @todo IO::NULL is incorrectly inferred to be a String.
-    # @sg-ignore
-    #
     # @param directory [String]
     # @param out [IO] The output stream for messages
     # @return [ApiMap]
diff --git a/lib/solargraph/complex_type.rb b/lib/solargraph/complex_type.rb
index 9e23eb502..ac9599329 100644
--- a/lib/solargraph/complex_type.rb
+++ b/lib/solargraph/complex_type.rb
@@ -299,7 +299,6 @@ class << self
       # #  @todo Need ability to use a literal true as a type below
       # #  @param partial [Boolean] True if the string is part of a another type
       # #  @return [Array<UniqueType>]
-      # @sg-ignore
       # @todo To be able to select the right signature above,
       #   Chain::Call needs to know the decl type (:arg, :optarg,
       #   :kwarg, etc) of the arguments given, instead of just having
diff --git a/lib/solargraph/complex_type/unique_type.rb b/lib/solargraph/complex_type/unique_type.rb
index 0f4ec430d..63a6ae15b 100644
--- a/lib/solargraph/complex_type/unique_type.rb
+++ b/lib/solargraph/complex_type/unique_type.rb
@@ -49,11 +49,7 @@ def self.parse name, substring = '', make_rooted: nil
           parameters_type = PARAMETERS_TYPE_BY_STARTING_TAG.fetch(substring[0])
           if parameters_type == :hash
             raise ComplexTypeError, "Bad hash type: name=#{name}, substring=#{substring}" unless !subs.is_a?(ComplexType) and subs.length == 2 and !subs[0].is_a?(UniqueType) and !subs[1].is_a?(UniqueType)
-            # @todo should be able to resolve map; both types have it
-            #   with same return type
-            # @sg-ignore
             key_types.concat(subs[0].map { |u| ComplexType.new([u]) })
-            # @sg-ignore
             subtypes.concat(subs[1].map { |u| ComplexType.new([u]) })
           elsif parameters_type == :list && name == 'Hash'
             # Treat Hash<A, B> as Hash{A => B}
diff --git a/lib/solargraph/parser/comment_ripper.rb b/lib/solargraph/parser/comment_ripper.rb
index 62a4dacc5..e74fcb259 100644
--- a/lib/solargraph/parser/comment_ripper.rb
+++ b/lib/solargraph/parser/comment_ripper.rb
@@ -51,7 +51,7 @@ def on_embdoc_end *args
         result
       end
 
-      # @return [Hash{Integer => String}]
+      # @return [Hash{Integer => Solargraph::Parser::Snippet}]
       def parse
         @comments = {}
         super
diff --git a/lib/solargraph/parser/flow_sensitive_typing.rb b/lib/solargraph/parser/flow_sensitive_typing.rb
index 58f149d73..308db214b 100644
--- a/lib/solargraph/parser/flow_sensitive_typing.rb
+++ b/lib/solargraph/parser/flow_sensitive_typing.rb
@@ -236,8 +236,6 @@ def type_name(node)
         "#{module_type_name}::#{class_node}"
       end
 
-      # @todo "return type could not be inferred" should not trigger here
-      # @sg-ignore
       # @param clause_node [Parser::AST::Node]
       def always_breaks?(clause_node)
         clause_node&.type == :break
diff --git a/lib/solargraph/parser/parser_gem/class_methods.rb b/lib/solargraph/parser/parser_gem/class_methods.rb
index 58ca8056b..ddc742bd8 100644
--- a/lib/solargraph/parser/parser_gem/class_methods.rb
+++ b/lib/solargraph/parser/parser_gem/class_methods.rb
@@ -17,7 +17,7 @@ module ParserGem
       module ClassMethods
         # @param code [String]
         # @param filename [String, nil]
-        # @return [Array(Parser::AST::Node, Hash{Integer => String})]
+        # @return [Array(Parser::AST::Node, Hash{Integer => Solargraph::Parser::Snippet})]
         def parse_with_comments code, filename = nil
           node = parse(code, filename)
           comments = CommentRipper.new(code, filename, 0).parse
diff --git a/lib/solargraph/pin/base.rb b/lib/solargraph/pin/base.rb
index 6ac2cac52..fb3274dab 100644
--- a/lib/solargraph/pin/base.rb
+++ b/lib/solargraph/pin/base.rb
@@ -129,7 +129,6 @@ def choose_longer(other, attr)
         val2 = other.send(attr)
         return val1 if val1 == val2
         return val2 if val1.nil?
-        # @sg-ignore
         val1.length > val2.length ? val1 : val2
       end
 
@@ -268,7 +267,6 @@ def assert_same_array_content(other, attr, &block)
         raise "Expected #{attr} on #{other} to be an Enumerable, got #{arr2.class}" unless arr2.is_a?(::Enumerable)
         # @type arr2 [::Enumerable]
 
-        # @sg-ignore
         # @type [undefined]
         values1 = arr1.map(&block)
         # @type [undefined]
diff --git a/lib/solargraph/pin/base_variable.rb b/lib/solargraph/pin/base_variable.rb
index cef3f44cb..764c1fb39 100644
--- a/lib/solargraph/pin/base_variable.rb
+++ b/lib/solargraph/pin/base_variable.rb
@@ -43,7 +43,6 @@ def return_type
         @return_type ||= generate_complex_type
       end
 
-      # @sg-ignore
       def nil_assignment?
         # this will always be false - should it be return_type ==
         #   ComplexType::NIL or somesuch?
diff --git a/lib/solargraph/pin/method.rb b/lib/solargraph/pin/method.rb
index 6302a940a..6309cb55a 100644
--- a/lib/solargraph/pin/method.rb
+++ b/lib/solargraph/pin/method.rb
@@ -305,7 +305,6 @@ def typify api_map
         super
       end
 
-      # @sg-ignore
       def documentation
         if @documentation.nil?
           method_docs ||= super || ''
diff --git a/lib/solargraph/source.rb b/lib/solargraph/source.rb
index 11ab215ed..d2b24cc61 100644
--- a/lib/solargraph/source.rb
+++ b/lib/solargraph/source.rb
@@ -30,7 +30,7 @@ def node
       @node
     end
 
-    # @return [Hash{Integer => Array<String>}]
+    # @return [Hash{Integer => Solargraph::Parser::Snippet}]
     def comments
       finalize
       @comments
@@ -235,6 +235,7 @@ def synchronized?
     # @return [Hash{Integer => String}]
     def associated_comments
       @associated_comments ||= begin
+        # @type [Hash{Integer => String}]
         result = {}
         buffer = String.new('')
         # @type [Integer, nil]
diff --git a/lib/solargraph/source/cursor.rb b/lib/solargraph/source/cursor.rb
index 0b95bb9bd..70e4fd47a 100644
--- a/lib/solargraph/source/cursor.rb
+++ b/lib/solargraph/source/cursor.rb
@@ -35,7 +35,6 @@ def word
       # The part of the word before the current position. Given the text
       # `foo.bar`, the start_of_word at position(0, 6) is `ba`.
       #
-      # @sg-ignore Improve resolution of String#match below
       # @return [String]
       def start_of_word
         @start_of_word ||= begin
diff --git a/lib/solargraph/type_checker.rb b/lib/solargraph/type_checker.rb
index aa215f97b..e99f99195 100644
--- a/lib/solargraph/type_checker.rb
+++ b/lib/solargraph/type_checker.rb
@@ -38,15 +38,20 @@ def source_map
       @source_map ||= api_map.source_map(filename)
     end
 
+    # @return [Source]
+    def source
+      @source_map.source
+    end
+
     # @return [Array<Problem>]
     def problems
       @problems ||= begin
-        without_ignored(
-          method_tag_problems
-            .concat variable_type_tag_problems
-            .concat const_problems
-            .concat call_problems
-        )
+         all = method_tag_problems
+                 .concat(variable_type_tag_problems)
+                 .concat(const_problems)
+                 .concat(call_problems)
+         unignored = without_ignored(all)
+         unignored.concat(unneeded_sgignore_problems)
       end
     end
 
@@ -140,7 +145,7 @@ def resolved_constant? pin
 
     # @param pin [Pin::Base]
     def virtual_pin? pin
-      pin.location && source_map.source.comment_at?(pin.location.range.ending)
+      pin.location && source.comment_at?(pin.location.range.ending)
     end
 
     # @param pin [Pin::Method]
@@ -231,7 +236,7 @@ def all_variables
     def const_problems
       return [] unless rules.validate_consts?
       result = []
-      Solargraph::Parser::NodeMethods.const_nodes_from(source_map.source.node).each do |const|
+      Solargraph::Parser::NodeMethods.const_nodes_from(source.node).each do |const|
         rng = Solargraph::Range.from_node(const)
         chain = Solargraph::Parser.chain(const, filename)
         block_pin = source_map.locate_block_pin(rng.start.line, rng.start.column)
@@ -249,7 +254,7 @@ def const_problems
     # @return [Array<Problem>]
     def call_problems
       result = []
-      Solargraph::Parser::NodeMethods.call_nodes_from(source_map.source.node).each do |call|
+      Solargraph::Parser::NodeMethods.call_nodes_from(source.node).each do |call|
         rng = Solargraph::Range.from_node(call)
         next if @marked_ranges.any? { |d| d.contain?(rng.start) }
         chain = Solargraph::Parser.chain(call, filename)
@@ -646,7 +651,6 @@ def parameterized_arity_problems_for(pin, parameters, arguments, location)
     # @param parameters [Enumerable<Pin::Parameter>]
     # @todo need to use generic types in method to choose correct
     #   signature and generate Integer as return type
-    # @sg-ignore
     # @return [Integer]
     def required_param_count(parameters)
       parameters.sum { |param| %i[arg kwarg].include?(param.decl) ? 1 : 0 }
@@ -687,12 +691,48 @@ def fake_args_for(pin)
       args
     end
 
+    # @return [Set<Integer>]
+    def sg_ignore_lines_processed
+      @sg_ignore_lines_processed ||= Set.new
+    end
+
+    # @return [Set<Integer>]
+    def all_sg_ignore_lines
+      source.associated_comments.select do |_line, text|
+        text.include?('@sg-ignore')
+      end.keys.to_set
+    end
+
+    # @return [Array<Integer>]
+    def unprocessed_sg_ignore_lines
+      (all_sg_ignore_lines - sg_ignore_lines_processed).to_a.sort
+    end
+
+    # @return [Array<Problem>]
+    def unneeded_sgignore_problems
+      return [] unless rules.validate_sg_ignores?
+
+      unprocessed_sg_ignore_lines.map do |line|
+        Problem.new(
+          Location.new(filename, Range.from_to(line, 0, line, 0)),
+          'Unneeded @sg-ignore comment'
+        )
+      end
+    end
+
     # @param problems [Array<Problem>]
     # @return [Array<Problem>]
     def without_ignored problems
       problems.reject do |problem|
-        node = source_map.source.node_at(problem.location.range.start.line, problem.location.range.start.column)
-        node && source_map.source.comments_for(node)&.include?('@sg-ignore')
+        node = source.node_at(problem.location.range.start.line, problem.location.range.start.column)
+        ignored = node && source.comments_for(node)&.include?('@sg-ignore')
+        unless !ignored || all_sg_ignore_lines.include?(problem.location.range.start.line)
+          # :nocov:
+          Solargraph.assert_or_log(:sg_ignore) { "@sg-ignore accounting issue - node is #{node}" }
+          # :nocov:
+        end
+        sg_ignore_lines_processed.add problem.location.range.start.line if ignored
+        ignored
       end
     end
   end
diff --git a/lib/solargraph/type_checker/rules.rb b/lib/solargraph/type_checker/rules.rb
index 0aad5ed8a..8f15037d5 100644
--- a/lib/solargraph/type_checker/rules.rb
+++ b/lib/solargraph/type_checker/rules.rb
@@ -57,6 +57,14 @@ def validate_tags?
       def require_all_return_types_match_inferred?
         rank >= LEVELS[:alpha]
       end
+
+      # We keep this at strong because if you added an @sg-ignore to
+      # address a strong-level issue, then ran at a lower level, you'd
+      # get a false positive - we don't run stronger level checks than
+      # requested for performance reasons
+      def validate_sg_ignores?
+        rank >= LEVELS[:strong]
+      end
     end
   end
 end
diff --git a/lib/solargraph/workspace/config.rb b/lib/solargraph/workspace/config.rb
index ce45e5b11..0b2d84a01 100644
--- a/lib/solargraph/workspace/config.rb
+++ b/lib/solargraph/workspace/config.rb
@@ -90,7 +90,6 @@ def reporters
 
       # A hash of options supported by the formatter
       #
-      # @sg-ignore pending https://github.com/castwide/solargraph/pull/905
       # @return [Hash]
       def formatter
         raw_data['formatter']
@@ -105,7 +104,6 @@ def plugins
 
       # The maximum number of files to parse from the workspace.
       #
-      # @sg-ignore pending https://github.com/castwide/solargraph/pull/905
       # @return [Integer]
       def max_files
         raw_data['max_files']
diff --git a/spec/type_checker/levels/strong_spec.rb b/spec/type_checker/levels/strong_spec.rb
index 12db1e442..6fdf84e30 100644
--- a/spec/type_checker/levels/strong_spec.rb
+++ b/spec/type_checker/levels/strong_spec.rb
@@ -4,6 +4,17 @@ def type_checker(code)
       Solargraph::TypeChecker.load_string(code, 'test.rb', :strong)
     end
 
+    it 'reports unneeded @sg-ignore tags' do
+      checker = type_checker(%(
+        class Foo
+          # @sg-ignore
+          # @return [void]
+          def bar; end
+        end
+      ))
+      expect(checker.problems.map(&:message)).to eq(['Unneeded @sg-ignore comment'])
+    end
+
     it 'reports missing return tags' do
       checker = type_checker(%(
         class Foo

From 8c7a5b8195d7a689b47f89ceae1e4d84098473d9 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 21 Aug 2025 08:16:33 -0400
Subject: [PATCH 010/172] Document a log level env variable (#894)

* Document a log level env variable

* Fix logger reference

* Fix env var name

* Populate location information from RBS files (#768)

* Populate location information from RBS files

The 'rbs' gem maps the location of different definitions to the
relevant point in the RGS files themselves - this change provides the
ability to jump into the right place in those files to see the type
definition via the LSP.

* Prefer source location in language server

* Resolve merge issue

* Fix Path vs String type error

* Consolidate parameter handling into Pin::Callable (#844)

* Consolidate parameter handling into Pin::Closure

* Clarify clobbered variable names

* Fix bug in to_rbs, add spec, then fix new bug found after running spec

* Catch one more Signature.new to translate from strict typechecking

* Introduce Pin::Callable

* Introduce Pin::Callable

* Introduce Pin::Callable

* Introduce Pin::Callable

* Introduce Pin::Callable

* Introduce Pin::Callable

* Introduce Pin::Callable

* Use Pin::Callable type in args_node.rb

* Select String#each_line overload with mandatory vs optional arg info

* Adjust local variable presence to start after assignment, not before (#864)

* Adjust local variable presence to start after assignment, not before

* Add regression test around assignment in return position

* Fix assignment visibility code, which relied on bad asgn semantics

* Resolve params from ref tags (#872)

* Resolve params from ref tags

* Resolve ref tags with namespaces

* Fix merge issue

* RuboCop fixes

* Add @sg-ignore

* Linting

* Linting fix

* Linting fix

---------

Co-authored-by: Fred Snyder <fsnyder@castwide.com>
---
 README.md                      |  4 ++++
 lib/solargraph/logging.rb      | 14 ++++++++++++--
 lib/solargraph/source/chain.rb |  6 +++++-
 spec/spec_helper.rb            |  4 +++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index b3cb2ef5a..3e94a60b9 100755
--- a/README.md
+++ b/README.md
@@ -132,6 +132,10 @@ See [https://solargraph.org/guides](https://solargraph.org/guides) for more tips
 
 ### Development
 
+To see more logging when typechecking or running specs, set the
+`SOLARGRAPH_LOG` environment variable to `debug` or `info`.  `warn` is
+the default value.
+
 Code contributions are always appreciated. Feel free to fork the repo and submit pull requests. Check for open issues that could use help. Start new issues to discuss changes that have a major impact on the code or require large time commitments.
 
 ### Sponsorship and Donation
diff --git a/lib/solargraph/logging.rb b/lib/solargraph/logging.rb
index a26610fee..a8bc3b3ee 100644
--- a/lib/solargraph/logging.rb
+++ b/lib/solargraph/logging.rb
@@ -11,8 +11,18 @@ module Logging
       'info' => Logger::INFO,
       'debug' => Logger::DEBUG
     }
-
-    @@logger = Logger.new(STDERR, level: DEFAULT_LOG_LEVEL)
+    configured_level = ENV.fetch('SOLARGRAPH_LOG', nil)
+    level = if LOG_LEVELS.keys.include?(configured_level)
+              LOG_LEVELS.fetch(configured_level)
+            else
+              if configured_level
+                warn "Invalid value for SOLARGRAPH_LOG: #{configured_level.inspect} - " \
+                     "valid values are #{LOG_LEVELS.keys}"
+              end
+              DEFAULT_LOG_LEVEL
+            end
+    # @sg-ignore Fix cvar issue
+    @@logger = Logger.new(STDERR, level: level)
     # @sg-ignore Fix cvar issue
     @@logger.formatter = proc do |severity, datetime, progname, msg|
       "[#{severity}] #{msg}\n"
diff --git a/lib/solargraph/source/chain.rb b/lib/solargraph/source/chain.rb
index 8fdeed228..065c3bf10 100644
--- a/lib/solargraph/source/chain.rb
+++ b/lib/solargraph/source/chain.rb
@@ -15,6 +15,7 @@ class Source
     #
     class Chain
       include Equality
+      include Logging
 
       autoload :Link,             'solargraph/source/chain/link'
       autoload :Call,             'solargraph/source/chain/call'
@@ -75,7 +76,9 @@ def base
 
       # Determine potential Pins returned by this chain of words
       #
-      # @param api_map [ApiMap] @param name_pin [Pin::Base] A pin
+      # @param api_map [ApiMap]
+      #
+      # @param name_pin [Pin::Base] A pin
       # representing the place in which expression is evaluated (e.g.,
       # a Method pin, or a Module or Class pin if not run within a
       # method - both in terms of the closure around the chain, as well
@@ -192,6 +195,7 @@ def nullable?
 
       include Logging
 
+      # @return [String]
       def desc
         links.map(&:desc).to_s
       end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index b23c21b74..3e2631976 100755
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -27,7 +27,9 @@
 end
 require 'solargraph'
 # Suppress logger output in specs (if possible)
-Solargraph::Logging.logger.reopen(File::NULL) if Solargraph::Logging.logger.respond_to?(:reopen)
+if Solargraph::Logging.logger.respond_to?(:reopen) && !ENV.key?('SOLARGRAPH_LOG')
+  Solargraph::Logging.logger.reopen(File::NULL)
+end
 
 # @param name [String]
 # @param value [String]

From fba485e78664078a23f2f23f5f5dbc8d4be48e56 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 24 Aug 2025 10:44:31 -0400
Subject: [PATCH 011/172] Fix hole in type checking evaluation (#1009)

* Fix hole in type checking evaluation

The call to `bar()` in `[ bar('string') ].compact` is not currently
type-checked due to a missed spot in `NodeMethods#call_nodes_from(node)`

* Avoid over-reporting call issues

* Fix annotation

* Add nocov markers around unreachable area

* Fix a coverage issue

* Cover more paths in type checking

* Fix a code coverage issue

* Drop blank line

* Ratchet Rubocop todo

* Fix missing coverage
---
 .rubocop_todo.yml                             |  11 -
 .../parser/parser_gem/node_methods.rb         |   1 +
 lib/solargraph/type_checker.rb                | 223 +++++++++---------
 spec/parser/node_methods_spec.rb              |  40 ++++
 spec/type_checker/levels/strict_spec.rb       |  35 ++-
 spec/type_checker/levels/strong_spec.rb       | 120 ++++++++++
 6 files changed, 311 insertions(+), 119 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index d8283c5c6..fe8ab7c48 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -99,7 +99,6 @@ Layout/ElseAlignment:
     - 'lib/solargraph/source/chain/call.rb'
     - 'lib/solargraph/source_map/clip.rb'
     - 'lib/solargraph/source_map/mapper.rb'
-    - 'lib/solargraph/type_checker.rb'
     - 'lib/solargraph/type_checker/rules.rb'
     - 'lib/solargraph/yard_map/mapper.rb'
 
@@ -159,7 +158,6 @@ Layout/EndAlignment:
     - 'lib/solargraph/source/chain/call.rb'
     - 'lib/solargraph/source_map/clip.rb'
     - 'lib/solargraph/source_map/mapper.rb'
-    - 'lib/solargraph/type_checker.rb'
     - 'lib/solargraph/type_checker/rules.rb'
     - 'lib/solargraph/yard_map/mapper.rb'
 
@@ -778,7 +776,6 @@ Metrics/MethodLength:
     - 'lib/solargraph/parser/parser_gem/node_chainer.rb'
     - 'lib/solargraph/source/chain/call.rb'
     - 'lib/solargraph/source_map/mapper.rb'
-    - 'lib/solargraph/type_checker.rb'
 
 # Configuration parameters: CountComments, Max, CountAsOne.
 Metrics/ModuleLength:
@@ -2135,13 +2132,6 @@ Style/NegatedIfElseCondition:
     - 'lib/solargraph/shell.rb'
     - 'lib/solargraph/type_checker.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowedMethods.
-# AllowedMethods: be, be_a, be_an, be_between, be_falsey, be_kind_of, be_instance_of, be_truthy, be_within, eq, eql, end_with, include, match, raise_error, respond_to, start_with
-Style/NestedParenthesizedCalls:
-  Exclude:
-    - 'lib/solargraph/type_checker.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 Style/NestedTernaryOperator:
   Exclude:
@@ -2237,7 +2227,6 @@ Style/RedundantBegin:
     - 'lib/solargraph/shell.rb'
     - 'lib/solargraph/source/cursor.rb'
     - 'lib/solargraph/source/encoding_fixes.rb'
-    - 'lib/solargraph/type_checker.rb'
     - 'lib/solargraph/workspace.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
diff --git a/lib/solargraph/parser/parser_gem/node_methods.rb b/lib/solargraph/parser/parser_gem/node_methods.rb
index b716b352d..af5c62cca 100644
--- a/lib/solargraph/parser/parser_gem/node_methods.rb
+++ b/lib/solargraph/parser/parser_gem/node_methods.rb
@@ -179,6 +179,7 @@ def call_nodes_from node
             node.children[1..-1].each { |child| result.concat call_nodes_from(child) }
           elsif node.type == :send
             result.push node
+            result.concat call_nodes_from(node.children.first)
             node.children[2..-1].each { |child| result.concat call_nodes_from(child) }
           elsif [:super, :zsuper].include?(node.type)
             result.push node
diff --git a/lib/solargraph/type_checker.rb b/lib/solargraph/type_checker.rb
index e99f99195..55bf55745 100644
--- a/lib/solargraph/type_checker.rb
+++ b/lib/solargraph/type_checker.rb
@@ -289,127 +289,136 @@ def call_problems
 
     # @param chain [Solargraph::Source::Chain]
     # @param api_map [Solargraph::ApiMap]
-    # @param block_pin [Solargraph::Pin::Base]
+    # @param closure_pin [Solargraph::Pin::Closure]
     # @param locals [Array<Solargraph::Pin::Base>]
     # @param location [Solargraph::Location]
     # @return [Array<Problem>]
-    def argument_problems_for chain, api_map, block_pin, locals, location
+    def argument_problems_for chain, api_map, closure_pin, locals, location
       result = []
       base = chain
-      until base.links.length == 1 && base.undefined?
-        last_base_link = base.links.last
-        break unless last_base_link.is_a?(Solargraph::Source::Chain::Call)
-
-        arguments = last_base_link.arguments
-
-        pins = base.define(api_map, block_pin, locals)
-
-        first_pin = pins.first
-        if first_pin.is_a?(Pin::DelegatedMethod) && !first_pin.resolvable?(api_map)
-          # Do nothing, as we can't find the actual method implementation
-        elsif first_pin.is_a?(Pin::Method)
-          # @type [Pin::Method]
-          pin = first_pin
-          ap = if base.links.last.is_a?(Solargraph::Source::Chain::ZSuper)
-            arity_problems_for(pin, fake_args_for(block_pin), location)
-          elsif pin.path == 'Class#new'
-            fqns = if base.links.one?
-              block_pin.namespace
+      # @type last_base_link [Solargraph::Source::Chain::Call]
+      last_base_link = base.links.last
+      return [] unless last_base_link.is_a?(Solargraph::Source::Chain::Call)
+
+      arguments = last_base_link.arguments
+
+      pins = base.define(api_map, closure_pin, locals)
+
+      first_pin = pins.first
+      unresolvable = first_pin.is_a?(Pin::DelegatedMethod) && !first_pin.resolvable?(api_map)
+      if !unresolvable && first_pin.is_a?(Pin::Method)
+        # @type [Pin::Method]
+        pin = first_pin
+        ap = if base.links.last.is_a?(Solargraph::Source::Chain::ZSuper)
+               arity_problems_for(pin, fake_args_for(closure_pin), location)
+             elsif pin.path == 'Class#new'
+               fqns = if base.links.one?
+                        closure_pin.namespace
+                      else
+                        base.base.infer(api_map, closure_pin, locals).namespace
+                      end
+               init = api_map.get_method_stack(fqns, 'initialize').first
+
+               init ? arity_problems_for(init, arguments, location) : []
+             else
+               arity_problems_for(pin, arguments, location)
+             end
+        return ap unless ap.empty?
+        return [] if !rules.validate_calls? || base.links.first.is_a?(Solargraph::Source::Chain::ZSuper)
+
+        params = first_param_hash(pins)
+
+        all_errors = []
+        pin.signatures.sort { |sig| sig.parameters.length }.each do |sig|
+          signature_errors = signature_argument_problems_for location, locals, closure_pin, params, arguments, sig, pin
+          if signature_errors.empty?
+            # we found a signature that works - meaning errors from
+            # other signatures don't matter.
+            return []
+          end
+          all_errors.concat signature_errors
+        end
+        result.concat all_errors
+      end
+      result
+    end
+
+    # @param location [Location]
+    # @param locals [Array<Pin::LocalVariable>]
+    # @param closure_pin [Pin::Closure]
+    # @param params [Hash{String => Hash{Symbol => String, Solargraph::ComplexType}}]
+    # @param arguments [Array<Source::Chain>]
+    # @param sig [Pin::Signature]
+    # @param pin [Pin::Method]
+    # @param pins [Array<Pin::Method>]
+    #
+    # @return [Array<Problem>]
+    def signature_argument_problems_for location, locals, closure_pin, params, arguments, sig, pin
+      errors = []
+      # @todo add logic mapping up restarg parameters with
+      #   arguments (including restarg arguments).  Use tuples
+      #   when possible, and when not, ensure provably
+      #   incorrect situations are detected.
+      sig.parameters.each_with_index do |par, idx|
+        return errors if par.decl == :restarg  # bail out and assume the rest is valid pending better arg processing
+        argchain = arguments[idx]
+        if argchain.nil?
+          if par.decl == :arg
+            final_arg = arguments.last
+            if final_arg && final_arg.node.type == :splat
+              argchain = final_arg
+              return errors
             else
-              base.base.infer(api_map, block_pin, locals).namespace
+              errors.push Problem.new(location, "Not enough arguments to #{pin.path}")
             end
-            init = api_map.get_method_stack(fqns, 'initialize').first
-            init ? arity_problems_for(init, arguments, location) : []
           else
-            arity_problems_for(pin, arguments, location)
-          end
-          unless ap.empty?
-            result.concat ap
-            break
+            final_arg = arguments.last
+            argchain = final_arg if final_arg && [:kwsplat, :hash].include?(final_arg.node.type)
           end
-          break if !rules.validate_calls? || base.links.first.is_a?(Solargraph::Source::Chain::ZSuper)
-
-          params = first_param_hash(pins)
-
-          all_errors = []
-          pin.signatures.sort { |sig| sig.parameters.length }.each do |sig|
-            errors = []
-            sig.parameters.each_with_index do |par, idx|
-              # @todo add logic mapping up restarg parameters with
-              #   arguments (including restarg arguments).  Use tuples
-              #   when possible, and when not, ensure provably
-              #   incorrect situations are detected.
-              break if par.decl == :restarg  # bail out pending better arg processing
-              argchain = arguments[idx]
-              if argchain.nil?
-                if par.decl == :arg
-                  final_arg = arguments.last
-                  if final_arg && final_arg.node.type == :splat
-                    argchain = final_arg
-                    next # don't try to apply the type of the splat - unlikely to be specific enough
-                  else
-                    errors.push Problem.new(location, "Not enough arguments to #{pin.path}")
-                    next
-                  end
-                else
-                  final_arg = arguments.last
-                  argchain = final_arg if final_arg && [:kwsplat, :hash].include?(final_arg.node.type)
-                end
-              end
-              if argchain
-                if par.decl != :arg
-                  errors.concat kwarg_problems_for sig, argchain, api_map, block_pin, locals, location, pin, params, idx
-                  next
-                else
-                  if argchain.node.type == :splat && argchain == arguments.last
-                    final_arg = argchain
-                  end
-                  if (final_arg && final_arg.node.type == :splat)
-                    # The final argument given has been seen and was a
-                    # splat, which doesn't give us useful types or
-                    # arities against positional parameters, so let's
-                    # continue on in case there are any required
-                    # kwargs we should warn about
-                    next
-                  end
-
-                  if argchain.node.type == :splat && par != sig.parameters.last
-                    # we have been given a splat and there are more
-                    # arguments to come.
-
-                    # @todo Improve this so that we can skip past the
-                    #   rest of the positional parameters here but still
-                    #   process the kwargs
-                    break
-                  end
-                  ptype = params.key?(par.name) ? params[par.name][:qualified] : ComplexType::UNDEFINED
-                  ptype = ptype.self_to_type(par.context)
-                  if ptype.nil?
-                    # @todo Some level (strong, I guess) should require the param here
-                  else
-                    argtype = argchain.infer(api_map, block_pin, locals)
-                    if argtype.defined? && ptype.defined? && !any_types_match?(api_map, ptype, argtype)
-                      errors.push Problem.new(location, "Wrong argument type for #{pin.path}: #{par.name} expected #{ptype}, received #{argtype}")
-                      next
-                    end
-                  end
-                end
-              elsif par.decl == :kwarg
-                errors.push Problem.new(location, "Call to #{pin.path} is missing keyword argument #{par.name}")
-                next
-              end
+        end
+        if argchain
+          if par.decl != :arg
+            errors.concat kwarg_problems_for sig, argchain, api_map, closure_pin, locals, location, pin, params, idx
+            next
+          else
+            if argchain.node.type == :splat && argchain == arguments.last
+              final_arg = argchain
+            end
+            if (final_arg && final_arg.node.type == :splat)
+              # The final argument given has been seen and was a
+              # splat, which doesn't give us useful types or
+              # arities against positional parameters, so let's
+              # continue on in case there are any required
+              # kwargs we should warn about
+              next
             end
-            if errors.empty?
-              all_errors.clear
-              break
+            if argchain.node.type == :splat && par != sig.parameters.last
+              # we have been given a splat and there are more
+              # arguments to come.
+
+              # @todo Improve this so that we can skip past the
+              #   rest of the positional parameters here but still
+              #   process the kwargs
+              return errors
+            end
+            ptype = params.key?(par.name) ? params[par.name][:qualified] : ComplexType::UNDEFINED
+            ptype = ptype.self_to_type(par.context)
+            if ptype.nil?
+            # @todo Some level (strong, I guess) should require the param here
+            else
+              argtype = argchain.infer(api_map, closure_pin, locals)
+              if argtype.defined? && ptype.defined? && !any_types_match?(api_map, ptype, argtype)
+                errors.push Problem.new(location, "Wrong argument type for #{pin.path}: #{par.name} expected #{ptype}, received #{argtype}")
+                return errors
+              end
             end
-            all_errors.concat errors
           end
-          result.concat all_errors
+        elsif par.decl == :kwarg
+          errors.push Problem.new(location, "Call to #{pin.path} is missing keyword argument #{par.name}")
+          next
         end
-        base = base.base
       end
-      result
+      errors
     end
 
     # @param sig [Pin::Signature]
diff --git a/spec/parser/node_methods_spec.rb b/spec/parser/node_methods_spec.rb
index eb026725b..f9504b584 100644
--- a/spec/parser/node_methods_spec.rb
+++ b/spec/parser/node_methods_spec.rb
@@ -440,5 +440,45 @@ def super_with_block
       calls = Solargraph::Parser::NodeMethods.call_nodes_from(source.node)
       expect(calls).to be_one
     end
+
+    it 'handles chained calls' do
+      source = Solargraph::Source.load_string(%(
+        Foo.new.bar('string')
+      ))
+      calls = Solargraph::Parser::NodeMethods.call_nodes_from(source.node)
+      expect(calls.length).to eq(2)
+    end
+
+    it 'handles calls from inside array literals' do
+      source = Solargraph::Source.load_string(%(
+        [ Foo.new.bar('string') ]
+      ))
+      calls = Solargraph::Parser::NodeMethods.call_nodes_from(source.node)
+      expect(calls.length).to eq(2)
+    end
+
+    it 'handles calls from inside array literals that are chained' do
+      source = Solargraph::Source.load_string(%(
+        [ Foo.new.bar('string') ].compact
+      ))
+      calls = Solargraph::Parser::NodeMethods.call_nodes_from(source.node)
+      expect(calls.length).to eq(3)
+    end
+
+    it 'does not over-report calls' do
+      source = Solargraph::Source.load_string(%(
+        class Foo
+          def something
+          end
+        end
+        class Bar < Foo
+          def something
+            super(1) + 2
+          end
+        end
+      ))
+      calls = Solargraph::Parser::NodeMethods.call_nodes_from(source.node)
+      expect(calls.length).to eq(2)
+    end
   end
 end
diff --git a/spec/type_checker/levels/strict_spec.rb b/spec/type_checker/levels/strict_spec.rb
index b198cec89..25890683b 100644
--- a/spec/type_checker/levels/strict_spec.rb
+++ b/spec/type_checker/levels/strict_spec.rb
@@ -115,6 +115,39 @@ def bar(baz); end
       expect(checker.problems.first.message).to include('Wrong argument type')
     end
 
+    it 'reports mismatched argument types in chained calls' do
+      checker = type_checker(%(
+        # @param baz [Integer]
+        # @return [String]
+        def bar(baz); "foo"; end
+        bar('string').upcase
+      ))
+      expect(checker.problems).to be_one
+      expect(checker.problems.first.message).to include('Wrong argument type')
+    end
+
+    it 'reports mismatched argument types in calls inside array literals' do
+      checker = type_checker(%(
+        # @param baz [Integer]
+        # @return [String]
+        def bar(baz); "foo"; end
+        [ bar('string') ]
+      ))
+      expect(checker.problems).to be_one
+      expect(checker.problems.first.message).to include('Wrong argument type')
+    end
+
+    it 'reports mismatched argument types in calls inside array literals used in a chain' do
+      checker = type_checker(%(
+        # @param baz [Integer]
+        # @return [String]
+        def bar(baz); "foo"; end
+        [ bar('string') ].compact
+      ))
+      expect(checker.problems).to be_one
+      expect(checker.problems.first.message).to include('Wrong argument type')
+    end
+
     xit 'complains about calling a private method from an illegal place'
 
     xit 'complains about calling a non-existent method'
@@ -126,7 +159,7 @@ def foo(a)
           a[0] = :something
         end
       ))
-      expect(checker.problems.map(&:problems)).to eq(['Wrong argument type'])
+      expect(checker.problems.map(&:message)).to eq(['Wrong argument type'])
     end
 
     it 'complains about dereferencing a non-existent tuple slot'
diff --git a/spec/type_checker/levels/strong_spec.rb b/spec/type_checker/levels/strong_spec.rb
index 6fdf84e30..a03e6eb5d 100644
--- a/spec/type_checker/levels/strong_spec.rb
+++ b/spec/type_checker/levels/strong_spec.rb
@@ -4,6 +4,48 @@ def type_checker(code)
       Solargraph::TypeChecker.load_string(code, 'test.rb', :strong)
     end
 
+    it 'does not complain on array dereference' do
+      checker = type_checker(%(
+        # @param idx [Integer, nil] an index
+        # @param arr [Array<Integer>] an array of integers
+        #
+        # @return [void]
+        def foo(idx, arr)
+          arr[idx]
+        end
+      ))
+      expect(checker.problems.map(&:message)).to be_empty
+    end
+
+    it 'complains on bad @type assignment' do
+      checker = type_checker(%(
+        # @type [Integer]
+        c = Class.new
+      ))
+      expect(checker.problems.map(&:message))
+        .to eq ['Declared type Integer does not match inferred type Class for variable c']
+    end
+
+    it 'does not complain on another variant of Class.new' do
+      checker = type_checker(%(
+        class Class
+          # @return [self]
+          def self.blah
+            new
+          end
+        end
+      ))
+      expect(checker.problems.map(&:message)).to be_empty
+    end
+
+    it 'does not complain on indirect Class.new', skip: 'hangs in a loop currently' do
+      checker = type_checker(%(
+        class Foo < Class; end
+        Foo.new
+      ))
+      expect(checker.problems.map(&:message)).to be_empty
+    end
+
     it 'reports unneeded @sg-ignore tags' do
       checker = type_checker(%(
         class Foo
@@ -25,6 +67,84 @@ def bar; end
       expect(checker.problems.first.message).to include('Missing @return tag')
     end
 
+    it 'ignores nilable type issues' do
+      checker = type_checker(%(
+        # @param a [String]
+        # @return [void]
+        def foo(a); end
+
+        # @param b [String, nil]
+        # @return [void]
+        def bar(b)
+         foo(b)
+        end
+      ))
+      expect(checker.problems.map(&:message)).to eq([])
+    end
+
+    it 'calls out keyword issues even when required arg count matches' do
+      checker = type_checker(%(
+        # @param a [String]
+        # @param b [String]
+        # @return [void]
+        def foo(a = 'foo', b:); end
+
+        # @return [void]
+        def bar
+         foo('baz')
+        end
+      ))
+      expect(checker.problems.map(&:message)).to include('Call to #foo is missing keyword argument b')
+    end
+
+    it 'calls out type issues even when keyword issues are there' do
+      pending('fixes to arg vs param checking algorithm')
+
+      checker = type_checker(%(
+        # @param a [String]
+        # @param b [String]
+        # @return [void]
+        def foo(a = 'foo', b:); end
+
+        # @return [void]
+        def bar
+         foo(123)
+        end
+      ))
+      expect(checker.problems.map(&:message))
+        .to include('Wrong argument type for #foo: a expected String, received 123')
+    end
+
+    it 'calls out keyword issues even when arg type issues are there' do
+      checker = type_checker(%(
+        # @param a [String]
+        # @param b [String]
+        # @return [void]
+        def foo(a = 'foo', b:); end
+
+        # @return [void]
+        def bar
+         foo(123)
+        end
+      ))
+      expect(checker.problems.map(&:message)).to include('Call to #foo is missing keyword argument b')
+    end
+
+    it 'calls out missing args after a defaulted param' do
+      checker = type_checker(%(
+        # @param a [String]
+        # @param b [String]
+        # @return [void]
+        def foo(a = 'foo', b); end
+
+        # @return [void]
+        def bar
+         foo(123)
+        end
+      ))
+      expect(checker.problems.map(&:message)).to include('Not enough arguments to #foo')
+    end
+
     it 'reports missing param tags' do
       checker = type_checker(%(
         class Foo

From f61b1b6a94439c21b0eb0a986053b5d88276316f Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 24 Aug 2025 10:47:12 -0400
Subject: [PATCH 012/172] Improve typechecking error message (#1014)

If we know the target of an unresolved method call, include it in the
error message.
---
 lib/solargraph/type_checker.rb          | 6 +++++-
 spec/type_checker/levels/strict_spec.rb | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/solargraph/type_checker.rb b/lib/solargraph/type_checker.rb
index 55bf55745..e0b23f56b 100644
--- a/lib/solargraph/type_checker.rb
+++ b/lib/solargraph/type_checker.rb
@@ -277,7 +277,11 @@ def call_problems
           # @todo remove the internal_or_core? check at a higher-than-strict level
           if !found || found.is_a?(Pin::BaseVariable) || (closest.defined? && internal_or_core?(found))
             unless closest.generic? || ignored_pins.include?(found)
-              result.push Problem.new(location, "Unresolved call to #{missing.links.last.word}")
+              if closest.defined?
+                result.push Problem.new(location, "Unresolved call to #{missing.links.last.word} on #{closest}")
+              else
+                result.push Problem.new(location, "Unresolved call to #{missing.links.last.word}")
+              end
               @marked_ranges.push rng
             end
           end
diff --git a/spec/type_checker/levels/strict_spec.rb b/spec/type_checker/levels/strict_spec.rb
index 25890683b..0e2159d95 100644
--- a/spec/type_checker/levels/strict_spec.rb
+++ b/spec/type_checker/levels/strict_spec.rb
@@ -40,6 +40,7 @@ def bar(a); end
       ))
       expect(checker.problems).to be_one
       expect(checker.problems.first.message).to include('Unresolved call')
+      expect(checker.problems.first.message).not_to include('undefined')
     end
 
     it 'reports undefined method calls with defined roots' do
@@ -48,6 +49,7 @@ def bar(a); end
       ))
       expect(checker.problems).to be_one
       expect(checker.problems.first.message).to include('Unresolved call')
+      expect(checker.problems.first.message).to include('String')
       expect(checker.problems.first.message).to include('not_a_method')
     end
 

From 9d4c711bed1af477224bae346b98e93a2d2e732e Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 24 Aug 2025 10:48:37 -0400
Subject: [PATCH 013/172] Internal strict type-checking fixes (#1013)

* Internal strict type-checking fixes

* Add annotation

* Add annotation

* Add @sg-ignores for now
---
 lib/solargraph/api_map/cache.rb                           | 5 +++--
 lib/solargraph/api_map/index.rb                           | 8 ++++----
 lib/solargraph/api_map/store.rb                           | 1 +
 lib/solargraph/complex_type/unique_type.rb                | 4 ++--
 lib/solargraph/diagnostics/rubocop_helpers.rb             | 1 -
 lib/solargraph/library.rb                                 | 3 ++-
 lib/solargraph/parser/node_processor/base.rb              | 2 +-
 .../parser/parser_gem/node_processors/block_node.rb       | 5 +++--
 .../parser/parser_gem/node_processors/if_node.rb          | 2 ++
 lib/solargraph/rbs_map/conversions.rb                     | 2 +-
 lib/solargraph/source.rb                                  | 2 +-
 lib/solargraph/source_map/clip.rb                         | 2 +-
 lib/solargraph/yard_map/mapper/to_method.rb               | 2 +-
 13 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/lib/solargraph/api_map/cache.rb b/lib/solargraph/api_map/cache.rb
index 329a1e5e1..0052d91ea 100644
--- a/lib/solargraph/api_map/cache.rb
+++ b/lib/solargraph/api_map/cache.rb
@@ -4,9 +4,9 @@ module Solargraph
   class ApiMap
     class Cache
       def initialize
-        # @type [Hash{Array => Array<Pin::Method>}]
+        # @type [Hash{String => Array<Pin::Method>}]
         @methods = {}
-        # @type [Hash{(String, Array<String>) => Array<Pin::Base>}]
+        # @type [Hash{String, Array<String> => Array<Pin::Base>}]
         @constants = {}
         # @type [Hash{String => String}]
         @qualified_namespaces = {}
@@ -101,6 +101,7 @@ def empty?
 
       private
 
+      # @return [Array<Object>]
       def all_caches
         [@methods, @constants, @qualified_namespaces, @receiver_definitions, @clips]
       end
diff --git a/lib/solargraph/api_map/index.rb b/lib/solargraph/api_map/index.rb
index ea358297e..5237a3802 100644
--- a/lib/solargraph/api_map/index.rb
+++ b/lib/solargraph/api_map/index.rb
@@ -42,22 +42,22 @@ def pins_by_class klass
         @pin_select_cache[klass] ||= pin_class_hash.each_with_object(s) { |(key, o), n| n.merge(o) if key <= klass }
       end
 
-      # @return [Hash{String => Array<Pin::Reference::Include>}]
+      # @return [Hash{String => Array<String>}]
       def include_references
         @include_references ||= Hash.new { |h, k| h[k] = [] }
       end
 
-      # @return [Hash{String => Array<Pin::Reference::Extend>}]
+      # @return [Hash{String => Array<String>}]
       def extend_references
         @extend_references ||= Hash.new { |h, k| h[k] = [] }
       end
 
-      # @return [Hash{String => Array<Pin::Reference::Prepend>}]
+      # @return [Hash{String => Array<String>}]
       def prepend_references
         @prepend_references ||= Hash.new { |h, k| h[k] = [] }
       end
 
-      # @return [Hash{String => Array<Pin::Reference::Superclass>}]
+      # @return [Hash{String => Array<String>}]
       def superclass_references
         @superclass_references ||= Hash.new { |h, k| h[k] = [] }
       end
diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index d41a2a0ae..87f053596 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -210,6 +210,7 @@ def index
       # @return [Boolean]
       def catalog pinsets
         @pinsets = pinsets
+        # @type [Array<Index>]
         @indexes = []
         pinsets.each do |pins|
           if @indexes.last && pins.empty?
diff --git a/lib/solargraph/complex_type/unique_type.rb b/lib/solargraph/complex_type/unique_type.rb
index 63a6ae15b..a782656f0 100644
--- a/lib/solargraph/complex_type/unique_type.rb
+++ b/lib/solargraph/complex_type/unique_type.rb
@@ -349,9 +349,9 @@ def to_a
 
       # @param new_name [String, nil]
       # @param make_rooted [Boolean, nil]
-      # @param new_key_types [Array<UniqueType>, nil]
+      # @param new_key_types [Array<ComplexType>, nil]
       # @param rooted [Boolean, nil]
-      # @param new_subtypes [Array<UniqueType>, nil]
+      # @param new_subtypes [Array<ComplexType>, nil]
       # @return [self]
       def recreate(new_name: nil, make_rooted: nil, new_key_types: nil, new_subtypes: nil)
         raise "Please remove leading :: and set rooted instead - #{new_name}" if new_name&.start_with?('::')
diff --git a/lib/solargraph/diagnostics/rubocop_helpers.rb b/lib/solargraph/diagnostics/rubocop_helpers.rb
index 4eb2c711d..bfae43822 100644
--- a/lib/solargraph/diagnostics/rubocop_helpers.rb
+++ b/lib/solargraph/diagnostics/rubocop_helpers.rb
@@ -19,7 +19,6 @@ def require_rubocop(version = nil)
           gem_path = Gem::Specification.find_by_name('rubocop', version).full_gem_path
           gem_lib_path = File.join(gem_path, 'lib')
           $LOAD_PATH.unshift(gem_lib_path) unless $LOAD_PATH.include?(gem_lib_path)
-        # @todo Gem::MissingSpecVersionError is undocumented for some reason
         # @sg-ignore
         rescue Gem::MissingSpecVersionError => e
           raise InvalidRubocopVersionError,
diff --git a/lib/solargraph/library.rb b/lib/solargraph/library.rb
index 72224f672..b4da03b2e 100644
--- a/lib/solargraph/library.rb
+++ b/lib/solargraph/library.rb
@@ -500,7 +500,7 @@ def external_requires
 
     private
 
-    # @return [Hash{String => Set<String>}]
+    # @return [Hash{String => Array<String>}]
     def source_map_external_require_hash
       @source_map_external_require_hash ||= {}
     end
@@ -508,6 +508,7 @@ def source_map_external_require_hash
     # @param source_map [SourceMap]
     # @return [void]
     def find_external_requires source_map
+      # @type [Set<String>]
       new_set = source_map.requires.map(&:name).to_set
       # return if new_set == source_map_external_require_hash[source_map.filename]
       _filenames = nil
diff --git a/lib/solargraph/parser/node_processor/base.rb b/lib/solargraph/parser/node_processor/base.rb
index d87268a91..fad31e95b 100644
--- a/lib/solargraph/parser/node_processor/base.rb
+++ b/lib/solargraph/parser/node_processor/base.rb
@@ -13,7 +13,7 @@ class Base
         # @return [Array<Pin::Base>]
         attr_reader :pins
 
-        # @return [Array<Pin::BaseVariable>]
+        # @return [Array<Pin::LocalVariable>]
         attr_reader :locals
 
         # @param node [Parser::AST::Node]
diff --git a/lib/solargraph/parser/parser_gem/node_processors/block_node.rb b/lib/solargraph/parser/parser_gem/node_processors/block_node.rb
index 70a2d9e68..d773e8e50 100644
--- a/lib/solargraph/parser/parser_gem/node_processors/block_node.rb
+++ b/lib/solargraph/parser/parser_gem/node_processors/block_node.rb
@@ -19,7 +19,7 @@ def process
             else
               region.closure
             end
-            pins.push Solargraph::Pin::Block.new(
+            block_pin = Solargraph::Pin::Block.new(
               location: location,
               closure: parent,
               node: node,
@@ -28,7 +28,8 @@ def process
               scope: region.scope || region.closure.context.scope,
               source: :parser
             )
-            process_children region.update(closure: pins.last)
+            pins.push block_pin
+            process_children region.update(closure: block_pin)
           end
 
           private
diff --git a/lib/solargraph/parser/parser_gem/node_processors/if_node.rb b/lib/solargraph/parser/parser_gem/node_processors/if_node.rb
index 5784afcbe..2452b9cc5 100644
--- a/lib/solargraph/parser/parser_gem/node_processors/if_node.rb
+++ b/lib/solargraph/parser/parser_gem/node_processors/if_node.rb
@@ -11,6 +11,8 @@ def process
             process_children
 
             position = get_node_start_position(node)
+            # @sg-ignore
+            # @type [Solargraph::Pin::Breakable, nil]
             enclosing_breakable_pin = pins.select{|pin| pin.is_a?(Pin::Breakable) && pin.location.range.contain?(position)}.last
             FlowSensitiveTyping.new(locals, enclosing_breakable_pin).process_if(node)
           end
diff --git a/lib/solargraph/rbs_map/conversions.rb b/lib/solargraph/rbs_map/conversions.rb
index 6e50c022a..f8deec251 100644
--- a/lib/solargraph/rbs_map/conversions.rb
+++ b/lib/solargraph/rbs_map/conversions.rb
@@ -345,7 +345,7 @@ def global_decl_to_pin decl
       }
 
       # @param decl [RBS::AST::Members::MethodDefinition, RBS::AST::Members::AttrReader, RBS::AST::Members::AttrAccessor]
-      # @param closure [Pin::Namespace]
+      # @param closure [Pin::Closure]
       # @param context [Context]
       # @param scope [Symbol] :instance or :class
       # @param name [String] The name of the method
diff --git a/lib/solargraph/source.rb b/lib/solargraph/source.rb
index d2b24cc61..ee8baa768 100644
--- a/lib/solargraph/source.rb
+++ b/lib/solargraph/source.rb
@@ -318,7 +318,7 @@ def string_nodes
       @string_nodes ||= string_nodes_in(node)
     end
 
-    # @return [Array<Range>]
+    # @return [Array<Solargraph::Range>]
     def comment_ranges
       @comment_ranges ||= comments.values.map(&:range)
     end
diff --git a/lib/solargraph/source_map/clip.rb b/lib/solargraph/source_map/clip.rb
index ba69b1b93..16a4ec845 100644
--- a/lib/solargraph/source_map/clip.rb
+++ b/lib/solargraph/source_map/clip.rb
@@ -65,7 +65,7 @@ def infer
       # position. Locals can be local variables, method parameters, or block
       # parameters. The array starts with the nearest local pin.
       #
-      # @return [::Array<Solargraph::Pin::Base>]
+      # @return [::Array<Solargraph::Pin::LocalVariable>]
       def locals
         @locals ||= source_map.locals_at(location)
       end
diff --git a/lib/solargraph/yard_map/mapper/to_method.rb b/lib/solargraph/yard_map/mapper/to_method.rb
index df431bb3c..6bb4fa261 100644
--- a/lib/solargraph/yard_map/mapper/to_method.rb
+++ b/lib/solargraph/yard_map/mapper/to_method.rb
@@ -27,7 +27,7 @@ def self.make code_object, name = nil, scope = nil, visibility = nil, closure =
           final_scope = scope || code_object.scope
           override_key = [closure.path, final_scope, name]
           final_visibility = VISIBILITY_OVERRIDE[override_key]
-          final_visibility ||= VISIBILITY_OVERRIDE[override_key[0..-2]]
+          final_visibility ||= VISIBILITY_OVERRIDE[[closure.path, final_scope]]
           final_visibility ||= :private if closure.path == 'Kernel' && Kernel.private_instance_methods(false).include?(name)
           final_visibility ||= visibility
           final_visibility ||= :private if code_object.module_function? && final_scope == :instance

From 3bcbf85d5a5e7445754b1a0392e39238f8a681c3 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 24 Aug 2025 10:50:13 -0400
Subject: [PATCH 014/172] Reproduce and fix a ||= (or-asgn) evaluation issue
 (#1017)

* Reproduce and fix a ||= (or-asgn) evaluation issue

* Fix linting issue
---
 .../parser/parser_gem/node_chainer.rb           |  3 ++-
 spec/type_checker/levels/strict_spec.rb         | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/lib/solargraph/parser/parser_gem/node_chainer.rb b/lib/solargraph/parser/parser_gem/node_chainer.rb
index 646e753d5..d8d46319b 100644
--- a/lib/solargraph/parser/parser_gem/node_chainer.rb
+++ b/lib/solargraph/parser/parser_gem/node_chainer.rb
@@ -99,7 +99,8 @@ def generate_links n
           elsif [:gvar, :gvasgn].include?(n.type)
             result.push Chain::GlobalVariable.new(n.children[0].to_s)
           elsif n.type == :or_asgn
-            result.concat generate_links n.children[1]
+            new_node = n.updated(n.children[0].type, n.children[0].children + [n.children[1]])
+            result.concat generate_links new_node
           elsif [:class, :module, :def, :defs].include?(n.type)
             # @todo Undefined or what?
             result.push Chain::UNDEFINED_CALL
diff --git a/spec/type_checker/levels/strict_spec.rb b/spec/type_checker/levels/strict_spec.rb
index 0e2159d95..7e57cb7cf 100644
--- a/spec/type_checker/levels/strict_spec.rb
+++ b/spec/type_checker/levels/strict_spec.rb
@@ -976,5 +976,22 @@ def bar(a)
       ))
       expect(checker.problems.map(&:message)).to eq([])
     end
+
+    it 'does not complain on defaulted reader with detailed expression' do
+      checker = type_checker(%(
+        class Foo
+          # @return [Integer, nil]
+          def bar
+            @bar ||=
+              if rand
+                 123
+               elsif rand
+                 456
+               end
+          end
+        end
+      ))
+      expect(checker.problems.map(&:message)).to eq([])
+    end
   end
 end

From 25557b42fea981ddf8d5a01042204e55c71fdab5 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 24 Aug 2025 10:51:19 -0400
Subject: [PATCH 015/172] Define closure for Pin::Symbol, for completeness
 (#1027)

This isn't used anywhere to my knowledge, but it makes sense to think
of symbols as being in the global namespace, helps guarantee that
closure is always available on a pin, and of course keeps the assert
happy ;)
---
 lib/solargraph/pin/symbol.rb | 4 ++++
 spec/pin/symbol_spec.rb      | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/solargraph/pin/symbol.rb b/lib/solargraph/pin/symbol.rb
index 9e11c3d7d..9c59155a1 100644
--- a/lib/solargraph/pin/symbol.rb
+++ b/lib/solargraph/pin/symbol.rb
@@ -20,6 +20,10 @@ def path
         ''
       end
 
+      def closure
+        @closure ||= Pin::ROOT_PIN
+      end
+
       def completion_item_kind
         Solargraph::LanguageServer::CompletionItemKinds::KEYWORD
       end
diff --git a/spec/pin/symbol_spec.rb b/spec/pin/symbol_spec.rb
index 98d88137e..16961cadc 100644
--- a/spec/pin/symbol_spec.rb
+++ b/spec/pin/symbol_spec.rb
@@ -1,10 +1,15 @@
 describe Solargraph::Pin::Symbol do
   context "as an unquoted literal" do
-    it "is a kind of keyword" do
+    it "is a kind of keyword to the LSP" do
       pin = Solargraph::Pin::Symbol.new(nil, ':symbol')
       expect(pin.completion_item_kind).to eq(Solargraph::LanguageServer::CompletionItemKinds::KEYWORD)
     end
 
+    it "has global closure" do
+      pin = Solargraph::Pin::Symbol.new(nil, ':symbol')
+      expect(pin.closure).to eq(Solargraph::Pin::ROOT_PIN)
+    end
+
     it "has a Symbol return type" do
       pin = Solargraph::Pin::Symbol.new(nil, ':symbol')
       expect(pin.return_type.tag).to eq('Symbol')

From 32565d4488765c6a4ebfc302ee24bb123dd5c5af Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 24 Aug 2025 10:52:07 -0400
Subject: [PATCH 016/172] Fix 'all!' config to reporters (#1018)

* Fix 'all!' config to reporters

Solargraph found the type error here!

* Linting fixes
---
 lib/solargraph/library.rb |  4 ++--
 spec/library_spec.rb      | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/lib/solargraph/library.rb b/lib/solargraph/library.rb
index b4da03b2e..9d5162431 100644
--- a/lib/solargraph/library.rb
+++ b/lib/solargraph/library.rb
@@ -402,8 +402,8 @@ def diagnose filename
       repargs = {}
       workspace.config.reporters.each do |line|
         if line == 'all!'
-          Diagnostics.reporters.each do |reporter|
-            repargs[reporter] ||= []
+          Diagnostics.reporters.each do |reporter_name|
+            repargs[Diagnostics.reporter(reporter_name)] ||= []
           end
         else
           args = line.split(':').map(&:strip)
diff --git a/spec/library_spec.rb b/spec/library_spec.rb
index bea0f2983..34de9e1f0 100644
--- a/spec/library_spec.rb
+++ b/spec/library_spec.rb
@@ -132,6 +132,20 @@ def bar baz, key: ''
     # @todo More tests
   end
 
+  it 'diagnoses using all reporters' do
+    directory = ''
+    config = instance_double(Solargraph::Workspace::Config)
+    allow(config).to receive_messages(plugins: [], required: [], reporters: ['all!'])
+    workspace = Solargraph::Workspace.new directory, config
+    library = Solargraph::Library.new workspace
+    src = Solargraph::Source.load_string(%(
+      puts 'hello'
+    ), 'file.rb', 0)
+    library.attach src
+    result = library.diagnose 'file.rb'
+    expect(result.to_s).to include('rubocop')
+  end
+
   it "documents symbols" do
     library = Solargraph::Library.new
     src = Solargraph::Source.load_string(%(

From 3946cc481c12c704bd9265b87516079d179ce5a2 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Sun, 24 Aug 2025 11:54:48 -0400
Subject: [PATCH 017/172] Fix DocMap.all_rbs_collection_gems_in_memory return
 type (#1037)

---
 lib/solargraph/doc_map.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/solargraph/doc_map.rb b/lib/solargraph/doc_map.rb
index 43c8768b0..56f51973f 100644
--- a/lib/solargraph/doc_map.rb
+++ b/lib/solargraph/doc_map.rb
@@ -133,7 +133,7 @@ def self.all_yard_gems_in_memory
       @yard_gems_in_memory ||= {}
     end
 
-    # @return [Hash{String => Array<Pin::Base>}] stored by RBS collection path
+    # @return [Hash{String => Hash{Array(String, String) => Array<Pin::Base>}}] stored by RBS collection path
     def self.all_rbs_collection_gems_in_memory
       @rbs_collection_gems_in_memory ||= {}
     end

From 43caccadaaf71bbd51acc85d74d437fd061875f1 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Sun, 24 Aug 2025 12:40:56 -0400
Subject: [PATCH 018/172] Fix RuboCop linting errors in regular expressions
 (#1038)

* Fix RuboCop linting errors in regular expressions

* Continue on rubocop_todo errors

* Move configuration

* Continue on undercover errors
---
 .github/workflows/linting.yml                    | 1 +
 .github/workflows/rspec.yml                      | 1 +
 lib/solargraph/parser/parser_gem/node_methods.rb | 2 +-
 lib/solargraph/pin/method.rb                     | 4 ++--
 lib/solargraph/pin/parameter.rb                  | 2 +-
 lib/solargraph/source/change.rb                  | 4 ++--
 lib/solargraph/source/cursor.rb                  | 4 ++--
 lib/solargraph/source/source_chainer.rb          | 2 +-
 lib/solargraph/source_map/mapper.rb              | 4 ++--
 9 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index 2a5968351..8abbf51ef 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -113,6 +113,7 @@ jobs:
       run: bundle exec rubocop -c .rubocop.yml
 
     - name: Run RuboCop against todo file
+      continue-on-error: true
       run: |
         bundle exec rubocop --auto-gen-config --no-exclude-limit --no-offense-counts --no-auto-gen-timestamp
         if [ -n "$(git status --porcelain)" ]
diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index 35f7a1d13..ecc3d9771 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -69,3 +69,4 @@ jobs:
       run: bundle exec rake spec
     - name: Check PR coverage
       run: bundle exec rake undercover
+      continue-on-error: true
diff --git a/lib/solargraph/parser/parser_gem/node_methods.rb b/lib/solargraph/parser/parser_gem/node_methods.rb
index af5c62cca..1397f9583 100644
--- a/lib/solargraph/parser/parser_gem/node_methods.rb
+++ b/lib/solargraph/parser/parser_gem/node_methods.rb
@@ -243,7 +243,7 @@ def find_recipient_node cursor
                 if source.synchronized?
                   return node if source.code[0..offset-1] =~ /\(\s*\z/ && source.code[offset..-1] =~ /^\s*\)/
                 else
-                  return node if source.code[0..offset-1] =~ /\([^\(]*\z/
+                  return node if source.code[0..offset-1] =~ /\([^(]*\z/
                 end
               end
             end
diff --git a/lib/solargraph/pin/method.rb b/lib/solargraph/pin/method.rb
index 6309cb55a..0482b2b54 100644
--- a/lib/solargraph/pin/method.rb
+++ b/lib/solargraph/pin/method.rb
@@ -428,7 +428,7 @@ def resolve_ref_tag api_map
         @resolved_ref_tag = true
         return self unless docstring.ref_tags.any?
         docstring.ref_tags.each do |tag|
-          ref = if tag.owner.to_s.start_with?(/[#\.]/)
+          ref = if tag.owner.to_s.start_with?(/[#.]/)
             api_map.get_methods(namespace)
                    .select { |pin| pin.path.end_with?(tag.owner.to_s) }
                    .first
@@ -552,7 +552,7 @@ def typify_from_super api_map
       # @param api_map [ApiMap]
       # @return [ComplexType, nil]
       def resolve_reference ref, api_map
-        parts = ref.split(/[\.#]/)
+        parts = ref.split(/[.#]/)
         if parts.first.empty? || parts.one?
           path = "#{namespace}#{ref}"
         else
diff --git a/lib/solargraph/pin/parameter.rb b/lib/solargraph/pin/parameter.rb
index e298ba20a..512ee0ead 100644
--- a/lib/solargraph/pin/parameter.rb
+++ b/lib/solargraph/pin/parameter.rb
@@ -247,7 +247,7 @@ def see_reference heredoc, api_map, skip = []
       def resolve_reference ref, api_map, skip
         return nil if skip.include?(ref)
         skip.push ref
-        parts = ref.split(/[\.#]/)
+        parts = ref.split(/[.#]/)
         if parts.first.empty?
           path = "#{namespace}#{ref}"
         else
diff --git a/lib/solargraph/source/change.rb b/lib/solargraph/source/change.rb
index 72a99b6a6..65c47c7e0 100644
--- a/lib/solargraph/source/change.rb
+++ b/lib/solargraph/source/change.rb
@@ -28,7 +28,7 @@ def initialize range, new_text
       #   syntax errors will be repaired.
       # @return [String] The updated text.
       def write text, nullable = false
-        if nullable and !range.nil? and new_text.match(/[\.\[\{\(@\$:]$/)
+        if nullable and !range.nil? and new_text.match(/[.\[{(@$:]$/)
           [':', '@'].each do |dupable|
             next unless new_text == dupable
             offset = Position.to_offset(text, range.start)
@@ -59,7 +59,7 @@ def repair text
         else
           result = commit text, fixed
           off = Position.to_offset(text, range.start)
-          match = result[0, off].match(/[\.:]+\z/)
+          match = result[0, off].match(/[.:]+\z/)
           if match
             result = result[0, off].sub(/#{match[0]}\z/, ' ' * match[0].length) + result[off..-1]
           end
diff --git a/lib/solargraph/source/cursor.rb b/lib/solargraph/source/cursor.rb
index 70e4fd47a..a8226eb07 100644
--- a/lib/solargraph/source/cursor.rb
+++ b/lib/solargraph/source/cursor.rb
@@ -124,7 +124,7 @@ def node
       def node_position
         @node_position ||= begin
           if start_of_word.empty?
-            match = source.code[0, offset].match(/[\s]*(\.|:+)[\s]*$/)
+            match = source.code[0, offset].match(/\s*(\.|:+)\s*$/)
             if match
               Position.from_offset(source.code, offset - match[0].length)
             else
@@ -159,7 +159,7 @@ def start_word_pattern
       #
       # @return [Regexp]
       def end_word_pattern
-        /^([a-z0-9_]|[^\u0000-\u007F])*[\?\!]?/i
+        /^([a-z0-9_]|[^\u0000-\u007F])*[?!]?/i
       end
     end
   end
diff --git a/lib/solargraph/source/source_chainer.rb b/lib/solargraph/source/source_chainer.rb
index e79d85b7e..5758a9d35 100644
--- a/lib/solargraph/source/source_chainer.rb
+++ b/lib/solargraph/source/source_chainer.rb
@@ -97,7 +97,7 @@ def fixed_position
       # @return [String]
       def end_of_phrase
         @end_of_phrase ||= begin
-          match = phrase.match(/[\s]*(\.{1}|::)[\s]*$/)
+          match = phrase.match(/\s*(\.{1}|::)\s*$/)
           if match
             match[0]
           else
diff --git a/lib/solargraph/source_map/mapper.rb b/lib/solargraph/source_map/mapper.rb
index d53fd49a0..5fdcb9fe6 100644
--- a/lib/solargraph/source_map/mapper.rb
+++ b/lib/solargraph/source_map/mapper.rb
@@ -163,7 +163,7 @@ def process_directive source_position, comment_position, directive
             end
           end
         when 'visibility'
-          begin
+
             kind = directive.tag.text&.to_sym
             return unless [:private, :protected, :public].include?(kind)
 
@@ -182,7 +182,7 @@ def process_directive source_position, comment_position, directive
                 pin.instance_variable_set(:@visibility, kind)
               end
             end
-          end
+
         when 'parse'
           begin
             ns = closure_at(source_position)

From d3bdfea12869252296c8b2cf9ca1ce2186f86321 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 24 Aug 2025 13:33:58 -0400
Subject: [PATCH 019/172] Resolve class aliases via Constant pins (#1029)

* Resolve class aliases via Constant pins

This also eliminates the need for Parser::NodeMethods as a searately
defined class.

* Resolve merge issues

* Resolve Solargraph strong complaint

* Add @sg-ignore

* Fix RuboCop issues

* Drop unused method

* Ratchet .rubocop_todo.yml
---
 .rubocop_todo.yml                             |  11 +-
 lib/solargraph.rb                             |  18 +-
 lib/solargraph/api_map.rb                     | 118 +++++++++++---
 lib/solargraph/api_map/store.rb               |   9 +-
 lib/solargraph/complex_type.rb                |   3 +
 lib/solargraph/complex_type/type_methods.rb   |  12 +-
 lib/solargraph/complex_type/unique_type.rb    |   5 +-
 lib/solargraph/parser/node_methods.rb         |  97 -----------
 .../parser/parser_gem/node_methods.rb         |   2 +-
 lib/solargraph/pin/base.rb                    |   2 +-
 lib/solargraph/rbs_map/conversions.rb         |   2 +-
 spec/api_map/api_map_method_spec.rb           | 154 ++++++++++++++++++
 spec/api_map_spec.rb                          |  59 +++++++
 spec/convention/struct_definition_spec.rb     |   4 +-
 14 files changed, 355 insertions(+), 141 deletions(-)
 delete mode 100644 lib/solargraph/parser/node_methods.rb
 create mode 100644 spec/api_map/api_map_method_spec.rb

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index fe8ab7c48..14cc0ca5d 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -397,7 +397,6 @@ Layout/SpaceBeforeComma:
 # SupportedStylesForEmptyBraces: space, no_space
 Layout/SpaceInsideBlockBraces:
   Exclude:
-    - 'lib/solargraph/api_map.rb'
     - 'lib/solargraph/api_map/store.rb'
     - 'lib/solargraph/diagnostics/update_errors.rb'
     - 'lib/solargraph/language_server/host.rb'
@@ -569,7 +568,6 @@ Lint/NonAtomicFileOperation:
 # This cop supports safe autocorrection (--autocorrect).
 Lint/ParenthesesAsGroupedExpression:
   Exclude:
-    - 'lib/solargraph.rb'
     - 'lib/solargraph/parser/parser_gem/node_chainer.rb'
     - 'spec/language_server/host_spec.rb'
     - 'spec/source_map/clip_spec.rb'
@@ -672,7 +670,6 @@ Lint/UselessAccessModifier:
 # Configuration parameters: AutoCorrect.
 Lint/UselessAssignment:
   Exclude:
-    - 'lib/solargraph/api_map.rb'
     - 'lib/solargraph/doc_map.rb'
     - 'lib/solargraph/language_server/message/extended/check_gem_version.rb'
     - 'lib/solargraph/language_server/message/extended/document_gems.rb'
@@ -757,6 +754,7 @@ Metrics/ClassLength:
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
   Exclude:
+    - 'lib/solargraph/api_map.rb'
     - 'lib/solargraph/api_map/source_to_yard.rb'
     - 'lib/solargraph/complex_type.rb'
     - 'lib/solargraph/parser/parser_gem/node_chainer.rb'
@@ -1057,7 +1055,6 @@ RSpec/ExampleLength:
 # DisallowedExamples: works
 RSpec/ExampleWording:
   Exclude:
-    - 'spec/convention/struct_definition_spec.rb'
     - 'spec/pin/base_spec.rb'
     - 'spec/pin/method_spec.rb'
 
@@ -1098,7 +1095,6 @@ RSpec/ImplicitExpect:
 RSpec/InstanceVariable:
   Exclude:
     - 'spec/api_map/config_spec.rb'
-    - 'spec/api_map_spec.rb'
     - 'spec/diagnostics/require_not_found_spec.rb'
     - 'spec/language_server/host/dispatch_spec.rb'
     - 'spec/language_server/host_spec.rb'
@@ -1282,6 +1278,7 @@ RSpec/ScatteredLet:
 RSpec/SpecFilePathFormat:
   Exclude:
     - '**/spec/routing/**/*'
+    - 'spec/api_map/api_map_method_spec.rb'
     - 'spec/api_map/cache_spec.rb'
     - 'spec/api_map/config_spec.rb'
     - 'spec/api_map/source_to_yard_spec.rb'
@@ -1622,7 +1619,6 @@ Style/Documentation:
     - 'lib/solargraph/parser.rb'
     - 'lib/solargraph/parser/comment_ripper.rb'
     - 'lib/solargraph/parser/flow_sensitive_typing.rb'
-    - 'lib/solargraph/parser/node_methods.rb'
     - 'lib/solargraph/parser/node_processor/base.rb'
     - 'lib/solargraph/parser/parser_gem.rb'
     - 'lib/solargraph/parser/parser_gem/class_methods.rb'
@@ -1763,7 +1759,6 @@ Style/FrozenStringLiteralComment:
     - 'lib/solargraph/parser.rb'
     - 'lib/solargraph/parser/comment_ripper.rb'
     - 'lib/solargraph/parser/flow_sensitive_typing.rb'
-    - 'lib/solargraph/parser/node_methods.rb'
     - 'lib/solargraph/parser/parser_gem.rb'
     - 'lib/solargraph/parser/snippet.rb'
     - 'lib/solargraph/pin/breakable.rb'
@@ -2037,7 +2032,6 @@ Style/MethodDefParentheses:
     - 'lib/solargraph/location.rb'
     - 'lib/solargraph/parser/comment_ripper.rb'
     - 'lib/solargraph/parser/flow_sensitive_typing.rb'
-    - 'lib/solargraph/parser/node_methods.rb'
     - 'lib/solargraph/parser/node_processor/base.rb'
     - 'lib/solargraph/parser/parser_gem/flawed_builder.rb'
     - 'lib/solargraph/parser/parser_gem/node_chainer.rb'
@@ -2249,7 +2243,6 @@ Style/RedundantInitialize:
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/RedundantInterpolation:
   Exclude:
-    - 'lib/solargraph/api_map/store.rb'
     - 'lib/solargraph/parser/parser_gem/node_chainer.rb'
     - 'lib/solargraph/source_map/mapper.rb'
 
diff --git a/lib/solargraph.rb b/lib/solargraph.rb
index 038e7bccf..8520e3a93 100755
--- a/lib/solargraph.rb
+++ b/lib/solargraph.rb
@@ -72,7 +72,23 @@ def self.asserts_on?(type)
   # @param block [Proc] A block that returns a message to log
   # @return [void]
   def self.assert_or_log(type, msg = nil, &block)
-    raise (msg || block.call) if asserts_on?(type) && ![:combine_with_visibility].include?(type)
+    if asserts_on? type
+      # @type [String, nil]
+      msg ||= block.call
+
+      raise "No message given for #{type.inspect}" if msg.nil?
+
+      # @todo :combine_with_visibility is not ready for prime time -
+      #  lots of disagreements found in practice that heuristics need
+      #  to be created for and/or debugging needs to resolve in pin
+      #  generation.
+      # @todo :api_map_namespace_pin_stack triggers in a badly handled
+      #   self type case - 'keeps track of self type in method
+      #   parameters in subclass' in call_spec.rb
+      return if %i[api_map_namespace_pin_stack combine_with_visibility].include?(type)
+
+      raise msg
+    end
     logger.info msg, &block
   end
 
diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index eed02b4ef..9db21128f 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -308,12 +308,11 @@ def qualify tag, context_tag = ''
       return unless type
       return tag if type.literal?
 
-      context_type = ComplexType.try_parse(context_tag)
-      return unless context_type
-
       fqns = qualify_namespace(type.rooted_namespace, context_type.rooted_namespace)
       return unless fqns
 
+      return fqns if %w[Class Module].include? type
+
       fqns + type.substring
     end
 
@@ -406,16 +405,18 @@ def get_block_pins
     # @param deep [Boolean] True to include superclasses, mixins, etc.
     # @return [Array<Solargraph::Pin::Method>]
     def get_methods rooted_tag, scope: :instance, visibility: [:public], deep: true
+      rooted_tag = qualify(rooted_tag, '')
+      return [] unless rooted_tag
       if rooted_tag.start_with? 'Array('
         # Array() are really tuples - use our fill, as the RBS repo
         # does not give us definitions for it
         rooted_tag = "Solargraph::Fills::Tuple(#{rooted_tag[6..-2]})"
       end
-      rooted_type = ComplexType.try_parse(rooted_tag)
-      fqns = rooted_type.namespace
-      namespace_pin = store.get_path_pins(fqns).select { |p| p.is_a?(Pin::Namespace) }.first
       cached = cache.get_methods(rooted_tag, scope, visibility, deep)
       return cached.clone unless cached.nil?
+      rooted_type = ComplexType.try_parse(rooted_tag)
+      fqns = rooted_type.namespace
+      namespace_pin = get_namespace_pin(fqns)
       # @type [Array<Solargraph::Pin::Method>]
       result = []
       skip = Set.new
@@ -535,10 +536,20 @@ def get_complex_type_methods complex_type, context = '', internal = false
     # @param visibility [Array<Symbol>] :public, :protected, and/or :private
     # @param preserve_generics [Boolean]
     # @return [Array<Solargraph::Pin::Method>]
-    def get_method_stack rooted_tag, name, scope: :instance, visibility: [:private, :protected, :public], preserve_generics: false
-      rooted_type = ComplexType.parse(rooted_tag)
+    def get_method_stack rooted_tag, name, scope: :instance, visibility: [:private, :protected, :public],
+                         preserve_generics: false
+      rooted_tag = qualify(rooted_tag, '')
+      return [] unless rooted_tag
+      rooted_type = ComplexType.try_parse(rooted_tag)
+      return [] if rooted_type.nil?
       fqns = rooted_type.namespace
-      namespace_pin = store.get_path_pins(fqns).select { |p| p.is_a?(Pin::Namespace) }.first
+      namespace_pin = get_namespace_pin(fqns)
+      if namespace_pin.nil?
+        # :nocov:
+        Solargraph.assert_or_log(:api_map_namespace_pin_stack, "Could not find namespace pin for #{fqns} while looking for method #{name}")
+        return []
+        # :nocov:
+      end
       methods = get_methods(rooted_tag, scope: scope, visibility: visibility).select { |p| p.name == name }
       methods = erase_generics(namespace_pin, rooted_type, methods) unless preserve_generics
       methods
@@ -695,7 +706,7 @@ def resolve_method_aliases pins, visibility = [:public, :private, :protected]
     # @param skip [Set<String>]
     # @param no_core [Boolean] Skip core classes if true
     # @return [Array<Pin::Base>]
-    def inner_get_methods_from_reference(fq_reference_tag, namespace_pin, type, scope, visibility, deep, skip, no_core)
+    def inner_get_methods_from_reference fq_reference_tag, namespace_pin, type, scope, visibility, deep, skip, no_core
       logger.debug { "ApiMap#add_methods_from_reference(type=#{type}) starting" }
 
       # Ensure the types returned by the methods in the referenced
@@ -709,7 +720,7 @@ def inner_get_methods_from_reference(fq_reference_tag, namespace_pin, type, scop
       # @todo Can inner_get_methods be cached?  Lots of lookups of base types going on.
       methods = inner_get_methods(resolved_reference_type.tag, scope, visibility, deep, skip, no_core)
       if namespace_pin && !resolved_reference_type.all_params.empty?
-        reference_pin = store.get_path_pins(resolved_reference_type.name).select { |p| p.is_a?(Pin::Namespace) }.first
+        reference_pin = get_namespace_pin(resolved_reference_type.namespace)
         # logger.debug { "ApiMap#add_methods_from_reference(type=#{type}) - resolving generics with #{reference_pin.generics}, #{resolved_reference_type.rooted_tags}" }
         methods = methods.map do |method_pin|
           method_pin.resolve_generics(reference_pin, resolved_reference_type)
@@ -734,6 +745,13 @@ def store
     # @return [Solargraph::ApiMap::Cache]
     attr_reader :cache
 
+    # @param fqns [String]
+    # @return [Pin::Namespace, nil]
+    def get_namespace_pin fqns
+      # fqns = ComplexType.parse(fqns).namespace
+      store.get_path_pins(fqns).select { |p| p.is_a?(Pin::Namespace) }.first
+    end
+
     # @param rooted_tag [String] A fully qualified namespace, with
     #   generic parameter values if applicable
     # @param scope [Symbol] :class or :instance
@@ -743,11 +761,20 @@ def store
     # @param no_core [Boolean] Skip core classes if true
     # @return [Array<Pin::Base>]
     def inner_get_methods rooted_tag, scope, visibility, deep, skip, no_core = false
+      rooted_tag = qualify(rooted_tag, '')
+      return [] if rooted_tag.nil?
+      return [] unless rooted_tag
       rooted_type = ComplexType.parse(rooted_tag).force_rooted
       fqns = rooted_type.namespace
-      fqns_generic_params = rooted_type.all_params
-      namespace_pin = store.get_path_pins(fqns).select { |p| p.is_a?(Pin::Namespace) }.first
+      namespace_pin = get_namespace_pin(fqns)
+      if namespace_pin.nil?
+        # :nocov:
+        Solargraph.assert_or_log(:api_map_namespace_pin_inner, "Could not find namespace pin for #{fqns}")
+        return []
+        # :nocov:
+      end
       return [] if no_core && fqns =~ /^(Object|BasicObject|Class|Module)$/
+      # @todo should this by by rooted_tag_?
       reqstr = "#{fqns}|#{scope}|#{visibility.sort}|#{deep}"
       return [] if skip.include?(reqstr)
       skip.add reqstr
@@ -770,7 +797,10 @@ def inner_get_methods rooted_tag, scope, visibility, deep, skip, no_core = false
         if scope == :instance
           store.get_includes(fqns).reverse.each do |include_tag|
             rooted_include_tag = qualify(include_tag, rooted_tag)
-            result.concat inner_get_methods_from_reference(rooted_include_tag, namespace_pin, rooted_type, scope, visibility, deep, skip, true)
+            if rooted_include_tag
+              result.concat inner_get_methods_from_reference(rooted_include_tag, namespace_pin, rooted_type, scope,
+                                                             visibility, deep, skip, true)
+            end
           end
           rooted_sc_tag = qualify_superclass(rooted_tag)
           unless rooted_sc_tag.nil?
@@ -864,16 +894,21 @@ def inner_qualify name, root, skip
         if root == ''
           return ''
         else
+          root = root[2..-1] if root&.start_with?('::')
           return inner_qualify(root, '', skip)
         end
       else
-        return name if root == '' && store.namespace_exists?(name)
         roots = root.to_s.split('::')
         while roots.length > 0
-          fqns = roots.join('::') + '::' + name
-          return fqns if store.namespace_exists?(fqns)
-          incs = store.get_includes(roots.join('::'))
+          potential_root = roots.join('::')
+          potential_root = potential_root[2..-1] if potential_root.start_with?('::')
+          potential_fqns = potential_root + '::' + name
+          potential_fqns = potential_fqns[2..-1] if potential_fqns.start_with?('::')
+          fqns = resolve_fqns(potential_fqns)
+          return fqns if fqns
+          incs = store.get_includes(potential_root)
           incs.each do |inc|
+            next if potential_root == root && inc == name
             foundinc = inner_qualify(name, inc, skip)
             possibles.push foundinc unless foundinc.nil?
           end
@@ -886,11 +921,54 @@ def inner_qualify name, root, skip
             possibles.push foundinc unless foundinc.nil?
           end
         end
-        return name if store.namespace_exists?(name)
+        resolved_fqns = resolve_fqns(name)
+        return resolved_fqns if resolved_fqns
+
         return possibles.last
       end
     end
 
+    # @param fqns [String]
+    # @return [String, nil]
+    def resolve_fqns fqns
+      return fqns if store.namespace_exists?(fqns)
+
+      constant_namespace = nil
+      constant = store.constant_pins.find do |c|
+        constant_fqns = if c.namespace.empty?
+                          c.name
+                        else
+                          c.namespace + '::' + c.name
+                        end
+        constant_namespace = c.namespace
+        constant_fqns == fqns
+      end
+      return nil unless constant
+
+      return constant.return_type.namespace if constant.return_type.defined?
+
+      assignment = constant.assignment
+
+      # @sg-ignore Wrong argument type for Solargraph::ApiMap#resolve_trivial_constant: node expected AST::Node, received Parser::AST::Node, nil
+      target_ns = resolve_trivial_constant(assignment) if assignment
+      return nil unless target_ns
+      qualify_namespace target_ns, constant_namespace
+    end
+
+    # @param node [AST::Node]
+    # @return [String, nil]
+    def resolve_trivial_constant node
+      return nil unless node.is_a?(::Parser::AST::Node)
+      return nil unless node.type == :const
+      return nil if node.children.empty?
+      prefix_node = node.children[0]
+      prefix = ''
+      prefix = resolve_trivial_constant(prefix_node) + '::' unless prefix_node.nil? || prefix_node.children.empty?
+      const_name = node.children[1].to_s
+      return nil if const_name.empty?
+      return prefix + const_name
+    end
+
     # Get the namespace's type (Class or Module).
     #
     # @param fqns [String] A fully qualified namespace
@@ -898,7 +976,7 @@ def inner_qualify name, root, skip
     def get_namespace_type fqns
       return nil if fqns.nil?
       # @type [Pin::Namespace, nil]
-      pin = store.get_path_pins(fqns).select{|p| p.is_a?(Pin::Namespace)}.first
+      pin = get_namespace_pin(fqns)
       return nil if pin.nil?
       pin.type
     end
diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index 87f053596..3b3fffd69 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -73,13 +73,13 @@ def get_methods fqns, scope: :instance, visibility: [:public]
       def get_superclass fq_tag
         raise "Do not prefix fully qualified tags with '::' - #{fq_tag.inspect}" if fq_tag.start_with?('::')
         sub = ComplexType.parse(fq_tag)
+        return sub.simplify_literals.name if sub.literal?
+        return 'Boolean' if %w[TrueClass FalseClass].include?(fq_tag)
         fqns = sub.namespace
         return superclass_references[fq_tag].first if superclass_references.key?(fq_tag)
         return superclass_references[fqns].first if superclass_references.key?(fqns)
         return 'Object' if fqns != 'BasicObject' && namespace_exists?(fqns)
         return 'Object' if fqns == 'Boolean'
-        simplified_literal_name = ComplexType.parse("#{fqns}").simplify_literals.name
-        return simplified_literal_name if simplified_literal_name != fqns
         nil
       end
 
@@ -143,6 +143,11 @@ def namespace_pins
         pins_by_class(Solargraph::Pin::Namespace)
       end
 
+      # @return [Enumerable<Solargraph::Pin::Constant>]
+      def constant_pins
+        pins_by_class(Solargraph::Pin::Constant)
+      end
+
       # @return [Enumerable<Solargraph::Pin::Method>]
       def method_pins
         pins_by_class(Solargraph::Pin::Method)
diff --git a/lib/solargraph/complex_type.rb b/lib/solargraph/complex_type.rb
index ac9599329..00dda2d3e 100644
--- a/lib/solargraph/complex_type.rb
+++ b/lib/solargraph/complex_type.rb
@@ -17,10 +17,13 @@ def initialize types = [UniqueType::UNDEFINED]
       # @todo @items here should not need an annotation
       # @type [Array<UniqueType>]
       items = types.flat_map(&:items).uniq(&:to_s)
+
+      # Canonicalize 'true, false' to the non-runtime-type 'Boolean'
       if items.any? { |i| i.name == 'false' } && items.any? { |i| i.name == 'true' }
         items.delete_if { |i| i.name == 'false' || i.name == 'true' }
         items.unshift(ComplexType::BOOLEAN)
       end
+
       items = [UniqueType::UNDEFINED] if items.any?(&:undefined?)
       @items = items
     end
diff --git a/lib/solargraph/complex_type/type_methods.rb b/lib/solargraph/complex_type/type_methods.rb
index e6d596244..6bf383a1a 100644
--- a/lib/solargraph/complex_type/type_methods.rb
+++ b/lib/solargraph/complex_type/type_methods.rb
@@ -10,11 +10,7 @@ class ComplexType
     #     @name: String
     #     @subtypes: Array<ComplexType>
     #     @rooted: boolish
-    #   methods:
-    #     transform()
-    #     all_params()
-    #     rooted?()
-    #     can_root_name?()
+    #   methods: (see @!method declarations below)
     module TypeMethods
       # @!method transform(new_name = nil, &transform_type)
       #   @param new_name [String, nil]
@@ -24,6 +20,9 @@ module TypeMethods
       # @!method all_params
       #   @return [Array<ComplexType>]
       # @!method rooted?
+      # @!method literal?
+      # @!method simplify_literals
+      #   @return [ComplexType::UniqueType, ComplexType]
       # @!method can_root_name?(name_to_check = nil)
       #   @param name_to_check [String, nil]
 
@@ -124,7 +123,8 @@ def key_types
       def namespace
         # if priority higher than ||=, old implements cause unnecessary check
         @namespace ||= lambda do
-          return 'Object' if duck_type?
+          return simplify_literals.namespace if literal?
+          return 'Object' if duck_type? || name == 'Boolean'
           return 'NilClass' if nil_type?
           return (name == 'Class' || name == 'Module') && !subtypes.empty? ? subtypes.first.name : name
         end.call
diff --git a/lib/solargraph/complex_type/unique_type.rb b/lib/solargraph/complex_type/unique_type.rb
index a782656f0..86a69fe0f 100644
--- a/lib/solargraph/complex_type/unique_type.rb
+++ b/lib/solargraph/complex_type/unique_type.rb
@@ -74,6 +74,8 @@ def initialize(name, key_types = [], subtypes = [], rooted:, parameters_type: ni
         if parameters_type.nil?
           raise "You must supply parameters_type if you provide parameters" unless key_types.empty? && subtypes.empty?
         end
+
+        raise "name must be a String" unless name.is_a?(String)
         raise "Please remove leading :: and set rooted instead - #{name.inspect}" if name.start_with?('::')
         @name = name
         @parameters_type = parameters_type
@@ -126,7 +128,8 @@ def determine_non_literal_name
         #    | `false`
         return name if name.empty?
         return 'NilClass' if name == 'nil'
-        return 'Boolean' if ['true', 'false'].include?(name)
+        return 'TrueClass' if name == 'true'
+        return 'FalseClass' if name == 'false'
         return 'Symbol' if name[0] == ':'
         return 'String' if ['"', "'"].include?(name[0])
         return 'Integer' if name.match?(/^-?\d+$/)
diff --git a/lib/solargraph/parser/node_methods.rb b/lib/solargraph/parser/node_methods.rb
deleted file mode 100644
index 5d3d1079a..000000000
--- a/lib/solargraph/parser/node_methods.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-module Solargraph
-  module Parser
-    module NodeMethods
-      module_function
-
-      # @abstract
-      # @param node [Parser::AST::Node]
-      # @return [String]
-      def unpack_name node
-        raise NotImplementedError
-      end
-
-      # @abstract
-      # @todo Temporarily here for testing. Move to Solargraph::Parser.
-      # @param node [Parser::AST::Node]
-      # @return [Array<Parser::AST::Node>]
-      def call_nodes_from node
-        raise NotImplementedError
-      end
-
-      # Find all the nodes within the provided node that potentially return a
-      # value.
-      #
-      # The node parameter typically represents a method's logic, e.g., the
-      # second child (after the :args node) of a :def node. A simple one-line
-      # method would typically return itself, while a node with conditions
-      # would return the resulting node from each conditional branch. Nodes
-      # that follow a :return node are assumed to be unreachable. Nil values
-      # are converted to nil node types.
-      #
-      # @abstract
-      # @param node [Parser::AST::Node]
-      # @return [Array<Parser::AST::Node>]
-      def returns_from_method_body node
-        raise NotImplementedError
-      end
-
-      # @abstract
-      # @param node [Parser::AST::Node]
-      #
-      # @return [Array<Parser::AST::Node>]
-      def const_nodes_from node
-        raise NotImplementedError
-      end
-
-      # @abstract
-      # @param cursor [Solargraph::Source::Cursor]
-      # @return [Parser::AST::Node, nil]
-      def find_recipient_node cursor
-        raise NotImplementedError
-      end
-
-      # @abstract
-      # @param node [Parser::AST::Node]
-      # @return [Array<AST::Node>] low-level value nodes in
-      #   value position.  Does not include explicit return
-      #   statements
-      def value_position_nodes_only(node)
-        raise NotImplementedError
-      end
-
-      # @abstract
-      # @param nodes [Enumerable<Parser::AST::Node>]
-      def any_splatted_call?(nodes)
-        raise NotImplementedError
-      end
-
-      # @abstract
-      # @param node [Parser::AST::Node]
-      # @return [void]
-      def process node
-        raise NotImplementedError
-      end
-
-      # @abstract
-      # @param node [Parser::AST::Node]
-      # @return [Hash{Parser::AST::Node => Source::Chain}]
-      def convert_hash node
-        raise NotImplementedError
-      end
-
-      # @abstract
-      # @param node [Parser::AST::Node]
-      # @return [Position]
-      def get_node_start_position(node)
-        raise NotImplementedError
-      end
-
-      # @abstract
-      # @param node [Parser::AST::Node]
-      # @return [Position]
-      def get_node_end_position(node)
-        raise NotImplementedError
-      end
-    end
-  end
-end
diff --git a/lib/solargraph/parser/parser_gem/node_methods.rb b/lib/solargraph/parser/parser_gem/node_methods.rb
index 1397f9583..5b1c47996 100644
--- a/lib/solargraph/parser/parser_gem/node_methods.rb
+++ b/lib/solargraph/parser/parser_gem/node_methods.rb
@@ -120,7 +120,7 @@ def drill_signature node, signature
         end
 
         # @param node [Parser::AST::Node]
-        # @return [Hash{Parser::AST::Node => Chain}]
+        # @return [Hash{Parser::AST::Node, Symbol => Source::Chain}]
         def convert_hash node
           return {} unless Parser.is_ast_node?(node)
           return convert_hash(node.children[0]) if node.type == :kwsplat
diff --git a/lib/solargraph/pin/base.rb b/lib/solargraph/pin/base.rb
index fb3274dab..020d92def 100644
--- a/lib/solargraph/pin/base.rb
+++ b/lib/solargraph/pin/base.rb
@@ -300,8 +300,8 @@ def assert_same_count(other, attr)
       #
       # @return [Object, nil]
       def assert_same(other, attr)
-        return false if other.nil?
         val1 = send(attr)
+        return val1 if other.nil?
         val2 = other.send(attr)
         return val1 if val1 == val2
         Solargraph.assert_or_log("combine_with_#{attr}".to_sym,
diff --git a/lib/solargraph/rbs_map/conversions.rb b/lib/solargraph/rbs_map/conversions.rb
index f8deec251..657ea982f 100644
--- a/lib/solargraph/rbs_map/conversions.rb
+++ b/lib/solargraph/rbs_map/conversions.rb
@@ -240,6 +240,7 @@ def module_decl_to_pin decl
       #
       # @return [Solargraph::Pin::Constant]
       def create_constant(name, tag, comments, decl, base = nil)
+        tag = "#{base}<#{tag}>" if base
         parts = name.split('::')
         if parts.length > 1
           name = parts.last
@@ -255,7 +256,6 @@ def create_constant(name, tag, comments, decl, base = nil)
           comments: comments,
           source: :rbs
         )
-        tag = "#{base}<#{tag}>" if base
         rooted_tag = ComplexType.parse(tag).force_rooted.rooted_tags
         constant_pin.docstring.add_tag(YARD::Tags::Tag.new(:return, '', rooted_tag))
         constant_pin
diff --git a/spec/api_map/api_map_method_spec.rb b/spec/api_map/api_map_method_spec.rb
new file mode 100644
index 000000000..a3adc9b94
--- /dev/null
+++ b/spec/api_map/api_map_method_spec.rb
@@ -0,0 +1,154 @@
+# frozen_string_literal: true
+
+describe Solargraph::ApiMap do
+  let(:api_map) { described_class.new }
+  let(:bench) do
+    Solargraph::Bench.new(external_requires: external_requires, workspace: Solargraph::Workspace.new('.'))
+  end
+  let(:external_requires) { [] }
+
+  before do
+    api_map.catalog bench
+  end
+
+  describe '#qualify' do
+    let(:external_requires) { ['yaml'] }
+
+    it 'resolves YAML to Psych' do
+      expect(api_map.qualify('YAML', '')).to eq('Psych')
+    end
+
+    it 'resolves constants used to alias namespaces' do
+      map = Solargraph::SourceMap.load_string(%(
+        class Foo
+          def bing; end
+        end
+
+        module Bar
+          Baz = ::Foo
+        end
+    ))
+      api_map.index map.pins
+      fqns = api_map.qualify('Bar::Baz')
+      expect(fqns).to eq('Foo')
+    end
+
+    it 'understands alias namespaces resolving types' do
+      source = Solargraph::Source.load_string(%(
+        class Foo
+          # @return [Symbol]
+          def bing; end
+        end
+
+        module Bar
+          Baz = ::Foo
+        end
+
+        a = Bar::Baz.new.bing
+        a
+        Bar::Baz
+      ), 'test.rb')
+
+      api_map = described_class.new.map(source)
+
+      clip = api_map.clip_at('test.rb', [11, 8])
+      expect(clip.infer.to_s).to eq('Symbol')
+    end
+
+    it 'understands nested alias namespaces to nested classes resolving types' do
+      source = Solargraph::Source.load_string(%(
+        module A
+          class Foo
+            # @return [Symbol]
+            def bing; end
+          end
+        end
+
+        module Bar
+          Baz = A::Foo
+        end
+
+        a = Bar::Baz.new.bing
+        a
+      ), 'test.rb')
+
+      api_map = described_class.new.map(source)
+
+      clip = api_map.clip_at('test.rb', [13, 8])
+      expect(clip.infer.to_s).to eq('Symbol')
+    end
+
+    it 'understands nested alias namespaces resolving types' do
+      source = Solargraph::Source.load_string(%(
+        module Bar
+          module A
+            class Foo
+              # @return [Symbol]
+              def bing; :bingo; end
+            end
+          end
+        end
+
+        module Bar
+          Foo = A::Foo
+        end
+
+        a = Bar::Foo.new.bing
+        a
+      ), 'test.rb')
+
+      api_map = described_class.new.map(source)
+
+      clip = api_map.clip_at('test.rb', [15, 8])
+      expect(clip.infer.to_s).to eq('Symbol')
+    end
+
+    it 'understands includes using nested alias namespaces resolving types' do
+      source = Solargraph::Source.load_string(%(
+        module Foo
+          # @return [Symbol]
+          def bing; :yay; end
+        end
+
+        module Bar
+          Baz = Foo
+        end
+
+        class B
+          include Foo
+        end
+
+        a = B.new.bing
+        a
+      ), 'test.rb')
+
+      api_map = described_class.new.map(source)
+
+      clip = api_map.clip_at('test.rb', [15, 8])
+      expect(clip.infer.to_s).to eq('Symbol')
+    end
+  end
+
+  describe '#get_method_stack' do
+    let(:out) { StringIO.new }
+    let(:api_map) { described_class.load_with_cache(Dir.pwd, out) }
+
+    context 'with stdlib that has vital dependencies' do
+      let(:external_requires) { ['yaml'] }
+      let(:method_stack) { api_map.get_method_stack('YAML', 'safe_load', scope: :class) }
+
+      it 'handles the YAML gem aliased to Psych' do
+        expect(method_stack).not_to be_empty
+      end
+    end
+
+    context 'with thor' do
+      let(:external_requires) { ['thor'] }
+      let(:method_stack) { api_map.get_method_stack('Thor', 'desc', scope: :class) }
+
+      it 'handles finding Thor.desc' do
+        expect(method_stack).not_to be_empty
+      end
+    end
+  end
+end
diff --git a/spec/api_map_spec.rb b/spec/api_map_spec.rb
index c95d4d8ec..494f9e156 100755
--- a/spec/api_map_spec.rb
+++ b/spec/api_map_spec.rb
@@ -1,6 +1,7 @@
 require 'tmpdir'
 
 describe Solargraph::ApiMap do
+  # rubocop:disable RSpec/InstanceVariable
   before :all do
     @api_map = Solargraph::ApiMap.new
   end
@@ -817,4 +818,62 @@ def baz
     clip = api_map.clip_at('test.rb', [11, 10])
     expect(clip.infer.to_s).to eq('Symbol')
   end
+
+  it 'resolves aliases in identically named deeply nested classes' do
+    source = Solargraph::Source.load_string(%(
+      module A
+        module Bar
+          # @return [Integer]
+          def quux; 123; end
+        end
+
+        Baz = Bar
+
+        class Foo
+          include Baz
+        end
+      end
+
+      def c
+        b = A::Foo.new.quux
+        b
+      end
+    ), 'test.rb')
+
+    api_map = described_class.new.map(source)
+
+    clip = api_map.clip_at('test.rb', [16, 4])
+    expect(clip.infer.to_s).to eq('Integer')
+  end
+
+  it 'resolves aliases in nested classes' do
+    source = Solargraph::Source.load_string(%(
+      module A
+        module Bar
+          class Baz
+            # @return [Integer]
+            def quux; 123; end
+          end
+        end
+
+        Baz = Bar::Baz
+
+        class Foo
+          include Baz
+        end
+      end
+
+      def c
+        b = A::Foo.new.quux
+        b
+      end
+    ), 'test.rb')
+
+    api_map = described_class.new.map(source)
+
+    clip = api_map.clip_at('test.rb', [18, 4])
+    expect(clip.infer.to_s).to eq('Integer')
+  end
+
+  # rubocop:enable RSpec/InstanceVariable
 end
diff --git a/spec/convention/struct_definition_spec.rb b/spec/convention/struct_definition_spec.rb
index fe317a42b..5c3fc5211 100644
--- a/spec/convention/struct_definition_spec.rb
+++ b/spec/convention/struct_definition_spec.rb
@@ -21,7 +21,7 @@
       expect(param_baz.return_type.tag).to eql('Integer')
     end
 
-    it 'should set closure to method on assignment operator parameters' do
+    it 'sets closure to method on assignment operator parameters' do
       source = Solargraph::SourceMap.load_string(%(
         # @param bar [String]
         # @param baz [Integer]
@@ -140,7 +140,7 @@ def type_checker code
       Solargraph::TypeChecker.load_string(code, 'test.rb', :strong)
     end
 
-    it 'should not crash' do
+    it "doesn't crash" do
       checker = type_checker(%(
         Foo = Struct.new(:bar, :baz)
       ))

From 4a10b44b3802ea9bd077b7aaab0238b865363e82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lek=C3=AB=20Mula?= <l.mula@finlink.de>
Date: Sun, 24 Aug 2025 19:46:19 +0200
Subject: [PATCH 020/172] Speed-up LSP completion response times (#1035)

* Improve performance of resolve_method_aliases method

- Add indexed lookups for methods and aliases by name
- Cache ancestor traversal to avoid repeated computations
- Separate regular pins from aliases for more efficient processing
- Replace linear search with direct indexed method lookup
- Add fast path for creating resolved alias pins without individual lookups

Generated with Claude Code

* Update .rubocop_todo.yml

* Fix typechecking - get_method_stack order

`get_method_stack` returns the following order for `Enumerable#select`:

- master branch:

=> ["Enumerable#select", "Kernel#select"]

- current branch:

=> ["Kernel#select", "Enumerable#select"]

* Avoid redundant indexing methods_by_name

loop through ancestors and rely on store.get_path_pins
---
 .rubocop_todo.yml               |  2 -
 lib/solargraph/api_map.rb       | 91 +++++++++++++++++++++------------
 lib/solargraph/api_map/store.rb | 38 ++++++++++++++
 spec/api_map_spec.rb            | 12 ++---
 4 files changed, 103 insertions(+), 40 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 14cc0ca5d..f400dcfaf 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -77,7 +77,6 @@ Layout/ClosingHeredocIndentation:
 # Configuration parameters: AllowForAlignment.
 Layout/CommentIndentation:
   Exclude:
-    - 'lib/solargraph/api_map.rb'
     - 'lib/solargraph/language_server/host.rb'
     - 'lib/solargraph/parser/parser_gem/node_methods.rb'
     - 'lib/solargraph/source_map/mapper.rb'
@@ -2656,7 +2655,6 @@ YARD/MismatchName:
     - 'lib/solargraph/pin/until.rb'
     - 'lib/solargraph/pin/while.rb'
     - 'lib/solargraph/pin_cache.rb'
-    - 'lib/solargraph/source/chain.rb'
     - 'lib/solargraph/source/chain/call.rb'
     - 'lib/solargraph/source/chain/z_super.rb'
     - 'lib/solargraph/type_checker.rb'
diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 9db21128f..89ed3a308 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -26,7 +26,6 @@ class ApiMap
     def initialize pins: []
       @source_map_hash = {}
       @cache = Cache.new
-      @method_alias_stack = []
       index pins
     end
 
@@ -687,6 +686,7 @@ def type_include?(host_ns, module_ns)
     # @return [Array<Pin::Base>]
     def resolve_method_aliases pins, visibility = [:public, :private, :protected]
       with_resolved_aliases = pins.map do |pin|
+        next pin unless pin.is_a?(Pin::MethodAlias)
         resolved = resolve_method_alias(pin)
         next nil if resolved.respond_to?(:visibility) && !visibility.include?(resolved.visibility)
         resolved
@@ -998,49 +998,76 @@ def prefer_non_nil_variables pins
       result + nil_pins
     end
 
-    # @param pin [Pin::MethodAlias, Pin::Base]
-    # @return [Pin::Method]
-    def resolve_method_alias pin
-      return pin unless pin.is_a?(Pin::MethodAlias)
-      return nil if @method_alias_stack.include?(pin.path)
-      @method_alias_stack.push pin.path
-      origin = get_method_stack(pin.full_context.tag, pin.original, scope: pin.scope, preserve_generics: true).first
-      @method_alias_stack.pop
-      return nil if origin.nil?
+    include Logging
+
+    private
+
+    # @param alias_pin [Pin::MethodAlias]
+    # @return [Pin::Method, nil]
+    def resolve_method_alias(alias_pin)
+      ancestors = store.get_ancestors(alias_pin.full_context.tag)
+      original = nil
+
+      # Search each ancestor for the original method
+      ancestors.each do |ancestor_fqns|
+        ancestor_fqns = ComplexType.parse(ancestor_fqns).force_rooted.namespace
+        ancestor_method_path = "#{ancestor_fqns}#{alias_pin.scope == :instance ? '#' : '.'}#{alias_pin.original}"
+
+        # Search for the original method in the ancestor
+        original = store.get_path_pins(ancestor_method_path).find do |candidate_pin|
+          if candidate_pin.is_a?(Pin::MethodAlias)
+            # recursively resolve method aliases
+            resolved = resolve_method_alias(candidate_pin)
+            break resolved if resolved
+          end
+
+          candidate_pin.is_a?(Pin::Method) && candidate_pin.scope == alias_pin.scope
+        end
+
+        break if original
+      end
+
+      # @sg-ignore ignore `received nil` for original
+      create_resolved_alias_pin(alias_pin, original) if original
+    end
+
+    # Fast path for creating resolved alias pins without individual method stack lookups
+    # @param alias_pin [Pin::MethodAlias] The alias pin to resolve
+    # @param original [Pin::Method] The original method pin that was already found
+    # @return [Pin::Method] The resolved method pin
+    def create_resolved_alias_pin(alias_pin, original)
+      # Build the resolved method pin directly (same logic as resolve_method_alias but without lookup)
       args = {
-        location: pin.location,
-        type_location: origin.type_location,
-        closure: pin.closure,
-        name: pin.name,
-        comments: origin.comments,
-        scope: origin.scope,
-#        context: pin.context,
-        visibility: origin.visibility,
-        signatures: origin.signatures.map(&:clone).freeze,
-        attribute: origin.attribute?,
-        generics: origin.generics.clone,
-        return_type: origin.return_type,
+        location: alias_pin.location,
+        type_location: original.type_location,
+        closure: alias_pin.closure,
+        name: alias_pin.name,
+        comments: original.comments,
+        scope: original.scope,
+        visibility: original.visibility,
+        signatures: original.signatures.map(&:clone).freeze,
+        attribute: original.attribute?,
+        generics: original.generics.clone,
+        return_type: original.return_type,
         source: :resolve_method_alias
       }
-      out = Pin::Method.new **args
-      out.signatures.each do |sig|
+      resolved_pin = Pin::Method.new **args
+
+      # Clone signatures and parameters
+      resolved_pin.signatures.each do |sig|
         sig.parameters = sig.parameters.map(&:clone).freeze
         sig.source = :resolve_method_alias
         sig.parameters.each do |param|
-          param.closure = out
+          param.closure = resolved_pin
           param.source = :resolve_method_alias
           param.reset_generated!
         end
-        sig.closure = out
+        sig.closure = resolved_pin
         sig.reset_generated!
       end
-      logger.debug { "ApiMap#resolve_method_alias(pin=#{pin}) - returning #{out} from #{origin}" }
-      out
-    end
 
-    include Logging
-
-    private
+      resolved_pin
+    end
 
     # @param namespace_pin [Pin::Namespace]
     # @param rooted_type [ComplexType]
diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index 3b3fffd69..6479e6039 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -204,6 +204,44 @@ def fqns_pins fqns
         fqns_pins_map[[base, name]]
       end
 
+      # Get all ancestors (superclasses, includes, prepends, extends) for a namespace
+      # @param fqns [String] The fully qualified namespace
+      # @return [Array<String>] Array of ancestor namespaces including the original
+      def get_ancestors(fqns)
+        return [] if fqns.nil? || fqns.empty?
+
+        ancestors = [fqns]
+        visited = Set.new
+        queue = [fqns]
+
+        until queue.empty?
+          current = queue.shift
+          next if current.nil? || current.empty? || visited.include?(current)
+          visited.add(current)
+
+          current = current.gsub(/^::/, '')
+
+          # Add superclass
+          superclass = get_superclass(current)
+          if superclass && !superclass.empty? && !visited.include?(superclass)
+            ancestors << superclass
+            queue << superclass
+          end
+
+          # Add includes, prepends, and extends
+          [get_includes(current), get_prepends(current), get_extends(current)].each do |refs|
+            next if refs.nil?
+            refs.each do |ref|
+              next if ref.nil? || ref.empty? || visited.include?(ref)
+              ancestors << ref
+              queue << ref
+            end
+          end
+        end
+
+        ancestors.compact.uniq
+      end
+
       private
 
       # @return [Index]
diff --git a/spec/api_map_spec.rb b/spec/api_map_spec.rb
index 494f9e156..b447e3fd3 100755
--- a/spec/api_map_spec.rb
+++ b/spec/api_map_spec.rb
@@ -210,19 +210,19 @@ def prot
   it 'finds stacks of methods' do
     map = Solargraph::SourceMap.load_string(%(
       module Mixin
-        def meth; end
+        def select; end
       end
-      class Foo
+      class Foo < Array
         include Mixin
-        def meth; end
+        def select; end
       end
       class Bar < Foo
-        def meth; end
+        def select; end
       end
     ))
     @api_map.index map.pins
-    pins = @api_map.get_method_stack('Bar', 'meth')
-    expect(pins.map(&:path)).to eq(['Bar#meth', 'Foo#meth', 'Mixin#meth'])
+    pins = @api_map.get_method_stack('Bar', 'select')
+    expect(pins.map(&:path)).to eq(['Bar#select', 'Foo#select', 'Mixin#select', 'Array#select', 'Enumerable#select', 'Kernel#select'])
   end
 
   it 'finds symbols' do

From d1e6b128e289ff8ef4ed8bd4c563ec297fcea486 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 27 Aug 2025 13:18:41 -0400
Subject: [PATCH 021/172] RuboCop todo update

---
 .rubocop_todo.yml         | 43 +++++++++++----------------------------
 lib/solargraph/api_map.rb |  2 +-
 lib/solargraph/shell.rb   |  5 +++++
 spec/shell_spec.rb        |  8 +++++---
 spec/spec_helper.rb       |  1 -
 5 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index f400dcfaf..d32ff61cb 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,51 +1,44 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --no-exclude-limit --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 1.79.2.
+# using RuboCop version 1.80.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Include.
-# Include: **/*.gemspec
 Gemspec/AddRuntimeDependency:
   Exclude:
     - 'solargraph.gemspec'
 
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Severity, Include.
-# Include: **/*.gemspec
+# Configuration parameters: Severity.
 Gemspec/DeprecatedAttributeAssignment:
   Exclude:
     - 'solargraph.gemspec'
     - 'spec/fixtures/rdoc-lib/rdoc-lib.gemspec'
 
-# Configuration parameters: EnforcedStyle, AllowedGems, Include.
+# Configuration parameters: EnforcedStyle, AllowedGems.
 # SupportedStyles: Gemfile, gems.rb, gemspec
-# Include: **/*.gemspec, **/Gemfile, **/gems.rb
 Gemspec/DevelopmentDependencies:
   Exclude:
     - 'solargraph.gemspec'
 
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
-# Include: **/*.gemspec
+# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation.
 Gemspec/OrderedDependencies:
   Exclude:
     - 'solargraph.gemspec'
 
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Severity, Include.
-# Include: **/*.gemspec
+# Configuration parameters: Severity.
 Gemspec/RequireMFA:
   Exclude:
     - 'solargraph.gemspec'
     - 'spec/fixtures/rdoc-lib/rdoc-lib.gemspec'
     - 'spec/fixtures/rubocop-custom-version/specifications/rubocop-0.0.0.gemspec'
 
-# Configuration parameters: Severity, Include.
-# Include: **/*.gemspec
+# Configuration parameters: Severity.
 Gemspec/RequiredRubyVersion:
   Exclude:
     - 'spec/fixtures/rdoc-lib/rdoc-lib.gemspec'
@@ -622,7 +615,7 @@ Lint/UnmodifiedReduceAccumulator:
     - 'lib/solargraph/pin/method.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AutoCorrect, IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
+# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
 Lint/UnusedBlockArgument:
   Exclude:
     - 'lib/solargraph/language_server/message/workspace/did_change_workspace_folders.rb'
@@ -630,7 +623,7 @@ Lint/UnusedBlockArgument:
     - 'spec/language_server/transport/data_reader_spec.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AutoCorrect, AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods, NotImplementedExceptions.
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods, NotImplementedExceptions.
 # NotImplementedExceptions: NotImplementedError
 Lint/UnusedMethodArgument:
   Exclude:
@@ -660,13 +653,12 @@ Lint/UnusedMethodArgument:
     - 'spec/doc_map_spec.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AutoCorrect, ContextCreatingMethods, MethodCreatingMethods.
+# Configuration parameters: ContextCreatingMethods, MethodCreatingMethods.
 Lint/UselessAccessModifier:
   Exclude:
     - 'lib/solargraph/api_map.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AutoCorrect.
 Lint/UselessAssignment:
   Exclude:
     - 'lib/solargraph/doc_map.rb'
@@ -697,7 +689,6 @@ Lint/UselessConstantScoping:
     - 'lib/solargraph/rbs_map/conversions.rb'
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AutoCorrect.
 Lint/UselessMethodDefinition:
   Exclude:
     - 'lib/solargraph/pin/signature.rb'
@@ -1009,7 +1000,6 @@ RSpec/DescribedClass:
     - 'spec/yard_map/mapper_spec.rb'
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AutoCorrect.
 RSpec/EmptyExampleGroup:
   Exclude:
     - 'spec/convention_spec.rb'
@@ -1109,16 +1099,10 @@ RSpec/LeakyConstantDeclaration:
     - 'spec/complex_type_spec.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AutoCorrect.
 RSpec/LetBeforeExamples:
   Exclude:
     - 'spec/complex_type_spec.rb'
 
-# Configuration parameters: .
-# SupportedStyles: have_received, receive
-RSpec/MessageSpies:
-  EnforcedStyle: receive
-
 RSpec/MissingExampleGroupArgument:
   Exclude:
     - 'spec/diagnostics/rubocop_helpers_spec.rb'
@@ -1267,13 +1251,11 @@ RSpec/RepeatedExample:
     - 'spec/type_checker/levels/strict_spec.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AutoCorrect.
 RSpec/ScatteredLet:
   Exclude:
     - 'spec/complex_type_spec.rb'
 
-# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
-# Include: **/*_spec.rb
+# Configuration parameters: CustomTransform, IgnoreMethods, IgnoreMetadata.
 RSpec/SpecFilePathFormat:
   Exclude:
     - '**/spec/routing/**/*'
@@ -1703,7 +1685,7 @@ Style/EmptyLambdaParameter:
     - 'spec/rbs_map/core_map_spec.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AutoCorrect, EnforcedStyle.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: compact, expanded
 Style/EmptyMethod:
   Exclude:
@@ -1842,7 +1824,6 @@ Style/FrozenStringLiteralComment:
     - 'spec/rbs_map/core_map_spec.rb'
     - 'spec/rbs_map/stdlib_map_spec.rb'
     - 'spec/rbs_map_spec.rb'
-    - 'spec/shell_spec.rb'
     - 'spec/source/chain/array_spec.rb'
     - 'spec/source/chain/call_spec.rb'
     - 'spec/source/chain/class_variable_spec.rb'
@@ -2234,7 +2215,7 @@ Style/RedundantFreeze:
     - 'lib/solargraph/source_map/mapper.rb'
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AutoCorrect, AllowComments.
+# Configuration parameters: AllowComments.
 Style/RedundantInitialize:
   Exclude:
     - 'lib/solargraph/rbs_map/core_map.rb'
diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 89ed3a308..9231e6a59 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -568,7 +568,7 @@ def get_path_suggestions path
     # Get an array of pins that match the specified path.
     #
     # @param path [String]
-    # @return [Enumerable<Pin::Base>]
+    # @return [Array<Pin::Base>]
     def get_path_pins path
       get_path_suggestions(path)
     end
diff --git a/lib/solargraph/shell.rb b/lib/solargraph/shell.rb
index 48d636bc2..40f5f4323 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -249,12 +249,17 @@ def list
     def method_pin path
       api_map = Solargraph::ApiMap.load_with_cache('.', $stderr)
 
+      # @type [Array<Pin::Base>]
       pins = if options[:stack]
                scope, ns, meth = if path.include? '#'
                                    [:instance, *path.split('#', 2)]
                                  else
                                    [:class, *path.split('.', 2)]
                                  end
+
+               # @sg-ignore Wrong argument type for
+               #   Solargraph::ApiMap#get_method_stack: rooted_tag
+               #   expected String, received Array<String>
                api_map.get_method_stack(ns, meth, scope: scope)
              else
                api_map.get_path_pins path
diff --git a/spec/shell_spec.rb b/spec/shell_spec.rb
index f2eba6a83..cdc0d09fc 100644
--- a/spec/shell_spec.rb
+++ b/spec/shell_spec.rb
@@ -5,7 +5,7 @@
 
 describe Solargraph::Shell do
   let(:shell) { described_class.new }
-  
+
   let(:temp_dir) { Dir.mktmpdir }
 
   before do
@@ -42,7 +42,9 @@ def bundle_exec(*cmd)
     it "uncaches without erroring out" do
       output = bundle_exec("solargraph", "uncache", "solargraph")
 
-      expect(output).to include('Clearing pin cache in')  
+      expect(output).to include('Clearing pin cache in')
+    end
+  end
 
   # @type cmd [Array<String>]
   # @return [String]
@@ -95,7 +97,7 @@ def bundle_exec(*cmd)
           shell.options = { stack: true }
           shell.method_pin('String#to_s')
         end
-        expect(api_map).to have_received(:get_method_stack).with('String', 'to_s', scope: :instance)
+        expect(api_map).to haveo_received(:get_method_stack).with('String', 'to_s', scope: :instance)
       end
 
       it 'prints a static pin using stack results' do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3e2631976..59d107aa3 100755
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -44,7 +44,6 @@ def with_env_var(name, value)
   end
 end
 
-
 def capture_stdout &block
   original_stdout = $stdout
   $stdout = StringIO.new

From 5b612ddee00a78208206095ec32c4bc661820df8 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 27 Aug 2025 13:21:21 -0400
Subject: [PATCH 022/172] Try rbs collection update before specs

---
 .github/workflows/rspec.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index ecc3d9771..9c0fe219e 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -48,6 +48,9 @@ jobs:
       run: |
         bundle install
         bundle update rbs # use latest available for this Ruby version
+    - name: Update types
+      run: |
+        bundle update rbs collection update
     - name: Run tests
       run: bundle exec rake spec
   undercover:

From f2291f4eadf8cf69b4f9f6baa18908a71e40cbbe Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 27 Aug 2025 16:14:24 -0400
Subject: [PATCH 023/172] RuboCop fixes

---
 spec/doc_map_spec.rb                             | 3 ++-
 spec/language_server/host/diagnoser_spec.rb      | 3 ++-
 spec/language_server/host/message_worker_spec.rb | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/spec/doc_map_spec.rb b/spec/doc_map_spec.rb
index b03e573f0..a13308bf6 100644
--- a/spec/doc_map_spec.rb
+++ b/spec/doc_map_spec.rb
@@ -42,8 +42,9 @@
   it 'does not warn for redundant requires' do
     # Requiring 'set' is unnecessary because it's already included in core. It
     # might make sense to log redundant requires, but a warning is overkill.
-    expect(Solargraph.logger).not_to receive(:warn).with(/path set/)
+    allow(Solargraph.logger).to receive(:warn).and_call_original
     Solargraph::DocMap.new(['set'], [])
+    expect(Solargraph.logger).not_to have_received(:warn).with(/path set/)
   end
 
   it 'ignores nil requires' do
diff --git a/spec/language_server/host/diagnoser_spec.rb b/spec/language_server/host/diagnoser_spec.rb
index d59a843f1..69ee0b866 100644
--- a/spec/language_server/host/diagnoser_spec.rb
+++ b/spec/language_server/host/diagnoser_spec.rb
@@ -3,7 +3,8 @@
     host = double(Solargraph::LanguageServer::Host, options: { 'diagnostics' => true }, synchronizing?: false)
     diagnoser = Solargraph::LanguageServer::Host::Diagnoser.new(host)
     diagnoser.schedule 'file.rb'
-    expect(host).to receive(:diagnose).with('file.rb')
+    allow(host).to receive(:diagnose)
     diagnoser.tick
+    expect(host).to have_received(:diagnose).with('file.rb')
   end
 end
diff --git a/spec/language_server/host/message_worker_spec.rb b/spec/language_server/host/message_worker_spec.rb
index b9ce2a41f..5e5bef481 100644
--- a/spec/language_server/host/message_worker_spec.rb
+++ b/spec/language_server/host/message_worker_spec.rb
@@ -2,11 +2,12 @@
   it "handle requests on queue" do
     host = double(Solargraph::LanguageServer::Host)
     message = {'method' => '$/example'}
-    expect(host).to receive(:receive).with(message).and_return(nil)
+    allow(host).to receive(:receive).with(message).and_return(nil)
 
     worker = Solargraph::LanguageServer::Host::MessageWorker.new(host)
     worker.queue(message)
     expect(worker.messages).to eq [message]
     worker.tick
+    expect(host).to have_received(:receive).with(message)
   end
 end

From be46aa30a4951813535e34f3b540fde75a5fb12f Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 27 Aug 2025 16:26:40 -0400
Subject: [PATCH 024/172] Add @sg-ignores

---
 lib/solargraph/shell.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lib/solargraph/shell.rb b/lib/solargraph/shell.rb
index 40f5f4323..0200cc624 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -239,16 +239,22 @@ def list
       puts "#{workspace.filenames.length} files total."
     end
 
+    # @sg-ignore Unresolved call to desc
     desc 'method_pin [PATH]', 'Describe a method pin'
+    # @sg-ignore Unresolved call to option
     option :rbs, type: :boolean, desc: 'Output the pin as RBS', default: false
+    # @sg-ignore Unresolved call to option
     option :typify, type: :boolean, desc: 'Output the calculated return type of the pin from annotations', default: false
+    # @sg-ignore Unresolved call to option
     option :probe, type: :boolean, desc: 'Output the calculated return type of the pin from annotations and inference', default: false
+    # @sg-ignore Unresolved call to option
     option :stack, type: :boolean, desc: 'Show entire stack by including definitions in superclasses', default: false
     # @param path [String] The path to the method pin, e.g. 'Class#method' or 'Class.method'
     # @return [void]
     def method_pin path
       api_map = Solargraph::ApiMap.load_with_cache('.', $stderr)
 
+      # @sg-ignore Unresolved call to options
       # @type [Array<Pin::Base>]
       pins = if options[:stack]
                scope, ns, meth = if path.include? '#'
@@ -269,9 +275,12 @@ def method_pin path
         exit 1
       end
       pins.each do |pin|
+        # @sg-ignore Unresolved call to options
         if options[:typify] || options[:probe]
           type = ComplexType::UNDEFINED
+          # @sg-ignore Unresolved call to options
           type = pin.typify(api_map) if options[:typify]
+          # @sg-ignore Unresolved call to options
           type = pin.probe(api_map) if options[:probe] && type.undefined?
           print_type(type)
           next
@@ -311,6 +320,7 @@ def do_cache gemspec, api_map
     # @param type [ComplexType]
     # @return [void]
     def print_type(type)
+      # @sg-ignore Unresolved call to options
       if options[:rbs]
         puts type.to_rbs
       else
@@ -321,6 +331,7 @@ def print_type(type)
     # @param pin [Solargraph::Pin::Base]
     # @return [void]
     def print_pin(pin)
+      # @sg-ignore Unresolved call to options
       if options[:rbs]
         puts pin.to_rbs
       else

From 0927309cf2d4ff598feff0058fc04bcd9e44bad0 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 27 Aug 2025 17:11:04 -0400
Subject: [PATCH 025/172] Fix typo

---
 .github/workflows/rspec.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index 9c0fe219e..8f6dac24d 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -50,7 +50,7 @@ jobs:
         bundle update rbs # use latest available for this Ruby version
     - name: Update types
       run: |
-        bundle update rbs collection update
+        bundle exec rbs collection update
     - name: Run tests
       run: bundle exec rake spec
   undercover:

From 78995508e6bf35ce1e8c9b2ee4693e71bec52981 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 27 Aug 2025 17:15:16 -0400
Subject: [PATCH 026/172] Exclude problematic combinations on Ruby head

---
 .github/workflows/rspec.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index 8f6dac24d..b06f1425e 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -29,7 +29,15 @@ jobs:
             rbs-version: '3.9.4'
           - ruby-version: '3.0'
             rbs-version: '4.0.0.dev.4'
-    steps:
+          # Missing require in 'rbs collection update' - hopefully
+          # fixed in next RBS release
+          - ruby-version: 'head'
+            rbs-version: '4.0.0.dev.4'
+          - ruby-version: 'head'
+            rbs-version: '3.9.4'
+          - ruby-version: 'head'
+            rbs-version: '3.6.1'
+  steps:
     - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1

From d5d6c5fb74415521d5daab6e91aa9ff4e19ada57 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 27 Aug 2025 17:20:49 -0400
Subject: [PATCH 027/172] Fix indentation

---
 .github/workflows/rspec.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index b06f1425e..7e2c4b9c9 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -37,7 +37,7 @@ jobs:
             rbs-version: '3.9.4'
           - ruby-version: 'head'
             rbs-version: '3.6.1'
-  steps:
+    steps:
     - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1

From 2c6cacd9a2e9c41bdf6a5085e4d263017a392498 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 27 Aug 2025 17:28:18 -0400
Subject: [PATCH 028/172] method_pin -> pin, hide command

---
 lib/solargraph/shell.rb |  6 +++---
 spec/shell_spec.rb      | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/solargraph/shell.rb b/lib/solargraph/shell.rb
index 0200cc624..21a53172f 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -240,7 +240,7 @@ def list
     end
 
     # @sg-ignore Unresolved call to desc
-    desc 'method_pin [PATH]', 'Describe a method pin'
+    desc 'pin [PATH]', 'Describe a pin', hide: true
     # @sg-ignore Unresolved call to option
     option :rbs, type: :boolean, desc: 'Output the pin as RBS', default: false
     # @sg-ignore Unresolved call to option
@@ -248,10 +248,10 @@ def list
     # @sg-ignore Unresolved call to option
     option :probe, type: :boolean, desc: 'Output the calculated return type of the pin from annotations and inference', default: false
     # @sg-ignore Unresolved call to option
-    option :stack, type: :boolean, desc: 'Show entire stack by including definitions in superclasses', default: false
+    option :stack, type: :boolean, desc: 'Show entire stack of a method pin by including definitions in superclasses', default: false
     # @param path [String] The path to the method pin, e.g. 'Class#method' or 'Class.method'
     # @return [void]
-    def method_pin path
+    def pin path
       api_map = Solargraph::ApiMap.load_with_cache('.', $stderr)
 
       # @sg-ignore Unresolved call to options
diff --git a/spec/shell_spec.rb b/spec/shell_spec.rb
index cdc0d09fc..e3c85c6e0 100644
--- a/spec/shell_spec.rb
+++ b/spec/shell_spec.rb
@@ -57,7 +57,7 @@ def bundle_exec(*cmd)
     end
   end
 
-  describe 'method_pin' do
+  describe 'pin' do
     let(:api_map) { instance_double(Solargraph::ApiMap) }
     let(:to_s_pin) { instance_double(Solargraph::Pin::Method, return_type: Solargraph::ComplexType.parse('String')) }
 
@@ -70,7 +70,7 @@ def bundle_exec(*cmd)
       it 'prints a pin' do
         allow(to_s_pin).to receive(:inspect).and_return('pin inspect result')
 
-        out = capture_both { shell.method_pin('String#to_s') }
+        out = capture_both { shell.pin('String#to_s') }
 
         expect(out).to eq("pin inspect result\n")
       end
@@ -82,7 +82,7 @@ def bundle_exec(*cmd)
 
         out = capture_both do
           shell.options = { rbs: true }
-          shell.method_pin('String#to_s')
+          shell.pin('String#to_s')
         end
         expect(out).to eq("pin RBS result\n")
       end
@@ -95,9 +95,9 @@ def bundle_exec(*cmd)
         allow(api_map).to receive(:get_method_stack).and_return([to_s_pin])
         capture_both do
           shell.options = { stack: true }
-          shell.method_pin('String#to_s')
+          shell.pin('String#to_s')
         end
-        expect(api_map).to haveo_received(:get_method_stack).with('String', 'to_s', scope: :instance)
+        expect(api_map).to have_received(:get_method_stack).with('String', 'to_s', scope: :instance)
       end
 
       it 'prints a static pin using stack results' do
@@ -107,7 +107,7 @@ def bundle_exec(*cmd)
         allow(api_map).to receive(:get_method_stack).with('String', 'new', scope: :class).and_return([string_new_pin])
         capture_both do
           shell.options = { stack: true }
-          shell.method_pin('String.new')
+          shell.pin('String.new')
         end
         expect(api_map).to have_received(:get_method_stack).with('String', 'new', scope: :class)
       end
@@ -119,7 +119,7 @@ def bundle_exec(*cmd)
 
         out = capture_both do
           shell.options = { typify: true }
-          shell.method_pin('String#to_s')
+          shell.pin('String#to_s')
         end
         expect(out).to eq("::String\n")
       end
@@ -131,7 +131,7 @@ def bundle_exec(*cmd)
 
         out = capture_both do
           shell.options = { typify: true, rbs: true }
-          shell.method_pin('String#to_s')
+          shell.pin('String#to_s')
         end
         expect(out).to eq("::String\n")
       end
@@ -143,7 +143,7 @@ def bundle_exec(*cmd)
 
         out = capture_both do
           shell.options = {}
-          shell.method_pin('Not#found')
+          shell.pin('Not#found')
         rescue SystemExit
           # Ignore the SystemExit raised by the shell when no pin is found
         end

From 56636ae7022c3cc9c47b729e25c42d816243bdb9 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 27 Aug 2025 17:40:15 -0400
Subject: [PATCH 029/172] Fix type

---
 lib/solargraph/api_map.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 9231e6a59..4e8332080 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -559,7 +559,7 @@ def get_method_stack rooted_tag, name, scope: :instance, visibility: [:private,
     # @deprecated Use #get_path_pins instead.
     #
     # @param path [String] The path to find
-    # @return [Enumerable<Solargraph::Pin::Base>]
+    # @return [Array<Solargraph::Pin::Base>]
     def get_path_suggestions path
       return [] if path.nil?
       resolve_method_aliases store.get_path_pins(path)

From 6acfa0c54a806da203daf30765c7a99a67066f16 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 30 Aug 2025 09:06:14 -0400
Subject: [PATCH 030/172] RuboCop todo file stability

To avoid merge conflicts and contributors having to deal with
non-intuitive RuboCop todo changes:

* Lock down development versions of RuboCop and plugins so that
  unrelated PRs aren't affected by newly implemented RuboCop rules.
* Exclude rule entirely if more than 5 files violate it today, so that
  PRs are less likely to cause todo file changes unless they are
  specifically targeted at cleanup.
* Clarify guidance on RuboCop todo file in CI error message.
* Fix to hopefully ensure guidance always appears in CI error message.
---
 .github/workflows/linting.yml |    6 +-
 .rubocop.yml                  |    1 -
 .rubocop_todo.yml             | 1588 ++-------------------------------
 solargraph.gemspec            |   13 +-
 4 files changed, 98 insertions(+), 1510 deletions(-)

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index 8abbf51ef..aa22ce22c 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -115,11 +115,13 @@ jobs:
     - name: Run RuboCop against todo file
       continue-on-error: true
       run: |
-        bundle exec rubocop --auto-gen-config --no-exclude-limit --no-offense-counts --no-auto-gen-timestamp
+        cmd="bundle exec rubocop --auto-gen-config --exclude-limit=5 --no-offense-counts --no-auto-gen-timestampxb*com"
+        ${cmd:?}
+        set +e
         if [ -n "$(git status --porcelain)" ]
         then
           git status --porcelain
           git diff -u .
-           >&2 echo "Please fix deltas if bad or run 'bundle exec rubocop --auto-gen-config --no-exclude-limit --no-offense-counts --no-auto-gen-timestamp' and push up changes if good"
+           >&2 echo "Please address any new issues, then run '${cmd:?}' and push up any improvements"
            exit 1
         fi
diff --git a/.rubocop.yml b/.rubocop.yml
index a73324db2..c7643c3c6 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -34,7 +34,6 @@ Metrics/ParameterLists:
   Max: 7
   CountKeywordArgs: false
 
-
 # we tend to use @@ and the risk doesn't seem high
 Style/ClassVars:
   Enabled: false
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index f3f0069f3..bf6b2272a 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,5 +1,5 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config --no-exclude-limit --no-offense-counts --no-auto-gen-timestamp`
+# `rubocop --auto-gen-config --exclude-limit 5 --no-offense-counts --no-auto-gen-timestamp`
 # using RuboCop version 1.79.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
@@ -83,23 +83,7 @@ Layout/CommentIndentation:
 
 # This cop supports safe autocorrection (--autocorrect).
 Layout/ElseAlignment:
-  Exclude:
-    - 'lib/solargraph.rb'
-    - 'lib/solargraph/api_map/store.rb'
-    - 'lib/solargraph/diagnostics/rubocop.rb'
-    - 'lib/solargraph/language_server/message/extended/check_gem_version.rb'
-    - 'lib/solargraph/library.rb'
-    - 'lib/solargraph/parser/parser_gem/node_methods.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/block_node.rb'
-    - 'lib/solargraph/pin/method.rb'
-    - 'lib/solargraph/pin/namespace.rb'
-    - 'lib/solargraph/rbs_map.rb'
-    - 'lib/solargraph/shell.rb'
-    - 'lib/solargraph/source/chain/call.rb'
-    - 'lib/solargraph/source_map/clip.rb'
-    - 'lib/solargraph/source_map/mapper.rb'
-    - 'lib/solargraph/type_checker/rules.rb'
-    - 'lib/solargraph/yard_map/mapper.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EmptyLineBetweenMethodDefs, EmptyLineBetweenClassDefs, EmptyLineBetweenModuleDefs, DefLikeMacros, AllowAdjacentOneLineDefs, NumberOfEmptyLines.
@@ -111,18 +95,7 @@ Layout/EmptyLineBetweenDefs:
 
 # This cop supports safe autocorrection (--autocorrect).
 Layout/EmptyLines:
-  Exclude:
-    - 'lib/solargraph/bench.rb'
-    - 'lib/solargraph/complex_type/unique_type.rb'
-    - 'lib/solargraph/doc_map.rb'
-    - 'lib/solargraph/language_server/message/extended/check_gem_version.rb'
-    - 'lib/solargraph/language_server/message/initialize.rb'
-    - 'lib/solargraph/pin/delegated_method.rb'
-    - 'lib/solargraph/rbs_map/conversions.rb'
-    - 'spec/complex_type_spec.rb'
-    - 'spec/pin/local_variable_spec.rb'
-    - 'spec/pin/symbol_spec.rb'
-    - 'spec/type_checker/levels/strict_spec.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
@@ -142,23 +115,7 @@ Layout/EmptyLinesAroundModuleBody:
 # Configuration parameters: EnforcedStyleAlignWith, Severity.
 # SupportedStylesAlignWith: keyword, variable, start_of_line
 Layout/EndAlignment:
-  Exclude:
-    - 'lib/solargraph.rb'
-    - 'lib/solargraph/api_map/store.rb'
-    - 'lib/solargraph/diagnostics/rubocop.rb'
-    - 'lib/solargraph/language_server/message/extended/check_gem_version.rb'
-    - 'lib/solargraph/library.rb'
-    - 'lib/solargraph/parser/parser_gem/node_methods.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/block_node.rb'
-    - 'lib/solargraph/pin/method.rb'
-    - 'lib/solargraph/pin/namespace.rb'
-    - 'lib/solargraph/rbs_map.rb'
-    - 'lib/solargraph/shell.rb'
-    - 'lib/solargraph/source/chain/call.rb'
-    - 'lib/solargraph/source_map/clip.rb'
-    - 'lib/solargraph/source_map/mapper.rb'
-    - 'lib/solargraph/type_checker/rules.rb'
-    - 'lib/solargraph/yard_map/mapper.rb'
+  Enabled: false
 
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: native, lf, crlf
@@ -172,13 +129,7 @@ Layout/EndOfLine:
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
 Layout/ExtraSpacing:
-  Exclude:
-    - 'lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb'
-    - 'lib/solargraph/pin/closure.rb'
-    - 'lib/solargraph/pin/local_variable.rb'
-    - 'lib/solargraph/rbs_map/conversions.rb'
-    - 'lib/solargraph/type_checker.rb'
-    - 'spec/spec_helper.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, IndentationWidth.
@@ -203,22 +154,7 @@ Layout/FirstArrayElementIndentation:
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
 Layout/FirstHashElementIndentation:
-  Exclude:
-    - 'lib/solargraph/language_server/message/extended/check_gem_version.rb'
-    - 'lib/solargraph/language_server/message/extended/document_gems.rb'
-    - 'lib/solargraph/language_server/message/text_document/completion.rb'
-    - 'lib/solargraph/language_server/message/text_document/rename.rb'
-    - 'lib/solargraph/language_server/message/text_document/signature_help.rb'
-    - 'lib/solargraph/pin/base_variable.rb'
-    - 'spec/language_server/host_spec.rb'
-    - 'spec/language_server/message/completion_item/resolve_spec.rb'
-    - 'spec/language_server/message/initialize_spec.rb'
-    - 'spec/language_server/message/text_document/definition_spec.rb'
-    - 'spec/language_server/message/text_document/formatting_spec.rb'
-    - 'spec/language_server/message/text_document/hover_spec.rb'
-    - 'spec/language_server/message/text_document/rename_spec.rb'
-    - 'spec/language_server/message/text_document/type_definition_spec.rb'
-    - 'spec/language_server/message/workspace/did_change_watched_files_spec.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
@@ -239,27 +175,7 @@ Layout/HeredocIndentation:
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Width, AllowedPatterns.
 Layout/IndentationWidth:
-  Exclude:
-    - 'lib/solargraph.rb'
-    - 'lib/solargraph/api_map/store.rb'
-    - 'lib/solargraph/diagnostics/rubocop.rb'
-    - 'lib/solargraph/language_server/message/extended/check_gem_version.rb'
-    - 'lib/solargraph/library.rb'
-    - 'lib/solargraph/parser/parser_gem/node_methods.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/block_node.rb'
-    - 'lib/solargraph/pin/method.rb'
-    - 'lib/solargraph/pin/namespace.rb'
-    - 'lib/solargraph/rbs_map.rb'
-    - 'lib/solargraph/shell.rb'
-    - 'lib/solargraph/source/chain/call.rb'
-    - 'lib/solargraph/source_map/clip.rb'
-    - 'lib/solargraph/source_map/mapper.rb'
-    - 'lib/solargraph/type_checker.rb'
-    - 'lib/solargraph/type_checker/rules.rb'
-    - 'lib/solargraph/yard_map/mapper.rb'
-    - 'spec/api_map/config_spec.rb'
-    - 'spec/shell_spec.rb'
-    - 'spec/source_map/mapper_spec.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment, AllowRBSInlineAnnotation, AllowSteepAnnotation.
@@ -289,14 +205,7 @@ Layout/MultilineMethodCallBraceLayout:
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: aligned, indented, indented_relative_to_receiver
 Layout/MultilineMethodCallIndentation:
-  Exclude:
-    - 'lib/solargraph/api_map.rb'
-    - 'lib/solargraph/diagnostics/type_check.rb'
-    - 'lib/solargraph/language_server/message/completion_item/resolve.rb'
-    - 'lib/solargraph/language_server/message/text_document/hover.rb'
-    - 'lib/solargraph/library.rb'
-    - 'lib/solargraph/pin/search.rb'
-    - 'lib/solargraph/type_checker.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, IndentationWidth.
@@ -316,13 +225,7 @@ Layout/SpaceAfterComma:
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: space, no_space
 Layout/SpaceAroundEqualsInParameterDefault:
-  Exclude:
-    - 'lib/solargraph/pin/base.rb'
-    - 'lib/solargraph/pin/base_variable.rb'
-    - 'lib/solargraph/pin/callable.rb'
-    - 'lib/solargraph/pin/closure.rb'
-    - 'lib/solargraph/pin/local_variable.rb'
-    - 'lib/solargraph/pin/parameter.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 Layout/SpaceAroundKeyword:
@@ -334,56 +237,14 @@ Layout/SpaceAroundKeyword:
 # SupportedStylesForExponentOperator: space, no_space
 # SupportedStylesForRationalLiterals: space, no_space
 Layout/SpaceAroundOperators:
-  Exclude:
-    - 'lib/solargraph/library.rb'
-    - 'lib/solargraph/parser/parser_gem/node_methods.rb'
-    - 'lib/solargraph/pin/local_variable.rb'
-    - 'lib/solargraph/source.rb'
-    - 'lib/solargraph/source/change.rb'
-    - 'lib/solargraph/source/cursor.rb'
-    - 'lib/solargraph/source/source_chainer.rb'
-    - 'lib/solargraph/source_map/clip.rb'
-    - 'lib/solargraph/workspace/config.rb'
-    - 'spec/library_spec.rb'
-    - 'spec/yard_map/mapper_spec.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
 # SupportedStyles: space, no_space
 # SupportedStylesForEmptyBraces: space, no_space
 Layout/SpaceBeforeBlockBraces:
-  Exclude:
-    - 'lib/solargraph/api_map.rb'
-    - 'lib/solargraph/api_map/store.rb'
-    - 'lib/solargraph/diagnostics/rubocop.rb'
-    - 'lib/solargraph/diagnostics/update_errors.rb'
-    - 'lib/solargraph/language_server/host.rb'
-    - 'lib/solargraph/library.rb'
-    - 'lib/solargraph/parser/parser_gem/node_methods.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/and_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/if_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/send_node.rb'
-    - 'lib/solargraph/pin/base.rb'
-    - 'lib/solargraph/source.rb'
-    - 'lib/solargraph/source/chain/call.rb'
-    - 'lib/solargraph/source/chain/class_variable.rb'
-    - 'lib/solargraph/source/chain/constant.rb'
-    - 'lib/solargraph/source/chain/global_variable.rb'
-    - 'lib/solargraph/source/chain/instance_variable.rb'
-    - 'lib/solargraph/source/chain/variable.rb'
-    - 'lib/solargraph/source/source_chainer.rb'
-    - 'lib/solargraph/source_map/clip.rb'
-    - 'lib/solargraph/source_map/mapper.rb'
-    - 'lib/solargraph/workspace/config.rb'
-    - 'spec/language_server/host_spec.rb'
-    - 'spec/language_server/protocol_spec.rb'
-    - 'spec/library_spec.rb'
-    - 'spec/pin/constant_spec.rb'
-    - 'spec/pin/instance_variable_spec.rb'
-    - 'spec/rbs_map/core_map_spec.rb'
-    - 'spec/source_map/mapper_spec.rb'
-    - 'spec/source_map_spec.rb'
-    - 'spec/source_spec.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 Layout/SpaceBeforeComma:
@@ -395,28 +256,7 @@ Layout/SpaceBeforeComma:
 # SupportedStyles: space, no_space
 # SupportedStylesForEmptyBraces: space, no_space
 Layout/SpaceInsideBlockBraces:
-  Exclude:
-    - 'lib/solargraph/api_map.rb'
-    - 'lib/solargraph/api_map/store.rb'
-    - 'lib/solargraph/diagnostics/update_errors.rb'
-    - 'lib/solargraph/language_server/host.rb'
-    - 'lib/solargraph/parser/parser_gem/node_methods.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/and_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/if_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/send_node.rb'
-    - 'lib/solargraph/source/chain/call.rb'
-    - 'lib/solargraph/source/chain/class_variable.rb'
-    - 'lib/solargraph/source/chain/global_variable.rb'
-    - 'lib/solargraph/source/chain/instance_variable.rb'
-    - 'lib/solargraph/source/chain/variable.rb'
-    - 'lib/solargraph/source/source_chainer.rb'
-    - 'lib/solargraph/source_map/mapper.rb'
-    - 'spec/language_server/protocol_spec.rb'
-    - 'spec/library_spec.rb'
-    - 'spec/pin/constant_spec.rb'
-    - 'spec/rbs_map/core_map_spec.rb'
-    - 'spec/source_map/mapper_spec.rb'
-    - 'spec/source_spec.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
@@ -455,13 +295,7 @@ Lint/AmbiguousBlockAssociation:
 
 # This cop supports safe autocorrection (--autocorrect).
 Lint/AmbiguousOperator:
-  Exclude:
-    - 'lib/solargraph/api_map.rb'
-    - 'lib/solargraph/complex_type.rb'
-    - 'lib/solargraph/language_server/message/workspace/did_change_watched_files.rb'
-    - 'lib/solargraph/parser/parser_gem/class_methods.rb'
-    - 'lib/solargraph/pin/constant.rb'
-    - 'lib/solargraph/pin/method.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 Lint/AmbiguousOperatorPrecedence:
@@ -472,15 +306,7 @@ Lint/AmbiguousOperatorPrecedence:
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: RequireParenthesesForMethodChains.
 Lint/AmbiguousRange:
-  Exclude:
-    - 'lib/solargraph/library.rb'
-    - 'lib/solargraph/parser/parser_gem/node_methods.rb'
-    - 'lib/solargraph/source.rb'
-    - 'lib/solargraph/source/change.rb'
-    - 'lib/solargraph/source/cursor.rb'
-    - 'lib/solargraph/source/source_chainer.rb'
-    - 'lib/solargraph/source_map/clip.rb'
-    - 'spec/library_spec.rb'
+  Enabled: false
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowSafeAssignment.
@@ -514,14 +340,7 @@ Lint/DuplicateBranch:
     - 'lib/solargraph/rbs_map/conversions.rb'
 
 Lint/DuplicateMethods:
-  Exclude:
-    - 'lib/solargraph/complex_type.rb'
-    - 'lib/solargraph/location.rb'
-    - 'lib/solargraph/pin/base.rb'
-    - 'lib/solargraph/pin/signature.rb'
-    - 'lib/solargraph/rbs_map.rb'
-    - 'lib/solargraph/rbs_map/core_map.rb'
-    - 'lib/solargraph/source/chain/link.rb'
+  Enabled: false
 
 # Configuration parameters: AllowComments, AllowEmptyLambdas.
 Lint/EmptyBlock:
@@ -530,13 +349,7 @@ Lint/EmptyBlock:
 
 # Configuration parameters: AllowComments.
 Lint/EmptyClass:
-  Exclude:
-    - 'spec/fixtures/rubocop-validation-error/app.rb'
-    - 'spec/fixtures/workspace-with-gemfile/lib/other.rb'
-    - 'spec/fixtures/workspace/lib/other.rb'
-    - 'spec/fixtures/workspace/lib/something.rb'
-    - 'spec/fixtures/workspace_folders/folder1/app.rb'
-    - 'spec/fixtures/workspace_folders/folder2/app.rb'
+  Enabled: false
 
 # Configuration parameters: AllowComments.
 Lint/EmptyFile:
@@ -635,31 +448,7 @@ Lint/UnusedBlockArgument:
 # Configuration parameters: AutoCorrect, AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods, NotImplementedExceptions.
 # NotImplementedExceptions: NotImplementedError
 Lint/UnusedMethodArgument:
-  Exclude:
-    - 'lib/solargraph.rb'
-    - 'lib/solargraph/complex_type/type_methods.rb'
-    - 'lib/solargraph/convention/base.rb'
-    - 'lib/solargraph/diagnostics/base.rb'
-    - 'lib/solargraph/diagnostics/update_errors.rb'
-    - 'lib/solargraph/doc_map.rb'
-    - 'lib/solargraph/pin/namespace.rb'
-    - 'lib/solargraph/rbs_map/conversions.rb'
-    - 'lib/solargraph/source.rb'
-    - 'lib/solargraph/source/chain.rb'
-    - 'lib/solargraph/source/chain/block_symbol.rb'
-    - 'lib/solargraph/source/chain/block_variable.rb'
-    - 'lib/solargraph/source/chain/call.rb'
-    - 'lib/solargraph/source/chain/class_variable.rb'
-    - 'lib/solargraph/source/chain/constant.rb'
-    - 'lib/solargraph/source/chain/global_variable.rb'
-    - 'lib/solargraph/source/chain/hash.rb'
-    - 'lib/solargraph/source/chain/head.rb'
-    - 'lib/solargraph/source/chain/instance_variable.rb'
-    - 'lib/solargraph/source/chain/link.rb'
-    - 'lib/solargraph/source/chain/literal.rb'
-    - 'lib/solargraph/source/chain/variable.rb'
-    - 'lib/solargraph/source/chain/z_super.rb'
-    - 'spec/doc_map_spec.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AutoCorrect, ContextCreatingMethods, MethodCreatingMethods.
@@ -670,30 +459,7 @@ Lint/UselessAccessModifier:
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AutoCorrect.
 Lint/UselessAssignment:
-  Exclude:
-    - 'lib/solargraph/api_map.rb'
-    - 'lib/solargraph/doc_map.rb'
-    - 'lib/solargraph/language_server/message/extended/check_gem_version.rb'
-    - 'lib/solargraph/language_server/message/extended/document_gems.rb'
-    - 'lib/solargraph/language_server/message/text_document/completion.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/send_node.rb'
-    - 'lib/solargraph/pin/method.rb'
-    - 'lib/solargraph/pin/parameter.rb'
-    - 'lib/solargraph/rbs_map/conversions.rb'
-    - 'lib/solargraph/source.rb'
-    - 'lib/solargraph/source/chain/call.rb'
-    - 'lib/solargraph/source/source_chainer.rb'
-    - 'lib/solargraph/source_map/mapper.rb'
-    - 'lib/solargraph/type_checker.rb'
-    - 'spec/fixtures/long_squiggly_heredoc.rb'
-    - 'spec/fixtures/rubocop-unused-variable-error/app.rb'
-    - 'spec/fixtures/unicode.rb'
-    - 'spec/language_server/host_spec.rb'
-    - 'spec/language_server/protocol_spec.rb'
-    - 'spec/library_spec.rb'
-    - 'spec/pin/namespace_spec.rb'
-    - 'spec/source/chain/call_spec.rb'
-    - 'spec/source_map/mapper_spec.rb'
+  Enabled: false
 
 Lint/UselessConstantScoping:
   Exclude:
@@ -707,43 +473,16 @@ Lint/UselessMethodDefinition:
 
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
-  Exclude:
-    - 'lib/solargraph/api_map.rb'
-    - 'lib/solargraph/api_map/source_to_yard.rb'
-    - 'lib/solargraph/complex_type.rb'
-    - 'lib/solargraph/doc_map.rb'
-    - 'lib/solargraph/language_server/host.rb'
-    - 'lib/solargraph/language_server/message/initialize.rb'
-    - 'lib/solargraph/library.rb'
-    - 'lib/solargraph/parser/parser_gem/node_chainer.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/sclass_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/send_node.rb'
-    - 'lib/solargraph/pin/method.rb'
-    - 'lib/solargraph/rbs_map/conversions.rb'
-    - 'lib/solargraph/source/chain/call.rb'
-    - 'lib/solargraph/source/source_chainer.rb'
-    - 'lib/solargraph/source_map/clip.rb'
-    - 'lib/solargraph/source_map/mapper.rb'
-    - 'lib/solargraph/type_checker.rb'
+  Enabled: false
 
-# Configuration parameters: CountComments, Max, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Exclude:
-    - 'lib/solargraph/api_map.rb'
-    - 'lib/solargraph/api_map/source_to_yard.rb'
-    - 'lib/solargraph/complex_type.rb'
-    - 'lib/solargraph/convention/struct_definition.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/send_node.rb'
-    - 'lib/solargraph/source/chain/call.rb'
-    - 'lib/solargraph/type_checker.rb'
+  Max: 54
 
-# Configuration parameters: CountBlocks, CountModifierForms, Max.
+# Configuration parameters: CountBlocks, CountModifierForms.
 Metrics/BlockNesting:
-  Exclude:
-    - 'lib/solargraph/source/source_chainer.rb'
-    - 'lib/solargraph/source_map/clip.rb'
-    - 'lib/solargraph/type_checker.rb'
+  Max: 5
 
 # Configuration parameters: CountComments, Max, CountAsOne.
 Metrics/ClassLength:
@@ -755,33 +494,15 @@ Metrics/ClassLength:
 
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
-  Exclude:
-    - 'lib/solargraph/api_map/source_to_yard.rb'
-    - 'lib/solargraph/complex_type.rb'
-    - 'lib/solargraph/parser/parser_gem/node_chainer.rb'
-    - 'lib/solargraph/pin/method.rb'
-    - 'lib/solargraph/rbs_map/conversions.rb'
-    - 'lib/solargraph/source/chain/call.rb'
-    - 'lib/solargraph/source/source_chainer.rb'
-    - 'lib/solargraph/source_map/mapper.rb'
-    - 'lib/solargraph/type_checker.rb'
+  Enabled: false
 
 # Configuration parameters: CountComments, Max, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Exclude:
-    - 'lib/solargraph/api_map.rb'
-    - 'lib/solargraph/complex_type.rb'
-    - 'lib/solargraph/convention/struct_definition.rb'
-    - 'lib/solargraph/parser/parser_gem/node_chainer.rb'
-    - 'lib/solargraph/source/chain/call.rb'
-    - 'lib/solargraph/source_map/mapper.rb'
+  Enabled: false
 
-# Configuration parameters: CountComments, Max, CountAsOne.
+# Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Exclude:
-    - 'lib/solargraph/complex_type/type_methods.rb'
-    - 'lib/solargraph/parser/parser_gem/node_methods.rb'
-    - 'lib/solargraph/pin_cache.rb'
+  Max: 169
 
 # Configuration parameters: Max, CountKeywordArgs, MaxOptionalParameters.
 Metrics/ParameterLists:
@@ -794,13 +515,7 @@ Metrics/ParameterLists:
 
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/PerceivedComplexity:
-  Exclude:
-    - 'lib/solargraph/complex_type.rb'
-    - 'lib/solargraph/parser/parser_gem/node_chainer.rb'
-    - 'lib/solargraph/source/chain/call.rb'
-    - 'lib/solargraph/source/source_chainer.rb'
-    - 'lib/solargraph/source_map/mapper.rb'
-    - 'lib/solargraph/type_checker.rb'
+  Enabled: false
 
 Naming/AccessorMethodName:
   Exclude:
@@ -823,41 +538,18 @@ Naming/HeredocDelimiterNaming:
 # Configuration parameters: EnforcedStyleForLeadingUnderscores.
 # SupportedStylesForLeadingUnderscores: disallowed, required, optional
 Naming/MemoizedInstanceVariableName:
-  Exclude:
-    - 'lib/solargraph/complex_type/type_methods.rb'
-    - 'lib/solargraph/convention/gemfile.rb'
-    - 'lib/solargraph/convention/gemspec.rb'
-    - 'lib/solargraph/convention/rakefile.rb'
-    - 'lib/solargraph/doc_map.rb'
-    - 'lib/solargraph/rbs_map.rb'
-    - 'lib/solargraph/workspace.rb'
+  Enabled: false
 
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
 # AllowedNames: as, at, by, cc, db, id, if, in, io, ip, of, on, os, pp, to
 Naming/MethodParameterName:
-  Exclude:
-    - 'lib/solargraph/parser/parser_gem/node_chainer.rb'
-    - 'lib/solargraph/pin/base.rb'
-    - 'lib/solargraph/range.rb'
-    - 'lib/solargraph/source.rb'
-    - 'lib/solargraph/yard_map/mapper/to_method.rb'
-    - 'lib/solargraph/yard_map/to_method.rb'
+  Enabled: false
 
 # Configuration parameters: Mode, AllowedMethods, AllowedPatterns, AllowBangMethods, WaywardPredicates.
 # AllowedMethods: call
 # WaywardPredicates: nonzero?
 Naming/PredicateMethod:
-  Exclude:
-    - 'lib/solargraph/api_map/store.rb'
-    - 'lib/solargraph/convention/data_definition.rb'
-    - 'lib/solargraph/convention/struct_definition.rb'
-    - 'lib/solargraph/language_server/progress.rb'
-    - 'lib/solargraph/library.rb'
-    - 'lib/solargraph/parser/node_processor/base.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/send_node.rb'
-    - 'lib/solargraph/pin/base.rb'
-    - 'lib/solargraph/pin/local_variable.rb'
-    - 'lib/solargraph/workspace.rb'
+  Enabled: false
 
 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros, UseSorbetSigs.
 # NamePrefix: is_, has_, have_, does_
@@ -912,16 +604,7 @@ RSpec/BeforeAfterAll:
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
-  Exclude:
-    - 'spec/complex_type_spec.rb'
-    - 'spec/library_spec.rb'
-    - 'spec/pin/method_spec.rb'
-    - 'spec/pin/parameter_spec.rb'
-    - 'spec/pin/symbol_spec.rb'
-    - 'spec/type_checker/levels/normal_spec.rb'
-    - 'spec/type_checker/levels/strict_spec.rb'
-    - 'spec/type_checker/levels/strong_spec.rb'
-    - 'spec/type_checker/levels/typed_spec.rb'
+  Enabled: false
 
 # Configuration parameters: IgnoredMetadata.
 RSpec/DescribeClass:
@@ -938,81 +621,11 @@ RSpec/DescribeClass:
 # Configuration parameters: SkipBlocks, EnforcedStyle, OnlyStaticConstants.
 # SupportedStyles: described_class, explicit
 RSpec/DescribedClass:
-  Exclude:
-    - 'spec/api_map/cache_spec.rb'
-    - 'spec/api_map/source_to_yard_spec.rb'
-    - 'spec/api_map/store_spec.rb'
-    - 'spec/api_map_spec.rb'
-    - 'spec/diagnostics/base_spec.rb'
-    - 'spec/diagnostics/require_not_found_spec.rb'
-    - 'spec/diagnostics/rubocop_helpers_spec.rb'
-    - 'spec/diagnostics/rubocop_spec.rb'
-    - 'spec/diagnostics/type_check_spec.rb'
-    - 'spec/diagnostics/update_errors_spec.rb'
-    - 'spec/diagnostics_spec.rb'
-    - 'spec/doc_map_spec.rb'
-    - 'spec/gem_pins_spec.rb'
-    - 'spec/language_server/host/diagnoser_spec.rb'
-    - 'spec/language_server/host/dispatch_spec.rb'
-    - 'spec/language_server/host/message_worker_spec.rb'
-    - 'spec/language_server/host_spec.rb'
-    - 'spec/language_server/message/completion_item/resolve_spec.rb'
-    - 'spec/language_server/message/extended/check_gem_version_spec.rb'
-    - 'spec/language_server/message/initialize_spec.rb'
-    - 'spec/language_server/message/text_document/definition_spec.rb'
-    - 'spec/language_server/message/text_document/formatting_spec.rb'
-    - 'spec/language_server/message/text_document/hover_spec.rb'
-    - 'spec/language_server/message/text_document/rename_spec.rb'
-    - 'spec/language_server/message/text_document/type_definition_spec.rb'
-    - 'spec/language_server/message/workspace/did_change_watched_files_spec.rb'
-    - 'spec/language_server/message_spec.rb'
-    - 'spec/language_server/protocol_spec.rb'
-    - 'spec/language_server/transport/data_reader_spec.rb'
-    - 'spec/language_server/uri_helpers_spec.rb'
-    - 'spec/library_spec.rb'
-    - 'spec/logging_spec.rb'
-    - 'spec/parser/node_methods_spec.rb'
-    - 'spec/parser/node_processor_spec.rb'
-    - 'spec/parser_spec.rb'
-    - 'spec/pin/base_spec.rb'
-    - 'spec/pin/delegated_method_spec.rb'
-    - 'spec/pin/instance_variable_spec.rb'
-    - 'spec/pin/keyword_spec.rb'
-    - 'spec/pin/local_variable_spec.rb'
-    - 'spec/pin/method_spec.rb'
-    - 'spec/pin/namespace_spec.rb'
-    - 'spec/pin/parameter_spec.rb'
-    - 'spec/pin/search_spec.rb'
-    - 'spec/pin/symbol_spec.rb'
-    - 'spec/position_spec.rb'
-    - 'spec/rbs_map/conversions_spec.rb'
-    - 'spec/rbs_map/core_map_spec.rb'
-    - 'spec/rbs_map/stdlib_map_spec.rb'
-    - 'spec/rbs_map_spec.rb'
-    - 'spec/source/chain/class_variable_spec.rb'
-    - 'spec/source/chain/global_variable_spec.rb'
-    - 'spec/source/chain/head_spec.rb'
-    - 'spec/source/chain/instance_variable_spec.rb'
-    - 'spec/source/chain/z_super_spec.rb'
-    - 'spec/source/change_spec.rb'
-    - 'spec/source/source_chainer_spec.rb'
-    - 'spec/source/updater_spec.rb'
-    - 'spec/source_map/mapper_spec.rb'
-    - 'spec/source_map_spec.rb'
-    - 'spec/source_spec.rb'
-    - 'spec/type_checker/checks_spec.rb'
-    - 'spec/type_checker/levels/normal_spec.rb'
-    - 'spec/type_checker/levels/strict_spec.rb'
-    - 'spec/type_checker/rules_spec.rb'
-    - 'spec/type_checker_spec.rb'
-    - 'spec/workspace/config_spec.rb'
-    - 'spec/workspace_spec.rb'
-    - 'spec/yard_map/mapper/to_method_spec.rb'
-    - 'spec/yard_map/mapper_spec.rb'
-
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AutoCorrect.
-RSpec/EmptyExampleGroup:
+  Enabled: false
+
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AutoCorrect.
+RSpec/EmptyExampleGroup:
   Exclude:
     - 'spec/convention_spec.rb'
 
@@ -1023,33 +636,7 @@ RSpec/EmptyLineAfterFinalLet:
 
 # Configuration parameters: Max, CountAsOne.
 RSpec/ExampleLength:
-  Exclude:
-    - 'spec/api_map_spec.rb'
-    - 'spec/complex_type_spec.rb'
-    - 'spec/language_server/host_spec.rb'
-    - 'spec/language_server/message/initialize_spec.rb'
-    - 'spec/language_server/message/text_document/definition_spec.rb'
-    - 'spec/language_server/message/text_document/hover_spec.rb'
-    - 'spec/language_server/message/text_document/rename_spec.rb'
-    - 'spec/language_server/message/text_document/type_definition_spec.rb'
-    - 'spec/language_server/message/workspace/did_change_watched_files_spec.rb'
-    - 'spec/language_server/protocol_spec.rb'
-    - 'spec/library_spec.rb'
-    - 'spec/parser/flow_sensitive_typing_spec.rb'
-    - 'spec/parser/node_methods_spec.rb'
-    - 'spec/parser/node_processor_spec.rb'
-    - 'spec/pin/base_variable_spec.rb'
-    - 'spec/pin/delegated_method_spec.rb'
-    - 'spec/pin/local_variable_spec.rb'
-    - 'spec/pin/parameter_spec.rb'
-    - 'spec/source/chain/call_spec.rb'
-    - 'spec/source/chain_spec.rb'
-    - 'spec/source_map/clip_spec.rb'
-    - 'spec/source_map/mapper_spec.rb'
-    - 'spec/source_map_spec.rb'
-    - 'spec/source_spec.rb'
-    - 'spec/type_checker/levels/strict_spec.rb'
-    - 'spec/type_checker_spec.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: CustomTransform, IgnoredWords, DisallowedExamples.
@@ -1077,15 +664,7 @@ RSpec/ExpectActual:
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: implicit, each, example
 RSpec/HookArgument:
-  Exclude:
-    - 'spec/api_map/config_spec.rb'
-    - 'spec/diagnostics/require_not_found_spec.rb'
-    - 'spec/language_server/host/dispatch_spec.rb'
-    - 'spec/language_server/host_spec.rb'
-    - 'spec/language_server/message/extended/check_gem_version_spec.rb'
-    - 'spec/language_server/protocol_spec.rb'
-    - 'spec/workspace/config_spec.rb'
-    - 'spec/workspace_spec.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: .
@@ -1095,13 +674,7 @@ RSpec/ImplicitExpect:
 
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
-  Exclude:
-    - 'spec/api_map/config_spec.rb'
-    - 'spec/api_map_spec.rb'
-    - 'spec/diagnostics/require_not_found_spec.rb'
-    - 'spec/language_server/host/dispatch_spec.rb'
-    - 'spec/language_server/host_spec.rb'
-    - 'spec/language_server/protocol_spec.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 RSpec/LeadingSubject:
@@ -1127,89 +700,17 @@ RSpec/MissingExampleGroupArgument:
   Exclude:
     - 'spec/diagnostics/rubocop_helpers_spec.rb'
 
-# Configuration parameters: Max.
 RSpec/MultipleExpectations:
-  Exclude:
-    - 'spec/api_map/cache_spec.rb'
-    - 'spec/api_map/config_spec.rb'
-    - 'spec/api_map/source_to_yard_spec.rb'
-    - 'spec/api_map/store_spec.rb'
-    - 'spec/api_map_spec.rb'
-    - 'spec/complex_type_spec.rb'
-    - 'spec/convention/struct_definition_spec.rb'
-    - 'spec/diagnostics/rubocop_spec.rb'
-    - 'spec/diagnostics/type_check_spec.rb'
-    - 'spec/diagnostics/update_errors_spec.rb'
-    - 'spec/diagnostics_spec.rb'
-    - 'spec/doc_map_spec.rb'
-    - 'spec/gem_pins_spec.rb'
-    - 'spec/language_server/host/message_worker_spec.rb'
-    - 'spec/language_server/host_spec.rb'
-    - 'spec/language_server/message/completion_item/resolve_spec.rb'
-    - 'spec/language_server/message/initialize_spec.rb'
-    - 'spec/language_server/message/text_document/rename_spec.rb'
-    - 'spec/language_server/message/workspace/did_change_watched_files_spec.rb'
-    - 'spec/language_server/protocol_spec.rb'
-    - 'spec/language_server/transport/adapter_spec.rb'
-    - 'spec/language_server/transport/data_reader_spec.rb'
-    - 'spec/library_spec.rb'
-    - 'spec/parser/flow_sensitive_typing_spec.rb'
-    - 'spec/parser/node_chainer_spec.rb'
-    - 'spec/parser/node_methods_spec.rb'
-    - 'spec/parser/node_processor_spec.rb'
-    - 'spec/pin/base_spec.rb'
-    - 'spec/pin/base_variable_spec.rb'
-    - 'spec/pin/constant_spec.rb'
-    - 'spec/pin/instance_variable_spec.rb'
-    - 'spec/pin/local_variable_spec.rb'
-    - 'spec/pin/method_spec.rb'
-    - 'spec/pin/namespace_spec.rb'
-    - 'spec/pin/parameter_spec.rb'
-    - 'spec/position_spec.rb'
-    - 'spec/rbs_map/core_map_spec.rb'
-    - 'spec/rbs_map/stdlib_map_spec.rb'
-    - 'spec/rbs_map_spec.rb'
-    - 'spec/shell_spec.rb'
-    - 'spec/source/chain/call_spec.rb'
-    - 'spec/source/chain/class_variable_spec.rb'
-    - 'spec/source/chain/global_variable_spec.rb'
-    - 'spec/source/chain/head_spec.rb'
-    - 'spec/source/chain/instance_variable_spec.rb'
-    - 'spec/source/chain_spec.rb'
-    - 'spec/source/cursor_spec.rb'
-    - 'spec/source/source_chainer_spec.rb'
-    - 'spec/source_map/clip_spec.rb'
-    - 'spec/source_map/mapper_spec.rb'
-    - 'spec/source_map/node_processor_spec.rb'
-    - 'spec/source_map_spec.rb'
-    - 'spec/source_spec.rb'
-    - 'spec/type_checker/checks_spec.rb'
-    - 'spec/type_checker/levels/normal_spec.rb'
-    - 'spec/type_checker/levels/strict_spec.rb'
-    - 'spec/type_checker/levels/strong_spec.rb'
-    - 'spec/type_checker/levels/typed_spec.rb'
-    - 'spec/type_checker/rules_spec.rb'
-    - 'spec/workspace/config_spec.rb'
-    - 'spec/workspace_spec.rb'
-    - 'spec/yard_map/mapper/to_method_spec.rb'
-    - 'spec/yard_map/mapper_spec.rb'
+  Max: 14
 
-# Configuration parameters: Max, AllowedGroups.
+# Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
-  Exclude:
-    - 'spec/complex_type_spec.rb'
+  Max: 4
 
 # Configuration parameters: AllowedPatterns.
 # AllowedPatterns: ^expect_, ^assert_
 RSpec/NoExpectationExample:
-  Exclude:
-    - 'spec/language_server/protocol_spec.rb'
-    - 'spec/parser/node_methods_spec.rb'
-    - 'spec/pin/block_spec.rb'
-    - 'spec/pin/method_spec.rb'
-    - 'spec/source/chain/call_spec.rb'
-    - 'spec/type_checker/checks_spec.rb'
-    - 'spec/type_checker/levels/typed_spec.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
@@ -1220,18 +721,7 @@ RSpec/NotToNot:
     - 'spec/rbs_map/core_map_spec.rb'
 
 RSpec/PendingWithoutReason:
-  Exclude:
-    - 'spec/api_map_spec.rb'
-    - 'spec/complex_type_spec.rb'
-    - 'spec/parser/node_chainer_spec.rb'
-    - 'spec/parser/node_methods_spec.rb'
-    - 'spec/pin/local_variable_spec.rb'
-    - 'spec/rbs_map/core_map_spec.rb'
-    - 'spec/source/chain/call_spec.rb'
-    - 'spec/source/chain_spec.rb'
-    - 'spec/source_map/clip_spec.rb'
-    - 'spec/type_checker/levels/strict_spec.rb'
-    - 'spec/yard_map/mapper/to_method_spec.rb'
+  Enabled: false
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Strict, EnforcedStyle, AllowedExplicitMatchers.
@@ -1251,16 +741,7 @@ RSpec/RemoveConst:
     - 'spec/diagnostics/rubocop_helpers_spec.rb'
 
 RSpec/RepeatedDescription:
-  Exclude:
-    - 'spec/api_map_spec.rb'
-    - 'spec/language_server/protocol_spec.rb'
-    - 'spec/parser/node_methods_spec.rb'
-    - 'spec/source/chain/call_spec.rb'
-    - 'spec/source/source_chainer_spec.rb'
-    - 'spec/source_map/clip_spec.rb'
-    - 'spec/source_map/mapper_spec.rb'
-    - 'spec/type_checker/levels/normal_spec.rb'
-    - 'spec/type_checker/levels/strict_spec.rb'
+  Enabled: false
 
 RSpec/RepeatedExample:
   Exclude:
@@ -1279,99 +760,7 @@ RSpec/ScatteredLet:
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
 # Include: **/*_spec.rb
 RSpec/SpecFilePathFormat:
-  Exclude:
-    - '**/spec/routing/**/*'
-    - 'spec/api_map/cache_spec.rb'
-    - 'spec/api_map/config_spec.rb'
-    - 'spec/api_map/source_to_yard_spec.rb'
-    - 'spec/api_map/store_spec.rb'
-    - 'spec/api_map_spec.rb'
-    - 'spec/convention/activesupport_concern_spec.rb'
-    - 'spec/convention/struct_definition_spec.rb'
-    - 'spec/convention_spec.rb'
-    - 'spec/diagnostics/base_spec.rb'
-    - 'spec/diagnostics/require_not_found_spec.rb'
-    - 'spec/diagnostics/rubocop_helpers_spec.rb'
-    - 'spec/diagnostics/rubocop_spec.rb'
-    - 'spec/diagnostics/type_check_spec.rb'
-    - 'spec/diagnostics/update_errors_spec.rb'
-    - 'spec/diagnostics_spec.rb'
-    - 'spec/doc_map_spec.rb'
-    - 'spec/gem_pins_spec.rb'
-    - 'spec/language_server/host/diagnoser_spec.rb'
-    - 'spec/language_server/host/dispatch_spec.rb'
-    - 'spec/language_server/host/message_worker_spec.rb'
-    - 'spec/language_server/host_spec.rb'
-    - 'spec/language_server/message/completion_item/resolve_spec.rb'
-    - 'spec/language_server/message/extended/check_gem_version_spec.rb'
-    - 'spec/language_server/message/initialize_spec.rb'
-    - 'spec/language_server/message/text_document/definition_spec.rb'
-    - 'spec/language_server/message/text_document/formatting_spec.rb'
-    - 'spec/language_server/message/text_document/hover_spec.rb'
-    - 'spec/language_server/message/text_document/rename_spec.rb'
-    - 'spec/language_server/message/text_document/type_definition_spec.rb'
-    - 'spec/language_server/message/workspace/did_change_configuration_spec.rb'
-    - 'spec/language_server/message/workspace/did_change_watched_files_spec.rb'
-    - 'spec/language_server/message_spec.rb'
-    - 'spec/language_server/transport/adapter_spec.rb'
-    - 'spec/language_server/transport/data_reader_spec.rb'
-    - 'spec/language_server/uri_helpers_spec.rb'
-    - 'spec/library_spec.rb'
-    - 'spec/logging_spec.rb'
-    - 'spec/parser/flow_sensitive_typing_spec.rb'
-    - 'spec/parser/node_methods_spec.rb'
-    - 'spec/parser/node_processor_spec.rb'
-    - 'spec/parser_spec.rb'
-    - 'spec/pin/base_spec.rb'
-    - 'spec/pin/base_variable_spec.rb'
-    - 'spec/pin/block_spec.rb'
-    - 'spec/pin/constant_spec.rb'
-    - 'spec/pin/delegated_method_spec.rb'
-    - 'spec/pin/documenting_spec.rb'
-    - 'spec/pin/instance_variable_spec.rb'
-    - 'spec/pin/keyword_spec.rb'
-    - 'spec/pin/local_variable_spec.rb'
-    - 'spec/pin/method_spec.rb'
-    - 'spec/pin/namespace_spec.rb'
-    - 'spec/pin/parameter_spec.rb'
-    - 'spec/pin/search_spec.rb'
-    - 'spec/pin/symbol_spec.rb'
-    - 'spec/position_spec.rb'
-    - 'spec/rbs_map/conversions_spec.rb'
-    - 'spec/rbs_map/core_map_spec.rb'
-    - 'spec/rbs_map/stdlib_map_spec.rb'
-    - 'spec/rbs_map_spec.rb'
-    - 'spec/shell_spec.rb'
-    - 'spec/source/chain/array_spec.rb'
-    - 'spec/source/chain/call_spec.rb'
-    - 'spec/source/chain/class_variable_spec.rb'
-    - 'spec/source/chain/constant_spec.rb'
-    - 'spec/source/chain/global_variable_spec.rb'
-    - 'spec/source/chain/head_spec.rb'
-    - 'spec/source/chain/instance_variable_spec.rb'
-    - 'spec/source/chain/link_spec.rb'
-    - 'spec/source/chain/literal_spec.rb'
-    - 'spec/source/chain/z_super_spec.rb'
-    - 'spec/source/chain_spec.rb'
-    - 'spec/source/change_spec.rb'
-    - 'spec/source/cursor_spec.rb'
-    - 'spec/source/source_chainer_spec.rb'
-    - 'spec/source/updater_spec.rb'
-    - 'spec/source_map/clip_spec.rb'
-    - 'spec/source_map/mapper_spec.rb'
-    - 'spec/source_map_spec.rb'
-    - 'spec/source_spec.rb'
-    - 'spec/type_checker/checks_spec.rb'
-    - 'spec/type_checker/levels/normal_spec.rb'
-    - 'spec/type_checker/levels/strict_spec.rb'
-    - 'spec/type_checker/levels/strong_spec.rb'
-    - 'spec/type_checker/levels/typed_spec.rb'
-    - 'spec/type_checker/rules_spec.rb'
-    - 'spec/type_checker_spec.rb'
-    - 'spec/workspace/config_spec.rb'
-    - 'spec/workspace_spec.rb'
-    - 'spec/yard_map/mapper/to_method_spec.rb'
-    - 'spec/yard_map/mapper_spec.rb'
+  Enabled: false
 
 RSpec/StubbedMock:
   Exclude:
@@ -1379,20 +768,7 @@ RSpec/StubbedMock:
 
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
-  Exclude:
-    - 'spec/complex_type_spec.rb'
-    - 'spec/language_server/host/diagnoser_spec.rb'
-    - 'spec/language_server/host/message_worker_spec.rb'
-    - 'spec/language_server/host_spec.rb'
-    - 'spec/language_server/message/completion_item/resolve_spec.rb'
-    - 'spec/language_server/message/extended/check_gem_version_spec.rb'
-    - 'spec/language_server/message/text_document/formatting_spec.rb'
-    - 'spec/language_server/message/workspace/did_change_watched_files_spec.rb'
-    - 'spec/language_server/protocol_spec.rb'
-    - 'spec/source/chain/class_variable_spec.rb'
-    - 'spec/source/cursor_spec.rb'
-    - 'spec/source/source_chainer_spec.rb'
-    - 'spec/workspace_spec.rb'
+  Enabled: false
 
 Security/MarshalLoad:
   Exclude:
@@ -1402,20 +778,7 @@ Security/MarshalLoad:
 # Configuration parameters: EnforcedStyle, AllowModifiersOnSymbols, AllowModifiersOnAttrs, AllowModifiersOnAliasMethod.
 # SupportedStyles: inline, group
 Style/AccessModifierDeclarations:
-  Exclude:
-    - 'lib/solargraph/api_map.rb'
-    - 'lib/solargraph/complex_type.rb'
-    - 'lib/solargraph/complex_type/unique_type.rb'
-    - 'lib/solargraph/location.rb'
-    - 'lib/solargraph/pin/base.rb'
-    - 'lib/solargraph/position.rb'
-    - 'lib/solargraph/range.rb'
-    - 'lib/solargraph/source/chain.rb'
-    - 'lib/solargraph/source/chain/call.rb'
-    - 'lib/solargraph/source/chain/hash.rb'
-    - 'lib/solargraph/source/chain/if.rb'
-    - 'lib/solargraph/source/chain/link.rb'
-    - 'lib/solargraph/source/chain/literal.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
@@ -1431,21 +794,7 @@ Style/AccessorGrouping:
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, conditionals
 Style/AndOr:
-  Exclude:
-    - 'lib/solargraph/api_map/source_to_yard.rb'
-    - 'lib/solargraph/complex_type/unique_type.rb'
-    - 'lib/solargraph/language_server/message/base.rb'
-    - 'lib/solargraph/page.rb'
-    - 'lib/solargraph/parser/parser_gem/node_methods.rb'
-    - 'lib/solargraph/pin/method.rb'
-    - 'lib/solargraph/pin/parameter.rb'
-    - 'lib/solargraph/position.rb'
-    - 'lib/solargraph/source/change.rb'
-    - 'lib/solargraph/source/cursor.rb'
-    - 'lib/solargraph/source/source_chainer.rb'
-    - 'lib/solargraph/source/updater.rb'
-    - 'lib/solargraph/workspace.rb'
-    - 'lib/solargraph/yard_map/mapper.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowOnlyRestArgument, UseAnonymousForwarding, RedundantRestArgumentNames, RedundantKeywordRestArgumentNames, RedundantBlockArgumentNames.
@@ -1464,44 +813,12 @@ Style/ArgumentsForwarding:
 # FunctionalMethods: let, let!, subject, watch
 # AllowedMethods: lambda, proc, it
 Style/BlockDelimiters:
-  Exclude:
-    - 'lib/solargraph/api_map/source_to_yard.rb'
-    - 'lib/solargraph/api_map/store.rb'
-    - 'lib/solargraph/language_server/host.rb'
-    - 'lib/solargraph/parser/parser_gem/node_methods.rb'
-    - 'lib/solargraph/shell.rb'
-    - 'lib/solargraph/source.rb'
-    - 'lib/solargraph/source_map/clip.rb'
-    - 'lib/solargraph/source_map/mapper.rb'
-    - 'spec/diagnostics/rubocop_spec.rb'
-    - 'spec/language_server/host_spec.rb'
-    - 'spec/language_server/message/extended/check_gem_version_spec.rb'
-    - 'spec/language_server/message/workspace/did_change_watched_files_spec.rb'
-    - 'spec/language_server/protocol_spec.rb'
-    - 'spec/language_server/transport/adapter_spec.rb'
-    - 'spec/language_server/transport/data_reader_spec.rb'
-    - 'spec/library_spec.rb'
-    - 'spec/parser/node_processor_spec.rb'
-    - 'spec/pin/documenting_spec.rb'
-    - 'spec/position_spec.rb'
-    - 'spec/source/chain_spec.rb'
-    - 'spec/source/source_chainer_spec.rb'
-    - 'spec/source_map/mapper_spec.rb'
-    - 'spec/source_spec.rb'
-    - 'spec/type_checker_spec.rb'
-    - 'spec/workspace_spec.rb'
-    - 'spec/yard_map/mapper/to_method_spec.rb'
+  Enabled: false
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: MinBranchesCount.
 Style/CaseLikeIf:
-  Exclude:
-    - 'lib/solargraph/language_server/message/workspace/did_change_watched_files.rb'
-    - 'lib/solargraph/parser/parser_gem/node_methods.rb'
-    - 'lib/solargraph/pin/parameter.rb'
-    - 'lib/solargraph/rbs_map/conversions.rb'
-    - 'lib/solargraph/source/source_chainer.rb'
-    - 'lib/solargraph/yard_map/mapper.rb'
+  Enabled: false
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, EnforcedStyleForClasses, EnforcedStyleForModules.
@@ -1509,18 +826,7 @@ Style/CaseLikeIf:
 # SupportedStylesForClasses: ~, nested, compact
 # SupportedStylesForModules: ~, nested, compact
 Style/ClassAndModuleChildren:
-  Exclude:
-    - 'lib/solargraph/language_server/message/text_document/definition.rb'
-    - 'lib/solargraph/language_server/message/text_document/document_highlight.rb'
-    - 'lib/solargraph/language_server/message/text_document/document_symbol.rb'
-    - 'lib/solargraph/language_server/message/text_document/prepare_rename.rb'
-    - 'lib/solargraph/language_server/message/text_document/references.rb'
-    - 'lib/solargraph/language_server/message/text_document/rename.rb'
-    - 'lib/solargraph/language_server/message/text_document/type_definition.rb'
-    - 'lib/solargraph/language_server/message/workspace/did_change_configuration.rb'
-    - 'lib/solargraph/language_server/message/workspace/did_change_watched_files.rb'
-    - 'lib/solargraph/language_server/message/workspace/did_change_workspace_folders.rb'
-    - 'lib/solargraph/language_server/message/workspace/workspace_symbol.rb'
+  Enabled: false
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedMethods, AllowedPatterns.
@@ -1556,150 +862,13 @@ Style/ConcatArrayLiterals:
 # SupportedStyles: assign_to_condition, assign_inside_condition
 Style/ConditionalAssignment:
   Exclude:
+    - 'lib/solargraph/api_map/source_to_yard.rb'
     - 'lib/solargraph/parser/parser_gem/node_processors/defs_node.rb'
     - 'lib/solargraph/source/chain/call.rb'
 
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
-  Exclude:
-    - 'spec/**/*'
-    - 'test/**/*'
-    - 'lib/solargraph/api_map/cache.rb'
-    - 'lib/solargraph/api_map/index.rb'
-    - 'lib/solargraph/api_map/source_to_yard.rb'
-    - 'lib/solargraph/convention/data_definition.rb'
-    - 'lib/solargraph/convention/gemfile.rb'
-    - 'lib/solargraph/convention/gemspec.rb'
-    - 'lib/solargraph/convention/rakefile.rb'
-    - 'lib/solargraph/convention/struct_definition.rb'
-    - 'lib/solargraph/converters/dd.rb'
-    - 'lib/solargraph/converters/dl.rb'
-    - 'lib/solargraph/converters/dt.rb'
-    - 'lib/solargraph/diagnostics/update_errors.rb'
-    - 'lib/solargraph/language_server/message/base.rb'
-    - 'lib/solargraph/language_server/message/cancel_request.rb'
-    - 'lib/solargraph/language_server/message/client.rb'
-    - 'lib/solargraph/language_server/message/client/register_capability.rb'
-    - 'lib/solargraph/language_server/message/completion_item.rb'
-    - 'lib/solargraph/language_server/message/exit_notification.rb'
-    - 'lib/solargraph/language_server/message/extended/document.rb'
-    - 'lib/solargraph/language_server/message/extended/search.rb'
-    - 'lib/solargraph/language_server/message/initialize.rb'
-    - 'lib/solargraph/language_server/message/initialized.rb'
-    - 'lib/solargraph/language_server/message/method_not_found.rb'
-    - 'lib/solargraph/language_server/message/method_not_implemented.rb'
-    - 'lib/solargraph/language_server/message/shutdown.rb'
-    - 'lib/solargraph/language_server/message/text_document.rb'
-    - 'lib/solargraph/language_server/message/text_document/base.rb'
-    - 'lib/solargraph/language_server/message/text_document/code_action.rb'
-    - 'lib/solargraph/language_server/message/text_document/completion.rb'
-    - 'lib/solargraph/language_server/message/text_document/definition.rb'
-    - 'lib/solargraph/language_server/message/text_document/did_change.rb'
-    - 'lib/solargraph/language_server/message/text_document/did_close.rb'
-    - 'lib/solargraph/language_server/message/text_document/did_open.rb'
-    - 'lib/solargraph/language_server/message/text_document/did_save.rb'
-    - 'lib/solargraph/language_server/message/text_document/document_highlight.rb'
-    - 'lib/solargraph/language_server/message/text_document/document_symbol.rb'
-    - 'lib/solargraph/language_server/message/text_document/folding_range.rb'
-    - 'lib/solargraph/language_server/message/text_document/formatting.rb'
-    - 'lib/solargraph/language_server/message/text_document/hover.rb'
-    - 'lib/solargraph/language_server/message/text_document/on_type_formatting.rb'
-    - 'lib/solargraph/language_server/message/text_document/prepare_rename.rb'
-    - 'lib/solargraph/language_server/message/text_document/references.rb'
-    - 'lib/solargraph/language_server/message/text_document/rename.rb'
-    - 'lib/solargraph/language_server/message/text_document/signature_help.rb'
-    - 'lib/solargraph/language_server/message/text_document/type_definition.rb'
-    - 'lib/solargraph/language_server/message/workspace.rb'
-    - 'lib/solargraph/language_server/message/workspace/did_change_configuration.rb'
-    - 'lib/solargraph/language_server/message/workspace/did_change_watched_files.rb'
-    - 'lib/solargraph/language_server/message/workspace/did_change_workspace_folders.rb'
-    - 'lib/solargraph/language_server/message/workspace/workspace_symbol.rb'
-    - 'lib/solargraph/language_server/request.rb'
-    - 'lib/solargraph/language_server/transport/data_reader.rb'
-    - 'lib/solargraph/logging.rb'
-    - 'lib/solargraph/page.rb'
-    - 'lib/solargraph/parser.rb'
-    - 'lib/solargraph/parser/comment_ripper.rb'
-    - 'lib/solargraph/parser/flow_sensitive_typing.rb'
-    - 'lib/solargraph/parser/node_methods.rb'
-    - 'lib/solargraph/parser/node_processor/base.rb'
-    - 'lib/solargraph/parser/parser_gem.rb'
-    - 'lib/solargraph/parser/parser_gem/class_methods.rb'
-    - 'lib/solargraph/parser/parser_gem/node_methods.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/alias_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/and_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/args_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/begin_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/block_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/casgn_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/cvasgn_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/def_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/defs_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/gvasgn_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/if_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/ivasgn_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/lvasgn_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/masgn_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/namespace_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/orasgn_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/resbody_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/sclass_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/send_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/sym_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/until_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/while_node.rb'
-    - 'lib/solargraph/parser/snippet.rb'
-    - 'lib/solargraph/pin/base_variable.rb'
-    - 'lib/solargraph/pin/block.rb'
-    - 'lib/solargraph/pin/callable.rb'
-    - 'lib/solargraph/pin/closure.rb'
-    - 'lib/solargraph/pin/common.rb'
-    - 'lib/solargraph/pin/constant.rb'
-    - 'lib/solargraph/pin/instance_variable.rb'
-    - 'lib/solargraph/pin/keyword.rb'
-    - 'lib/solargraph/pin/local_variable.rb'
-    - 'lib/solargraph/pin/namespace.rb'
-    - 'lib/solargraph/pin/parameter.rb'
-    - 'lib/solargraph/pin/proxy_type.rb'
-    - 'lib/solargraph/pin/reference.rb'
-    - 'lib/solargraph/pin/reference/override.rb'
-    - 'lib/solargraph/pin/reference/require.rb'
-    - 'lib/solargraph/pin/search.rb'
-    - 'lib/solargraph/pin/signature.rb'
-    - 'lib/solargraph/pin/singleton.rb'
-    - 'lib/solargraph/pin/symbol.rb'
-    - 'lib/solargraph/pin/until.rb'
-    - 'lib/solargraph/pin/while.rb'
-    - 'lib/solargraph/pin_cache.rb'
-    - 'lib/solargraph/rbs_map.rb'
-    - 'lib/solargraph/server_methods.rb'
-    - 'lib/solargraph/shell.rb'
-    - 'lib/solargraph/source/chain/array.rb'
-    - 'lib/solargraph/source/chain/block_symbol.rb'
-    - 'lib/solargraph/source/chain/block_variable.rb'
-    - 'lib/solargraph/source/chain/class_variable.rb'
-    - 'lib/solargraph/source/chain/constant.rb'
-    - 'lib/solargraph/source/chain/global_variable.rb'
-    - 'lib/solargraph/source/chain/hash.rb'
-    - 'lib/solargraph/source/chain/if.rb'
-    - 'lib/solargraph/source/chain/instance_variable.rb'
-    - 'lib/solargraph/source/chain/link.rb'
-    - 'lib/solargraph/source/chain/literal.rb'
-    - 'lib/solargraph/source/chain/or.rb'
-    - 'lib/solargraph/source/chain/q_call.rb'
-    - 'lib/solargraph/source/chain/variable.rb'
-    - 'lib/solargraph/source/chain/z_super.rb'
-    - 'lib/solargraph/source/encoding_fixes.rb'
-    - 'lib/solargraph/source_map/data.rb'
-    - 'lib/solargraph/yard_map/cache.rb'
-    - 'lib/solargraph/yard_map/helpers.rb'
-    - 'lib/solargraph/yard_map/mapper.rb'
-    - 'lib/solargraph/yard_map/mapper/to_constant.rb'
-    - 'lib/solargraph/yard_map/mapper/to_method.rb'
-    - 'lib/solargraph/yard_map/mapper/to_namespace.rb'
-    - 'lib/solargraph/yard_map/to_method.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 Style/EmptyLambdaParameter:
@@ -1750,136 +919,7 @@ Style/FloatDivision:
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
-  Exclude:
-    - '**/*.arb'
-    - 'Gemfile'
-    - 'Rakefile'
-    - 'bin/solargraph'
-    - 'lib/solargraph/converters/dd.rb'
-    - 'lib/solargraph/converters/dl.rb'
-    - 'lib/solargraph/converters/dt.rb'
-    - 'lib/solargraph/converters/misc.rb'
-    - 'lib/solargraph/parser.rb'
-    - 'lib/solargraph/parser/comment_ripper.rb'
-    - 'lib/solargraph/parser/flow_sensitive_typing.rb'
-    - 'lib/solargraph/parser/node_methods.rb'
-    - 'lib/solargraph/parser/parser_gem.rb'
-    - 'lib/solargraph/parser/snippet.rb'
-    - 'lib/solargraph/pin/breakable.rb'
-    - 'lib/solargraph/pin/signature.rb'
-    - 'lib/solargraph/pin_cache.rb'
-    - 'lib/solargraph/source/chain/array.rb'
-    - 'lib/solargraph/source/chain/q_call.rb'
-    - 'lib/solargraph/yard_map/helpers.rb'
-    - 'solargraph.gemspec'
-    - 'spec/api_map/cache_spec.rb'
-    - 'spec/api_map/config_spec.rb'
-    - 'spec/api_map/source_to_yard_spec.rb'
-    - 'spec/api_map_spec.rb'
-    - 'spec/complex_type_spec.rb'
-    - 'spec/convention/struct_definition_spec.rb'
-    - 'spec/convention_spec.rb'
-    - 'spec/diagnostics/base_spec.rb'
-    - 'spec/diagnostics/require_not_found_spec.rb'
-    - 'spec/diagnostics/rubocop_helpers_spec.rb'
-    - 'spec/diagnostics/type_check_spec.rb'
-    - 'spec/diagnostics/update_errors_spec.rb'
-    - 'spec/diagnostics_spec.rb'
-    - 'spec/fixtures/formattable.rb'
-    - 'spec/fixtures/long_squiggly_heredoc.rb'
-    - 'spec/fixtures/rdoc-lib/Gemfile'
-    - 'spec/fixtures/rdoc-lib/lib/example.rb'
-    - 'spec/fixtures/rdoc-lib/rdoc-lib.gemspec'
-    - 'spec/fixtures/rubocop-custom-version/specifications/rubocop-0.0.0.gemspec'
-    - 'spec/fixtures/rubocop-validation-error/app.rb'
-    - 'spec/fixtures/unicode.rb'
-    - 'spec/fixtures/workspace-with-gemfile/Gemfile'
-    - 'spec/fixtures/workspace-with-gemfile/app.rb'
-    - 'spec/fixtures/workspace-with-gemfile/lib/other.rb'
-    - 'spec/fixtures/workspace-with-gemfile/lib/thing.rb'
-    - 'spec/fixtures/workspace/app.rb'
-    - 'spec/fixtures/workspace/lib/other.rb'
-    - 'spec/fixtures/workspace/lib/something.rb'
-    - 'spec/fixtures/workspace/lib/thing.rb'
-    - 'spec/fixtures/workspace_folders/folder1/app.rb'
-    - 'spec/fixtures/workspace_folders/folder2/app.rb'
-    - 'spec/fixtures/yard_map/attr.rb'
-    - 'spec/language_server/host/diagnoser_spec.rb'
-    - 'spec/language_server/host/dispatch_spec.rb'
-    - 'spec/language_server/host/message_worker_spec.rb'
-    - 'spec/language_server/host_spec.rb'
-    - 'spec/language_server/message/completion_item/resolve_spec.rb'
-    - 'spec/language_server/message/extended/check_gem_version_spec.rb'
-    - 'spec/language_server/message/initialize_spec.rb'
-    - 'spec/language_server/message/text_document/definition_spec.rb'
-    - 'spec/language_server/message/text_document/formatting_spec.rb'
-    - 'spec/language_server/message/text_document/hover_spec.rb'
-    - 'spec/language_server/message/text_document/type_definition_spec.rb'
-    - 'spec/language_server/message/workspace/did_change_watched_files_spec.rb'
-    - 'spec/language_server/message_spec.rb'
-    - 'spec/language_server/protocol_spec.rb'
-    - 'spec/language_server/transport/adapter_spec.rb'
-    - 'spec/language_server/transport/data_reader_spec.rb'
-    - 'spec/language_server/uri_helpers_spec.rb'
-    - 'spec/library_spec.rb'
-    - 'spec/logging_spec.rb'
-    - 'spec/parser/node_chainer_spec.rb'
-    - 'spec/parser/node_methods_spec.rb'
-    - 'spec/parser/node_processor_spec.rb'
-    - 'spec/parser_spec.rb'
-    - 'spec/pin/base_spec.rb'
-    - 'spec/pin/base_variable_spec.rb'
-    - 'spec/pin/block_spec.rb'
-    - 'spec/pin/class_variable_spec.rb'
-    - 'spec/pin/constant_spec.rb'
-    - 'spec/pin/delegated_method_spec.rb'
-    - 'spec/pin/documenting_spec.rb'
-    - 'spec/pin/instance_variable_spec.rb'
-    - 'spec/pin/keyword_spec.rb'
-    - 'spec/pin/local_variable_spec.rb'
-    - 'spec/pin/method_spec.rb'
-    - 'spec/pin/namespace_spec.rb'
-    - 'spec/pin/parameter_spec.rb'
-    - 'spec/pin/search_spec.rb'
-    - 'spec/pin/symbol_spec.rb'
-    - 'spec/position_spec.rb'
-    - 'spec/rbs_map/conversions_spec.rb'
-    - 'spec/rbs_map/core_map_spec.rb'
-    - 'spec/rbs_map/stdlib_map_spec.rb'
-    - 'spec/rbs_map_spec.rb'
-    - 'spec/shell_spec.rb'
-    - 'spec/source/chain/array_spec.rb'
-    - 'spec/source/chain/call_spec.rb'
-    - 'spec/source/chain/class_variable_spec.rb'
-    - 'spec/source/chain/constant_spec.rb'
-    - 'spec/source/chain/global_variable_spec.rb'
-    - 'spec/source/chain/head_spec.rb'
-    - 'spec/source/chain/instance_variable_spec.rb'
-    - 'spec/source/chain/link_spec.rb'
-    - 'spec/source/chain/literal_spec.rb'
-    - 'spec/source/chain/z_super_spec.rb'
-    - 'spec/source/chain_spec.rb'
-    - 'spec/source/change_spec.rb'
-    - 'spec/source/cursor_spec.rb'
-    - 'spec/source/source_chainer_spec.rb'
-    - 'spec/source/updater_spec.rb'
-    - 'spec/source_map/clip_spec.rb'
-    - 'spec/source_map/mapper_spec.rb'
-    - 'spec/source_map/node_processor_spec.rb'
-    - 'spec/source_map_spec.rb'
-    - 'spec/source_spec.rb'
-    - 'spec/spec_helper.rb'
-    - 'spec/type_checker/checks_spec.rb'
-    - 'spec/type_checker/levels/normal_spec.rb'
-    - 'spec/type_checker/levels/strict_spec.rb'
-    - 'spec/type_checker/levels/strong_spec.rb'
-    - 'spec/type_checker/levels/typed_spec.rb'
-    - 'spec/type_checker/rules_spec.rb'
-    - 'spec/type_checker_spec.rb'
-    - 'spec/workspace/config_spec.rb'
-    - 'spec/workspace_spec.rb'
-    - 'spec/yard_map/mapper/to_method_spec.rb'
-    - 'spec/yard_map/mapper_spec.rb'
+  Enabled: false
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/GlobalStdStream:
@@ -1892,15 +932,7 @@ Style/GlobalStdStream:
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
 Style/GuardClause:
-  Exclude:
-    - 'lib/solargraph/api_map.rb'
-    - 'lib/solargraph/library.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/send_node.rb'
-    - 'lib/solargraph/pin_cache.rb'
-    - 'lib/solargraph/range.rb'
-    - 'lib/solargraph/rbs_map/conversions.rb'
-    - 'lib/solargraph/source.rb'
-    - 'lib/solargraph/workspace.rb'
+  Enabled: false
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowSplatArgument.
@@ -1935,52 +967,11 @@ Style/IdenticalConditionalBranches:
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowIfModifier.
 Style/IfInsideElse:
-  Exclude:
-    - 'lib/solargraph/complex_type/type_methods.rb'
-    - 'lib/solargraph/language_server/transport/data_reader.rb'
-    - 'lib/solargraph/parser/parser_gem/node_chainer.rb'
-    - 'lib/solargraph/parser/parser_gem/node_methods.rb'
-    - 'lib/solargraph/source_map/clip.rb'
-    - 'lib/solargraph/type_checker.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 Style/IfUnlessModifier:
-  Exclude:
-    - 'lib/solargraph/api_map.rb'
-    - 'lib/solargraph/api_map/index.rb'
-    - 'lib/solargraph/complex_type.rb'
-    - 'lib/solargraph/complex_type/unique_type.rb'
-    - 'lib/solargraph/doc_map.rb'
-    - 'lib/solargraph/language_server/message/completion_item/resolve.rb'
-    - 'lib/solargraph/language_server/message/initialize.rb'
-    - 'lib/solargraph/language_server/message/text_document/completion.rb'
-    - 'lib/solargraph/language_server/message/text_document/hover.rb'
-    - 'lib/solargraph/library.rb'
-    - 'lib/solargraph/parser/parser_gem/class_methods.rb'
-    - 'lib/solargraph/parser/parser_gem/node_chainer.rb'
-    - 'lib/solargraph/parser/parser_gem/node_methods.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/sclass_node.rb'
-    - 'lib/solargraph/pin/base.rb'
-    - 'lib/solargraph/pin/callable.rb'
-    - 'lib/solargraph/pin/common.rb'
-    - 'lib/solargraph/pin/constant.rb'
-    - 'lib/solargraph/pin/method.rb'
-    - 'lib/solargraph/pin/parameter.rb'
-    - 'lib/solargraph/range.rb'
-    - 'lib/solargraph/rbs_map/conversions.rb'
-    - 'lib/solargraph/source/chain.rb'
-    - 'lib/solargraph/source/chain/call.rb'
-    - 'lib/solargraph/source/change.rb'
-    - 'lib/solargraph/source/cursor.rb'
-    - 'lib/solargraph/source/source_chainer.rb'
-    - 'lib/solargraph/source_map.rb'
-    - 'lib/solargraph/source_map/clip.rb'
-    - 'lib/solargraph/source_map/mapper.rb'
-    - 'lib/solargraph/type_checker.rb'
-    - 'lib/solargraph/workspace.rb'
-    - 'lib/solargraph/workspace/config.rb'
-    - 'lib/solargraph/yard_map/helpers.rb'
-    - 'lib/solargraph/yard_map/mapper/to_method.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
@@ -2010,69 +1001,8 @@ Style/MapToSet:
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: require_parentheses, require_no_parentheses, require_no_parentheses_except_multiline
-Style/MethodDefParentheses:
-  Exclude:
-    - 'lib/solargraph.rb'
-    - 'lib/solargraph/api_map.rb'
-    - 'lib/solargraph/api_map/index.rb'
-    - 'lib/solargraph/api_map/store.rb'
-    - 'lib/solargraph/complex_type.rb'
-    - 'lib/solargraph/complex_type/type_methods.rb'
-    - 'lib/solargraph/complex_type/unique_type.rb'
-    - 'lib/solargraph/convention.rb'
-    - 'lib/solargraph/convention/data_definition.rb'
-    - 'lib/solargraph/convention/data_definition/data_assignment_node.rb'
-    - 'lib/solargraph/convention/data_definition/data_definition_node.rb'
-    - 'lib/solargraph/convention/struct_definition.rb'
-    - 'lib/solargraph/convention/struct_definition/struct_assignment_node.rb'
-    - 'lib/solargraph/convention/struct_definition/struct_definition_node.rb'
-    - 'lib/solargraph/diagnostics/rubocop_helpers.rb'
-    - 'lib/solargraph/doc_map.rb'
-    - 'lib/solargraph/equality.rb'
-    - 'lib/solargraph/gem_pins.rb'
-    - 'lib/solargraph/language_server/host/message_worker.rb'
-    - 'lib/solargraph/language_server/host/sources.rb'
-    - 'lib/solargraph/language_server/message/text_document/formatting.rb'
-    - 'lib/solargraph/location.rb'
-    - 'lib/solargraph/parser/comment_ripper.rb'
-    - 'lib/solargraph/parser/flow_sensitive_typing.rb'
-    - 'lib/solargraph/parser/node_methods.rb'
-    - 'lib/solargraph/parser/node_processor/base.rb'
-    - 'lib/solargraph/parser/parser_gem/flawed_builder.rb'
-    - 'lib/solargraph/parser/parser_gem/node_chainer.rb'
-    - 'lib/solargraph/parser/parser_gem/node_methods.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/args_node.rb'
-    - 'lib/solargraph/pin/base.rb'
-    - 'lib/solargraph/pin/base_variable.rb'
-    - 'lib/solargraph/pin/block.rb'
-    - 'lib/solargraph/pin/callable.rb'
-    - 'lib/solargraph/pin/closure.rb'
-    - 'lib/solargraph/pin/delegated_method.rb'
-    - 'lib/solargraph/pin/local_variable.rb'
-    - 'lib/solargraph/pin/method.rb'
-    - 'lib/solargraph/pin/parameter.rb'
-    - 'lib/solargraph/pin_cache.rb'
-    - 'lib/solargraph/position.rb'
-    - 'lib/solargraph/range.rb'
-    - 'lib/solargraph/rbs_map/conversions.rb'
-    - 'lib/solargraph/shell.rb'
-    - 'lib/solargraph/source.rb'
-    - 'lib/solargraph/source/chain/call.rb'
-    - 'lib/solargraph/source/chain/constant.rb'
-    - 'lib/solargraph/source_map.rb'
-    - 'lib/solargraph/source_map/mapper.rb'
-    - 'lib/solargraph/type_checker.rb'
-    - 'lib/solargraph/type_checker/checks.rb'
-    - 'lib/solargraph/yard_map/helpers.rb'
-    - 'lib/solargraph/yardoc.rb'
-    - 'spec/doc_map_spec.rb'
-    - 'spec/fixtures/rdoc-lib/lib/example.rb'
-    - 'spec/source_map_spec.rb'
-    - 'spec/spec_helper.rb'
-    - 'spec/type_checker/levels/normal_spec.rb'
-    - 'spec/type_checker/levels/strict_spec.rb'
-    - 'spec/type_checker/levels/strong_spec.rb'
-    - 'spec/type_checker/levels/typed_spec.rb'
+Style/MethodDefParentheses:
+  Enabled: false
 
 Style/MultilineBlockChain:
   Exclude:
@@ -2091,29 +1021,13 @@ Style/MultilineTernaryOperator:
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowMethodComparison, ComparisonsThreshold.
 Style/MultipleComparison:
-  Exclude:
-    - 'lib/solargraph/complex_type.rb'
-    - 'lib/solargraph/complex_type/type_methods.rb'
-    - 'lib/solargraph/parser/parser_gem/node_methods.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/send_node.rb'
-    - 'lib/solargraph/pin/base.rb'
-    - 'lib/solargraph/pin/method.rb'
-    - 'lib/solargraph/pin/parameter.rb'
-    - 'lib/solargraph/source.rb'
-    - 'lib/solargraph/type_checker.rb'
+  Enabled: false
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: literals, strict
 Style/MutableConstant:
-  Exclude:
-    - 'lib/solargraph/diagnostics/rubocop.rb'
-    - 'lib/solargraph/logging.rb'
-    - 'lib/solargraph/parser/parser_gem/node_methods.rb'
-    - 'lib/solargraph/rbs_map/conversions.rb'
-    - 'lib/solargraph/rbs_map/core_fills.rb'
-    - 'lib/solargraph/yard_map/mapper/to_method.rb'
-    - 'spec/complex_type_spec.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
@@ -2148,34 +1062,15 @@ Style/Next:
     - 'lib/solargraph/type_checker/checks.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: MinDigits, Strict, AllowedNumbers, AllowedPatterns.
+# Configuration parameters: Strict, AllowedNumbers, AllowedPatterns.
 Style/NumericLiterals:
-  Exclude:
-    - 'lib/solargraph/language_server/error_codes.rb'
-    - 'spec/language_server/protocol_spec.rb'
+  MinDigits: 6
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
-  Exclude:
-    - 'spec/**/*'
-    - 'lib/solargraph/api_map.rb'
-    - 'lib/solargraph/api_map/index.rb'
-    - 'lib/solargraph/api_map/store.rb'
-    - 'lib/solargraph/complex_type.rb'
-    - 'lib/solargraph/complex_type/type_methods.rb'
-    - 'lib/solargraph/complex_type/unique_type.rb'
-    - 'lib/solargraph/language_server/message/extended/check_gem_version.rb'
-    - 'lib/solargraph/library.rb'
-    - 'lib/solargraph/parser/comment_ripper.rb'
-    - 'lib/solargraph/pin/delegated_method.rb'
-    - 'lib/solargraph/pin/method.rb'
-    - 'lib/solargraph/shell.rb'
-    - 'lib/solargraph/source/chain/array.rb'
-    - 'lib/solargraph/source/change.rb'
-    - 'lib/solargraph/source/source_chainer.rb'
-    - 'lib/solargraph/workspace.rb'
+  Enabled: false
 
 Style/OpenStructUse:
   Exclude:
@@ -2184,14 +1079,7 @@ Style/OpenStructUse:
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: respond_to_missing?
 Style/OptionalBooleanParameter:
-  Exclude:
-    - 'lib/solargraph/api_map.rb'
-    - 'lib/solargraph/language_server/message/text_document/completion.rb'
-    - 'lib/solargraph/source/chain.rb'
-    - 'lib/solargraph/source/chain/hash.rb'
-    - 'lib/solargraph/source/chain/z_super.rb'
-    - 'lib/solargraph/source/change.rb'
-    - 'lib/solargraph/source/updater.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowSafeAssignment, AllowInMultilineConditions.
@@ -2254,14 +1142,7 @@ Style/RedundantInterpolation:
 
 # This cop supports safe autocorrection (--autocorrect).
 Style/RedundantParentheses:
-  Exclude:
-    - 'lib/solargraph/diagnostics/type_check.rb'
-    - 'lib/solargraph/language_server/message/initialize.rb'
-    - 'lib/solargraph/parser/parser_gem/node_chainer.rb'
-    - 'lib/solargraph/pin/method.rb'
-    - 'lib/solargraph/pin/parameter.rb'
-    - 'lib/solargraph/source.rb'
-    - 'lib/solargraph/type_checker.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 Style/RedundantRegexpArgument:
@@ -2274,13 +1155,7 @@ Style/RedundantRegexpArgument:
 
 # This cop supports safe autocorrection (--autocorrect).
 Style/RedundantRegexpEscape:
-  Exclude:
-    - 'lib/solargraph/complex_type.rb'
-    - 'lib/solargraph/diagnostics/rubocop.rb'
-    - 'lib/solargraph/language_server/uri_helpers.rb'
-    - 'lib/solargraph/shell.rb'
-    - 'lib/solargraph/source_map/clip.rb'
-    - 'lib/solargraph/source_map/mapper.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowMultipleReturnValues.
@@ -2294,15 +1169,7 @@ Style/RedundantReturn:
 
 # This cop supports safe autocorrection (--autocorrect).
 Style/RedundantSelf:
-  Exclude:
-    - 'lib/solargraph/api_map.rb'
-    - 'lib/solargraph/equality.rb'
-    - 'lib/solargraph/location.rb'
-    - 'lib/solargraph/pin/base.rb'
-    - 'lib/solargraph/pin/callable.rb'
-    - 'lib/solargraph/pin/signature.rb'
-    - 'lib/solargraph/source/chain.rb'
-    - 'lib/solargraph/source/chain/link.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, AllowInnerSlashes.
@@ -2323,19 +1190,7 @@ Style/RescueStandardError:
 # Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
 # AllowedMethods: present?, blank?, presence, try, try!
 Style/SafeNavigation:
-  Exclude:
-    - 'lib/solargraph/api_map/index.rb'
-    - 'lib/solargraph/doc_map.rb'
-    - 'lib/solargraph/language_server/message/completion_item/resolve.rb'
-    - 'lib/solargraph/language_server/request.rb'
-    - 'lib/solargraph/language_server/transport/data_reader.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/send_node.rb'
-    - 'lib/solargraph/pin/base.rb'
-    - 'lib/solargraph/pin/conversions.rb'
-    - 'lib/solargraph/pin/method.rb'
-    - 'lib/solargraph/pin_cache.rb'
-    - 'lib/solargraph/range.rb'
-    - 'lib/solargraph/type_checker.rb'
+  Enabled: false
 
 # Configuration parameters: Max.
 Style/SafeNavigationChainLength:
@@ -2344,36 +1199,12 @@ Style/SafeNavigationChainLength:
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/SlicingWithRange:
-  Exclude:
-    - 'lib/solargraph/api_map.rb'
-    - 'lib/solargraph/complex_type/unique_type.rb'
-    - 'lib/solargraph/convention/data_definition/data_definition_node.rb'
-    - 'lib/solargraph/convention/struct_definition/struct_definition_node.rb'
-    - 'lib/solargraph/diagnostics/rubocop_helpers.rb'
-    - 'lib/solargraph/library.rb'
-    - 'lib/solargraph/parser/parser_gem/node_chainer.rb'
-    - 'lib/solargraph/parser/parser_gem/node_methods.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/send_node.rb'
-    - 'lib/solargraph/pin/method.rb'
-    - 'lib/solargraph/pin/namespace.rb'
-    - 'lib/solargraph/source.rb'
-    - 'lib/solargraph/source/chain/constant.rb'
-    - 'lib/solargraph/source/change.rb'
-    - 'lib/solargraph/source/cursor.rb'
-    - 'lib/solargraph/source/source_chainer.rb'
-    - 'lib/solargraph/source_map/mapper.rb'
-    - 'lib/solargraph/type_checker/checks.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowModifier.
 Style/SoleNestedConditional:
-  Exclude:
-    - 'lib/solargraph/complex_type/unique_type.rb'
-    - 'lib/solargraph/parser/flow_sensitive_typing.rb'
-    - 'lib/solargraph/pin/parameter.rb'
-    - 'lib/solargraph/source.rb'
-    - 'lib/solargraph/source/source_chainer.rb'
-    - 'lib/solargraph/type_checker.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 Style/StderrPuts:
@@ -2384,114 +1215,13 @@ Style/StderrPuts:
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Mode.
 Style/StringConcatenation:
-  Exclude:
-    - 'lib/solargraph/api_map.rb'
-    - 'lib/solargraph/api_map/index.rb'
-    - 'lib/solargraph/pin/base.rb'
-    - 'lib/solargraph/pin/callable.rb'
-    - 'lib/solargraph/pin/closure.rb'
-    - 'lib/solargraph/pin/local_variable.rb'
-    - 'lib/solargraph/pin/method.rb'
-    - 'lib/solargraph/pin/namespace.rb'
-    - 'solargraph.gemspec'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
-  Exclude:
-    - 'Gemfile'
-    - 'Rakefile'
-    - 'lib/solargraph/api_map/index.rb'
-    - 'lib/solargraph/complex_type.rb'
-    - 'lib/solargraph/complex_type/unique_type.rb'
-    - 'lib/solargraph/convention/struct_definition.rb'
-    - 'lib/solargraph/doc_map.rb'
-    - 'lib/solargraph/language_server/host.rb'
-    - 'lib/solargraph/language_server/message/extended/document_gems.rb'
-    - 'lib/solargraph/language_server/message/extended/download_core.rb'
-    - 'lib/solargraph/language_server/message/initialize.rb'
-    - 'lib/solargraph/language_server/message/text_document/completion.rb'
-    - 'lib/solargraph/library.rb'
-    - 'lib/solargraph/parser/parser_gem/class_methods.rb'
-    - 'lib/solargraph/parser/parser_gem/node_methods.rb'
-    - 'lib/solargraph/pin/base.rb'
-    - 'lib/solargraph/pin/conversions.rb'
-    - 'lib/solargraph/pin/method.rb'
-    - 'lib/solargraph/pin/parameter.rb'
-    - 'lib/solargraph/rbs_map/conversions.rb'
-    - 'lib/solargraph/server_methods.rb'
-    - 'lib/solargraph/shell.rb'
-    - 'lib/solargraph/workspace.rb'
-    - 'lib/solargraph/yard_map/mapper/to_method.rb'
-    - 'lib/solargraph/yard_tags.rb'
-    - 'solargraph.gemspec'
-    - 'spec/api_map/cache_spec.rb'
-    - 'spec/api_map/config_spec.rb'
-    - 'spec/api_map/source_to_yard_spec.rb'
-    - 'spec/complex_type_spec.rb'
-    - 'spec/convention/struct_definition_spec.rb'
-    - 'spec/diagnostics/base_spec.rb'
-    - 'spec/diagnostics/require_not_found_spec.rb'
-    - 'spec/diagnostics/rubocop_helpers_spec.rb'
-    - 'spec/diagnostics/rubocop_spec.rb'
-    - 'spec/diagnostics/type_check_spec.rb'
-    - 'spec/diagnostics/update_errors_spec.rb'
-    - 'spec/diagnostics_spec.rb'
-    - 'spec/fixtures/rdoc-lib/rdoc-lib.gemspec'
-    - 'spec/language_server/host/diagnoser_spec.rb'
-    - 'spec/language_server/host/dispatch_spec.rb'
-    - 'spec/language_server/host/message_worker_spec.rb'
-    - 'spec/language_server/host_spec.rb'
-    - 'spec/language_server/message/completion_item/resolve_spec.rb'
-    - 'spec/language_server/message/extended/check_gem_version_spec.rb'
-    - 'spec/language_server/message/initialize_spec.rb'
-    - 'spec/language_server/message/text_document/rename_spec.rb'
-    - 'spec/language_server/message_spec.rb'
-    - 'spec/language_server/protocol_spec.rb'
-    - 'spec/language_server/transport/adapter_spec.rb'
-    - 'spec/language_server/transport/data_reader_spec.rb'
-    - 'spec/library_spec.rb'
-    - 'spec/logging_spec.rb'
-    - 'spec/parser/node_chainer_spec.rb'
-    - 'spec/parser/node_methods_spec.rb'
-    - 'spec/parser_spec.rb'
-    - 'spec/pin/base_spec.rb'
-    - 'spec/pin/base_variable_spec.rb'
-    - 'spec/pin/constant_spec.rb'
-    - 'spec/pin/instance_variable_spec.rb'
-    - 'spec/pin/keyword_spec.rb'
-    - 'spec/pin/local_variable_spec.rb'
-    - 'spec/pin/namespace_spec.rb'
-    - 'spec/pin/symbol_spec.rb'
-    - 'spec/position_spec.rb'
-    - 'spec/rbs_map/conversions_spec.rb'
-    - 'spec/rbs_map/core_map_spec.rb'
-    - 'spec/rbs_map/stdlib_map_spec.rb'
-    - 'spec/shell_spec.rb'
-    - 'spec/source/chain/array_spec.rb'
-    - 'spec/source/chain/call_spec.rb'
-    - 'spec/source/chain/class_variable_spec.rb'
-    - 'spec/source/chain/constant_spec.rb'
-    - 'spec/source/chain/global_variable_spec.rb'
-    - 'spec/source/chain/head_spec.rb'
-    - 'spec/source/chain/instance_variable_spec.rb'
-    - 'spec/source/chain/link_spec.rb'
-    - 'spec/source/chain/literal_spec.rb'
-    - 'spec/source/chain/z_super_spec.rb'
-    - 'spec/source/chain_spec.rb'
-    - 'spec/source/change_spec.rb'
-    - 'spec/source/cursor_spec.rb'
-    - 'spec/source/source_chainer_spec.rb'
-    - 'spec/source/updater_spec.rb'
-    - 'spec/source_map/clip_spec.rb'
-    - 'spec/source_map/mapper_spec.rb'
-    - 'spec/source_map_spec.rb'
-    - 'spec/source_spec.rb'
-    - 'spec/type_checker/levels/strict_spec.rb'
-    - 'spec/workspace/config_spec.rb'
-    - 'spec/workspace_spec.rb'
-    - 'spec/yard_map/mapper/to_method_spec.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 Style/SuperArguments:
@@ -2505,35 +1235,13 @@ Style/SuperArguments:
 # Configuration parameters: EnforcedStyle, MinSize.
 # SupportedStyles: percent, brackets
 Style/SymbolArray:
-  Exclude:
-    - 'lib/solargraph/api_map.rb'
-    - 'lib/solargraph/parser/parser_gem/node_chainer.rb'
-    - 'lib/solargraph/parser/parser_gem/node_methods.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/block_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/send_node.rb'
-    - 'lib/solargraph/pin/method.rb'
-    - 'lib/solargraph/pin/parameter.rb'
-    - 'lib/solargraph/shell.rb'
-    - 'lib/solargraph/source.rb'
-    - 'lib/solargraph/source/chain/literal.rb'
-    - 'lib/solargraph/source_map/clip.rb'
-    - 'lib/solargraph/source_map/mapper.rb'
-    - 'lib/solargraph/type_checker.rb'
-    - 'spec/parser/node_methods_spec.rb'
-    - 'spec/source_map/mapper_spec.rb'
+  Enabled: false
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowMethodsWithArguments, AllowedMethods, AllowedPatterns, AllowComments.
 # AllowedMethods: define_method
 Style/SymbolProc:
-  Exclude:
-    - 'lib/solargraph/gem_pins.rb'
-    - 'lib/solargraph/language_server/message/text_document/hover.rb'
-    - 'lib/solargraph/language_server/message/text_document/signature_help.rb'
-    - 'lib/solargraph/parser/flow_sensitive_typing.rb'
-    - 'lib/solargraph/pin/base.rb'
-    - 'lib/solargraph/pin/callable.rb'
-    - 'lib/solargraph/pin/closure.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, AllowSafeAssignment.
@@ -2546,19 +1254,7 @@ Style/TernaryParentheses:
 # Configuration parameters: EnforcedStyleForMultiline.
 # SupportedStylesForMultiline: comma, consistent_comma, no_comma
 Style/TrailingCommaInArguments:
-  Exclude:
-    - 'lib/solargraph/api_map.rb'
-    - 'lib/solargraph/parser/node_processor.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/block_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/def_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/defs_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/sclass_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/until_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/while_node.rb'
-    - 'lib/solargraph/pin/method.rb'
-    - 'lib/solargraph/rbs_map/conversions.rb'
-    - 'lib/solargraph/yard_map/mapper/to_method.rb'
-    - 'lib/solargraph/yard_map/mapper/to_namespace.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyleForMultiline.
@@ -2572,13 +1268,7 @@ Style/TrailingCommaInArrayLiteral:
 # Configuration parameters: EnforcedStyleForMultiline.
 # SupportedStylesForMultiline: comma, consistent_comma, diff_comma, no_comma
 Style/TrailingCommaInHashLiteral:
-  Exclude:
-    - 'lib/solargraph/pin/base_variable.rb'
-    - 'lib/solargraph/pin/callable.rb'
-    - 'lib/solargraph/pin/closure.rb'
-    - 'lib/solargraph/pin/local_variable.rb'
-    - 'lib/solargraph/pin/parameter.rb'
-    - 'lib/solargraph/rbs_map/conversions.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: ExactNameMatch, AllowPredicates, AllowDSLWriters, IgnoreClassMethods, AllowedMethods.
@@ -2597,20 +1287,7 @@ Style/WhileUntilModifier:
 # Configuration parameters: EnforcedStyle, MinSize, WordRegex.
 # SupportedStyles: percent, brackets
 Style/WordArray:
-  Exclude:
-    - 'lib/solargraph/complex_type.rb'
-    - 'lib/solargraph/complex_type/unique_type.rb'
-    - 'lib/solargraph/diagnostics/type_check.rb'
-    - 'lib/solargraph/language_server/message/text_document/formatting.rb'
-    - 'spec/doc_map_spec.rb'
-    - 'spec/parser/node_chainer_spec.rb'
-    - 'spec/pin/method_spec.rb'
-    - 'spec/source/cursor_spec.rb'
-    - 'spec/source/source_chainer_spec.rb'
-    - 'spec/source_map/clip_spec.rb'
-    - 'spec/source_map/mapper_spec.rb'
-    - 'spec/source_map_spec.rb'
-    - 'spec/source_spec.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 Style/YAMLFileRead:
@@ -2619,13 +1296,7 @@ Style/YAMLFileRead:
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/ZeroLengthPredicate:
-  Exclude:
-    - 'lib/solargraph/api_map.rb'
-    - 'lib/solargraph/api_map/index.rb'
-    - 'lib/solargraph/language_server/host.rb'
-    - 'lib/solargraph/pin/method.rb'
-    - 'lib/solargraph/source/chain/array.rb'
-    - 'spec/language_server/protocol_spec.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
@@ -2638,33 +1309,7 @@ YARD/CollectionType:
 # Configuration parameters: EnforcedStylePrototypeName.
 # SupportedStylesPrototypeName: before, after
 YARD/MismatchName:
-  Exclude:
-    - 'lib/solargraph/complex_type.rb'
-    - 'lib/solargraph/complex_type/unique_type.rb'
-    - 'lib/solargraph/gem_pins.rb'
-    - 'lib/solargraph/language_server/host.rb'
-    - 'lib/solargraph/language_server/host/dispatch.rb'
-    - 'lib/solargraph/language_server/request.rb'
-    - 'lib/solargraph/parser/parser_gem/node_methods.rb'
-    - 'lib/solargraph/parser/region.rb'
-    - 'lib/solargraph/pin/base.rb'
-    - 'lib/solargraph/pin/base_variable.rb'
-    - 'lib/solargraph/pin/block.rb'
-    - 'lib/solargraph/pin/callable.rb'
-    - 'lib/solargraph/pin/closure.rb'
-    - 'lib/solargraph/pin/delegated_method.rb'
-    - 'lib/solargraph/pin/method.rb'
-    - 'lib/solargraph/pin/namespace.rb'
-    - 'lib/solargraph/pin/parameter.rb'
-    - 'lib/solargraph/pin/proxy_type.rb'
-    - 'lib/solargraph/pin/reference.rb'
-    - 'lib/solargraph/pin/symbol.rb'
-    - 'lib/solargraph/pin/until.rb'
-    - 'lib/solargraph/pin/while.rb'
-    - 'lib/solargraph/pin_cache.rb'
-    - 'lib/solargraph/source/chain/call.rb'
-    - 'lib/solargraph/source/chain/z_super.rb'
-    - 'lib/solargraph/type_checker.rb'
+  Enabled: false
 
 YARD/TagTypeSyntax:
   Exclude:
@@ -2673,72 +1318,7 @@ YARD/TagTypeSyntax:
     - 'lib/solargraph/type_checker.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
+# Configuration parameters: AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
-  Exclude:
-    - 'lib/solargraph/api_map.rb'
-    - 'lib/solargraph/api_map/source_to_yard.rb'
-    - 'lib/solargraph/api_map/store.rb'
-    - 'lib/solargraph/complex_type.rb'
-    - 'lib/solargraph/complex_type/unique_type.rb'
-    - 'lib/solargraph/convention/data_definition.rb'
-    - 'lib/solargraph/doc_map.rb'
-    - 'lib/solargraph/gem_pins.rb'
-    - 'lib/solargraph/language_server/host.rb'
-    - 'lib/solargraph/language_server/message/extended/check_gem_version.rb'
-    - 'lib/solargraph/language_server/message/extended/download_core.rb'
-    - 'lib/solargraph/language_server/message/initialize.rb'
-    - 'lib/solargraph/language_server/message/text_document/completion.rb'
-    - 'lib/solargraph/language_server/message/text_document/definition.rb'
-    - 'lib/solargraph/language_server/message/text_document/document_highlight.rb'
-    - 'lib/solargraph/language_server/message/text_document/prepare_rename.rb'
-    - 'lib/solargraph/language_server/message/text_document/references.rb'
-    - 'lib/solargraph/language_server/message/text_document/rename.rb'
-    - 'lib/solargraph/language_server/message/workspace/did_change_watched_files.rb'
-    - 'lib/solargraph/library.rb'
-    - 'lib/solargraph/parser/comment_ripper.rb'
-    - 'lib/solargraph/parser/flow_sensitive_typing.rb'
-    - 'lib/solargraph/parser/parser_gem/node_chainer.rb'
-    - 'lib/solargraph/parser/parser_gem/node_methods.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/and_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/if_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/ivasgn_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/masgn_node.rb'
-    - 'lib/solargraph/parser/parser_gem/node_processors/send_node.rb'
-    - 'lib/solargraph/pin/base.rb'
-    - 'lib/solargraph/pin/callable.rb'
-    - 'lib/solargraph/pin/common.rb'
-    - 'lib/solargraph/pin/documenting.rb'
-    - 'lib/solargraph/pin/method.rb'
-    - 'lib/solargraph/pin/parameter.rb'
-    - 'lib/solargraph/rbs_map/conversions.rb'
-    - 'lib/solargraph/rbs_map/core_fills.rb'
-    - 'lib/solargraph/shell.rb'
-    - 'lib/solargraph/source.rb'
-    - 'lib/solargraph/source/chain.rb'
-    - 'lib/solargraph/source/chain/call.rb'
-    - 'lib/solargraph/source/chain/if.rb'
-    - 'lib/solargraph/source/chain/instance_variable.rb'
-    - 'lib/solargraph/source/chain/variable.rb'
-    - 'lib/solargraph/source/cursor.rb'
-    - 'lib/solargraph/source/encoding_fixes.rb'
-    - 'lib/solargraph/source/source_chainer.rb'
-    - 'lib/solargraph/source_map.rb'
-    - 'lib/solargraph/source_map/clip.rb'
-    - 'lib/solargraph/source_map/mapper.rb'
-    - 'lib/solargraph/type_checker.rb'
-    - 'lib/solargraph/workspace.rb'
-    - 'lib/solargraph/workspace/config.rb'
-    - 'lib/solargraph/yard_map/mapper/to_method.rb'
-    - 'spec/api_map_spec.rb'
-    - 'spec/complex_type_spec.rb'
-    - 'spec/language_server/message/completion_item/resolve_spec.rb'
-    - 'spec/language_server/message/extended/check_gem_version_spec.rb'
-    - 'spec/language_server/message/text_document/definition_spec.rb'
-    - 'spec/language_server/protocol_spec.rb'
-    - 'spec/pin/parameter_spec.rb'
-    - 'spec/source/chain_spec.rb'
-    - 'spec/source_map/clip_spec.rb'
-    - 'spec/source_map_spec.rb'
-    - 'spec/workspace_spec.rb'
+  Max: 244
diff --git a/solargraph.gemspec b/solargraph.gemspec
index e6bb9394a..7610bb8ea 100755
--- a/solargraph.gemspec
+++ b/solargraph.gemspec
@@ -48,9 +48,16 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'public_suffix', '~> 3.1'
   s.add_development_dependency 'rake', '~> 13.2'
   s.add_development_dependency 'rspec', '~> 3.5'
-  s.add_development_dependency 'rubocop-rake', '~> 0.7'
-  s.add_development_dependency 'rubocop-rspec', '~> 3.6'
-  s.add_development_dependency 'rubocop-yard', '~> 1.0'
+  #
+  # very specific development-time RuboCop version patterns for CI
+  # stability - feel free to update in an isolated PR
+  #
+  # even more specific on RuboCop itself, which is written into _todo
+  # file.
+  s.add_development_dependency 'rubocop', '~> 1.79.2.0'
+  s.add_development_dependency 'rubocop-rake', '~> 0.7.1'
+  s.add_development_dependency 'rubocop-rspec', '~> 3.6.0'
+  s.add_development_dependency 'rubocop-yard', '~> 1.0.0'
   s.add_development_dependency 'simplecov', '~> 0.21'
   s.add_development_dependency 'simplecov-lcov', '~> 0.8'
   s.add_development_dependency 'undercover', '~> 0.7'

From 61260f346883de89c8dd9c61b205e88f59ae3a8b Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 30 Aug 2025 10:18:50 -0400
Subject: [PATCH 031/172] Fix merge issue

---
 .github/workflows/linting.yml |  2 +-
 .rubocop_todo.yml             | 25 +++++++++----------------
 lib/solargraph/api_map.rb     |  2 --
 spec/api_map_spec.rb          |  3 ---
 4 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index aa22ce22c..b4ef26bfe 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -115,7 +115,7 @@ jobs:
     - name: Run RuboCop against todo file
       continue-on-error: true
       run: |
-        cmd="bundle exec rubocop --auto-gen-config --exclude-limit=5 --no-offense-counts --no-auto-gen-timestampxb*com"
+        cmd="bundle exec rubocop --auto-gen-config --exclude-limit=5 --no-offense-counts --no-auto-gen-timestamp"
         ${cmd:?}
         set +e
         if [ -n "$(git status --porcelain)" ]
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 7641198af..0ed335f34 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,5 +1,5 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config --no-exclude-limit --no-offense-counts --no-auto-gen-timestamp`
+# `rubocop --auto-gen-config --exclude-limit 5 --no-offense-counts --no-auto-gen-timestamp`
 # using RuboCop version 1.80.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
@@ -121,7 +121,13 @@ Layout/EndOfLine:
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
-  Enabled: false
+Layout/ExtraSpacing:
+  Exclude:
+    - 'lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb'
+    - 'lib/solargraph/pin/closure.rb'
+    - 'lib/solargraph/rbs_map/conversions.rb'
+    - 'lib/solargraph/type_checker.rb'
+    - 'spec/spec_helper.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, IndentationWidth.
@@ -604,9 +610,9 @@ RSpec/DescribeClass:
     - '**/spec/routing/**/*'
     - '**/spec/system/**/*'
     - '**/spec/views/**/*'
+    - 'spec/api_map_method_spec.rb'
     - 'spec/complex_type_spec.rb'
     - 'spec/source_map/node_processor_spec.rb'
-    - 'spec/api_map_method_spec.rb'
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: SkipBlocks, EnforcedStyle, OnlyStaticConstants.
@@ -633,7 +639,6 @@ RSpec/ExampleLength:
 # DisallowedExamples: works
 RSpec/ExampleWording:
   Exclude:
-    - 'spec/convention/struct_definition_spec.rb'
     - 'spec/pin/base_spec.rb'
     - 'spec/pin/method_spec.rb'
 
@@ -1114,12 +1119,6 @@ Style/RedundantFreeze:
     - 'lib/solargraph/complex_type.rb'
     - 'lib/solargraph/source_map/mapper.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowComments.
-Style/RedundantInitialize:
-  Exclude:
-    - 'lib/solargraph/rbs_map/core_map.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/RedundantInterpolation:
   Exclude:
@@ -1140,12 +1139,6 @@ Style/RedundantRegexpArgument:
     - 'spec/diagnostics/rubocop_spec.rb'
     - 'spec/language_server/host_spec.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantRegexpCharacterClass:
-  Exclude:
-    - 'lib/solargraph/source/cursor.rb'
-    - 'lib/solargraph/source/source_chainer.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 Style/RedundantRegexpEscape:
   Enabled: false
diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index f58633a0c..ee35dc497 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -753,7 +753,6 @@ def store
     # @param skip [Set<String>]
     # @param no_core [Boolean] Skip core classes if true
     # @return [Array<Pin::Base>]
-    # rubocop:disable Metrics/CyclomaticComplexity
     def inner_get_methods rooted_tag, scope, visibility, deep, skip, no_core = false
       rooted_type = ComplexType.parse(rooted_tag).force_rooted
       fqns = rooted_type.namespace
@@ -827,7 +826,6 @@ def inner_get_methods rooted_tag, scope, visibility, deep, skip, no_core = false
       end
       result
     end
-    # rubocop:enable Metrics/CyclomaticComplexity
 
     # @param fqns [String]
     # @param visibility [Array<Symbol>]
diff --git a/spec/api_map_spec.rb b/spec/api_map_spec.rb
index a612b428e..85e62d507 100755
--- a/spec/api_map_spec.rb
+++ b/spec/api_map_spec.rb
@@ -1,7 +1,6 @@
 require 'tmpdir'
 
 describe Solargraph::ApiMap do
-  # rubocop:disable RSpec/InstanceVariable
   before :all do
     @api_map = Solargraph::ApiMap.new
   end
@@ -873,6 +872,4 @@ def c
     clip = api_map.clip_at('test.rb', [18, 4])
     expect(clip.infer.to_s).to eq('Integer')
   end
-
-  # rubocop:enable RSpec/InstanceVariable
 end

From f623a73ad88f44d3ff6e6873a1682f33a07d431b Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 1 Sep 2025 07:52:39 -0400
Subject: [PATCH 032/172] Pull in overcommit fix

---
 lib/solargraph/yardoc.rb | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/lib/solargraph/yardoc.rb b/lib/solargraph/yardoc.rb
index 625e41ce4..ed638a7ce 100644
--- a/lib/solargraph/yardoc.rb
+++ b/lib/solargraph/yardoc.rb
@@ -26,7 +26,7 @@ def cache(yard_plugins, gemspec)
       #
       # @sg-ignore RBS gem doesn't reflect that Open3.* also include
       #   kwopts from Process.spawn()
-      stdout_and_stderr_str, status = Open3.capture2e(cmd, chdir: gemspec.gem_dir)
+      stdout_and_stderr_str, status = Open3.capture2e(current_bundle_env_tweaks, cmd, chdir: gemspec.gem_dir)
       unless status.success?
         Solargraph.logger.warn { "YARD failed running #{cmd.inspect} in #{gemspec.gem_dir}" }
         Solargraph.logger.info stdout_and_stderr_str
@@ -60,5 +60,22 @@ def load!(gemspec)
       YARD::Registry.load! PinCache.yardoc_path gemspec
       YARD::Registry.all
     end
+
+    # If the BUNDLE_GEMFILE environment variable is set, we need to
+    # make sure it's an absolute path, as we'll be changing
+    # directories.
+    #
+    # 'bundle exec' sets an absolute path here, but at least the
+    # overcommit gem does not, breaking on-the-fly documention with a
+    # spawned yardoc command from our current bundle
+    #
+    # @return [Hash{String => String}] a hash of environment variables to override
+    def current_bundle_env_tweaks
+      tweaks = {}
+      if ENV['BUNDLE_GEMFILE'] && !ENV['BUNDLE_GEMFILE'].empty?
+        tweaks['BUNDLE_GEMFILE'] = File.expand_path(ENV['BUNDLE_GEMFILE'])
+      end
+      tweaks
+    end
   end
 end

From a8b678b1a1abec6a571ad321b4245575541bf969 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 1 Sep 2025 08:56:57 -0400
Subject: [PATCH 033/172] Add spec

---
 .rubocop.yml        |  3 +++
 spec/yardoc_spec.rb | 52 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 spec/yardoc_spec.rb

diff --git a/.rubocop.yml b/.rubocop.yml
index a73324db2..c17a56410 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -21,6 +21,9 @@ AllCops:
     - "vendor/**/.*"
   TargetRubyVersion: 3.0
 
+RSpec/SpecFilePathFormat:
+  Enabled: false
+
 Style/MethodDefParentheses:
   EnforcedStyle: require_no_parentheses
 
diff --git a/spec/yardoc_spec.rb b/spec/yardoc_spec.rb
new file mode 100644
index 000000000..34dcad45c
--- /dev/null
+++ b/spec/yardoc_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'tmpdir'
+require 'open3'
+
+describe Solargraph::Yardoc do
+  let(:gem_yardoc_path) do
+    Solargraph::PinCache.yardoc_path gemspec
+  end
+
+  before do
+    FileUtils.mkdir_p(gem_yardoc_path)
+  end
+
+  describe '#cache' do
+    let(:api_map) { Solargraph::ApiMap.new }
+    let(:doc_map) { api_map.doc_map }
+    let(:gemspec) { Gem::Specification.find_by_path('rubocop') }
+    let(:output) { '' }
+
+    before do
+      allow(Solargraph.logger).to receive(:warn)
+      allow(Solargraph.logger).to receive(:info)
+      FileUtils.rm_rf(gem_yardoc_path)
+    end
+
+    context 'when given a relative BUNDLE_GEMFILE path' do
+      around do |example|
+        # turn absolute BUNDLE_GEMFILE path into relative
+        existing_gemfile = ENV.fetch('BUNDLE_GEMFILE', nil)
+        current_dir = Dir.pwd
+        # remove prefix current_dir from path
+        ENV['BUNDLE_GEMFILE'] = existing_gemfile.sub("#{current_dir}/", '')
+        raise 'could not figure out relative path' if Pathname.new(ENV.fetch('BUNDLE_GEMFILE', nil)).absolute?
+        example.run
+        ENV['BUNDLE_GEMFILE'] = existing_gemfile
+      end
+
+      it 'sends Open3 an absolute path' do
+        called_with = nil
+        allow(Open3).to receive(:capture2e) do |*args|
+          called_with = args
+          ['output', instance_double(Process::Status, success?: true)]
+        end
+
+        described_class.cache([], gemspec)
+
+        expect(called_with[0]['BUNDLE_GEMFILE']).to start_with('/')
+      end
+    end
+  end
+end

From 9f7fe59e6f172486fc3cce20fad1d8d5ce29bfa6 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 2 Sep 2025 05:45:12 -0400
Subject: [PATCH 034/172] Add --references flag (superclass for now)

---
 lib/solargraph/api_map.rb | 31 ++++++++++++-------------
 lib/solargraph/shell.rb   | 49 +++++++++++++++++++++++++--------------
 2 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 4e8332080..54019d1b8 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -730,6 +730,21 @@ def inner_get_methods_from_reference fq_reference_tag, namespace_pin, type, scop
       methods
     end
 
+    # @param fq_sub_tag [String]
+    # @return [String, nil]
+    def qualify_superclass fq_sub_tag
+      fq_sub_type = ComplexType.try_parse(fq_sub_tag)
+      fq_sub_ns = fq_sub_type.name
+      sup_tag = store.get_superclass(fq_sub_tag)
+      sup_type = ComplexType.try_parse(sup_tag)
+      sup_ns = sup_type.name
+      return nil if sup_tag.nil?
+      parts = fq_sub_ns.split('::')
+      last = parts.pop
+      parts.pop if last == sup_ns
+      qualify(sup_tag, parts.join('::'))
+    end
+
     private
 
     # A hash of source maps with filename keys.
@@ -865,21 +880,6 @@ def qualify_lower namespace, context
       qualify namespace, context.split('::')[0..-2].join('::')
     end
 
-    # @param fq_sub_tag [String]
-    # @return [String, nil]
-    def qualify_superclass fq_sub_tag
-      fq_sub_type = ComplexType.try_parse(fq_sub_tag)
-      fq_sub_ns = fq_sub_type.name
-      sup_tag = store.get_superclass(fq_sub_tag)
-      sup_type = ComplexType.try_parse(sup_tag)
-      sup_ns = sup_type.name
-      return nil if sup_tag.nil?
-      parts = fq_sub_ns.split('::')
-      last = parts.pop
-      parts.pop if last == sup_ns
-      qualify(sup_tag, parts.join('::'))
-    end
-
     # @param name [String] Namespace to fully qualify
     # @param root [String] The context to search
     # @param skip [Set<String>] Contexts already searched
@@ -949,7 +949,6 @@ def resolve_fqns fqns
 
       assignment = constant.assignment
 
-      # @sg-ignore Wrong argument type for Solargraph::ApiMap#resolve_trivial_constant: node expected AST::Node, received Parser::AST::Node, nil
       target_ns = resolve_trivial_constant(assignment) if assignment
       return nil unless target_ns
       qualify_namespace target_ns, constant_namespace
diff --git a/lib/solargraph/shell.rb b/lib/solargraph/shell.rb
index 21a53172f..11039b187 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -246,6 +246,8 @@ def list
     # @sg-ignore Unresolved call to option
     option :typify, type: :boolean, desc: 'Output the calculated return type of the pin from annotations', default: false
     # @sg-ignore Unresolved call to option
+    option :references, type: :boolean, desc: 'Show references', default: false
+    # @sg-ignore Unresolved call to option
     option :probe, type: :boolean, desc: 'Output the calculated return type of the pin from annotations and inference', default: false
     # @sg-ignore Unresolved call to option
     option :stack, type: :boolean, desc: 'Show entire stack of a method pin by including definitions in superclasses', default: false
@@ -253,27 +255,34 @@ def list
     # @return [void]
     def pin path
       api_map = Solargraph::ApiMap.load_with_cache('.', $stderr)
-
-      # @sg-ignore Unresolved call to options
-      # @type [Array<Pin::Base>]
-      pins = if options[:stack]
-               scope, ns, meth = if path.include? '#'
-                                   [:instance, *path.split('#', 2)]
-                                 else
-                                   [:class, *path.split('.', 2)]
-                                 end
-
-               # @sg-ignore Wrong argument type for
-               #   Solargraph::ApiMap#get_method_stack: rooted_tag
-               #   expected String, received Array<String>
-               api_map.get_method_stack(ns, meth, scope: scope)
-             else
-               api_map.get_path_pins path
-             end
-      if pins.empty?
+      pins = api_map.get_path_pins path
+      references = {}
+      pin = pins.first
+      case pin
+      when nil
         $stderr.puts "Pin not found for path '#{path}'"
         exit 1
+      when Pin::Method
+        if options[:stack]
+          scope, ns, meth = if path.include? '#'
+                              [:instance, *path.split('#', 2)]
+                            else
+                              [:class, *path.split('.', 2)]
+                            end
+
+          # @sg-ignore Wrong argument type for
+          #   Solargraph::ApiMap#get_method_stack: rooted_tag
+          #   expected String, received Array<String>
+          pins = api_map.get_method_stack(ns, meth, scope: scope)
+        end
+      when Pin::Namespace
+        if options[:references]
+          superclass_tag = api_map.qualify_superclass(pin.return_type.tag)
+          superclass_pin = api_map.get_path_pins(superclass_tag).first if superclass_tag
+          references[:superclass] = superclass_pin if superclass_pin
+        end
       end
+
       pins.each do |pin|
         # @sg-ignore Unresolved call to options
         if options[:typify] || options[:probe]
@@ -288,6 +297,10 @@ def pin path
 
         print_pin(pin)
       end
+      references.each do |key, refpin|
+        puts "\n# #{key.to_s.capitalize}:\n\n"
+        print_pin(refpin)
+      end
     end
 
     private

From 79e8cd900b13c60591e3bc76e3f5bffeb93bbdcb Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 2 Sep 2025 05:49:18 -0400
Subject: [PATCH 035/172] Add another @sg-ignore

---
 lib/solargraph/shell.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/solargraph/shell.rb b/lib/solargraph/shell.rb
index c56be0107..aa7214196 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -278,6 +278,7 @@ def pin path
           pins = api_map.get_method_stack(ns, meth, scope: scope)
         end
       when Pin::Namespace
+        # @sg-ignore Unresolved call to options
         if options[:references]
           superclass_tag = api_map.qualify_superclass(pin.return_type.tag)
           superclass_pin = api_map.get_path_pins(superclass_tag).first if superclass_tag

From da205a3b208c7aad3aedced43b889e70ab247348 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 2 Sep 2025 05:52:39 -0400
Subject: [PATCH 036/172] Catch up with .rubocop_todo.yml

---
 .rubocop_todo.yml | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index c711cd674..c3d28df49 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -920,9 +920,9 @@ RSpec/DescribeClass:
     - '**/spec/routing/**/*'
     - '**/spec/system/**/*'
     - '**/spec/views/**/*'
+    - 'spec/api_map_method_spec.rb'
     - 'spec/complex_type_spec.rb'
     - 'spec/source_map/node_processor_spec.rb'
-    - 'spec/api_map_method_spec.rb'
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: SkipBlocks, EnforcedStyle, OnlyStaticConstants.
@@ -1045,7 +1045,6 @@ RSpec/ExampleLength:
 # DisallowedExamples: works
 RSpec/ExampleWording:
   Exclude:
-    - 'spec/convention/struct_definition_spec.rb'
     - 'spec/pin/base_spec.rb'
     - 'spec/pin/method_spec.rb'
 
@@ -1086,7 +1085,6 @@ RSpec/ImplicitExpect:
 RSpec/InstanceVariable:
   Exclude:
     - 'spec/api_map/config_spec.rb'
-    - 'spec/api_map_spec.rb'
     - 'spec/diagnostics/require_not_found_spec.rb'
     - 'spec/language_server/host/dispatch_spec.rb'
     - 'spec/language_server/host_spec.rb'
@@ -1354,10 +1352,6 @@ RSpec/SpecFilePathFormat:
     - 'spec/yard_map/mapper/to_method_spec.rb'
     - 'spec/yard_map/mapper_spec.rb'
 
-RSpec/StubbedMock:
-  Exclude:
-    - 'spec/language_server/host/message_worker_spec.rb'
-
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Exclude:
@@ -2219,12 +2213,6 @@ Style/RedundantFreeze:
     - 'lib/solargraph/complex_type.rb'
     - 'lib/solargraph/source_map/mapper.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowComments.
-Style/RedundantInitialize:
-  Exclude:
-    - 'lib/solargraph/rbs_map/core_map.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/RedundantInterpolation:
   Exclude:
@@ -2252,24 +2240,13 @@ Style/RedundantRegexpArgument:
     - 'spec/diagnostics/rubocop_spec.rb'
     - 'spec/language_server/host_spec.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantRegexpCharacterClass:
-  Exclude:
-    - 'lib/solargraph/source/cursor.rb'
-    - 'lib/solargraph/source/source_chainer.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 Style/RedundantRegexpEscape:
   Exclude:
     - 'lib/solargraph/complex_type.rb'
     - 'lib/solargraph/diagnostics/rubocop.rb'
     - 'lib/solargraph/language_server/uri_helpers.rb'
-    - 'lib/solargraph/parser/parser_gem/node_methods.rb'
-    - 'lib/solargraph/pin/method.rb'
-    - 'lib/solargraph/pin/parameter.rb'
     - 'lib/solargraph/shell.rb'
-    - 'lib/solargraph/source/change.rb'
-    - 'lib/solargraph/source/cursor.rb'
     - 'lib/solargraph/source_map/clip.rb'
     - 'lib/solargraph/source_map/mapper.rb'
 
@@ -2632,7 +2609,6 @@ YARD/MismatchName:
   Exclude:
     - 'lib/solargraph/complex_type.rb'
     - 'lib/solargraph/complex_type/unique_type.rb'
-    - 'lib/solargraph/gem_pins.rb'
     - 'lib/solargraph/language_server/host.rb'
     - 'lib/solargraph/language_server/host/dispatch.rb'
     - 'lib/solargraph/language_server/request.rb'

From 4c486edec853f702aaed8384379c17c9226d4f0f Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 2 Sep 2025 05:58:48 -0400
Subject: [PATCH 037/172] Add another @sg-ignore

---
 lib/solargraph/shell.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/solargraph/shell.rb b/lib/solargraph/shell.rb
index aa7214196..cb919476c 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -265,6 +265,7 @@ def pin path
         $stderr.puts "Pin not found for path '#{path}'"
         exit 1
       when Pin::Method
+        # @sg-ignore Unresolved call to options
         if options[:stack]
           scope, ns, meth = if path.include? '#'
                               [:instance, *path.split('#', 2)]

From 200e7e42b847bfb554de097d9ba5da6f182a7196 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 2 Sep 2025 07:57:19 -0400
Subject: [PATCH 038/172] Tolerate case statement in specs

---
 spec/shell_spec.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/shell_spec.rb b/spec/shell_spec.rb
index e3c85c6e0..b9dc6b327 100644
--- a/spec/shell_spec.rb
+++ b/spec/shell_spec.rb
@@ -62,6 +62,7 @@ def bundle_exec(*cmd)
     let(:to_s_pin) { instance_double(Solargraph::Pin::Method, return_type: Solargraph::ComplexType.parse('String')) }
 
     before do
+      allow(Solargraph::Pin::Method).to receive(:===).with(to_s_pin).and_return(true)
       allow(Solargraph::ApiMap).to receive(:load_with_cache).and_return(api_map)
       allow(api_map).to receive(:get_path_pins).with('String#to_s').and_return([to_s_pin])
     end
@@ -105,6 +106,8 @@ def bundle_exec(*cmd)
         string_new_pin = instance_double(Solargraph::Pin::Method, return_type: Solargraph::ComplexType.parse('String'))
 
         allow(api_map).to receive(:get_method_stack).with('String', 'new', scope: :class).and_return([string_new_pin])
+        allow(Solargraph::Pin::Method).to receive(:===).with(string_new_pin).and_return(true)
+        allow(api_map).to receive(:get_path_pins).with('String.new').and_return([string_new_pin])
         capture_both do
           shell.options = { stack: true }
           shell.pin('String.new')
@@ -140,6 +143,7 @@ def bundle_exec(*cmd)
     context 'with no pin' do
       it 'prints error' do
         allow(api_map).to receive(:get_path_pins).with('Not#found').and_return([])
+        allow(Solargraph::Pin::Method).to receive(:===).with(nil).and_return(false)
 
         out = capture_both do
           shell.options = {}

From 5b6a4af7d6474be1cbad660932d95fff6071a098 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 4 Sep 2025 12:46:07 -0400
Subject: [PATCH 039/172] Extract gemspec, bundle and dependency management
 into its own class

---
 .rubocop_todo.yml                    |  31 +----
 lib/solargraph/api_map.rb            |  30 +++--
 lib/solargraph/doc_map.rb            | 142 ++-------------------
 lib/solargraph/workspace.rb          |  39 ++++--
 lib/solargraph/workspace/gemspecs.rb | 184 +++++++++++++++++++++++++++
 spec/doc_map_spec.rb                 |  23 ++--
 spec/workspace_spec.rb               |   4 +-
 7 files changed, 259 insertions(+), 194 deletions(-)
 create mode 100644 lib/solargraph/workspace/gemspecs.rb

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index b8d123824..0b3e1fd0e 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --no-exclude-limit --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 1.80.0.
+# using RuboCop version 1.80.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -64,7 +64,6 @@ Layout/BlockAlignment:
 Layout/ClosingHeredocIndentation:
   Exclude:
     - 'spec/diagnostics/rubocop_spec.rb'
-    - 'spec/rbs_map/conversions_spec.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowForAlignment.
@@ -98,7 +97,6 @@ Layout/ElseAlignment:
 # Configuration parameters: EmptyLineBetweenMethodDefs, EmptyLineBetweenClassDefs, EmptyLineBetweenModuleDefs, DefLikeMacros, AllowAdjacentOneLineDefs, NumberOfEmptyLines.
 Layout/EmptyLineBetweenDefs:
   Exclude:
-    - 'lib/solargraph/doc_map.rb'
     - 'lib/solargraph/language_server/message/initialize.rb'
     - 'lib/solargraph/pin/delegated_method.rb'
 
@@ -107,7 +105,6 @@ Layout/EmptyLines:
   Exclude:
     - 'lib/solargraph/bench.rb'
     - 'lib/solargraph/complex_type/unique_type.rb'
-    - 'lib/solargraph/doc_map.rb'
     - 'lib/solargraph/language_server/message/extended/check_gem_version.rb'
     - 'lib/solargraph/language_server/message/initialize.rb'
     - 'lib/solargraph/pin/delegated_method.rb'
@@ -225,7 +222,6 @@ Layout/HashAlignment:
 Layout/HeredocIndentation:
   Exclude:
     - 'spec/diagnostics/rubocop_spec.rb'
-    - 'spec/rbs_map/conversions_spec.rb'
     - 'spec/yard_map/mapper/to_method_spec.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
@@ -920,9 +916,9 @@ RSpec/DescribeClass:
     - '**/spec/routing/**/*'
     - '**/spec/system/**/*'
     - '**/spec/views/**/*'
+    - 'spec/api_map_method_spec.rb'
     - 'spec/complex_type_spec.rb'
     - 'spec/source_map/node_processor_spec.rb'
-    - 'spec/api_map_method_spec.rb'
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: SkipBlocks, EnforcedStyle, OnlyStaticConstants.
@@ -1045,7 +1041,6 @@ RSpec/ExampleLength:
 # DisallowedExamples: works
 RSpec/ExampleWording:
   Exclude:
-    - 'spec/convention/struct_definition_spec.rb'
     - 'spec/pin/base_spec.rb'
     - 'spec/pin/method_spec.rb'
 
@@ -1086,7 +1081,6 @@ RSpec/ImplicitExpect:
 RSpec/InstanceVariable:
   Exclude:
     - 'spec/api_map/config_spec.rb'
-    - 'spec/api_map_spec.rb'
     - 'spec/diagnostics/require_not_found_spec.rb'
     - 'spec/language_server/host/dispatch_spec.rb'
     - 'spec/language_server/host_spec.rb'
@@ -2225,12 +2219,6 @@ Style/RedundantFreeze:
     - 'lib/solargraph/complex_type.rb'
     - 'lib/solargraph/source_map/mapper.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowComments.
-Style/RedundantInitialize:
-  Exclude:
-    - 'lib/solargraph/rbs_map/core_map.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/RedundantInterpolation:
   Exclude:
@@ -2246,6 +2234,7 @@ Style/RedundantParentheses:
     - 'lib/solargraph/parser/parser_gem/node_chainer.rb'
     - 'lib/solargraph/pin/method.rb'
     - 'lib/solargraph/pin/parameter.rb'
+    - 'lib/solargraph/pin/search.rb'
     - 'lib/solargraph/source.rb'
     - 'lib/solargraph/type_checker.rb'
 
@@ -2258,24 +2247,13 @@ Style/RedundantRegexpArgument:
     - 'spec/diagnostics/rubocop_spec.rb'
     - 'spec/language_server/host_spec.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantRegexpCharacterClass:
-  Exclude:
-    - 'lib/solargraph/source/cursor.rb'
-    - 'lib/solargraph/source/source_chainer.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 Style/RedundantRegexpEscape:
   Exclude:
     - 'lib/solargraph/complex_type.rb'
     - 'lib/solargraph/diagnostics/rubocop.rb'
     - 'lib/solargraph/language_server/uri_helpers.rb'
-    - 'lib/solargraph/parser/parser_gem/node_methods.rb'
-    - 'lib/solargraph/pin/method.rb'
-    - 'lib/solargraph/pin/parameter.rb'
     - 'lib/solargraph/shell.rb'
-    - 'lib/solargraph/source/change.rb'
-    - 'lib/solargraph/source/cursor.rb'
     - 'lib/solargraph/source_map/clip.rb'
     - 'lib/solargraph/source_map/mapper.rb'
 
@@ -2337,7 +2315,7 @@ Style/SafeNavigation:
 # Configuration parameters: Max.
 Style/SafeNavigationChainLength:
   Exclude:
-    - 'lib/solargraph/doc_map.rb'
+    - 'lib/solargraph/workspace/gemspecs.rb'
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/SlicingWithRange:
@@ -2638,7 +2616,6 @@ YARD/MismatchName:
   Exclude:
     - 'lib/solargraph/complex_type.rb'
     - 'lib/solargraph/complex_type/unique_type.rb'
-    - 'lib/solargraph/gem_pins.rb'
     - 'lib/solargraph/language_server/host.rb'
     - 'lib/solargraph/language_server/host/dispatch.rb'
     - 'lib/solargraph/language_server/request.rb'
diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index f58633a0c..c2e0967f7 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -22,6 +22,9 @@ class ApiMap
     # @return [Array<String>]
     attr_reader :missing_docs
 
+    # @return [Solargraph::Workspace::Gemspecs]
+    attr_reader :gemspecs
+
     # @param pins [Array<Solargraph::Pin::Base>]
     def initialize pins: []
       @source_map_hash = {}
@@ -99,7 +102,7 @@ def catalog bench
                      @doc_map&.uncached_rbs_collection_gemspecs&.any? ||
                      @doc_map&.rbs_collection_path != bench.workspace.rbs_collection_path
       if recreate_docmap
-        @doc_map = DocMap.new(unresolved_requires, [], bench.workspace) # @todo Implement gem preferences
+        @doc_map = DocMap.new(unresolved_requires, bench.workspace) # @todo Implement gem preferences
         @unresolved_requires = @doc_map.unresolved_requires
       end
       @cache.clear if store.update(@@core_map.pins, @doc_map.pins, implicit.pins, iced_pins, live_pins)
@@ -116,7 +119,7 @@ def catalog bench
 
     # @return [DocMap]
     def doc_map
-      @doc_map ||= DocMap.new([], [])
+      @doc_map ||= DocMap.new([], Workspace.new('.'))
     end
 
     # @return [::Array<Gem::Specification>]
@@ -212,6 +215,7 @@ class << self
     #
     # @param directory [String]
     # @param out [IO] The output stream for messages
+    #
     # @return [ApiMap]
     def self.load_with_cache directory, out
       api_map = load(directory)
@@ -533,7 +537,8 @@ def get_complex_type_methods complex_type, context = '', internal = false
     # @param name [String] Method name to look up
     # @param scope [Symbol] :instance or :class
     # @param visibility [Array<Symbol>] :public, :protected, and/or :private
-    # @param preserve_generics [Boolean]
+    # @param preserve_generics [Boolean] True to preserve any
+    #   unresolved generic parameters, false to erase them
     # @return [Array<Solargraph::Pin::Method>]
     def get_method_stack rooted_tag, name, scope: :instance, visibility: [:private, :protected, :public], preserve_generics: false
       rooted_type = ComplexType.parse(rooted_tag)
@@ -559,7 +564,7 @@ def get_method_stack rooted_tag, name, scope: :instance, visibility: [:private,
     # @deprecated Use #get_path_pins instead.
     #
     # @param path [String] The path to find
-    # @return [Enumerable<Solargraph::Pin::Base>]
+    # @return [Array<Solargraph::Pin::Base>]
     def get_path_suggestions path
       return [] if path.nil?
       resolve_method_aliases store.get_path_pins(path)
@@ -568,7 +573,7 @@ def get_path_suggestions path
     # Get an array of pins that match the specified path.
     #
     # @param path [String]
-    # @return [Enumerable<Pin::Base>]
+    # @return [Array<Pin::Base>]
     def get_path_pins path
       get_path_suggestions(path)
     end
@@ -658,7 +663,7 @@ def bundled? filename
     # @param sup [String] The superclass
     # @param sub [String] The subclass
     # @return [Boolean]
-    def super_and_sub?(sup, sub)
+    def super_and_sub? sup, sub
       fqsup = qualify(sup)
       cls = qualify(sub)
       tested = []
@@ -677,7 +682,7 @@ def super_and_sub?(sup, sub)
     # @param module_ns [String] The module namespace (no type parameters)
     #
     # @return [Boolean]
-    def type_include?(host_ns, module_ns)
+    def type_include? host_ns, module_ns
       store.get_includes(host_ns).map { |inc_tag| ComplexType.parse(inc_tag).name }.include?(module_ns)
     end
 
@@ -695,6 +700,11 @@ def resolve_method_aliases pins, visibility = [:public, :private, :protected]
       GemPins.combine_method_pins_by_path(with_resolved_aliases)
     end
 
+    # @return [Workspace, nil]
+    def workspace
+      @doc_map&.workspace
+    end
+
     # @param fq_reference_tag [String] A fully qualified whose method should be pulled in
     # @param namespace_pin [Pin::Base] Namespace pin for the rooted_type
     #   parameter - used to pull generics information
@@ -1038,18 +1048,18 @@ def erase_generics(namespace_pin, rooted_type, pins)
 
     # @param namespace_pin [Pin::Namespace]
     # @param rooted_type [ComplexType]
-    def should_erase_generics_when_done?(namespace_pin, rooted_type)
+    def should_erase_generics_when_done? namespace_pin, rooted_type
       has_generics?(namespace_pin) && !can_resolve_generics?(namespace_pin, rooted_type)
     end
 
     # @param namespace_pin [Pin::Namespace]
-    def has_generics?(namespace_pin)
+    def has_generics? namespace_pin
       namespace_pin && !namespace_pin.generics.empty?
     end
 
     # @param namespace_pin [Pin::Namespace]
     # @param rooted_type [ComplexType]
-    def can_resolve_generics?(namespace_pin, rooted_type)
+    def can_resolve_generics? namespace_pin, rooted_type
       has_generics?(namespace_pin) && !rooted_type.all_params.empty?
     end
   end
diff --git a/lib/solargraph/doc_map.rb b/lib/solargraph/doc_map.rb
index 5fe5e03f9..306dcfcf4 100644
--- a/lib/solargraph/doc_map.rb
+++ b/lib/solargraph/doc_map.rb
@@ -5,7 +5,10 @@
 require 'open3'
 
 module Solargraph
-  # A collection of pins generated from required gems.
+  # A collection of pins generated from specific 'require' statements
+  # in code.  Multiple can be created per workspace, to represent the
+  # pins available in different files based on their particular
+  # 'require' lines.
   #
   class DocMap
     include Logging
@@ -14,9 +17,6 @@ class DocMap
     attr_reader :requires
     alias required requires
 
-    # @return [Array<Gem::Specification>]
-    attr_reader :preferences
-
     # @return [Array<Pin::Base>]
     attr_reader :pins
 
@@ -46,11 +46,10 @@ def uncached_gemspecs
     attr_reader :environ
 
     # @param requires [Array<String>]
-    # @param preferences [Array<Gem::Specification>]
     # @param workspace [Workspace, nil]
-    def initialize(requires, preferences, workspace = nil)
+    # @param out [IO, nil] output stream for logging
+    def initialize requires, workspace, out: $stderr
       @requires = requires.compact
-      @preferences = preferences.compact
       @workspace = workspace
       @rbs_collection_path = workspace&.rbs_collection_path
       @rbs_collection_config_path = workspace&.rbs_collection_config_path
@@ -166,7 +165,7 @@ def yard_plugins
 
     # @return [Set<Gem::Specification>]
     def dependencies
-      @dependencies ||= (gemspecs.flat_map { |spec| fetch_dependencies(spec) } - gemspecs).to_set
+      @dependencies ||= (gemspecs.flat_map { |spec| workspace.fetch_dependencies(spec) } - gemspecs).to_set
     end
 
     private
@@ -203,12 +202,7 @@ def load_serialized_gem_pins
 
     # @return [Hash{String => Array<Gem::Specification>}]
     def required_gems_map
-      @required_gems_map ||= requires.to_h { |path| [path, resolve_path_to_gemspecs(path)] }
-    end
-
-    # @return [Hash{String => Gem::Specification}]
-    def preference_map
-      @preference_map ||= preferences.to_h { |gemspec| [gemspec.name, gemspec] }
+      @required_gems_map ||= requires.to_h { |path| [path, workspace.resolve_require(path)] }
     end
 
     # @param gemspec [Gem::Specification]
@@ -307,128 +301,8 @@ def deserialize_rbs_collection_cache gemspec, rbs_version_cache_key
       end
     end
 
-    # @param path [String]
-    # @return [::Array<Gem::Specification>, nil]
-    def resolve_path_to_gemspecs path
-      return nil if path.empty?
-      return gemspecs_required_from_bundler if path == 'bundler/require'
-
-      # @type [Gem::Specification, nil]
-      gemspec = Gem::Specification.find_by_path(path)
-      if gemspec.nil?
-        gem_name_guess = path.split('/').first
-        begin
-          # this can happen when the gem is included via a local path in
-          # a Gemfile; Gem doesn't try to index the paths in that case.
-          #
-          # See if we can make a good guess:
-          potential_gemspec = Gem::Specification.find_by_name(gem_name_guess)
-          file = "lib/#{path}.rb"
-          gemspec = potential_gemspec if potential_gemspec.files.any? { |gemspec_file| file == gemspec_file }
-        rescue Gem::MissingSpecError
-          logger.debug { "Require path #{path} could not be resolved to a gem via find_by_path or guess of #{gem_name_guess}" }
-          []
-        end
-      end
-      return nil if gemspec.nil?
-      [gemspec_or_preference(gemspec)]
-    end
-
-    # @param gemspec [Gem::Specification]
-    # @return [Gem::Specification]
-    def gemspec_or_preference gemspec
-      return gemspec unless preference_map.key?(gemspec.name)
-      return gemspec if gemspec.version == preference_map[gemspec.name].version
-
-      change_gemspec_version gemspec, preference_map[by_path.name].version
-    end
-
-    # @param gemspec [Gem::Specification]
-    # @param version [Gem::Version]
-    # @return [Gem::Specification]
-    def change_gemspec_version gemspec, version
-      Gem::Specification.find_by_name(gemspec.name, "= #{version}")
-    rescue Gem::MissingSpecError
-      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
-      # @param spec [Gem::Dependency]
-      only_runtime_dependencies(gemspec).each_with_object(Set.new) do |spec, deps|
-        Solargraph.logger.info "Adding #{spec.name} dependency for #{gemspec.name}"
-        dep = Gem.loaded_specs[spec.name]
-        # @todo is next line necessary?
-        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.requirement} for #{gemspec.name} not found in RubyGems."
-      end.to_a
-    end
-
-    # @param gemspec [Gem::Specification]
-    # @return [Array<Gem::Dependency>]
-    def only_runtime_dependencies gemspec
-      gemspec.dependencies - gemspec.development_dependencies
-    end
-
-
     def inspect
       self.class.inspect
     end
-
-    # @return [Array<Gem::Specification>]
-    def gemspecs_required_from_bundler
-      # @todo Handle projects with custom Bundler/Gemfile setups
-      return unless workspace.gemfile?
-
-      if workspace.gemfile? && 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.warn "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
-
-    # @return [Array<Gem::Specification>]
-    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.flat_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.warn "Gem #{name} #{version} from bundle not found: #{e}" if specs.nil?
-            next specs
-          end.compact
-        else
-          Solargraph.logger.warn "Failed to load gems from bundle at #{workspace&.directory}: #{e}"
-        end
-      end
-    end
   end
 end
diff --git a/lib/solargraph/workspace.rb b/lib/solargraph/workspace.rb
index ffd653d96..e907a7e43 100644
--- a/lib/solargraph/workspace.rb
+++ b/lib/solargraph/workspace.rb
@@ -9,7 +9,10 @@ module Solargraph
   # in an associated Library or ApiMap.
   #
   class Workspace
+    include Logging
+
     autoload :Config, 'solargraph/workspace/config'
+    autoload :Gemspecs, 'solargraph/workspace/gemspecs'
 
     # @return [String]
     attr_reader :directory
@@ -41,6 +44,19 @@ def config
       @config ||= Solargraph::Workspace::Config.new(directory)
     end
 
+    # @param out [IO, nil] output stream for logging
+    # @param gemspec [Gem::Specification]
+    # @return [Array<Gem::Specification>]
+    def fetch_dependencies gemspec, out: $stderr
+      gemspecs.fetch_dependencies(gemspec, out: out)
+    end
+
+    # @param require [String] The string sent to 'require' in the code to resolve, e.g. 'rails', 'bundler/require'
+    # @return [Array<Gem::Specification>]
+    def resolve_require require
+      gemspecs.resolve_require(require)
+    end
+
     # Merge the source. A merge will update the existing source for the file
     # or add it to the sources if the workspace is configured to include it.
     # The source is ignored if the configuration excludes it.
@@ -115,15 +131,15 @@ def would_require? path
     #
     # @return [Boolean]
     def gemspec?
-      !gemspecs.empty?
+      !gemspec_files.empty?
     end
 
     # Get an array of all gemspec files in the workspace.
     #
     # @return [Array<String>]
-    def gemspecs
+    def gemspec_files
       return [] if directory.empty? || directory == '*'
-      @gemspecs ||= Dir[File.join(directory, '**/*.gemspec')].select do |gs|
+      @gemspec_files ||= Dir[File.join(directory, '**/*.gemspec')].select do |gs|
         config.allow? gs
       end
     end
@@ -156,12 +172,15 @@ def command_path
       server['commandPath'] || 'solargraph'
     end
 
-    # True if the workspace has a root Gemfile.
-    #
-    # @todo Handle projects with custom Bundler/Gemfile setups (see DocMap#gemspecs_required_from_bundler)
-    #
-    def gemfile?
-      directory && File.file?(File.join(directory, 'Gemfile'))
+    # @return [String, nil]
+    def directory_or_nil
+      return nil if directory.empty? || directory == '*'
+      directory
+    end
+
+    # @return [Solargraph::Workspace::Gemspecs]
+    def gemspecs
+      @gemspecs ||= Solargraph::Workspace::Gemspecs.new(directory_or_nil)
     end
 
     private
@@ -200,7 +219,7 @@ def load_sources
     def generate_require_paths
       return configured_require_paths unless gemspec?
       result = []
-      gemspecs.each do |file|
+      gemspec_files.each do |file|
         base = File.dirname(file)
         # HACK: Evaluating gemspec files violates the goal of not running
         #   workspace code, but this is how Gem::Specification.load does it
diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
new file mode 100644
index 000000000..717c723da
--- /dev/null
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -0,0 +1,184 @@
+# frozen_string_literal: true
+
+require 'rubygems'
+require 'bundler'
+
+module Solargraph
+  class Workspace
+    # Manages determining which gemspecs are available in a workspace
+    class Gemspecs
+      include Logging
+
+      attr_reader :directory, :preferences
+
+      # @param directory [String, nil] If nil, assume no bundle is present
+      # @param preferences [Array<Gem::Specification>]
+      def initialize directory, preferences: []
+        # @todo an issue with both external bundles and the potential
+        #   preferences feature is that bundler gives you a 'clean'
+        #   rubygems environment with only the specified versions
+        #   installed.  Possible alternatives:
+        #
+        #   *) prompt the user to run solargraph outside of bundler
+        #      and treat all bundles as external
+        #   *) reinstall the needed gems dynamically each time
+        #   *) manipulate the rubygems/bundler environment
+        @directory = directory && File.absolute_path(directory)
+        # @todo implement preferences as a config-exposed feature
+        @preferences = preferences
+      end
+
+      # Take the path given to a 'require' statement in a source file
+      # and return the Gem::Specifications which will be brought into
+      # scope with it, so we can load pins for them.
+      #
+      # @param require [String] The string sent to 'require' in the code to resolve, e.g. 'rails', 'bundler/require'
+      # @return [::Array<Gem::Specification>, nil]
+      def resolve_require require
+        return nil if require.empty?
+        return gemspecs_required_from_bundler if require == 'bundler/require'
+
+        # @sg-ignore Variable type could not be inferred for gemspec
+        # @type [Gem::Specification, nil]
+        gemspec = Gem::Specification.find_by_path(require)
+        if gemspec.nil?
+          gem_name_guess = require.split('/').first
+          begin
+            # this can happen when the gem is included via a local path in
+            # a Gemfile; Gem doesn't try to index the paths in that case.
+            #
+            # See if we can make a good guess:
+            potential_gemspec = Gem::Specification.find_by_name(gem_name_guess)
+            file = "lib/#{require}.rb"
+            # @sg-ignore Unresolved call to files
+            gemspec = potential_gemspec if potential_gemspec.files.any? { |gemspec_file| file == gemspec_file }
+          rescue Gem::MissingSpecError
+            logger.debug do
+              "Require path #{require} could not be resolved to a gem via find_by_path or guess of #{gem_name_guess}"
+            end
+            []
+          end
+        end
+        return nil if gemspec.nil?
+        [gemspec_or_preference(gemspec)]
+      end
+
+      # @param gemspec [Gem::Specification]
+      # @param out[IO, nil] output stream for logging
+      #
+      # @return [Array<Gem::Specification>]
+      def fetch_dependencies gemspec, out: $stderr
+        # @param spec [Gem::Dependency]
+        only_runtime_dependencies(gemspec).each_with_object(Set.new) do |spec, deps|
+          Solargraph.logger.info "Adding #{spec.name} dependency for #{gemspec.name}"
+          dep = Gem.loaded_specs[spec.name]
+          # @todo is next line necessary?
+          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.requirement} for " \
+                                 "#{gemspec.name} not found in RubyGems."
+        end.to_a
+      end
+
+      private
+
+      # True if the workspace has a root Gemfile.
+      #
+      # @todo Handle projects with custom Bundler/Gemfile setups (see DocMap#gemspecs_required_from_bundler)
+      #
+      def gemfile?
+        directory && File.file?(File.join(directory, 'Gemfile'))
+      end
+
+      # @return [Hash{String => Gem::Specification}]
+      def preference_map
+        @preference_map ||= preferences.to_h { |gemspec| [gemspec.name, gemspec] }
+      end
+
+      # @param gemspec [Gem::Specification]
+      # @return [Gem::Specification]
+      def gemspec_or_preference gemspec
+        return gemspec unless preference_map.key?(gemspec.name)
+        return gemspec if gemspec.version == preference_map[gemspec.name].version
+
+        # @todo this code is unused but broken
+        # @sg-ignore Unresolved call to by_path
+        change_gemspec_version gemspec, preference_map[by_path.name].version
+      end
+
+      # @param gemspec [Gem::Specification]
+      # @param version [Gem::Version]
+      # @return [Gem::Specification]
+      def change_gemspec_version gemspec, version
+        Gem::Specification.find_by_name(gemspec.name, "= #{version}")
+      rescue Gem::MissingSpecError
+        Solargraph.logger.info "Gem #{gemspec.name} version #{version} not found. Using #{gemspec.version} instead"
+        gemspec
+      end
+
+      # @param gemspec [Gem::Specification]
+      # @return [Array<Gem::Dependency>]
+      def only_runtime_dependencies gemspec
+        gemspec.dependencies - gemspec.development_dependencies
+      end
+
+      # @return [Array<Gem::Specification>]
+      def gemspecs_required_from_bundler
+        # @todo Handle projects with custom Bundler/Gemfile setups
+        return unless gemfile?
+
+        if gemfile? && Bundler.definition&.lockfile&.to_s&.start_with?(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_require lazy_spec.name
+            logger.warn "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
+
+      # @return [Array<Gem::Specification>]
+      def gemspecs_required_from_external_bundle
+        logger.info 'Fetching gemspecs required from external bundle'
+        return [] unless directory
+
+        Solargraph.with_clean_env do
+          cmd = [
+            'ruby', '-e',
+            "require 'bundler'; " \
+            "require 'json'; " \
+            "Dir.chdir('#{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.flat_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_require name
+              logger.warn "Gem #{name} #{version} from bundle not found: #{e}" if specs.nil?
+              next specs
+            end.compact
+          else
+            Solargraph.logger.warn "Failed to load gems from bundle at #{directory}: #{e}"
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/doc_map_spec.rb b/spec/doc_map_spec.rb
index b03e573f0..e8c2c9763 100644
--- a/spec/doc_map_spec.rb
+++ b/spec/doc_map_spec.rb
@@ -8,15 +8,17 @@
     Solargraph::PinCache.serialize_yard_gem(gemspec, yard_pins)
   end
 
+  let(:workspace) { Solargraph::Workspace.new(Dir.pwd) }
+
   it 'generates pins from gems' do
-    doc_map = Solargraph::DocMap.new(['ast'], [])
+    doc_map = Solargraph::DocMap.new(['ast'], workspace)
     doc_map.cache_all!($stderr)
     node_pin = doc_map.pins.find { |pin| pin.path == 'AST::Node' }
     expect(node_pin).to be_a(Solargraph::Pin::Namespace)
   end
 
   it 'tracks unresolved requires' do
-    doc_map = Solargraph::DocMap.new(['not_a_gem'], [])
+    doc_map = Solargraph::DocMap.new(['not_a_gem'], workspace)
     expect(doc_map.unresolved_requires).to include('not_a_gem')
   end
 
@@ -26,15 +28,14 @@
       spec.version = '1.0.0'
     end
     allow(Gem::Specification).to receive(:find_by_path).and_return(gemspec)
-    doc_map = Solargraph::DocMap.new(['not_a_gem'], [gemspec])
+    doc_map = Solargraph::DocMap.new(['not_a_gem'], workspace)
     expect(doc_map.uncached_yard_gemspecs).to eq([gemspec])
     expect(doc_map.uncached_rbs_collection_gemspecs).to eq([gemspec])
   end
 
   it 'imports all gems when bundler/require used' do
-    workspace = Solargraph::Workspace.new(Dir.pwd)
-    plain_doc_map = Solargraph::DocMap.new([], [], workspace)
-    doc_map_with_bundler_require = Solargraph::DocMap.new(['bundler/require'], [], workspace)
+    plain_doc_map = Solargraph::DocMap.new([], workspace)
+    doc_map_with_bundler_require = Solargraph::DocMap.new(['bundler/require'], workspace)
 
     expect(doc_map_with_bundler_require.pins.length - plain_doc_map.pins.length).to be_positive
   end
@@ -43,19 +44,19 @@
     # Requiring 'set' is unnecessary because it's already included in core. It
     # might make sense to log redundant requires, but a warning is overkill.
     expect(Solargraph.logger).not_to receive(:warn).with(/path set/)
-    Solargraph::DocMap.new(['set'], [])
+    Solargraph::DocMap.new(['set'], workspace)
   end
 
   it 'ignores nil requires' do
-    expect { Solargraph::DocMap.new([nil], []) }.not_to raise_error
+    expect { Solargraph::DocMap.new([nil], workspace) }.not_to raise_error
   end
 
   it 'ignores empty requires' do
-    expect { Solargraph::DocMap.new([''], []) }.not_to raise_error
+    expect { Solargraph::DocMap.new([''], workspace) }.not_to raise_error
   end
 
   it 'collects dependencies' do
-    doc_map = Solargraph::DocMap.new(['rspec'], [])
+    doc_map = Solargraph::DocMap.new(['rspec'], workspace)
     expect(doc_map.dependencies.map(&:name)).to include('rspec-core')
   end
 
@@ -70,7 +71,7 @@ def global(doc_map)
 
     Solargraph::Convention.register dummy_convention
 
-    doc_map = Solargraph::DocMap.new(['original_gem'], [])
+    doc_map = Solargraph::DocMap.new(['original_gem'], workspace)
 
     expect(doc_map.requires).to include('original_gem', 'convention_gem1', 'convention_gem2')
 
diff --git a/spec/workspace_spec.rb b/spec/workspace_spec.rb
index 572c3e131..dd8d8844b 100644
--- a/spec/workspace_spec.rb
+++ b/spec/workspace_spec.rb
@@ -72,7 +72,7 @@
     gemspec_file = File.join(dir_path, 'test.gemspec')
     File.write(gemspec_file, '')
     expect(workspace.gemspec?).to be(true)
-    expect(workspace.gemspecs).to eq([gemspec_file])
+    expect(workspace.gemspec_files).to eq([gemspec_file])
   end
 
   it "generates default require path" do
@@ -130,7 +130,7 @@
   it 'ignores gemspecs in excluded directories' do
     # vendor/**/* is excluded by default
     workspace = Solargraph::Workspace.new('spec/fixtures/vendored')
-    expect(workspace.gemspecs).to be_empty
+    expect(workspace.gemspec_files).to be_empty
   end
 
   it 'rescues errors loading files into sources' do

From 74e1baf9a7cacad85625eee28875281835ce8fb3 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 4 Sep 2025 12:56:26 -0400
Subject: [PATCH 040/172] Add @sg-ignore

---
 lib/solargraph/workspace/gemspecs.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index 717c723da..c42b2d843 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -161,6 +161,7 @@ def gemspecs_required_from_external_bundle
             'puts Bundler.definition.locked_gems.specs.map { |spec| [spec.name, spec.version] }' \
             '.to_h.to_json }'
           ]
+          # @sg-ignore Unresolved call to capture3 on Module<Open3>
           o, e, s = Open3.capture3(*cmd)
           if s.success?
             Solargraph.logger.debug "External bundle: #{o}"

From 947d5b9c01b82d74c9f39613e0925ba975f0a98d Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 4 Sep 2025 16:42:36 -0400
Subject: [PATCH 041/172] Update rubocop todo file

---
 .rubocop_todo.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 0ed335f34..95d352ebc 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -64,7 +64,6 @@ Layout/BlockAlignment:
 Layout/ClosingHeredocIndentation:
   Exclude:
     - 'spec/diagnostics/rubocop_spec.rb'
-    - 'spec/rbs_map/conversions_spec.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowForAlignment.
@@ -82,7 +81,6 @@ Layout/ElseAlignment:
 # Configuration parameters: EmptyLineBetweenMethodDefs, EmptyLineBetweenClassDefs, EmptyLineBetweenModuleDefs, DefLikeMacros, AllowAdjacentOneLineDefs, NumberOfEmptyLines.
 Layout/EmptyLineBetweenDefs:
   Exclude:
-    - 'lib/solargraph/doc_map.rb'
     - 'lib/solargraph/language_server/message/initialize.rb'
     - 'lib/solargraph/pin/delegated_method.rb'
 
@@ -167,7 +165,6 @@ Layout/HashAlignment:
 Layout/HeredocIndentation:
   Exclude:
     - 'spec/diagnostics/rubocop_spec.rb'
-    - 'spec/rbs_map/conversions_spec.rb'
     - 'spec/yard_map/mapper/to_method_spec.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
@@ -1181,7 +1178,7 @@ Style/SafeNavigation:
 # Configuration parameters: Max.
 Style/SafeNavigationChainLength:
   Exclude:
-    - 'lib/solargraph/doc_map.rb'
+    - 'lib/solargraph/workspace/gemspecs.rb'
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/SlicingWithRange:

From c1e4c8d953cc512b28aa0477efd6005f82082330 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 5 Sep 2025 09:08:28 -0400
Subject: [PATCH 042/172] Add some new specs

---
 spec/spec_helper.rb                           |  26 ++
 .../gemspecs_fetch_dependencies_spec.rb       |  88 ++++++
 .../gemspecs_resolve_require_spec.rb          | 295 ++++++++++++++++++
 3 files changed, 409 insertions(+)
 create mode 100644 spec/workspace/gemspecs_fetch_dependencies_spec.rb
 create mode 100644 spec/workspace/gemspecs_resolve_require_spec.rb

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 00cc6c8c3..59d107aa3 100755
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -43,3 +43,29 @@ def with_env_var(name, value)
     ENV[name] = old_value  # Restore the old value
   end
 end
+
+def capture_stdout &block
+  original_stdout = $stdout
+  $stdout = StringIO.new
+  begin
+    block.call
+    $stdout.string
+  ensure
+    $stdout = original_stdout
+  end
+end
+
+def capture_both &block
+  original_stdout = $stdout
+  original_stderr = $stderr
+  stringio = StringIO.new
+  $stdout = stringio
+  $stderr = stringio
+  begin
+    block.call
+  ensure
+    $stdout = original_stdout
+    $stderr = original_stderr
+  end
+  stringio.string
+end
diff --git a/spec/workspace/gemspecs_fetch_dependencies_spec.rb b/spec/workspace/gemspecs_fetch_dependencies_spec.rb
new file mode 100644
index 000000000..21fe040e5
--- /dev/null
+++ b/spec/workspace/gemspecs_fetch_dependencies_spec.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+require 'tmpdir'
+require 'rubygems/commands/install_command'
+
+xdescribe Solargraph::Workspace::Gemspecs, '#fetch_dependencies' do
+  subject(:deps) { gemspecs.fetch_dependencies(gemspec) }
+
+  let(:gemspecs) { described_class.new(dir_path) }
+  let(:dir_path) { Dir.pwd }
+
+  context 'when in our bundle' do
+    context 'with a Bundler::LazySpecification' do
+      let(:gemspec) do
+        Bundler::LazySpecification.new('solargraph', nil, nil)
+      end
+
+      it 'finds a known dependency' do
+        pending('https://github.com/castwide/solargraph/pull/1006')
+        expect(deps.map(&:name)).to include('backport')
+      end
+    end
+
+    context 'with gem whose dependency does not exist in our bundle' do
+      let(:gemspec) do
+        instance_double(Gem::Specification,
+                        dependencies: [Gem::Dependency.new('activerecord')],
+                        development_dependencies: [],
+                        name: 'my_fake_gem',
+                        version: '123')
+      end
+      let(:gem_name) { 'my_fake_gem' }
+
+      it 'gives a useful message' do
+        pending('https://github.com/castwide/solargraph/pull/1006')
+
+        output = capture_both { deps.map(&:name) }
+        expect(output).to include('Please install the gem activerecord')
+      end
+    end
+  end
+
+  context 'with external bundle' do
+    let(:dir_path) { File.realpath(Dir.mktmpdir).to_s }
+
+    let(:gemspec) do
+      Bundler::LazySpecification.new(gem_name, nil, nil)
+    end
+
+    before do
+      # write out Gemfile
+      File.write(File.join(dir_path, 'Gemfile'), <<~GEMFILE)
+        source 'https://rubygems.org'
+        gem '#{gem_name}'
+      GEMFILE
+
+      # run bundle install
+      output, status = Solargraph.with_clean_env do
+        Open3.capture2e('bundle install --verbose', chdir: dir_path)
+      end
+      raise "Failure installing bundle: #{output}" unless status.success?
+
+      # ensure Gemfile.lock exists
+      unless File.exist?(File.join(dir_path, 'Gemfile.lock'))
+        raise "Gemfile.lock not found after bundle install in #{dir_path}"
+      end
+    end
+
+    context 'with gem that exists in our bundle' do
+      let(:gem_name) { 'undercover' }
+
+      it 'finds dependencies' do
+        expect(deps.map(&:name)).to include('ast')
+      end
+    end
+
+    context 'with gem does not exist in our bundle' do
+      let(:gem_name) { 'activerecord' }
+
+      it 'gives a useful message' do
+        dep_names = nil
+        output = capture_both { dep_names = deps.map(&:name) }
+        expect(output).to include('Please install the gem activerecord')
+      end
+    end
+  end
+end
diff --git a/spec/workspace/gemspecs_resolve_require_spec.rb b/spec/workspace/gemspecs_resolve_require_spec.rb
new file mode 100644
index 000000000..f6217271c
--- /dev/null
+++ b/spec/workspace/gemspecs_resolve_require_spec.rb
@@ -0,0 +1,295 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+require 'tmpdir'
+require 'rubygems/commands/install_command'
+
+describe Solargraph::Workspace::Gemspecs, '#resolve_require' do
+  subject(:specs) { gemspecs.resolve_require(require) }
+
+  let(:gemspecs) { described_class.new(dir_path) }
+
+  def find_or_install gem_name, version
+    Gem::Specification.find_by_name(gem_name, version)
+  rescue Gem::LoadError
+    install_gem(gem_name, version)
+  end
+
+  def add_bundle
+    # write out Gemfile
+    File.write(File.join(dir_path, 'Gemfile'), <<~GEMFILE)
+      source 'https://rubygems.org'
+      gem 'backport'
+    GEMFILE
+    # run bundle install
+    output, status = Solargraph.with_clean_env do
+      Open3.capture2e('bundle install --verbose', chdir: dir_path)
+    end
+    raise "Failure installing bundle: #{output}" unless status.success?
+    # ensure Gemfile.lock exists
+    return if File.exist?(File.join(dir_path, 'Gemfile.lock'))
+    raise "Gemfile.lock not found after bundle install in #{dir_path}"
+  end
+
+  def install_gem gem_name, version
+    Bundler.with_unbundled_env do
+      cmd = Gem::Commands::InstallCommand.new
+      cmd.handle_options [gem_name, '-v', version]
+      cmd.execute
+    rescue Gem::SystemExitException => e
+      raise unless e.exit_code == 0
+    end
+  end
+
+  context 'with local bundle' do
+    let(:dir_path) { File.realpath(Dir.pwd) }
+
+    context 'with a known gem' do
+      let(:require) { 'solargraph' }
+
+      it 'returns a single spec' do
+        expect(specs.size).to eq(1)
+      end
+
+      it 'resolves to the right known gem' do
+        expect(specs.map(&:name)).to eq(['solargraph'])
+      end
+    end
+
+    context 'with an unknown type from Bundler / RubyGems' do
+      let(:require) { 'solargraph' }
+      let(:specish_objects) { [double] }
+
+      before do
+        lockfile = instance_double(Pathname)
+        locked_gems = instance_double(Bundler::LockfileParser, specs: specish_objects)
+
+        definition = instance_double(Bundler::Definition,
+                                     locked_gems: locked_gems,
+                                     lockfile: lockfile)
+        allow(Bundler).to receive(:definition).and_return(definition)
+        allow(lockfile).to receive(:to_s).and_return(dir_path)
+      end
+
+      it 'returns a single spec' do
+        expect(specs.size).to eq(1)
+      end
+
+      it 'resolves to the right known gem' do
+        expect(specs.map(&:name)).to eq(['solargraph'])
+      end
+    end
+
+    def configure_bundler_spec stub_value
+      platform = Gem::Platform::RUBY
+      bundler_stub_spec = Bundler::StubSpecification.new('solargraph', '123', platform, spec_fetcher)
+      specish_objects = [bundler_stub_spec]
+      lockfile = instance_double(Pathname)
+      locked_gems = instance_double(Bundler::LockfileParser, specs: specish_objects)
+      definition = instance_double(Bundler::Definition,
+                                   locked_gems: locked_gems,
+                                   lockfile: lockfile)
+      # specish_objects = Bundler.definition.locked_gems.specs
+      allow(Bundler).to receive(:definition).and_return(definition)
+      allow(lockfile).to receive(:to_s).and_return(dir_path)
+      allow(bundler_stub_spec).to receive(:respond_to?).with(:name).and_return(true)
+      allow(bundler_stub_spec).to receive(:respond_to?).with(:version).and_return(true)
+      allow(bundler_stub_spec).to receive(:respond_to?).with(:gem_dir).and_return(false)
+      allow(bundler_stub_spec).to receive(:respond_to?).with(:materialize_for_installation).and_return(false)
+      allow(bundler_stub_spec).to receive_messages(name: 'solargraph', stub: stub_value)
+    end
+
+    context 'with a Bundler::StubSpecification from Bundler / RubyGems' do
+      # this can happen from local gems, which is hard to test
+      # organically
+
+      let(:require) { 'solargraph' }
+      let(:spec_fetcher) { instance_double(Gem::SpecFetcher) }
+
+      before do
+        platform = Gem::Platform::RUBY
+        real_spec = instance_double(Gem::Specification)
+        allow(real_spec).to receive(:name).and_return('solargraph')
+        gem_stub_spec = Gem::StubSpecification.new('solargraph', '123', platform, spec_fetcher)
+        configure_bundler_spec(gem_stub_spec)
+        allow(gem_stub_spec).to receive_messages(name: 'solargraph', version: '123', spec: real_spec)
+      end
+
+      it 'returns a single spec' do
+        expect(specs.size).to eq(1)
+      end
+
+      it 'resolves to the right known gem' do
+        expect(specs.map(&:name)).to eq(['solargraph'])
+      end
+    end
+
+    context 'with a Bundler::StubSpecification that resolves straight to Gem::Specification' do
+      # have seen different behavior with different versions of rubygems/bundler
+
+      let(:require) { 'solargraph' }
+      let(:spec_fetcher) { instance_double(Gem::SpecFetcher) }
+      let(:real_spec) { Gem::Specification.new('solargraph', '123') }
+
+      before do
+        configure_bundler_spec(real_spec)
+      end
+
+      it 'returns a single spec' do
+        expect(specs.size).to eq(1)
+      end
+
+      it 'resolves to the right known gem' do
+        expect(specs.map(&:name)).to eq(['solargraph'])
+      end
+    end
+
+    context 'with a less usual require mapping' do
+      let(:require) { 'diff/lcs' }
+
+      it 'returns a single spec' do
+        expect(specs.size).to eq(1)
+      end
+
+      it 'resolves to the right known gem' do
+        expect(specs.map(&:name)).to eq(['diff-lcs'])
+      end
+    end
+
+    context 'with Bundler.require' do
+      let(:require) { 'bundler/require' }
+
+      it 'returns the gemspec gem' do
+        expect(specs.map(&:name)).to include('solargraph')
+      end
+    end
+  end
+
+  context 'with nil as directory' do
+    let(:dir_path) { nil }
+
+    context 'with simple require' do
+      let(:require) { 'solargraph' }
+
+      it 'finds solargraph' do
+        expect(specs.map(&:name)).to eq(['solargraph'])
+      end
+    end
+
+    context 'with Bundler.require' do
+      let(:require) { 'bundler/require' }
+
+      it 'finds nothing' do
+        pending('https://github.com/castwide/solargraph/pull/1006')
+
+        expect(specs).to be_empty
+      end
+    end
+  end
+
+  context 'with external bundle' do
+    let(:dir_path) { File.realpath(Dir.mktmpdir).to_s }
+
+    context 'with no actual bundle' do
+      let(:require) { 'bundler/require' }
+
+      it 'raises' do
+        pending('https://github.com/castwide/solargraph/pull/1006')
+
+        expect { specs }.to raise_error(Solargraph::BundleNotFoundError)
+      end
+    end
+
+    context 'with Gemfile and Bundler.require' do
+      before { add_bundle }
+
+      let(:require) { 'bundler/require' }
+
+      it 'does not raise' do
+        expect { specs }.not_to raise_error
+      end
+
+      it 'returns gems' do
+        expect(specs.map(&:name)).to include('backport')
+      end
+    end
+
+    context 'with Gemfile but an unknown gem' do
+      before { add_bundle }
+
+      let(:require) { 'unknown_gemlaksdflkdf' }
+
+      it 'returns nil' do
+        expect(specs).to be_nil
+      end
+    end
+
+    context 'with a Gemfile and a gem preference' do
+      # find_or_install helper doesn't seem to work on older versions
+      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
+        before do
+          add_bundle
+          find_or_install('backport', '1.0.0')
+          Gem::Specification.find_by_name('backport', '= 1.0.0')
+        end
+
+        let(:preferences) do
+          [
+            Gem::Specification.new.tap do |spec|
+              spec.name = 'backport'
+              spec.version = '1.0.0'
+            end
+          ]
+        end
+
+        it 'returns the preferred gemspec' do
+          gemspecs = described_class.new(dir_path, preferences: preferences)
+          specs = gemspecs.resolve_require('backport')
+          backport = specs.find { |spec| spec.name == 'backport' }
+
+          expect(backport.version.to_s).to eq('1.0.0')
+        end
+
+        context 'with a gem preference that does not exist' do
+          let(:preferences) do
+            [
+              Gem::Specification.new.tap do |spec|
+                spec.name = 'backport'
+                spec.version = '99.0.0'
+              end
+            ]
+          end
+
+          it 'returns the gemspec we do have' do
+            gemspecs = described_class.new(dir_path, preferences: preferences)
+            specs = gemspecs.resolve_require('backport')
+            backport = specs.find { |spec| spec.name == 'backport' }
+
+            expect(backport.version.to_s).to eq('1.2.0')
+          end
+        end
+
+        context 'with a gem preference already set to the version we use' do
+          let(:version) { Gem::Specification.find_by_name('backport').version.to_s }
+
+          let(:preferences) do
+            [
+              Gem::Specification.new.tap do |spec|
+                spec.name = 'backport'
+                spec.version = version
+              end
+            ]
+          end
+
+          it 'returns the gemspec we do have' do
+            gemspecs = described_class.new(dir_path, preferences: preferences)
+            specs = gemspecs.resolve_require('backport')
+            backport = specs.find { |spec| spec.name == 'backport' }
+
+            expect(backport.version.to_s).to eq(version)
+          end
+        end
+      end
+    end
+  end
+end

From f32bb177d45cb62090b3c94f64b83f4ce4f7c4c2 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 5 Sep 2025 09:14:07 -0400
Subject: [PATCH 043/172] Convince GHA to run on branch of branch

---
 .github/workflows/linting.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index b4ef26bfe..4520280dc 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -8,7 +8,7 @@ name: Linting
 on:
   workflow_dispatch: {}
   pull_request:
-    branches: [ master ]
+    branches: [ * ]
   push:
     branches:
       - 'main'

From b1a736d1bb03aa4f51d4eb01553e869fd227b83f Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 5 Sep 2025 09:14:48 -0400
Subject: [PATCH 044/172] Convince GHA to run on branch of branch

---
 .github/workflows/linting.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index 4520280dc..1078f5534 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -7,8 +7,7 @@ name: Linting
 
 on:
   workflow_dispatch: {}
-  pull_request:
-    branches: [ * ]
+  pull_request: true
   push:
     branches:
       - 'main'

From 87cb546927e73b7e525c5a1aa622c856ed3c084d Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 5 Sep 2025 09:17:58 -0400
Subject: [PATCH 045/172] Convince GHA to run on branch of branch

---
 .github/workflows/linting.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index 1078f5534..84299cbb5 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -10,7 +10,7 @@ on:
   pull_request: true
   push:
     branches:
-      - 'main'
+      - '*'
     tags:
       - 'v*'
 

From 99c8b34a7d248f088c4d67a8b48bb38f1c4690ee Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 5 Sep 2025 09:19:18 -0400
Subject: [PATCH 046/172] Convince GHA to run on branch of branch

---
 .github/workflows/linting.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index 84299cbb5..aaefe0c16 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -7,10 +7,12 @@ name: Linting
 
 on:
   workflow_dispatch: {}
-  pull_request: true
-  push:
+  pull_request:
     branches:
       - '*'
+  push:
+    branches:
+      - 'main'
     tags:
       - 'v*'
 

From b9a16c41b41385c49ed3da101af3a1fce7dd332b Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 5 Sep 2025 09:20:34 -0400
Subject: [PATCH 047/172] Convince GHA to run on branch of branch

---
 .github/workflows/plugins.yml   | 3 ++-
 .github/workflows/rspec.yml     | 3 ++-
 .github/workflows/typecheck.yml | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index b0f22ec3e..69f93e25c 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -4,7 +4,8 @@ on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ master ]
+    branches:
+      - '*'
 
 permissions:
   contents: read
diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index ecc3d9771..1ad29dc63 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -11,7 +11,8 @@ on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ master ]
+    branches:
+      - '*'
 
 permissions:
   contents: read
diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml
index 0ae8a3d8a..26eb75a17 100644
--- a/.github/workflows/typecheck.yml
+++ b/.github/workflows/typecheck.yml
@@ -11,7 +11,8 @@ on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ master ]
+    branches:
+      - '*'
 
 permissions:
   contents: read

From 76e37a545ec479acbc7b1e005b0365a0fae7f285 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 5 Sep 2025 09:30:26 -0400
Subject: [PATCH 048/172] Mark another new spec as pending

---
 spec/workspace/gemspecs_resolve_require_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/workspace/gemspecs_resolve_require_spec.rb b/spec/workspace/gemspecs_resolve_require_spec.rb
index f6217271c..cda6c3d5b 100644
--- a/spec/workspace/gemspecs_resolve_require_spec.rb
+++ b/spec/workspace/gemspecs_resolve_require_spec.rb
@@ -243,6 +243,8 @@ def configure_bundler_spec stub_value
         end
 
         it 'returns the preferred gemspec' do
+          pending('https://github.com/castwide/solargraph/pull/1006')
+
           gemspecs = described_class.new(dir_path, preferences: preferences)
           specs = gemspecs.resolve_require('backport')
           backport = specs.find { |spec| spec.name == 'backport' }

From e08b61bf97c86b51e92da687de16a3ad7dfdb1b9 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 5 Sep 2025 09:31:12 -0400
Subject: [PATCH 049/172] Mark another new spec as pending

---
 spec/workspace/gemspecs_resolve_require_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/workspace/gemspecs_resolve_require_spec.rb b/spec/workspace/gemspecs_resolve_require_spec.rb
index cda6c3d5b..2807c3384 100644
--- a/spec/workspace/gemspecs_resolve_require_spec.rb
+++ b/spec/workspace/gemspecs_resolve_require_spec.rb
@@ -263,6 +263,8 @@ def configure_bundler_spec stub_value
           end
 
           it 'returns the gemspec we do have' do
+            pending('https://github.com/castwide/solargraph/pull/1006')
+
             gemspecs = described_class.new(dir_path, preferences: preferences)
             specs = gemspecs.resolve_require('backport')
             backport = specs.find { |spec| spec.name == 'backport' }

From 33b9cb1241ab20fcc552e5f775ff4b16230cb86a Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 5 Sep 2025 09:33:38 -0400
Subject: [PATCH 050/172] Show missing coverage

---
 .github/workflows/rspec.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index 1ad29dc63..a24b81335 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -70,4 +70,4 @@ jobs:
       run: bundle exec rake spec
     - name: Check PR coverage
       run: bundle exec rake undercover
-      continue-on-error: true
+      # continue-on-error: true TODO: Restore before merging

From 33a185788e2781b75ee314d19c36c990e4fd8863 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 5 Sep 2025 10:13:24 -0400
Subject: [PATCH 051/172] Handle some missed coverage areas

---
 lib/solargraph/api_map.rb   | 10 +++++-----
 spec/api_map_method_spec.rb | 31 +++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index c2e0967f7..ce8f9a0c2 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -124,7 +124,7 @@ def doc_map
 
     # @return [::Array<Gem::Specification>]
     def uncached_gemspecs
-      @doc_map&.uncached_gemspecs || []
+      doc_map.uncached_gemspecs || []
     end
 
     # @return [::Array<Gem::Specification>]
@@ -194,7 +194,7 @@ def self.load directory
     # @param out [IO, nil]
     # @return [void]
     def cache_all!(out)
-      @doc_map.cache_all!(out)
+      doc_map.cache_all!(out)
     end
 
     # @param gemspec [Gem::Specification]
@@ -202,7 +202,7 @@ def cache_all!(out)
     # @param out [IO, nil]
     # @return [void]
     def cache_gem(gemspec, rebuild: false, out: nil)
-      @doc_map.cache(gemspec, rebuild: rebuild, out: out)
+      doc_map.cache(gemspec, rebuild: rebuild, out: out)
     end
 
     class << self
@@ -700,9 +700,9 @@ def resolve_method_aliases pins, visibility = [:public, :private, :protected]
       GemPins.combine_method_pins_by_path(with_resolved_aliases)
     end
 
-    # @return [Workspace, nil]
+    # @return [Workspace]
     def workspace
-      @doc_map&.workspace
+      doc_map.workspace
     end
 
     # @param fq_reference_tag [String] A fully qualified whose method should be pulled in
diff --git a/spec/api_map_method_spec.rb b/spec/api_map_method_spec.rb
index 9d4e4f553..d3b91321b 100644
--- a/spec/api_map_method_spec.rb
+++ b/spec/api_map_method_spec.rb
@@ -133,6 +133,37 @@ class B
     end
   end
 
+  describe '#cache_all!' do
+    it 'can cache gems without a bench' do
+      api_map = Solargraph::ApiMap.new
+      doc_map = instance_double('DocMap', cache_all!: true)
+      allow(Solargraph::DocMap).to receive(:new).and_return(doc_map)
+      api_map.cache_all!($stderr)
+      expect(doc_map).to have_received(:cache_all!).with($stderr)
+    end
+  end
+
+  describe '#cache_gem' do
+    it 'can cache gem without a bench' do
+      api_map = Solargraph::ApiMap.new
+      expect { api_map.cache_gem('rake', out: StringIO.new) }.not_to raise_error
+    end
+  end
+
+  describe '#cache_gem' do
+    it 'can get a default workspace without a bench' do
+      api_map = Solargraph::ApiMap.new
+      expect(api_map.workspace).not_to be_nil
+    end
+  end
+
+  describe '#uncached_gemspecs' do
+    it 'can get uncached gemspecs workspace without a bench' do
+      api_map = Solargraph::ApiMap.new
+      expect(api_map.uncached_gemspecs).not_to be_nil
+    end
+  end
+
   describe '#get_methods' do
     it 'recognizes mixin references from context' do
       source = Solargraph::Source.load_string(%(

From 7c215108324ae9d5d625793ee413937e5e439a43 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 5 Sep 2025 10:21:54 -0400
Subject: [PATCH 052/172] Clean up RSpec/MessageSpies rubocop violations

---
 .rubocop_todo.yml                                | 5 -----
 spec/doc_map_spec.rb                             | 3 ++-
 spec/language_server/host/diagnoser_spec.rb      | 3 ++-
 spec/language_server/host/message_worker_spec.rb | 3 ++-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index b8d123824..5739f5fcd 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1106,11 +1106,6 @@ RSpec/LetBeforeExamples:
   Exclude:
     - 'spec/complex_type_spec.rb'
 
-# Configuration parameters: .
-# SupportedStyles: have_received, receive
-RSpec/MessageSpies:
-  EnforcedStyle: receive
-
 RSpec/MissingExampleGroupArgument:
   Exclude:
     - 'spec/diagnostics/rubocop_helpers_spec.rb'
diff --git a/spec/doc_map_spec.rb b/spec/doc_map_spec.rb
index b03e573f0..38fd8e5c5 100644
--- a/spec/doc_map_spec.rb
+++ b/spec/doc_map_spec.rb
@@ -42,8 +42,9 @@
   it 'does not warn for redundant requires' do
     # Requiring 'set' is unnecessary because it's already included in core. It
     # might make sense to log redundant requires, but a warning is overkill.
-    expect(Solargraph.logger).not_to receive(:warn).with(/path set/)
+    allow(Solargraph.logger).to receive(:warn)
     Solargraph::DocMap.new(['set'], [])
+    expect(Solargraph.logger).not_to have_received(:warn).with(/path set/)
   end
 
   it 'ignores nil requires' do
diff --git a/spec/language_server/host/diagnoser_spec.rb b/spec/language_server/host/diagnoser_spec.rb
index d59a843f1..697d352bd 100644
--- a/spec/language_server/host/diagnoser_spec.rb
+++ b/spec/language_server/host/diagnoser_spec.rb
@@ -1,9 +1,10 @@
 describe Solargraph::LanguageServer::Host::Diagnoser do
   it "diagnoses on ticks" do
     host = double(Solargraph::LanguageServer::Host, options: { 'diagnostics' => true }, synchronizing?: false)
+    allow(host).to receive(:diagnose)
     diagnoser = Solargraph::LanguageServer::Host::Diagnoser.new(host)
     diagnoser.schedule 'file.rb'
-    expect(host).to receive(:diagnose).with('file.rb')
     diagnoser.tick
+    expect(host).to have_received(:diagnose).with('file.rb')
   end
 end
diff --git a/spec/language_server/host/message_worker_spec.rb b/spec/language_server/host/message_worker_spec.rb
index b9ce2a41f..526d88a07 100644
--- a/spec/language_server/host/message_worker_spec.rb
+++ b/spec/language_server/host/message_worker_spec.rb
@@ -2,11 +2,12 @@
   it "handle requests on queue" do
     host = double(Solargraph::LanguageServer::Host)
     message = {'method' => '$/example'}
-    expect(host).to receive(:receive).with(message).and_return(nil)
+    allow(host).to receive(:receive)
 
     worker = Solargraph::LanguageServer::Host::MessageWorker.new(host)
     worker.queue(message)
     expect(worker.messages).to eq [message]
     worker.tick
+    expect(host).to have_received(:receive).with(message).and_return(nil)
   end
 end

From 5afe71b7d740cff980f4af051f702c08b254ed3b Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 5 Sep 2025 10:43:02 -0400
Subject: [PATCH 053/172] Fix up allow syntax

---
 spec/language_server/host/message_worker_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/language_server/host/message_worker_spec.rb b/spec/language_server/host/message_worker_spec.rb
index 526d88a07..5e5bef481 100644
--- a/spec/language_server/host/message_worker_spec.rb
+++ b/spec/language_server/host/message_worker_spec.rb
@@ -2,12 +2,12 @@
   it "handle requests on queue" do
     host = double(Solargraph::LanguageServer::Host)
     message = {'method' => '$/example'}
-    allow(host).to receive(:receive)
+    allow(host).to receive(:receive).with(message).and_return(nil)
 
     worker = Solargraph::LanguageServer::Host::MessageWorker.new(host)
     worker.queue(message)
     expect(worker.messages).to eq [message]
     worker.tick
-    expect(host).to have_received(:receive).with(message).and_return(nil)
+    expect(host).to have_received(:receive).with(message)
   end
 end

From aaa757347cb7218add6156d4484dde044d9bf8d9 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 5 Sep 2025 10:49:00 -0400
Subject: [PATCH 054/172] Allow solargraph version to be overidden for test
 purposes

Useful for:
1. Maintaining a separate pin cache per branch to avoid contamination
   and get more accurate spec results locally
2. Testing solargraph-rails against branches consolidating multiple
   open PRs (e.g., the dated ones at
   https://github.com/apiology/solargraph/pulls)

Includes a direnv implementation for #1
---
 .envrc                    | 3 +++
 lib/solargraph/version.rb | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 .envrc

diff --git a/.envrc b/.envrc
new file mode 100644
index 000000000..815cb00d0
--- /dev/null
+++ b/.envrc
@@ -0,0 +1,3 @@
+# current git branch
+SOLARGRAPH_FORCE_VERSION=0.0.0.dev-$(git rev-parse --abbrev-ref HEAD | tr -d '\n' | tr '/' '-' | tr '_' '-')
+export SOLARGRAPH_FORCE_VERSION
diff --git a/lib/solargraph/version.rb b/lib/solargraph/version.rb
index 94cc1b851..00ab4af98 100755
--- a/lib/solargraph/version.rb
+++ b/lib/solargraph/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Solargraph
-  VERSION = '0.56.2'
+  VERSION = ENV.fetch('SOLARGRAPH_FORCE_VERSION', '0.56.2')
 end

From c4f92467787ef76e8464c4e17d9b4fc458e88100 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 5 Sep 2025 14:09:08 -0400
Subject: [PATCH 055/172] Exercise log statements too

---
 spec/spec_helper.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 00cc6c8c3..a74b8f97e 100755
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -27,6 +27,9 @@
 end
 require 'solargraph'
 # Suppress logger output in specs (if possible)
+# execute any logging blocks to make sure they don't blow up
+Solargraph::Logging.logger.sev_threshold = Logger::DEBUG
+# ...but still suppress logger output in specs (if possible)
 if Solargraph::Logging.logger.respond_to?(:reopen) && !ENV.key?('SOLARGRAPH_LOG')
   Solargraph::Logging.logger.reopen(File::NULL)
 end

From 54334790f6846289d2324714af3900221738c53c Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 5 Sep 2025 18:35:16 -0400
Subject: [PATCH 056/172] Better versioning in example

---
 .envrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.envrc b/.envrc
index 815cb00d0..92f925b17 100644
--- a/.envrc
+++ b/.envrc
@@ -1,3 +1,3 @@
 # current git branch
-SOLARGRAPH_FORCE_VERSION=0.0.0.dev-$(git rev-parse --abbrev-ref HEAD | tr -d '\n' | tr '/' '-' | tr '_' '-')
+SOLARGRAPH_FORCE_VERSION=0.0.1.dev-$(git rev-parse --abbrev-ref HEAD | tr -d '\n' | tr -d '/' | tr -d '-'| tr -d '_')
 export SOLARGRAPH_FORCE_VERSION

From e38a79ad06d4a23fdb324390f2020dac0f2b4d50 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 5 Sep 2025 19:35:16 -0400
Subject: [PATCH 057/172] Backport in some specs

---
 spec/spec_helper.rb                           |  26 ++
 .../gemspecs_fetch_dependencies_spec.rb       |  95 ++++++
 .../gemspecs_resolve_require_spec.rb          | 299 ++++++++++++++++++
 3 files changed, 420 insertions(+)
 create mode 100644 spec/workspace/gemspecs_fetch_dependencies_spec.rb
 create mode 100644 spec/workspace/gemspecs_resolve_require_spec.rb

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a74b8f97e..366c22cc3 100755
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -46,3 +46,29 @@ def with_env_var(name, value)
     ENV[name] = old_value  # Restore the old value
   end
 end
+
+def capture_stdout &block
+  original_stdout = $stdout
+  $stdout = StringIO.new
+  begin
+    block.call
+    $stdout.string
+  ensure
+    $stdout = original_stdout
+  end
+end
+
+def capture_both &block
+  original_stdout = $stdout
+  original_stderr = $stderr
+  stringio = StringIO.new
+  $stdout = stringio
+  $stderr = stringio
+  begin
+    block.call
+  ensure
+    $stdout = original_stdout
+    $stderr = original_stderr
+  end
+  stringio.string
+end
diff --git a/spec/workspace/gemspecs_fetch_dependencies_spec.rb b/spec/workspace/gemspecs_fetch_dependencies_spec.rb
new file mode 100644
index 000000000..d466fc0d7
--- /dev/null
+++ b/spec/workspace/gemspecs_fetch_dependencies_spec.rb
@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+require 'tmpdir'
+require 'rubygems/commands/install_command'
+
+describe Solargraph::Workspace::Gemspecs, '#fetch_dependencies' do
+  subject(:deps) { gemspecs.fetch_dependencies(gemspec) }
+
+  let(:gemspecs) { described_class.new(dir_path) }
+  let(:dir_path) { Dir.pwd }
+
+  context 'when in our bundle' do
+    xcontext 'with a Bundler::LazySpecification' do
+      let(:gemspec) do
+        Bundler::LazySpecification.new('solargraph', nil, nil)
+      end
+
+      it 'finds a known dependency' do
+        pending('https://github.com/castwide/solargraph/pull/1006')
+        expect(deps.map(&:name)).to include('backport')
+      end
+    end
+
+    context 'with gem whose dependency does not exist in our bundle' do
+      let(:gemspec) do
+        instance_double(Gem::Specification,
+                        dependencies: [Gem::Dependency.new('activerecord')],
+                        development_dependencies: [],
+                        name: 'my_fake_gem',
+                        version: '123')
+      end
+      let(:gem_name) { 'my_fake_gem' }
+
+      it 'gives a useful message' do
+        pending('https://github.com/castwide/solargraph/pull/1006')
+
+        output = capture_both { deps.map(&:name) }
+        expect(output).to include('Please install the gem activerecord')
+      end
+    end
+  end
+
+  context 'with external bundle' do
+    let(:dir_path) { File.realpath(Dir.mktmpdir).to_s }
+
+    let(:gemspec) do
+      Gem::Specification.find_by_name(gem_name)
+    end
+
+    before do
+      # write out Gemfile
+      File.write(File.join(dir_path, 'Gemfile'), <<~GEMFILE)
+        source 'https://rubygems.org'
+        gem '#{gem_name}'
+      GEMFILE
+
+      # run bundle install
+      output, status = Solargraph.with_clean_env do
+        Open3.capture2e('bundle install --verbose', chdir: dir_path)
+      end
+      raise "Failure installing bundle: #{output}" unless status.success?
+
+      # ensure Gemfile.lock exists
+      unless File.exist?(File.join(dir_path, 'Gemfile.lock'))
+        raise "Gemfile.lock not found after bundle install in #{dir_path}"
+      end
+    end
+
+    context 'with gem that exists in our bundle' do
+      let(:gem_name) { 'undercover' }
+
+      it 'finds dependencies' do
+        expect(deps.map(&:name)).to include('ast')
+      end
+    end
+
+    context 'with gem does not exist in our bundle' do
+      let(:gemspec) do
+        Gem::Specification.new(fake_gem_name)
+      end
+
+      let(:gem_name) { 'undercover' }
+
+      let(:fake_gem_name) { 'faaaaaake912' }
+
+      it 'gives a useful message' do
+        pending('https://github.com/castwide/solargraph/pull/1006')
+        dep_names = nil
+        output = capture_both { dep_names = deps.map(&:name) }
+        expect(output).to include('Please install the gem activerecord')
+      end
+    end
+  end
+end
diff --git a/spec/workspace/gemspecs_resolve_require_spec.rb b/spec/workspace/gemspecs_resolve_require_spec.rb
new file mode 100644
index 000000000..2807c3384
--- /dev/null
+++ b/spec/workspace/gemspecs_resolve_require_spec.rb
@@ -0,0 +1,299 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+require 'tmpdir'
+require 'rubygems/commands/install_command'
+
+describe Solargraph::Workspace::Gemspecs, '#resolve_require' do
+  subject(:specs) { gemspecs.resolve_require(require) }
+
+  let(:gemspecs) { described_class.new(dir_path) }
+
+  def find_or_install gem_name, version
+    Gem::Specification.find_by_name(gem_name, version)
+  rescue Gem::LoadError
+    install_gem(gem_name, version)
+  end
+
+  def add_bundle
+    # write out Gemfile
+    File.write(File.join(dir_path, 'Gemfile'), <<~GEMFILE)
+      source 'https://rubygems.org'
+      gem 'backport'
+    GEMFILE
+    # run bundle install
+    output, status = Solargraph.with_clean_env do
+      Open3.capture2e('bundle install --verbose', chdir: dir_path)
+    end
+    raise "Failure installing bundle: #{output}" unless status.success?
+    # ensure Gemfile.lock exists
+    return if File.exist?(File.join(dir_path, 'Gemfile.lock'))
+    raise "Gemfile.lock not found after bundle install in #{dir_path}"
+  end
+
+  def install_gem gem_name, version
+    Bundler.with_unbundled_env do
+      cmd = Gem::Commands::InstallCommand.new
+      cmd.handle_options [gem_name, '-v', version]
+      cmd.execute
+    rescue Gem::SystemExitException => e
+      raise unless e.exit_code == 0
+    end
+  end
+
+  context 'with local bundle' do
+    let(:dir_path) { File.realpath(Dir.pwd) }
+
+    context 'with a known gem' do
+      let(:require) { 'solargraph' }
+
+      it 'returns a single spec' do
+        expect(specs.size).to eq(1)
+      end
+
+      it 'resolves to the right known gem' do
+        expect(specs.map(&:name)).to eq(['solargraph'])
+      end
+    end
+
+    context 'with an unknown type from Bundler / RubyGems' do
+      let(:require) { 'solargraph' }
+      let(:specish_objects) { [double] }
+
+      before do
+        lockfile = instance_double(Pathname)
+        locked_gems = instance_double(Bundler::LockfileParser, specs: specish_objects)
+
+        definition = instance_double(Bundler::Definition,
+                                     locked_gems: locked_gems,
+                                     lockfile: lockfile)
+        allow(Bundler).to receive(:definition).and_return(definition)
+        allow(lockfile).to receive(:to_s).and_return(dir_path)
+      end
+
+      it 'returns a single spec' do
+        expect(specs.size).to eq(1)
+      end
+
+      it 'resolves to the right known gem' do
+        expect(specs.map(&:name)).to eq(['solargraph'])
+      end
+    end
+
+    def configure_bundler_spec stub_value
+      platform = Gem::Platform::RUBY
+      bundler_stub_spec = Bundler::StubSpecification.new('solargraph', '123', platform, spec_fetcher)
+      specish_objects = [bundler_stub_spec]
+      lockfile = instance_double(Pathname)
+      locked_gems = instance_double(Bundler::LockfileParser, specs: specish_objects)
+      definition = instance_double(Bundler::Definition,
+                                   locked_gems: locked_gems,
+                                   lockfile: lockfile)
+      # specish_objects = Bundler.definition.locked_gems.specs
+      allow(Bundler).to receive(:definition).and_return(definition)
+      allow(lockfile).to receive(:to_s).and_return(dir_path)
+      allow(bundler_stub_spec).to receive(:respond_to?).with(:name).and_return(true)
+      allow(bundler_stub_spec).to receive(:respond_to?).with(:version).and_return(true)
+      allow(bundler_stub_spec).to receive(:respond_to?).with(:gem_dir).and_return(false)
+      allow(bundler_stub_spec).to receive(:respond_to?).with(:materialize_for_installation).and_return(false)
+      allow(bundler_stub_spec).to receive_messages(name: 'solargraph', stub: stub_value)
+    end
+
+    context 'with a Bundler::StubSpecification from Bundler / RubyGems' do
+      # this can happen from local gems, which is hard to test
+      # organically
+
+      let(:require) { 'solargraph' }
+      let(:spec_fetcher) { instance_double(Gem::SpecFetcher) }
+
+      before do
+        platform = Gem::Platform::RUBY
+        real_spec = instance_double(Gem::Specification)
+        allow(real_spec).to receive(:name).and_return('solargraph')
+        gem_stub_spec = Gem::StubSpecification.new('solargraph', '123', platform, spec_fetcher)
+        configure_bundler_spec(gem_stub_spec)
+        allow(gem_stub_spec).to receive_messages(name: 'solargraph', version: '123', spec: real_spec)
+      end
+
+      it 'returns a single spec' do
+        expect(specs.size).to eq(1)
+      end
+
+      it 'resolves to the right known gem' do
+        expect(specs.map(&:name)).to eq(['solargraph'])
+      end
+    end
+
+    context 'with a Bundler::StubSpecification that resolves straight to Gem::Specification' do
+      # have seen different behavior with different versions of rubygems/bundler
+
+      let(:require) { 'solargraph' }
+      let(:spec_fetcher) { instance_double(Gem::SpecFetcher) }
+      let(:real_spec) { Gem::Specification.new('solargraph', '123') }
+
+      before do
+        configure_bundler_spec(real_spec)
+      end
+
+      it 'returns a single spec' do
+        expect(specs.size).to eq(1)
+      end
+
+      it 'resolves to the right known gem' do
+        expect(specs.map(&:name)).to eq(['solargraph'])
+      end
+    end
+
+    context 'with a less usual require mapping' do
+      let(:require) { 'diff/lcs' }
+
+      it 'returns a single spec' do
+        expect(specs.size).to eq(1)
+      end
+
+      it 'resolves to the right known gem' do
+        expect(specs.map(&:name)).to eq(['diff-lcs'])
+      end
+    end
+
+    context 'with Bundler.require' do
+      let(:require) { 'bundler/require' }
+
+      it 'returns the gemspec gem' do
+        expect(specs.map(&:name)).to include('solargraph')
+      end
+    end
+  end
+
+  context 'with nil as directory' do
+    let(:dir_path) { nil }
+
+    context 'with simple require' do
+      let(:require) { 'solargraph' }
+
+      it 'finds solargraph' do
+        expect(specs.map(&:name)).to eq(['solargraph'])
+      end
+    end
+
+    context 'with Bundler.require' do
+      let(:require) { 'bundler/require' }
+
+      it 'finds nothing' do
+        pending('https://github.com/castwide/solargraph/pull/1006')
+
+        expect(specs).to be_empty
+      end
+    end
+  end
+
+  context 'with external bundle' do
+    let(:dir_path) { File.realpath(Dir.mktmpdir).to_s }
+
+    context 'with no actual bundle' do
+      let(:require) { 'bundler/require' }
+
+      it 'raises' do
+        pending('https://github.com/castwide/solargraph/pull/1006')
+
+        expect { specs }.to raise_error(Solargraph::BundleNotFoundError)
+      end
+    end
+
+    context 'with Gemfile and Bundler.require' do
+      before { add_bundle }
+
+      let(:require) { 'bundler/require' }
+
+      it 'does not raise' do
+        expect { specs }.not_to raise_error
+      end
+
+      it 'returns gems' do
+        expect(specs.map(&:name)).to include('backport')
+      end
+    end
+
+    context 'with Gemfile but an unknown gem' do
+      before { add_bundle }
+
+      let(:require) { 'unknown_gemlaksdflkdf' }
+
+      it 'returns nil' do
+        expect(specs).to be_nil
+      end
+    end
+
+    context 'with a Gemfile and a gem preference' do
+      # find_or_install helper doesn't seem to work on older versions
+      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
+        before do
+          add_bundle
+          find_or_install('backport', '1.0.0')
+          Gem::Specification.find_by_name('backport', '= 1.0.0')
+        end
+
+        let(:preferences) do
+          [
+            Gem::Specification.new.tap do |spec|
+              spec.name = 'backport'
+              spec.version = '1.0.0'
+            end
+          ]
+        end
+
+        it 'returns the preferred gemspec' do
+          pending('https://github.com/castwide/solargraph/pull/1006')
+
+          gemspecs = described_class.new(dir_path, preferences: preferences)
+          specs = gemspecs.resolve_require('backport')
+          backport = specs.find { |spec| spec.name == 'backport' }
+
+          expect(backport.version.to_s).to eq('1.0.0')
+        end
+
+        context 'with a gem preference that does not exist' do
+          let(:preferences) do
+            [
+              Gem::Specification.new.tap do |spec|
+                spec.name = 'backport'
+                spec.version = '99.0.0'
+              end
+            ]
+          end
+
+          it 'returns the gemspec we do have' do
+            pending('https://github.com/castwide/solargraph/pull/1006')
+
+            gemspecs = described_class.new(dir_path, preferences: preferences)
+            specs = gemspecs.resolve_require('backport')
+            backport = specs.find { |spec| spec.name == 'backport' }
+
+            expect(backport.version.to_s).to eq('1.2.0')
+          end
+        end
+
+        context 'with a gem preference already set to the version we use' do
+          let(:version) { Gem::Specification.find_by_name('backport').version.to_s }
+
+          let(:preferences) do
+            [
+              Gem::Specification.new.tap do |spec|
+                spec.name = 'backport'
+                spec.version = version
+              end
+            ]
+          end
+
+          it 'returns the gemspec we do have' do
+            gemspecs = described_class.new(dir_path, preferences: preferences)
+            specs = gemspecs.resolve_require('backport')
+            backport = specs.find { |spec| spec.name == 'backport' }
+
+            expect(backport.version.to_s).to eq(version)
+          end
+        end
+      end
+    end
+  end
+end

From bb0f6079024f1e28ee9f12c26bbc626fe475d2ce Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 6 Sep 2025 14:18:16 -0400
Subject: [PATCH 058/172] Rerun rubocop todo

---
 .rubocop_todo.yml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 0ed335f34..c55a29039 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -64,7 +64,6 @@ Layout/BlockAlignment:
 Layout/ClosingHeredocIndentation:
   Exclude:
     - 'spec/diagnostics/rubocop_spec.rb'
-    - 'spec/rbs_map/conversions_spec.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowForAlignment.
@@ -167,7 +166,6 @@ Layout/HashAlignment:
 Layout/HeredocIndentation:
   Exclude:
     - 'spec/diagnostics/rubocop_spec.rb'
-    - 'spec/rbs_map/conversions_spec.rb'
     - 'spec/yard_map/mapper/to_method_spec.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
@@ -685,10 +683,13 @@ RSpec/LetBeforeExamples:
   Exclude:
     - 'spec/complex_type_spec.rb'
 
-# Configuration parameters: .
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
-  EnforcedStyle: receive
+  Exclude:
+    - 'spec/doc_map_spec.rb'
+    - 'spec/language_server/host/diagnoser_spec.rb'
+    - 'spec/language_server/host/message_worker_spec.rb'
 
 RSpec/MissingExampleGroupArgument:
   Exclude:
@@ -750,10 +751,6 @@ RSpec/ScatteredLet:
   Exclude:
     - 'spec/complex_type_spec.rb'
 
-# Configuration parameters: CustomTransform, IgnoreMethods, IgnoreMetadata.
-RSpec/SpecFilePathFormat:
-  Enabled: false
-
 RSpec/StubbedMock:
   Exclude:
     - 'spec/language_server/host/message_worker_spec.rb'

From 2548d6d8bcf9dd3a4de3933eaebeeef355e7a275 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 05:36:42 -0400
Subject: [PATCH 059/172] Drop xcontext

---
 spec/workspace/gemspecs_fetch_dependencies_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/workspace/gemspecs_fetch_dependencies_spec.rb b/spec/workspace/gemspecs_fetch_dependencies_spec.rb
index d466fc0d7..285f8e1a0 100644
--- a/spec/workspace/gemspecs_fetch_dependencies_spec.rb
+++ b/spec/workspace/gemspecs_fetch_dependencies_spec.rb
@@ -11,7 +11,7 @@
   let(:dir_path) { Dir.pwd }
 
   context 'when in our bundle' do
-    xcontext 'with a Bundler::LazySpecification' do
+    context 'with a Bundler::LazySpecification' do
       let(:gemspec) do
         Bundler::LazySpecification.new('solargraph', nil, nil)
       end

From e51777bc2b97e031e0911e3edc5461d1acd3758d Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 05:43:30 -0400
Subject: [PATCH 060/172] Rename method and add comments

---
 lib/solargraph/workspace/gemspecs.rb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index c42b2d843..1f4fef27b 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -36,7 +36,12 @@ def initialize directory, preferences: []
       # @return [::Array<Gem::Specification>, nil]
       def resolve_require require
         return nil if require.empty?
-        return gemspecs_required_from_bundler if require == 'bundler/require'
+
+        # This is added in the parser when it sees 'Bundler.require' -
+        # see https://bundler.io/guides/bundler_setup.html '
+        #
+        # @todo handle different arguments to Bundler.require
+        return auto_required_gemspecs_from_bundler if require == 'bundler/require'
 
         # @sg-ignore Variable type could not be inferred for gemspec
         # @type [Gem::Specification, nil]
@@ -85,7 +90,7 @@ def fetch_dependencies gemspec, out: $stderr
 
       # True if the workspace has a root Gemfile.
       #
-      # @todo Handle projects with custom Bundler/Gemfile setups (see DocMap#gemspecs_required_from_bundler)
+      # @todo Handle projects with custom Bundler/Gemfile setups (see #auto_required_gemspecs_from_bundler)
       #
       def gemfile?
         directory && File.file?(File.join(directory, 'Gemfile'))
@@ -124,7 +129,7 @@ def only_runtime_dependencies gemspec
       end
 
       # @return [Array<Gem::Specification>]
-      def gemspecs_required_from_bundler
+      def auto_required_gemspecs_from_bundler
         # @todo Handle projects with custom Bundler/Gemfile setups
         return unless gemfile?
 

From 837d7f67872f47619200320bafb7d80da9abad95 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 16:57:05 -0400
Subject: [PATCH 061/172] Force build

---
 .github/workflows/rspec.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index ecc3d9771..bfa6dce07 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -48,8 +48,8 @@ jobs:
       run: |
         bundle install
         bundle update rbs # use latest available for this Ruby version
-    - name: Run tests
-      run: bundle exec rake spec
+#    - name: Run tests
+#      run: bundle exec rake spec
   undercover:
     runs-on: ubuntu-latest
     steps:

From a4208e71241a3b2e5e2f9198d8d135a065bd7ea4 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 17:10:41 -0400
Subject: [PATCH 062/172] Restore

---
 .github/workflows/rspec.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index bfa6dce07..ecc3d9771 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -48,8 +48,8 @@ jobs:
       run: |
         bundle install
         bundle update rbs # use latest available for this Ruby version
-#    - name: Run tests
-#      run: bundle exec rake spec
+    - name: Run tests
+      run: bundle exec rake spec
   undercover:
     runs-on: ubuntu-latest
     steps:

From b66f2ac85a8d5599e36decc6a24fce36eed2f382 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 17:14:22 -0400
Subject: [PATCH 063/172] install -> update with rbs collection

---
 .github/workflows/plugins.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index 730882e30..b013abd3b 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -164,7 +164,7 @@ jobs:
        cd ${RAILS_DIR}
        bundle install
        bundle exec --gemfile ../../Gemfile rbs --version
-       bundle exec --gemfile ../../Gemfile rbs collection install
+       bundle exec --gemfile ../../Gemfile rbs collection update
        cd ../../
        # bundle exec rbs collection init
        # bundle exec rbs collection install

From a09a9af2bc797134fac776c370ce4fcc2c6db121 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 17:25:05 -0400
Subject: [PATCH 064/172] Try Ruby 3.2

---
 .github/workflows/plugins.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index b013abd3b..af9997846 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -144,7 +144,8 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         # solargraph-rails supports Ruby 3.0+
-        ruby-version: '3.0'
+        # RBS 3.9 supports Ruby 3.2+
+        ruby-version: '3.2'
         bundler-cache: false
         bundler: latest
       env:
@@ -164,7 +165,7 @@ jobs:
        cd ${RAILS_DIR}
        bundle install
        bundle exec --gemfile ../../Gemfile rbs --version
-       bundle exec --gemfile ../../Gemfile rbs collection update
+       bundle exec --gemfile ../../Gemfile rbs collection install
        cd ../../
        # bundle exec rbs collection init
        # bundle exec rbs collection install

From 6fc8febcdd4cb9515785e0f85788497ad8923ae7 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 17:44:39 -0400
Subject: [PATCH 065/172] Update solargraph

---
 .github/workflows/plugins.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index af9997846..ef9fe0155 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -158,8 +158,7 @@ jobs:
        export BUNDLE_PATH
        cd ../solargraph-rails
        echo "gem 'solargraph', path: '${GITHUB_WORKSPACE:?}'" >> Gemfile
-       bundle install
-       bundle update rbs
+       bundle update solargraph rbs
        RAILS_DIR="$(pwd)/spec/rails7"
        export RAILS_DIR
        cd ${RAILS_DIR}

From 388c170d76531530012eb1dff32579a059e3bda6 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 17:45:56 -0400
Subject: [PATCH 066/172] Re-add bundle install

---
 .github/workflows/plugins.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index ef9fe0155..a97b27c7c 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -158,6 +158,7 @@ jobs:
        export BUNDLE_PATH
        cd ../solargraph-rails
        echo "gem 'solargraph', path: '${GITHUB_WORKSPACE:?}'" >> Gemfile
+       bundle install
        bundle update solargraph rbs
        RAILS_DIR="$(pwd)/spec/rails7"
        export RAILS_DIR

From f80b73a020dd405addf8f56d2317e31614c2f8da Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 17:58:16 -0400
Subject: [PATCH 067/172] Drop MATRIX_SOLARGRAPH_VERSION

---
 .github/workflows/plugins.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index a97b27c7c..4dedbd93f 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -149,7 +149,6 @@ jobs:
         bundler-cache: false
         bundler: latest
       env:
-        MATRIX_SOLARGRAPH_VERSION: '>=0.56.0.pre1'
         MATRIX_RAILS_VERSION: "7.0"
     - name: Install gems
       run: |
@@ -170,7 +169,6 @@ jobs:
        # bundle exec rbs collection init
        # bundle exec rbs collection install
       env:
-        MATRIX_SOLARGRAPH_VERSION: '>=0.56.0.pre1'
         MATRIX_RAILS_VERSION: "7.0"
         MATRIX_RAILS_MAJOR_VERSION: '7'
     - name: Run specs
@@ -184,5 +182,4 @@ jobs:
         bundle info yard
         ALLOW_IMPROVEMENTS=true bundle exec rake spec
       env:
-        MATRIX_SOLARGRAPH_VERSION: '>=0.56.0.pre1'
         MATRIX_RAILS_VERSION: "7.0"

From ce2bee62f20628f33f1e9abb98f7faf96f69166f Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 18:09:04 -0400
Subject: [PATCH 068/172] Drop debugging changes

---
 .github/workflows/plugins.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index 4dedbd93f..b5984f3cb 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -144,8 +144,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         # solargraph-rails supports Ruby 3.0+
-        # RBS 3.9 supports Ruby 3.2+
-        ruby-version: '3.2'
+        ruby-version: '3.0'
         bundler-cache: false
         bundler: latest
       env:
@@ -158,7 +157,7 @@ jobs:
        cd ../solargraph-rails
        echo "gem 'solargraph', path: '${GITHUB_WORKSPACE:?}'" >> Gemfile
        bundle install
-       bundle update solargraph rbs
+       bundle update rbs
        RAILS_DIR="$(pwd)/spec/rails7"
        export RAILS_DIR
        cd ${RAILS_DIR}

From dbe9a3edc5291e6cf50632560893306ee074a79f Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 18:40:51 -0400
Subject: [PATCH 069/172] Update expectations from master branch

---
 .rubocop_todo.yml       | 11 -----------
 spec/convention_spec.rb |  2 --
 2 files changed, 13 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index c55a29039..89f703d23 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -280,7 +280,6 @@ Layout/TrailingWhitespace:
   Exclude:
     - 'lib/solargraph/language_server/message/client/register_capability.rb'
     - 'spec/api_map/config_spec.rb'
-    - 'spec/convention_spec.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowedMethods, AllowedPatterns.
@@ -338,11 +337,6 @@ Lint/DuplicateBranch:
 Lint/DuplicateMethods:
   Enabled: false
 
-# Configuration parameters: AllowComments, AllowEmptyLambdas.
-Lint/EmptyBlock:
-  Exclude:
-    - 'spec/convention_spec.rb'
-
 # Configuration parameters: AllowComments.
 Lint/EmptyClass:
   Enabled: false
@@ -618,11 +612,6 @@ RSpec/DescribeClass:
 RSpec/DescribedClass:
   Enabled: false
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-RSpec/EmptyExampleGroup:
-  Exclude:
-    - 'spec/convention_spec.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 RSpec/EmptyLineAfterFinalLet:
   Exclude:
diff --git a/spec/convention_spec.rb b/spec/convention_spec.rb
index 98a8f41bf..b6f4fc52e 100644
--- a/spec/convention_spec.rb
+++ b/spec/convention_spec.rb
@@ -1,5 +1,4 @@
 describe Solargraph::Convention do
-  # rubocop:disable RSpec/ExampleLength, RSpec/MultipleExpectations
   it 'newly defined pins are resolved by ApiMap after file changes' do
     filename = 'test.rb'
 
@@ -106,5 +105,4 @@ def local _source_map
 
     described_class.unregister updated_dummy_convention
   end
-  # rubocop:enable RSpec/ExampleLength, RSpec/MultipleExpectations
 end

From bcd5fab2e88c7baf5b4bc0802835ebfd01d41ca5 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 8 Sep 2025 15:28:18 -0400
Subject: [PATCH 070/172] Factor out a find_gem() method

---
 lib/solargraph/shell.rb     |  2 +-
 lib/solargraph/workspace.rb | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/solargraph/shell.rb b/lib/solargraph/shell.rb
index a005f600b..5c3fc0581 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -145,7 +145,7 @@ def gems *names
         STDERR.puts "Documentation cached for all #{Gem::Specification.count} gems."
       else
         names.each do |name|
-          spec = Gem::Specification.find_by_name(*name.split('='))
+          spec = api_map.workspace.find_gem(*name.split('='))
           do_cache spec, api_map
         rescue Gem::MissingSpecError
           warn "Gem '#{name}' not found"
diff --git a/lib/solargraph/workspace.rb b/lib/solargraph/workspace.rb
index e2d3d7495..1531509af 100644
--- a/lib/solargraph/workspace.rb
+++ b/lib/solargraph/workspace.rb
@@ -162,6 +162,16 @@ def rbs_collection_config_path
       end
     end
 
+    # @param name [String]
+    # @param version [String, nil]
+    #
+    # @return [Gem::Specification, nil]
+    def find_gem name, version = nil
+      Gem::Specification.find_by_name(name, version)
+    rescue Gem::MissingSpecError
+      nil
+    end
+
     # Synchronize the workspace from the provided updater.
     #
     # @param updater [Source::Updater]

From c32c86cc9fbdb45f97aed4c7ead1c20fcfbcaee2 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 10 Sep 2025 16:55:27 -0400
Subject: [PATCH 071/172] Point to branch immediately upstream

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index d731fc786..793831b14 100755
--- a/Rakefile
+++ b/Rakefile
@@ -54,7 +54,7 @@ def undercover
   cmd = 'bundle exec undercover ' \
         '--simplecov coverage/combined/coverage.json ' \
         '--exclude-files "Rakefile,spec/*,spec/**/*,lib/solargraph/version.rb" ' \
-        '--compare origin/master'
+        '--compare origin/extract_gemspecs_logic_from_doc_map'
   output, status = Bundler.with_unbundled_env do
     Open3.capture2e(cmd)
   end

From bd3ce0b0ed43efb0b1f3401e595a4e2a1dd4d6c7 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 10 Sep 2025 18:00:20 -0400
Subject: [PATCH 072/172] Move find_gem implementation, add more specs

---
 lib/solargraph/workspace.rb              |   4 +-
 lib/solargraph/workspace/gemspecs.rb     |  11 +++
 spec/workspace/gemspecs_find_gem_spec.rb | 102 +++++++++++++++++++++++
 3 files changed, 114 insertions(+), 3 deletions(-)
 create mode 100644 spec/workspace/gemspecs_find_gem_spec.rb

diff --git a/lib/solargraph/workspace.rb b/lib/solargraph/workspace.rb
index 1531509af..69ad12bae 100644
--- a/lib/solargraph/workspace.rb
+++ b/lib/solargraph/workspace.rb
@@ -167,9 +167,7 @@ def rbs_collection_config_path
     #
     # @return [Gem::Specification, nil]
     def find_gem name, version = nil
-      Gem::Specification.find_by_name(name, version)
-    rescue Gem::MissingSpecError
-      nil
+      gemspecs.find_gem(name, version)
     end
 
     # Synchronize the workspace from the provided updater.
diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index 1f4fef27b..4b4eb0265 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -68,6 +68,17 @@ def resolve_require require
         [gemspec_or_preference(gemspec)]
       end
 
+      # @param name [String]
+      # @param version [String, nil]
+      # @param out [IO, nil] output stream for logging
+      #
+      # @return [Gem::Specification, nil]
+      def find_gem name, version = nil, out = nil
+        Gem::Specification.find_by_name(name, version)
+      rescue Gem::MissingSpecError
+        nil
+      end
+
       # @param gemspec [Gem::Specification]
       # @param out[IO, nil] output stream for logging
       #
diff --git a/spec/workspace/gemspecs_find_gem_spec.rb b/spec/workspace/gemspecs_find_gem_spec.rb
new file mode 100644
index 000000000..76caddab3
--- /dev/null
+++ b/spec/workspace/gemspecs_find_gem_spec.rb
@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+require 'tmpdir'
+require 'rubygems/commands/install_command'
+
+describe Solargraph::Workspace::Gemspecs, '#find_gem' do
+  subject(:gemspec) { gemspecs.find_gem(name, version, out: out) }
+
+  let(:gemspecs) { described_class.new(dir_path) }
+  let(:out) { StringIO.new }
+
+  context 'with local bundle' do
+    let(:dir_path) { File.realpath(Dir.pwd) }
+
+    context 'with solargraph from bundle' do
+      let(:name) { 'solargraph' }
+      let(:version) { nil }
+
+      it 'returns the gem' do
+        expect(gemspec.name).to eq(name)
+      end
+    end
+
+    context 'with random from core' do
+      let(:name) { 'random' }
+      let(:version) { nil }
+
+      it 'returns no gemspec' do
+        expect(gemspec).to be_nil
+      end
+
+      it 'does not complain' do
+        expect(out.string).to be_empty
+      end
+    end
+
+    context 'with ripper from core' do
+      let(:name) { 'ripper' }
+      let(:version) { nil }
+
+      it 'returns no gemspec' do
+        expect(gemspec).to be_nil
+      end
+    end
+
+    context 'with base64 from stdlib' do
+      let(:name) { 'base64' }
+      let(:version) { nil }
+
+      it 'returns a gemspec' do
+        expect(gemspec).not_to be_nil
+      end
+    end
+
+    context 'with gem not in bundle' do
+      let(:name) { 'checkoff' }
+      let(:version) { nil }
+
+      it 'returns no gemspec' do
+        expect(gemspec).to be_nil
+      end
+
+      it 'complains' do
+        pending("implementation")
+        gemspec
+
+        expect(out.string).to include('install the gem checkoff ')
+      end
+    end
+
+    context 'with gem not in bundle but no logger' do
+      let(:name) { 'checkoff' }
+      let(:version) { nil }
+      let(:out) { nil }
+
+      it 'returns no gemspec' do
+        expect(gemspec).to be_nil
+      end
+
+      it 'does not fail' do
+        expect { gemspec }.not_to raise_error
+      end
+    end
+
+    context 'with gem not in bundle with version' do
+      let(:name) { 'checkoff' }
+      let(:version) { '1.0.0' }
+
+      it 'returns no gemspec' do
+        expect(gemspec).to be_nil
+      end
+
+      it 'complains' do
+        pending("implementation")
+        gemspec
+
+        expect(out.string).to include('install the gem checkoff:1.0.0')
+      end
+    end
+  end
+end

From adb34e55d3ca11e84191acbf4ccea18643da7f12 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 10 Sep 2025 21:02:51 -0400
Subject: [PATCH 073/172] Use find_gem in another location

---
 lib/solargraph/shell.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/solargraph/shell.rb b/lib/solargraph/shell.rb
index 5c3fc0581..4284838d3 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -129,7 +129,7 @@ def uncache *gems
           next
         end
 
-        spec = Gem::Specification.find_by_name(gem)
+        spec = api_map.workspace.find_gem(gem)
         PinCache.uncache_gem(spec, out: $stdout)
       end
     end

From 97a3ceb841eafb6e2d69c26ec39c822c711abc6d Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 10 Sep 2025 22:15:39 -0400
Subject: [PATCH 074/172] Fix workspace calls in shell.rb

---
 lib/solargraph/shell.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/solargraph/shell.rb b/lib/solargraph/shell.rb
index 4284838d3..907daccc6 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -118,6 +118,7 @@ def cache gem, version = nil
     # @return [void]
     def uncache *gems
       raise ArgumentError, 'No gems specified.' if gems.empty?
+      workspace = Solargraph::Workspace.new(Dir.pwd)
       gems.each do |gem|
         if gem == 'core'
           PinCache.uncache_core
@@ -129,7 +130,7 @@ def uncache *gems
           next
         end
 
-        spec = api_map.workspace.find_gem(gem)
+        spec = workspace.find_gem(gem)
         PinCache.uncache_gem(spec, out: $stdout)
       end
     end
@@ -140,12 +141,13 @@ def uncache *gems
     # @return [void]
     def gems *names
       api_map = ApiMap.load('.')
+      workspace = api_map.workspace
       if names.empty?
         Gem::Specification.to_a.each { |spec| do_cache spec, api_map }
         STDERR.puts "Documentation cached for all #{Gem::Specification.count} gems."
       else
         names.each do |name|
-          spec = api_map.workspace.find_gem(*name.split('='))
+          spec = workspace.find_gem(*name.split('='))
           do_cache spec, api_map
         rescue Gem::MissingSpecError
           warn "Gem '#{name}' not found"

From 4c181eccd77b202a16798a486ec379b517809ef2 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 11 Sep 2025 08:26:29 -0400
Subject: [PATCH 075/172] Refactor doc_map_spec

---
 spec/doc_map_spec.rb | 193 +++++++++++++++++++++++++++++++------------
 1 file changed, 142 insertions(+), 51 deletions(-)

diff --git a/spec/doc_map_spec.rb b/spec/doc_map_spec.rb
index 3f77cd7cc..f557366e0 100644
--- a/spec/doc_map_spec.rb
+++ b/spec/doc_map_spec.rb
@@ -1,82 +1,173 @@
 # frozen_string_literal: true
 
+require 'bundler'
+require 'benchmark'
+
 describe Solargraph::DocMap do
-  before :all do
-    # We use ast here because it's a known dependency.
-    gemspec = Gem::Specification.find_by_name('ast')
-    yard_pins = Solargraph::GemPins.build_yard_pins([], gemspec)
-    Solargraph::PinCache.serialize_yard_gem(gemspec, yard_pins)
+  subject(:doc_map) do
+    described_class.new(requires, workspace, out: out)
+  end
+
+  let(:out) { StringIO.new }
+  let(:pre_cache) { true }
+  let(:requires) { [] }
+
+  let(:workspace) do
+    Solargraph::Workspace.new(Dir.pwd)
   end
 
-  let(:workspace) { Solargraph::Workspace.new(Dir.pwd) }
+  let(:plain_doc_map) { described_class.new([], workspace, out: nil) }
 
-  it 'generates pins from gems' do
-    doc_map = Solargraph::DocMap.new(['ast'], workspace)
-    doc_map.cache_all!($stderr)
-    node_pin = doc_map.pins.find { |pin| pin.path == 'AST::Node' }
-    expect(node_pin).to be_a(Solargraph::Pin::Namespace)
+  before do
+    doc_map.cache_all!(nil) if pre_cache
   end
 
-  it 'tracks unresolved requires' do
-    doc_map = Solargraph::DocMap.new(['not_a_gem'], workspace)
-    expect(doc_map.unresolved_requires).to include('not_a_gem')
+  context 'with a require in solargraph test bundle' do
+    let(:requires) do
+      ['ast']
+    end
+
+    it 'generates pins from gems' do
+      node_pin = doc_map.pins.find { |pin| pin.path == 'AST::Node' }
+      expect(node_pin).to be_a(Solargraph::Pin::Namespace)
+    end
   end
 
-  it 'tracks uncached_gemspecs' do
-    gemspec = Gem::Specification.new do |spec|
-      spec.name = 'not_a_gem'
-      spec.version = '1.0.0'
+  context 'understands rspec + rspec-mocks require pattern' do
+    let(:requires) do
+      ['rspec-mocks']
+    end
+
+    it 'generates pins from gems' do
+      pending('handling dependencies from conventions as gem names, not requires')
+
+      ns_pin = doc_map.pins.find { |pin| pin.path == 'RSpec::Mocks' }
+      expect(ns_pin).to be_a(Solargraph::Pin::Namespace)
     end
-    allow(Gem::Specification).to receive(:find_by_path).and_return(gemspec)
-    doc_map = Solargraph::DocMap.new(['not_a_gem'], workspace)
-    expect(doc_map.uncached_yard_gemspecs).to eq([gemspec])
-    expect(doc_map.uncached_rbs_collection_gemspecs).to eq([gemspec])
   end
 
-  it 'imports all gems when bundler/require used' do
-    plain_doc_map = Solargraph::DocMap.new([], workspace)
-    doc_map_with_bundler_require = Solargraph::DocMap.new(['bundler/require'], workspace)
+  context 'with an invalid require' do
+    let(:requires) do
+      ['not_a_gem']
+    end
+
+    # expected: ["not_a_gem"]
+    # got: ["not_a_gem", "rspec-mocks"]
+    #
+    # This is a gem name vs require name issue coming from conventions
+    # - will pass once the above context passes
+    xit 'tracks unresolved requires' do
+      # These are auto-required by solargraph-rspec in case the bundle
+      # includes these gems.  In our case, it doesn't!
+      unprovided_solargraph_rspec_requires = [
+        'rspec-rails',
+        'actionmailer',
+        'activerecord',
+        'shoulda-matchers',
+        'rspec-sidekiq',
+        'airborne',
+        'activesupport'
+      ]
+      expect(doc_map.unresolved_requires - unprovided_solargraph_rspec_requires)
+        .to eq(['not_a_gem'])
+    end
+  end
 
-    expect(doc_map_with_bundler_require.pins.length - plain_doc_map.pins.length).to be_positive
+  context 'with an uncached but valid gemspec' do
+    let(:requires) { ['uncached_gem'] }
+    let(:pre_cache) { false }
+    let(:workspace) { instance_double(Solargraph::Workspace) }
+
+    it 'tracks uncached_gemspecs' do
+      pending('moving cache_stdlib_rbs_map into PinCache')
+
+      pincache = instance_double(Solargraph::PinCache, cache_stdlib_rbs_map: false)
+      uncached_gemspec = Gem::Specification.new('uncached_gem', '1.0.0')
+      allow(workspace).to receive_messages(fresh_pincache: pincache, resolve_require: [uncached_gemspec], stdlib_dependencies: [],
+                                           fetch_dependencies: [])
+      allow(Gem::Specification).to receive(:find_by_path).with('uncached_gem').and_return(uncached_gemspec)
+      allow(workspace).to receive(:global_environ).and_return(Solargraph::Environ.new)
+      allow(pincache).to receive(:deserialize_combined_pin_cache).with(uncached_gemspec).and_return(nil)
+      expect(doc_map.uncached_gemspecs).to eq([uncached_gemspec])
+    end
   end
 
-  it 'does not warn for redundant requires' do
-    # Requiring 'set' is unnecessary because it's already included in core. It
-    # might make sense to log redundant requires, but a warning is overkill.
-    allow(Solargraph.logger).to receive(:warn)
-    Solargraph::DocMap.new(['set'], workspace)
-    expect(Solargraph.logger).not_to have_received(:warn).with(/path set/)
+  context 'with require as bundle/require' do
+    # @todo need to debug this failure in CI:
+    #
+    #      Errno::ENOENT:
+    #    No such file or directory - /opt/hostedtoolcache/Ruby/3.3.9/x64/lib/ruby/3.3.0/gems/bundler-2.5.22
+    #  # ./lib/solargraph/yardoc.rb:29:in `cache'
+    #  # ./lib/solargraph/gem_pins.rb:48:in `build_yard_pins'
+    #  # ./lib/solargraph/doc_map.rb:86:in `cache_yard_pins'
+    #  # ./lib/solargraph/doc_map.rb:117:in `cache'
+    #  # ./lib/solargraph/doc_map.rb:75:in `block in cache_all!'
+    #  # ./lib/solargraph/doc_map.rb:74:in `each'
+    #  # ./lib/solargraph/doc_map.rb:74:in `cache_all!'
+    #  # ./spec/doc_map_spec.rb:99:in `block (3 levels) in <top (required)>'
+    xit 'imports all gems when bundler/require used' do
+      doc_map_with_bundler_require = described_class.new(['bundler/require'], [], workspace, out: nil)
+      doc_map_with_bundler_require.cache_doc_map_gems!(nil)
+      expect(doc_map_with_bundler_require.pins.length - plain_doc_map.pins.length).to be_positive
+    end
   end
 
-  it 'ignores nil requires' do
-    expect { Solargraph::DocMap.new([nil], workspace) }.not_to raise_error
+  context 'with a require not needed by Ruby core' do
+    let(:requires) { ['set'] }
+
+    it 'does not warn' do
+      # Requiring 'set' is unnecessary because it's already included in core. It
+      # might make sense to log redundant requires, but a warning is overkill.
+      allow(Solargraph.logger).to receive(:warn)
+      doc_map
+      expect(Solargraph.logger).not_to have_received(:warn).with(/path set/)
+    end
   end
 
-  it 'ignores empty requires' do
-    expect { Solargraph::DocMap.new([''], workspace) }.not_to raise_error
+  context 'with a nil require' do
+    let(:requires) { [nil] }
+
+    it 'does not raise error' do
+      expect { doc_map }.not_to raise_error
+    end
   end
 
-  it 'collects dependencies' do
-    doc_map = Solargraph::DocMap.new(['rspec'], workspace)
-    expect(doc_map.dependencies.map(&:name)).to include('rspec-core')
+  context 'with an empty require' do
+    let(:requires) { [''] }
+
+    it 'does not raise error' do
+      expect { doc_map }.not_to raise_error
+    end
   end
 
-  it 'includes convention requires from environ' do
-    dummy_convention = Class.new(Solargraph::Convention::Base) do
-      def global(doc_map)
-        Solargraph::Environ.new(
-          requires: ['convention_gem1', 'convention_gem2']
-        )
-      end
+  context 'with a require that has dependencies' do
+    let(:requires) { ['rspec'] }
+
+    it 'collects dependencies' do
+      expect(doc_map.dependencies.map(&:name)).to include('rspec-core')
     end
+  end
 
-    Solargraph::Convention.register dummy_convention
+  context 'with convention' do
+    let(:pre_cache) { false }
 
-    doc_map = Solargraph::DocMap.new(['original_gem'], workspace)
+    it 'includes convention requires from environ' do
+      dummy_convention = Class.new(Solargraph::Convention::Base) do
+        def global(doc_map)
+          Solargraph::Environ.new(
+            requires: ['convention_gem1', 'convention_gem2']
+          )
+        end
+      end
+
+      Solargraph::Convention.register dummy_convention
 
-    expect(doc_map.requires).to include('original_gem', 'convention_gem1', 'convention_gem2')
+      doc_map = Solargraph::DocMap.new(['original_gem'], workspace)
 
-    # Clean up the registered convention
-    Solargraph::Convention.unregister dummy_convention
+      expect(doc_map.requires).to include('original_gem', 'convention_gem1', 'convention_gem2')
+    ensure
+      # Clean up the registered convention
+      Solargraph::Convention.unregister dummy_convention
+    end
   end
 end

From 7762471ebddfdfc1a1a11f9f2f6c91a3e155ebfa Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 11 Sep 2025 08:44:35 -0400
Subject: [PATCH 076/172] Enable xit'ed spec

---
 spec/doc_map_spec.rb | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/spec/doc_map_spec.rb b/spec/doc_map_spec.rb
index f557366e0..18fef6ff6 100644
--- a/spec/doc_map_spec.rb
+++ b/spec/doc_map_spec.rb
@@ -51,12 +51,7 @@
       ['not_a_gem']
     end
 
-    # expected: ["not_a_gem"]
-    # got: ["not_a_gem", "rspec-mocks"]
-    #
-    # This is a gem name vs require name issue coming from conventions
-    # - will pass once the above context passes
-    xit 'tracks unresolved requires' do
+    it 'tracks unresolved requires' do
       # These are auto-required by solargraph-rspec in case the bundle
       # includes these gems.  In our case, it doesn't!
       unprovided_solargraph_rspec_requires = [

From 7a88bd05cc8697442136f10c08816e756f086b39 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 11 Sep 2025 09:23:52 -0400
Subject: [PATCH 077/172] Add assert

---
 lib/solargraph/workspace/gemspecs.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index 4b4eb0265..a796cbabf 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -57,6 +57,7 @@ def resolve_require require
             file = "lib/#{require}.rb"
             # @sg-ignore Unresolved call to files
             gemspec = potential_gemspec if potential_gemspec.files.any? { |gemspec_file| file == gemspec_file }
+            Solargraph.assert_or_log(:gemspecs_resolve_require_guess, "Could not find require based on #{require.inspect}") if gemspec.nil?
           rescue Gem::MissingSpecError
             logger.debug do
               "Require path #{require} could not be resolved to a gem via find_by_path or guess of #{gem_name_guess}"

From 436f9708a1e84af78da63c5872944a74ded2b77a Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 11 Sep 2025 09:26:15 -0400
Subject: [PATCH 078/172] Add failing spec

---
 spec/workspace/gemspecs_resolve_require_spec.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/spec/workspace/gemspecs_resolve_require_spec.rb b/spec/workspace/gemspecs_resolve_require_spec.rb
index 2807c3384..b3fefa840 100644
--- a/spec/workspace/gemspecs_resolve_require_spec.rb
+++ b/spec/workspace/gemspecs_resolve_require_spec.rb
@@ -214,6 +214,18 @@ def configure_bundler_spec stub_value
       end
     end
 
+    context 'with Gemfile and deep require into a gem' do
+      before { add_bundle }
+
+      let(:require) { 'bundler/gem_tasks' }
+
+      it 'returns gems' do
+        pending('improved logic for require lookups')
+
+        expect(specs&.map(&:name)).to include('bundler')
+      end
+    end
+
     context 'with Gemfile but an unknown gem' do
       before { add_bundle }
 

From 70c60a4e36b8f459341d2e999a5294bbc2303acf Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 11 Sep 2025 10:11:47 -0400
Subject: [PATCH 079/172] Use xit to exclude spec that fails in some
 environment combinations

---
 spec/workspace/gemspecs_resolve_require_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/workspace/gemspecs_resolve_require_spec.rb b/spec/workspace/gemspecs_resolve_require_spec.rb
index b3fefa840..eb2ab1f58 100644
--- a/spec/workspace/gemspecs_resolve_require_spec.rb
+++ b/spec/workspace/gemspecs_resolve_require_spec.rb
@@ -219,7 +219,7 @@ def configure_bundler_spec stub_value
 
       let(:require) { 'bundler/gem_tasks' }
 
-      it 'returns gems' do
+      xit 'returns gems' do
         pending('improved logic for require lookups')
 
         expect(specs&.map(&:name)).to include('bundler')

From 602d803000c3d598fa005cda362c78d6efc562e0 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 11 Sep 2025 10:20:20 -0400
Subject: [PATCH 080/172] Add another regression spec

---
 spec/workspace/gemspecs_resolve_require_spec.rb | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/spec/workspace/gemspecs_resolve_require_spec.rb b/spec/workspace/gemspecs_resolve_require_spec.rb
index eb2ab1f58..4ffcd0bd1 100644
--- a/spec/workspace/gemspecs_resolve_require_spec.rb
+++ b/spec/workspace/gemspecs_resolve_require_spec.rb
@@ -214,7 +214,7 @@ def configure_bundler_spec stub_value
       end
     end
 
-    context 'with Gemfile and deep require into a gem' do
+    context 'with Gemfile and deep require into a possibly-core gem' do
       before { add_bundle }
 
       let(:require) { 'bundler/gem_tasks' }
@@ -226,6 +226,16 @@ def configure_bundler_spec stub_value
       end
     end
 
+    context 'with Gemfile and deep require into a gem' do
+      before { add_bundle }
+
+      let(:require) { 'rspec/mocks' }
+
+      it 'returns gems' do
+        expect(specs&.map(&:name)).to include('rspec-mocks')
+      end
+    end
+
     context 'with Gemfile but an unknown gem' do
       before { add_bundle }
 

From 569bf4f3d97120c8264657a9322b5ad2f83140d1 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 11 Sep 2025 10:41:48 -0400
Subject: [PATCH 081/172] Improve assertion

---
 lib/solargraph/pin_cache.rb          | 17 +++++++++++++++++
 lib/solargraph/workspace/gemspecs.rb |  4 +++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/lib/solargraph/pin_cache.rb b/lib/solargraph/pin_cache.rb
index 2a0ec4639..c72a6a770 100644
--- a/lib/solargraph/pin_cache.rb
+++ b/lib/solargraph/pin_cache.rb
@@ -7,6 +7,23 @@ module PinCache
     class << self
       include Logging
 
+      # @return [Array<String>] a list of possible standard library names
+      def possible_stdlibs
+        @possible_stdlibs ||= begin
+          # all dirs and .rb files in Gem::RUBYGEMS_DIR
+          Dir.glob(File.join(Gem::RUBYGEMS_DIR, '*')).map do |file_or_dir|
+            basename = File.basename(file_or_dir)
+            # remove .rb
+            basename = basename[0..-4] if basename.end_with?('.rb')
+            basename
+          end.sort.uniq
+        rescue StandardError => e
+          logger.info { "Failed to get possible stdlibs: #{e.message}" }
+          logger.debug { e.backtrace.join("\n") }
+          []
+        end
+      end
+
       # The base directory where cached YARD documentation and serialized pins are serialized
       #
       # @return [String]
diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index a796cbabf..40826879a 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -57,7 +57,9 @@ def resolve_require require
             file = "lib/#{require}.rb"
             # @sg-ignore Unresolved call to files
             gemspec = potential_gemspec if potential_gemspec.files.any? { |gemspec_file| file == gemspec_file }
-            Solargraph.assert_or_log(:gemspecs_resolve_require_guess, "Could not find require based on #{require.inspect}") if gemspec.nil?
+            if gemspec.nil? && !PinCache.possible_stdlibs.include?(gem_name_guess)
+              Solargraph.assert_or_log(:gemspecs_resolve_require_guess, "Could not find require based on #{require.inspect}")
+            end
           rescue Gem::MissingSpecError
             logger.debug do
               "Require path #{require} could not be resolved to a gem via find_by_path or guess of #{gem_name_guess}"

From 396c11406b24dd5ce5fc163a333bddae8c6b20d7 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 11 Sep 2025 11:54:05 -0400
Subject: [PATCH 082/172] Drop assert, add gem lookup workaround for
 conventions, enable spec

---
 lib/solargraph/workspace/gemspecs.rb | 18 +++++++++++----
 spec/doc_map_spec.rb                 | 34 +++++-----------------------
 2 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index 40826879a..31c5908c3 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -57,17 +57,23 @@ def resolve_require require
             file = "lib/#{require}.rb"
             # @sg-ignore Unresolved call to files
             gemspec = potential_gemspec if potential_gemspec.files.any? { |gemspec_file| file == gemspec_file }
-            if gemspec.nil? && !PinCache.possible_stdlibs.include?(gem_name_guess)
-              Solargraph.assert_or_log(:gemspecs_resolve_require_guess, "Could not find require based on #{require.inspect}")
-            end
           rescue Gem::MissingSpecError
             logger.debug do
               "Require path #{require} could not be resolved to a gem via find_by_path or guess of #{gem_name_guess}"
             end
-            []
           end
         end
-        return nil if gemspec.nil?
+        # @todo the 'requires' provided in Environ is being used
+        #   by plugins to pass gem names instead of require paths
+        #   - need to expand Environ to provide a place to put gem
+        #   names and get new plugins out before retiring this.
+        gemspec ||= find_gem(gem_name_guess)
+        if gemspec.nil?
+          if !PinCache.possible_stdlibs.include?(gem_name_guess) && !['rspec-rails', 'actionmailer', 'activesupport', 'activerecord', 'shoulda-matchers', 'rspec-sidekiq', 'airborne'].include?(gem_name_guess)
+            Solargraph.assert_or_log(:gemspecs_resolve_require_guess, "Could not find require based on #{require.inspect}")
+          end
+          return nil
+        end
         [gemspec_or_preference(gemspec)]
       end
 
@@ -156,6 +162,7 @@ def auto_required_gemspecs_from_bundler
             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
+            # TODO: should this be resolve_require or find_gem?
             specs = resolve_require lazy_spec.name
             logger.warn "Gem #{lazy_spec.name} #{lazy_spec.version} from bundle not found: #{e}" if specs.nil?
             next specs
@@ -190,6 +197,7 @@ def gemspecs_required_from_external_bundle
             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
+              # TODO: should this be resolve_require or find_gem?
               specs = resolve_require name
               logger.warn "Gem #{name} #{version} from bundle not found: #{e}" if specs.nil?
               next specs
diff --git a/spec/doc_map_spec.rb b/spec/doc_map_spec.rb
index 18fef6ff6..fad6d3363 100644
--- a/spec/doc_map_spec.rb
+++ b/spec/doc_map_spec.rb
@@ -33,19 +33,6 @@
     end
   end
 
-  context 'understands rspec + rspec-mocks require pattern' do
-    let(:requires) do
-      ['rspec-mocks']
-    end
-
-    it 'generates pins from gems' do
-      pending('handling dependencies from conventions as gem names, not requires')
-
-      ns_pin = doc_map.pins.find { |pin| pin.path == 'RSpec::Mocks' }
-      expect(ns_pin).to be_a(Solargraph::Pin::Namespace)
-    end
-  end
-
   context 'with an invalid require' do
     let(:requires) do
       ['not_a_gem']
@@ -88,21 +75,9 @@
   end
 
   context 'with require as bundle/require' do
-    # @todo need to debug this failure in CI:
-    #
-    #      Errno::ENOENT:
-    #    No such file or directory - /opt/hostedtoolcache/Ruby/3.3.9/x64/lib/ruby/3.3.0/gems/bundler-2.5.22
-    #  # ./lib/solargraph/yardoc.rb:29:in `cache'
-    #  # ./lib/solargraph/gem_pins.rb:48:in `build_yard_pins'
-    #  # ./lib/solargraph/doc_map.rb:86:in `cache_yard_pins'
-    #  # ./lib/solargraph/doc_map.rb:117:in `cache'
-    #  # ./lib/solargraph/doc_map.rb:75:in `block in cache_all!'
-    #  # ./lib/solargraph/doc_map.rb:74:in `each'
-    #  # ./lib/solargraph/doc_map.rb:74:in `cache_all!'
-    #  # ./spec/doc_map_spec.rb:99:in `block (3 levels) in <top (required)>'
-    xit 'imports all gems when bundler/require used' do
-      doc_map_with_bundler_require = described_class.new(['bundler/require'], [], workspace, out: nil)
-      doc_map_with_bundler_require.cache_doc_map_gems!(nil)
+    it 'imports all gems when bundler/require used' do
+      doc_map_with_bundler_require = described_class.new(['bundler/require'], workspace, out: nil)
+      doc_map_with_bundler_require.cache_all!(nil)
       expect(doc_map_with_bundler_require.pins.length - plain_doc_map.pins.length).to be_positive
     end
   end
@@ -159,6 +134,9 @@ def global(doc_map)
 
       doc_map = Solargraph::DocMap.new(['original_gem'], workspace)
 
+      # @todo this should probably not be in requires, which is a
+      #   path, and instead be in a new gem_names property on the
+      #   Environ
       expect(doc_map.requires).to include('original_gem', 'convention_gem1', 'convention_gem2')
     ensure
       # Clean up the registered convention

From 6e03bc8ae2e4d973397db0e77c9764e3bcbe9f25 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 11 Sep 2025 14:19:00 -0400
Subject: [PATCH 083/172] Handle bad gemdir from gemspec object

---
 lib/solargraph/gem_pins.rb | 1 +
 lib/solargraph/yardoc.rb   | 9 +++++++++
 spec/gem_pins_spec.rb      | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/lib/solargraph/gem_pins.rb b/lib/solargraph/gem_pins.rb
index a193a8a39..ba362c351 100644
--- a/lib/solargraph/gem_pins.rb
+++ b/lib/solargraph/gem_pins.rb
@@ -46,6 +46,7 @@ def self.combine_method_pins(*pins)
     # @return [Array<Pin::Base>]
     def self.build_yard_pins(yard_plugins, gemspec)
       Yardoc.cache(yard_plugins, gemspec) unless Yardoc.cached?(gemspec)
+      return [] unless Yardoc.cached?(gemspec)
       yardoc = Yardoc.load!(gemspec)
       YardMap::Mapper.new(yardoc, gemspec).map
     end
diff --git a/lib/solargraph/yardoc.rb b/lib/solargraph/yardoc.rb
index 625e41ce4..43424d99a 100644
--- a/lib/solargraph/yardoc.rb
+++ b/lib/solargraph/yardoc.rb
@@ -18,6 +18,15 @@ def cache(yard_plugins, gemspec)
       path = PinCache.yardoc_path gemspec
       return path if cached?(gemspec)
 
+      unless Dir.exist? gemspec.gem_dir
+        # Can happen in at least some (old?) RubyGems versions when we
+        # have a gemspec describing a standard library like bundler.
+        #
+        # https://github.com/apiology/solargraph/actions/runs/17650140201/job/50158676842?pr=10
+        Solargraph.logger.info { "Bad info from gemspec - #{gemspec.gem_dir} does not exist" }
+        return path
+      end
+
       Solargraph.logger.info "Caching yardoc for #{gemspec.name} #{gemspec.version}"
       cmd = "yardoc --db #{path} --no-output --plugin solargraph"
       yard_plugins.each { |plugin| cmd << " --plugin #{plugin}" }
diff --git a/spec/gem_pins_spec.rb b/spec/gem_pins_spec.rb
index d630784cf..c3c18109d 100644
--- a/spec/gem_pins_spec.rb
+++ b/spec/gem_pins_spec.rb
@@ -11,4 +11,9 @@
     expect(core_root.return_type.to_s).to eq('Pathname, nil')
     expect(core_root.location.filename).to end_with('environment_loader.rb')
   end
+
+  it "does not error out when handed incorrect gemspec" do
+    gemspec = instance_double(Gem::Specification, name: 'foo', version: '1.0', gem_dir: "/not-there")
+    expect { Solargraph::GemPins.build_yard_pins([], gemspec) }.not_to raise_error
+  end
 end

From 62d7d0833bd366a7b98690e157a1dd79be2db658 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 11 Sep 2025 14:29:03 -0400
Subject: [PATCH 084/172] Linting fix

---
 spec/gem_pins_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/gem_pins_spec.rb b/spec/gem_pins_spec.rb
index c3c18109d..8e3962341 100644
--- a/spec/gem_pins_spec.rb
+++ b/spec/gem_pins_spec.rb
@@ -12,8 +12,8 @@
     expect(core_root.location.filename).to end_with('environment_loader.rb')
   end
 
-  it "does not error out when handed incorrect gemspec" do
-    gemspec = instance_double(Gem::Specification, name: 'foo', version: '1.0', gem_dir: "/not-there")
+  it 'does not error out when handed incorrect gemspec' do
+    gemspec = instance_double(Gem::Specification, name: 'foo', version: '1.0', gem_dir: '/not-there')
     expect { Solargraph::GemPins.build_yard_pins([], gemspec) }.not_to raise_error
   end
 end

From 182fcccd35475b30682010d0b81aa7b97634320e Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 11 Sep 2025 14:36:53 -0400
Subject: [PATCH 085/172] Handle a solargraph-rails case

---
 spec/source_map/clip_spec.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spec/source_map/clip_spec.rb b/spec/source_map/clip_spec.rb
index 0f83331ec..3fea653f7 100644
--- a/spec/source_map/clip_spec.rb
+++ b/spec/source_map/clip_spec.rb
@@ -1647,7 +1647,9 @@ def foo; end
     expect(array_names).to eq(["byteindex", "byterindex", "bytes", "bytesize", "byteslice", "bytesplice"])
 
     string_names = api_map.clip_at('test.rb', [6, 22]).complete.pins.map(&:name)
-    expect(string_names).to eq(['upcase', 'upcase!', 'upto'])
+    # can be brought in by solargraph-rails
+    activesupport_completions = ['upcase_first']
+    expect(string_names - activesupport_completions).to eq(['upcase', 'upcase!', 'upto'])
   end
 
   it 'completes global methods defined in top level scope inside class when referenced inside a namespace' do

From d85fc6526448a8f6580b72a9b47d260c5a4bb3e7 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 11 Sep 2025 15:54:04 -0400
Subject: [PATCH 086/172] Reenable specs

---
 spec/workspace/gemspecs_resolve_require_spec.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/spec/workspace/gemspecs_resolve_require_spec.rb b/spec/workspace/gemspecs_resolve_require_spec.rb
index 4ffcd0bd1..6ee0cecf0 100644
--- a/spec/workspace/gemspecs_resolve_require_spec.rb
+++ b/spec/workspace/gemspecs_resolve_require_spec.rb
@@ -180,9 +180,7 @@ def configure_bundler_spec stub_value
       let(:require) { 'bundler/require' }
 
       it 'finds nothing' do
-        pending('https://github.com/castwide/solargraph/pull/1006')
-
-        expect(specs).to be_empty
+        expect(specs).to be_nil
       end
     end
   end
@@ -219,9 +217,7 @@ def configure_bundler_spec stub_value
 
       let(:require) { 'bundler/gem_tasks' }
 
-      xit 'returns gems' do
-        pending('improved logic for require lookups')
-
+      it 'returns gems' do
         expect(specs&.map(&:name)).to include('bundler')
       end
     end

From 73f98b9ee3ab7914c899837d54ca418b2b6fffce Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 11 Sep 2025 16:08:14 -0400
Subject: [PATCH 087/172] Add a regression spec

---
 spec/workspace/gemspecs_fetch_dependencies_spec.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/spec/workspace/gemspecs_fetch_dependencies_spec.rb b/spec/workspace/gemspecs_fetch_dependencies_spec.rb
index 285f8e1a0..6ead1060a 100644
--- a/spec/workspace/gemspecs_fetch_dependencies_spec.rb
+++ b/spec/workspace/gemspecs_fetch_dependencies_spec.rb
@@ -22,6 +22,16 @@
       end
     end
 
+    context 'with a Gem::Specification' do
+      let(:gemspec) do
+        Gem::Specification.find_by_name('solargraph')
+      end
+
+      it 'finds a known dependency' do
+        expect(deps.map(&:name)).to include('backport')
+      end
+    end
+
     context 'with gem whose dependency does not exist in our bundle' do
       let(:gemspec) do
         instance_double(Gem::Specification,

From cb59ba6bebbc35461a47bc97642a1d5cc4d0cb4f Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 11 Sep 2025 16:11:40 -0400
Subject: [PATCH 088/172] Drop assert

---
 lib/solargraph/pin_cache.rb          | 17 -----------------
 lib/solargraph/workspace/gemspecs.rb |  8 ++------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/lib/solargraph/pin_cache.rb b/lib/solargraph/pin_cache.rb
index c72a6a770..2a0ec4639 100644
--- a/lib/solargraph/pin_cache.rb
+++ b/lib/solargraph/pin_cache.rb
@@ -7,23 +7,6 @@ module PinCache
     class << self
       include Logging
 
-      # @return [Array<String>] a list of possible standard library names
-      def possible_stdlibs
-        @possible_stdlibs ||= begin
-          # all dirs and .rb files in Gem::RUBYGEMS_DIR
-          Dir.glob(File.join(Gem::RUBYGEMS_DIR, '*')).map do |file_or_dir|
-            basename = File.basename(file_or_dir)
-            # remove .rb
-            basename = basename[0..-4] if basename.end_with?('.rb')
-            basename
-          end.sort.uniq
-        rescue StandardError => e
-          logger.info { "Failed to get possible stdlibs: #{e.message}" }
-          logger.debug { e.backtrace.join("\n") }
-          []
-        end
-      end
-
       # The base directory where cached YARD documentation and serialized pins are serialized
       #
       # @return [String]
diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index 31c5908c3..05acb56c9 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -68,12 +68,8 @@ def resolve_require require
         #   - need to expand Environ to provide a place to put gem
         #   names and get new plugins out before retiring this.
         gemspec ||= find_gem(gem_name_guess)
-        if gemspec.nil?
-          if !PinCache.possible_stdlibs.include?(gem_name_guess) && !['rspec-rails', 'actionmailer', 'activesupport', 'activerecord', 'shoulda-matchers', 'rspec-sidekiq', 'airborne'].include?(gem_name_guess)
-            Solargraph.assert_or_log(:gemspecs_resolve_require_guess, "Could not find require based on #{require.inspect}")
-          end
-          return nil
-        end
+        return nil if gemspec.nil?
+
         [gemspec_or_preference(gemspec)]
       end
 

From 05b36ec01808b6af7d898f49a976eb7ec820ca30 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 11 Sep 2025 16:25:18 -0400
Subject: [PATCH 089/172] Import spec to cover shell.rb changes

---
 lib/solargraph/shell.rb |   2 +-
 spec/shell_spec.rb      | 159 ++++++++++++++++++++++++++++++++++++++--
 2 files changed, 153 insertions(+), 8 deletions(-)

diff --git a/lib/solargraph/shell.rb b/lib/solargraph/shell.rb
index 907daccc6..117bbbe2d 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -267,7 +267,7 @@ def pin_description pin
     def do_cache gemspec, api_map
       # @todo if the rebuild: option is passed as a positional arg,
       #   typecheck doesn't complain on the below line
-      api_map.cache_gem(gemspec, rebuild: options.rebuild, out: $stdout)
+      api_map.cache_gem(gemspec, rebuild: options[:rebuild], out: $stdout)
     end
   end
 end
diff --git a/spec/shell_spec.rb b/spec/shell_spec.rb
index 91f84b4c7..f56cebc7d 100644
--- a/spec/shell_spec.rb
+++ b/spec/shell_spec.rb
@@ -1,18 +1,23 @@
+# frozen_string_literal: true
+
 require 'tmpdir'
 require 'open3'
 
 describe Solargraph::Shell do
+  let(:shell) { described_class.new }
   let(:temp_dir) { Dir.mktmpdir }
 
   before do
     File.open(File.join(temp_dir, 'Gemfile'), 'w') do |file|
         file.puts "source 'https://rubygems.org'"
-        file.puts "gem 'solargraph', path: #{File.expand_path('..', __dir__)}"
+        file.puts "gem 'solargraph', path: '#{File.expand_path('..', __dir__)}'"
     end
     output, status = Open3.capture2e("bundle install", chdir: temp_dir)
     raise "Failure installing bundle: #{output}" unless status.success?
   end
 
+  # @type cmd [Array<String>]
+  # @return [String]
   def bundle_exec(*cmd)
     # run the command in the temporary directory with bundle exec
     output, status = Open3.capture2e("bundle exec #{cmd.join(' ')}", chdir: temp_dir)
@@ -25,20 +30,160 @@ def bundle_exec(*cmd)
     FileUtils.rm_rf(temp_dir)
   end
 
-  describe "--version" do
-    it "returns a version when run" do
-      output = bundle_exec("solargraph", "--version")
+  describe '--version' do
+    let(:output) { bundle_exec('solargraph', '--version') }
 
+    it 'returns output' do
       expect(output).not_to be_empty
+    end
+
+    it 'returns a version when run' do
       expect(output).to eq("#{Solargraph::VERSION}\n")
     end
   end
 
-  describe "uncache" do
-    it "uncaches without erroring out" do
-      output = bundle_exec("solargraph", "uncache", "solargraph")
+  describe 'uncache' do
+    it 'uncaches without erroring out' do
+      output = capture_stdout do
+        shell.uncache('backport')
+      end
 
       expect(output).to include('Clearing pin cache in')
     end
+
+    it 'uncaches stdlib without erroring out' do
+      expect { shell.uncache('stdlib') }.not_to raise_error
+    end
+
+    it 'uncaches core without erroring out' do
+      expect { shell.uncache('core') }.not_to raise_error
+    end
+  end
+
+  describe 'scan' do
+    context 'with mocked dependencies' do
+      let(:api_map) { instance_double(Solargraph::ApiMap) }
+
+      before do
+        allow(Solargraph::ApiMap).to receive(:load_with_cache).and_return(api_map)
+      end
+
+      it 'scans without erroring out' do
+        allow(api_map).to receive(:pins).and_return([])
+        output = capture_stdout do
+          shell.options = { directory: 'spec/fixtures/workspace' }
+          shell.scan
+        end
+
+        expect(output).to include('Scanned ').and include(' seconds.')
+      end
+    end
+  end
+
+  describe 'typecheck' do
+    context 'with mocked dependencies' do
+      let(:type_checker) { instance_double(Solargraph::TypeChecker) }
+      let(:api_map) { instance_double(Solargraph::ApiMap) }
+
+      before do
+        allow(Solargraph::ApiMap).to receive(:load_with_cache).and_return(api_map)
+        allow(Solargraph::TypeChecker).to receive(:new).and_return(type_checker)
+        allow(type_checker).to receive(:problems).and_return([])
+      end
+
+      it 'typechecks without erroring out' do
+        output = capture_stdout do
+          shell.options = { level: 'normal', directory: '.' }
+          shell.typecheck('Gemfile')
+        end
+
+        expect(output).to include('Typecheck finished in')
+      end
+    end
+  end
+
+  describe 'gems' do
+    context 'without mocked ApiMap' do
+      it 'complains when gem does not exist' do
+        pending 'error message improvements'
+
+        output = capture_both do
+          shell.gems('nonexistentgem')
+        end
+
+        expect(output).to include("Gem 'nonexistentgem' not found")
+      end
+
+      it 'caches core without erroring out' do
+        pending 'core caching suppport'
+
+        capture_both do
+          shell.uncache('core')
+        end
+
+        expect { shell.cache('core') }.not_to raise_error
+      end
+
+      it 'gives sensible error for gem that does not exist' do
+        pending 'error message improvements'
+
+        output = capture_both do
+          shell.gems('solargraph123')
+        end
+
+        expect(output).to include("Gem 'solargraph123' not found")
+      end
+    end
+
+    context 'with mocked Workspace' do
+      let(:api_map) { instance_double(Solargraph::ApiMap) }
+      let(:workspace) { instance_double(Solargraph::Workspace) }
+      let(:gemspec) { instance_double(Gem::Specification, name: 'backport') }
+
+      before do
+        allow(Solargraph::Workspace).to receive(:new).and_return(workspace)
+        allow(Solargraph::ApiMap).to receive(:load).with('.').and_return(api_map)
+        allow(api_map).to receive(:cache_gem)
+        allow(api_map).to receive(:workspace).and_return(workspace)
+      end
+
+      it 'caches all without erroring out' do
+        pending 'delegation to api_map'
+
+        allow(api_map).to receive(:cache_all!)
+
+        _output = capture_both { shell.gems }
+
+        expect(api_map).to have_received(:cache_all!)
+      end
+
+      it 'caches single gem without erroring out' do
+        allow(workspace).to receive(:find_gem).with('backport').and_return(gemspec)
+
+        capture_both do
+          shell.options = { rebuild: false }
+          shell.gems('backport')
+        end
+
+        expect(api_map).to have_received(:cache_gem).with(gemspec, out: an_instance_of(StringIO), rebuild: false)
+      end
+    end
+  end
+
+  describe 'cache' do
+    it 'caches a stdlib gem without erroring out' do
+      expect { shell.cache('stringio') }.not_to raise_error
+    end
+
+    context 'when gem does not exist' do
+      subject(:call) { shell.cache('nonexistentgem8675309') }
+
+      it 'gives a good error message' do
+        pending 'better error message'
+
+        # capture stderr output
+        expect { call }.to output(/not found/).to_stderr
+      end
+    end
   end
 end

From db725f78fdb3756c917044e35dd6d1eec1c86095 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 13 Sep 2025 16:30:39 -0400
Subject: [PATCH 090/172] Update rubocop todo

---
 .rubocop_todo.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 89f703d23..f7e83b95f 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -285,7 +285,6 @@ Layout/TrailingWhitespace:
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Lint/AmbiguousBlockAssociation:
   Exclude:
-    - 'lib/solargraph/api_map.rb'
     - 'lib/solargraph/language_server/host.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
@@ -1108,7 +1107,6 @@ Style/RedundantFreeze:
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/RedundantInterpolation:
   Exclude:
-    - 'lib/solargraph/api_map/store.rb'
     - 'lib/solargraph/parser/parser_gem/node_chainer.rb'
     - 'lib/solargraph/source_map/mapper.rb'
 
@@ -1133,7 +1131,6 @@ Style/RedundantRegexpEscape:
 # Configuration parameters: AllowMultipleReturnValues.
 Style/RedundantReturn:
   Exclude:
-    - 'lib/solargraph/api_map.rb'
     - 'lib/solargraph/complex_type/type_methods.rb'
     - 'lib/solargraph/doc_map.rb'
     - 'lib/solargraph/parser/parser_gem/node_methods.rb'
@@ -1268,7 +1265,11 @@ Style/YAMLFileRead:
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/ZeroLengthPredicate:
-  Enabled: false
+  Exclude:
+    - 'lib/solargraph/language_server/host.rb'
+    - 'lib/solargraph/pin/method.rb'
+    - 'lib/solargraph/source/chain/array.rb'
+    - 'spec/language_server/protocol_spec.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.

From b6d86ecb49631fc9201aa02e9e0626be85147c23 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 13 Sep 2025 17:37:08 -0400
Subject: [PATCH 091/172] Fix merge failure

---
 lib/solargraph/api_map.rb | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 194e6cd3a..c27fceb7b 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -705,21 +705,6 @@ def inner_get_methods_from_reference(fq_reference_tag, namespace_pin, type, scop
       methods
     end
 
-    # @param fq_sub_tag [String]
-    # @return [String, nil]
-    def qualify_superclass fq_sub_tag
-      fq_sub_type = ComplexType.try_parse(fq_sub_tag)
-      fq_sub_ns = fq_sub_type.name
-      sup_tag = store.get_superclass(fq_sub_tag)
-      sup_type = ComplexType.try_parse(sup_tag)
-      sup_ns = sup_type.name
-      return nil if sup_tag.nil?
-      parts = fq_sub_ns.split('::')
-      last = parts.pop
-      parts.pop if last == sup_ns
-      qualify(sup_tag, parts.join('::'))
-    end
-
     private
 
     # A hash of source maps with filename keys.

From 9d4ba443abbe73a9bbab2cc3179ecee6e54d7d46 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 26 Sep 2025 16:25:40 -0400
Subject: [PATCH 092/172] Allow more valid method pin paths

---
 lib/solargraph/shell.rb | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/lib/solargraph/shell.rb b/lib/solargraph/shell.rb
index cb919476c..f9b655664 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -257,7 +257,21 @@ def list
     # @return [void]
     def pin path
       api_map = Solargraph::ApiMap.load_with_cache('.', $stderr)
-      pins = api_map.get_path_pins path
+      is_method = path.include?('#') || path.include?('.')
+      if is_method && options[:stack]
+        scope, ns, meth = if path.include? '#'
+                            [:instance, *path.split('#', 2)]
+                          else
+                            [:class, *path.split('.', 2)]
+                          end
+
+        # @sg-ignore Wrong argument type for
+        #   Solargraph::ApiMap#get_method_stack: rooted_tag
+        #   expected String, received Array<String>
+        pins = api_map.get_method_stack(ns, meth, scope: scope)
+      else
+        pins = api_map.get_path_pins path
+      end
       references = {}
       pin = pins.first
       case pin
@@ -265,19 +279,6 @@ def pin path
         $stderr.puts "Pin not found for path '#{path}'"
         exit 1
       when Pin::Method
-        # @sg-ignore Unresolved call to options
-        if options[:stack]
-          scope, ns, meth = if path.include? '#'
-                              [:instance, *path.split('#', 2)]
-                            else
-                              [:class, *path.split('.', 2)]
-                            end
-
-          # @sg-ignore Wrong argument type for
-          #   Solargraph::ApiMap#get_method_stack: rooted_tag
-          #   expected String, received Array<String>
-          pins = api_map.get_method_stack(ns, meth, scope: scope)
-        end
       when Pin::Namespace
         # @sg-ignore Unresolved call to options
         if options[:references]

From 2712e6624275f341fffcb03aa62c2da881c3feaf Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 26 Sep 2025 16:31:05 -0400
Subject: [PATCH 093/172] RuboCop fix

---
 lib/solargraph/shell.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/solargraph/shell.rb b/lib/solargraph/shell.rb
index f9b655664..40410d909 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -278,7 +278,6 @@ def pin path
       when nil
         $stderr.puts "Pin not found for path '#{path}'"
         exit 1
-      when Pin::Method
       when Pin::Namespace
         # @sg-ignore Unresolved call to options
         if options[:references]

From 7bc2092b7844aaa78298f1d94d5f5e7e7cc84f1f Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 26 Sep 2025 16:36:10 -0400
Subject: [PATCH 094/172] Linting

---
 lib/solargraph/shell.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/solargraph/shell.rb b/lib/solargraph/shell.rb
index 40410d909..046a74296 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -258,6 +258,7 @@ def list
     def pin path
       api_map = Solargraph::ApiMap.load_with_cache('.', $stderr)
       is_method = path.include?('#') || path.include?('.')
+      # @sg-ignore Unresolved call to options
       if is_method && options[:stack]
         scope, ns, meth = if path.include? '#'
                             [:instance, *path.split('#', 2)]

From 1416e1d1e3f51c5c44dea3807796cbccccd870d3 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 28 Sep 2025 12:08:05 -0400
Subject: [PATCH 095/172] Reduce number of build jobs for faster CI feedback

This takes out some lower value combinations - ideally we could keep
the number of jobs to <= 20, which is the max that GHA will run
simultaneously here.
---
 .github/workflows/rspec.yml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index ecc3d9771..33d09b579 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -23,12 +23,26 @@ jobs:
       matrix:
         ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4', 'head']
         rbs-version: ['3.6.1', '3.9.4', '4.0.0.dev.4']
-        # Ruby 3.0 doesn't work with RBS 3.9.4 or 4.0.0.dev.4
         exclude:
+          # Ruby 3.0 doesn't work with RBS 3.9.4 or 4.0.0.dev.4
           - ruby-version: '3.0'
             rbs-version: '3.9.4'
           - ruby-version: '3.0'
             rbs-version: '4.0.0.dev.4'
+          # only include the 3.1 variants we include later
+          - ruby-version: '3.1'
+          # only include the 3.2 variants we include later
+          - ruby-version: '3.2'
+          # only include the 3.3 variants we include later
+          - ruby-version: '3.3'
+        include:
+          - ruby-version: '3.1'
+            rbs_version: '3.6.1'
+          - ruby-version: '3.2'
+            rbs_version: '3.9.4'
+          - ruby-version: '3.3'
+            rbs_version: '4.0.0.dev.4'
+
     steps:
     - uses: actions/checkout@v3
     - name: Set up Ruby

From f2abb735f39f7adb08d4a487dd4c6a1b76acbfd2 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 28 Sep 2025 12:10:38 -0400
Subject: [PATCH 096/172] Fix punctuation

---
 .github/workflows/rspec.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index 33d09b579..76003b412 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -37,12 +37,11 @@ jobs:
           - ruby-version: '3.3'
         include:
           - ruby-version: '3.1'
-            rbs_version: '3.6.1'
+            rbs-version: '3.6.1'
           - ruby-version: '3.2'
-            rbs_version: '3.9.4'
+            rbs-version: '3.9.4'
           - ruby-version: '3.3'
-            rbs_version: '4.0.0.dev.4'
-
+            rbs-version: '4.0.0.dev.4'
     steps:
     - uses: actions/checkout@v3
     - name: Set up Ruby

From 94de7b5c34c1da22e694289ef4f2cb2c4ef7064e Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 30 Sep 2025 11:19:06 -0400
Subject: [PATCH 097/172] Ratchet RuboCop

---
 .rubocop_todo.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 38cf122ee..e05aa4ccf 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -34,7 +34,6 @@ Gemspec/OrderedDependencies:
 # Configuration parameters: Severity.
 Gemspec/RequireMFA:
   Exclude:
-    - 'solargraph.gemspec'
     - 'spec/fixtures/rdoc-lib/rdoc-lib.gemspec'
     - 'spec/fixtures/rubocop-custom-version/specifications/rubocop-0.0.0.gemspec'
 
@@ -88,13 +87,6 @@ Layout/EmptyLineBetweenDefs:
 Layout/EmptyLines:
   Enabled: false
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only
-Layout/EmptyLinesAroundClassBody:
-  Exclude:
-    - 'lib/solargraph/rbs_map/core_map.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines

From 3ab765d51bbe781a8c746005f476e01db49a0926 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 30 Sep 2025 12:11:50 -0400
Subject: [PATCH 098/172] Drop unneeded @sg-ignores

---
 lib/solargraph/workspace/gemspecs.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index c42b2d843..38b46da30 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -38,7 +38,6 @@ def resolve_require require
         return nil if require.empty?
         return gemspecs_required_from_bundler if require == 'bundler/require'
 
-        # @sg-ignore Variable type could not be inferred for gemspec
         # @type [Gem::Specification, nil]
         gemspec = Gem::Specification.find_by_path(require)
         if gemspec.nil?
@@ -50,7 +49,6 @@ def resolve_require require
             # See if we can make a good guess:
             potential_gemspec = Gem::Specification.find_by_name(gem_name_guess)
             file = "lib/#{require}.rb"
-            # @sg-ignore Unresolved call to files
             gemspec = potential_gemspec if potential_gemspec.files.any? { |gemspec_file| file == gemspec_file }
           rescue Gem::MissingSpecError
             logger.debug do
@@ -161,7 +159,6 @@ def gemspecs_required_from_external_bundle
             'puts Bundler.definition.locked_gems.specs.map { |spec| [spec.name, spec.version] }' \
             '.to_h.to_json }'
           ]
-          # @sg-ignore Unresolved call to capture3 on Module<Open3>
           o, e, s = Open3.capture3(*cmd)
           if s.success?
             Solargraph.logger.debug "External bundle: #{o}"

From d486e6485d4cce9d182da079c588c3821c69cfa6 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 30 Sep 2025 22:36:37 -0400
Subject: [PATCH 099/172] Trim more matrix entries to make room for
 solargraph-rspec specs

---
 .github/workflows/rspec.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index 76003b412..628bbc8ab 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -35,6 +35,8 @@ jobs:
           - ruby-version: '3.2'
           # only include the 3.3 variants we include later
           - ruby-version: '3.3'
+          # only include the 3.4 variants we include later
+          - ruby-version: '3.3'
         include:
           - ruby-version: '3.1'
             rbs-version: '3.6.1'
@@ -42,6 +44,8 @@ jobs:
             rbs-version: '3.9.4'
           - ruby-version: '3.3'
             rbs-version: '4.0.0.dev.4'
+          - ruby-version: '3.4'
+            rbs-version: '4.0.0.dev.4'
     steps:
     - uses: actions/checkout@v3
     - name: Set up Ruby

From 56342d4a9ff7c1141372404883cd2ddd1f337de7 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 30 Sep 2025 22:50:42 -0400
Subject: [PATCH 100/172] Fix version number

---
 .github/workflows/rspec.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index 628bbc8ab..cc4efda4b 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -36,7 +36,7 @@ jobs:
           # only include the 3.3 variants we include later
           - ruby-version: '3.3'
           # only include the 3.4 variants we include later
-          - ruby-version: '3.3'
+          - ruby-version: '3.4'
         include:
           - ruby-version: '3.1'
             rbs-version: '3.6.1'

From ac05669348b9e5518a2defd0c4fc207393567bf5 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 5 Oct 2025 18:57:44 -0400
Subject: [PATCH 101/172] Document method

---
 lib/solargraph/workspace/gemspecs.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index 05acb56c9..03ecc6f0a 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -144,6 +144,9 @@ def only_runtime_dependencies gemspec
         gemspec.dependencies - gemspec.development_dependencies
       end
 
+      # Return the gems which would be required by Bundler.require
+      #
+      # @see https://bundler.io/guides/groups.html
       # @return [Array<Gem::Specification>]
       def auto_required_gemspecs_from_bundler
         # @todo Handle projects with custom Bundler/Gemfile setups

From 84fb04996c8d90ec445091b3c38b662bba869f92 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 5 Oct 2025 19:34:39 -0400
Subject: [PATCH 102/172] Drop untested change

---
 lib/solargraph/workspace/gemspecs.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index 03ecc6f0a..a956e1c5d 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -63,11 +63,6 @@ def resolve_require require
             end
           end
         end
-        # @todo the 'requires' provided in Environ is being used
-        #   by plugins to pass gem names instead of require paths
-        #   - need to expand Environ to provide a place to put gem
-        #   names and get new plugins out before retiring this.
-        gemspec ||= find_gem(gem_name_guess)
         return nil if gemspec.nil?
 
         [gemspec_or_preference(gemspec)]

From 4fb2b2c74fb54c5b9a598aa34756fa2336eac4ae Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 5 Oct 2025 19:35:20 -0400
Subject: [PATCH 103/172] Fix typo in existing code

---
 lib/solargraph/workspace/gemspecs.rb            | 4 +---
 spec/workspace/gemspecs_resolve_require_spec.rb | 4 ----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index a956e1c5d..ea21ef203 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -118,9 +118,7 @@ def gemspec_or_preference gemspec
         return gemspec unless preference_map.key?(gemspec.name)
         return gemspec if gemspec.version == preference_map[gemspec.name].version
 
-        # @todo this code is unused but broken
-        # @sg-ignore Unresolved call to by_path
-        change_gemspec_version gemspec, preference_map[by_path.name].version
+        change_gemspec_version gemspec, preference_map[gemspec.name].version
       end
 
       # @param gemspec [Gem::Specification]
diff --git a/spec/workspace/gemspecs_resolve_require_spec.rb b/spec/workspace/gemspecs_resolve_require_spec.rb
index 6ee0cecf0..b88bae269 100644
--- a/spec/workspace/gemspecs_resolve_require_spec.rb
+++ b/spec/workspace/gemspecs_resolve_require_spec.rb
@@ -261,8 +261,6 @@ def configure_bundler_spec stub_value
         end
 
         it 'returns the preferred gemspec' do
-          pending('https://github.com/castwide/solargraph/pull/1006')
-
           gemspecs = described_class.new(dir_path, preferences: preferences)
           specs = gemspecs.resolve_require('backport')
           backport = specs.find { |spec| spec.name == 'backport' }
@@ -281,8 +279,6 @@ def configure_bundler_spec stub_value
           end
 
           it 'returns the gemspec we do have' do
-            pending('https://github.com/castwide/solargraph/pull/1006')
-
             gemspecs = described_class.new(dir_path, preferences: preferences)
             specs = gemspecs.resolve_require('backport')
             backport = specs.find { |spec| spec.name == 'backport' }

From e25702f3c948c58e56870f104988ba2ddb9b31b6 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 6 Oct 2025 08:26:23 -0400
Subject: [PATCH 104/172] Back out spec

---
 spec/workspace/gemspecs_resolve_require_spec.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spec/workspace/gemspecs_resolve_require_spec.rb b/spec/workspace/gemspecs_resolve_require_spec.rb
index b88bae269..aa7b8d79d 100644
--- a/spec/workspace/gemspecs_resolve_require_spec.rb
+++ b/spec/workspace/gemspecs_resolve_require_spec.rb
@@ -217,7 +217,9 @@ def configure_bundler_spec stub_value
 
       let(:require) { 'bundler/gem_tasks' }
 
-      it 'returns gems' do
+      xit 'returns gems' do
+        pending('improved logic for require lookups')
+
         expect(specs&.map(&:name)).to include('bundler')
       end
     end

From 0aefc35b6035601d04fef46b387f10a55a9ec25a Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 6 Oct 2025 08:44:31 -0400
Subject: [PATCH 105/172] Add more solargraph-rspec requires

---
 spec/doc_map_spec.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/spec/doc_map_spec.rb b/spec/doc_map_spec.rb
index fad6d3363..94a7ebf3b 100644
--- a/spec/doc_map_spec.rb
+++ b/spec/doc_map_spec.rb
@@ -42,13 +42,17 @@
       # These are auto-required by solargraph-rspec in case the bundle
       # includes these gems.  In our case, it doesn't!
       unprovided_solargraph_rspec_requires = [
-        'rspec-rails',
         'actionmailer',
+        'actionpack'
         'activerecord',
-        'shoulda-matchers',
-        'rspec-sidekiq',
+        'activesupport',
         'airborne',
-        'activesupport'
+        'rspec-core',
+        'rspec-expectations',
+        'rspec-mocks',
+        'rspec-rails',
+        'rspec-sidekiq',
+        'shoulda-matchers',
       ]
       expect(doc_map.unresolved_requires - unprovided_solargraph_rspec_requires)
         .to eq(['not_a_gem'])

From 358ff37e529914ab15e1a91f18fc63e24b16be43 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 6 Oct 2025 08:46:17 -0400
Subject: [PATCH 106/172] Fix syntax

---
 spec/doc_map_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/doc_map_spec.rb b/spec/doc_map_spec.rb
index 94a7ebf3b..d7f40f585 100644
--- a/spec/doc_map_spec.rb
+++ b/spec/doc_map_spec.rb
@@ -43,7 +43,7 @@
       # includes these gems.  In our case, it doesn't!
       unprovided_solargraph_rspec_requires = [
         'actionmailer',
-        'actionpack'
+        'actionpack',
         'activerecord',
         'activesupport',
         'airborne',
@@ -52,7 +52,7 @@
         'rspec-mocks',
         'rspec-rails',
         'rspec-sidekiq',
-        'shoulda-matchers',
+        'shoulda-matchers'
       ]
       expect(doc_map.unresolved_requires - unprovided_solargraph_rspec_requires)
         .to eq(['not_a_gem'])

From ada4c1299de7118ca625e2ce43af86bbdbab39c8 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 6 Oct 2025 12:09:44 -0400
Subject: [PATCH 107/172] Use bundle information to resolve gemspecs

---
 lib/solargraph/rbs_map/core_map.rb            |   4 -
 lib/solargraph/workspace/gemspecs.rb          | 365 +++++++++++++-----
 spec/api_map_method_spec.rb                   |   9 +-
 spec/doc_map_spec.rb                          |  23 +-
 .../gemspecs_fetch_dependencies_spec.rb       |  18 +-
 spec/workspace/gemspecs_find_gem_spec.rb      |   2 -
 .../gemspecs_resolve_require_spec.rb          |   8 +-
 spec/yard_map/mapper_spec.rb                  |  57 ++-
 8 files changed, 312 insertions(+), 174 deletions(-)

diff --git a/lib/solargraph/rbs_map/core_map.rb b/lib/solargraph/rbs_map/core_map.rb
index 8c3d7dbdd..48b8dcdc4 100644
--- a/lib/solargraph/rbs_map/core_map.rb
+++ b/lib/solargraph/rbs_map/core_map.rb
@@ -34,10 +34,6 @@ def pins
         @pins
       end
 
-      def loader
-        @loader ||= RBS::EnvironmentLoader.new(repository: RBS::Repository.new(no_stdlib: false))
-      end
-
       private
 
       # @return [RBS::EnvironmentLoader]
diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index ea21ef203..55dac6c6a 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -43,29 +43,41 @@ def resolve_require require
         # @todo handle different arguments to Bundler.require
         return auto_required_gemspecs_from_bundler if require == 'bundler/require'
 
-        # @sg-ignore Variable type could not be inferred for gemspec
-        # @type [Gem::Specification, nil]
-        gemspec = Gem::Specification.find_by_path(require)
-        if gemspec.nil?
-          gem_name_guess = require.split('/').first
+        # Determine gem name based on the require path
+        file = "lib/#{require}.rb"
+        spec_with_path = Gem::Specification.find_by_path(file)
+
+        all_gemspecs = all_gemspecs_from_bundle
+
+        gem_names_to_try = [
+          spec_with_path&.name,
+          require.tr('/', '-'),
+          require.split('/').first
+        ].compact.uniq
+        gem_names_to_try.each do |gem_name|
+          gemspec = all_gemspecs.find { |gemspec| gemspec.name == gem_name }
+          return [gemspec_or_preference(gemspec)] if gemspec
+
           begin
-            # this can happen when the gem is included via a local path in
-            # a Gemfile; Gem doesn't try to index the paths in that case.
-            #
-            # See if we can make a good guess:
-            potential_gemspec = Gem::Specification.find_by_name(gem_name_guess)
-            file = "lib/#{require}.rb"
-            # @sg-ignore Unresolved call to files
-            gemspec = potential_gemspec if potential_gemspec.files.any? { |gemspec_file| file == gemspec_file }
+            gemspec = Gem::Specification.find_by_name(gem_name)
+            return [gemspec_or_preference(gemspec)] if gemspec
           rescue Gem::MissingSpecError
             logger.debug do
-              "Require path #{require} could not be resolved to a gem via find_by_path or guess of #{gem_name_guess}"
+              "Require path #{require} could not be resolved to a gem via find_by_path or guess of #{gem_name}"
             end
           end
+
+          # look ourselves just in case this is hanging out somewhere
+          # that find_by_path doesn't index'
+          gemspec = all_gemspecs.find do |spec|
+            spec = to_gem_specification(spec) unless spec.respond_to?(:files)
+
+            spec&.files&.any? { |gemspec_file| file == gemspec_file }
+          end
+          return [gemspec_or_preference(gemspec)] if gemspec
         end
-        return nil if gemspec.nil?
 
-        [gemspec_or_preference(gemspec)]
+        nil
       end
 
       # @param name [String]
@@ -73,10 +85,14 @@ def resolve_require require
       # @param out [IO, nil] output stream for logging
       #
       # @return [Gem::Specification, nil]
-      def find_gem name, version = nil, out = nil
-        Gem::Specification.find_by_name(name, version)
-      rescue Gem::MissingSpecError
-        nil
+      def find_gem name, version = nil, out: $stderr
+        gemspec = all_gemspecs_from_bundle.find { |gemspec| gemspec.name == name && gemspec.version == version }
+        return gemspec if gemspec
+
+        gemspec = all_gemspecs_from_bundle.find { |gemspec| gemspec.name == name }
+        return gemspec if gemspec
+
+        resolve_gem_ignoring_local_bundle name, version, out: out
       end
 
       # @param gemspec [Gem::Specification]
@@ -84,27 +100,233 @@ def find_gem name, version = nil, out = nil
       #
       # @return [Array<Gem::Specification>]
       def fetch_dependencies gemspec, out: $stderr
-        # @param spec [Gem::Dependency]
-        only_runtime_dependencies(gemspec).each_with_object(Set.new) do |spec, deps|
-          Solargraph.logger.info "Adding #{spec.name} dependency for #{gemspec.name}"
-          dep = Gem.loaded_specs[spec.name]
-          # @todo is next line necessary?
-          dep ||= Gem::Specification.find_by_name(spec.name, spec.requirement)
-          deps.merge fetch_dependencies(dep) if deps.add?(dep)
+        gemspecs = all_gemspecs_from_bundle
+
+        # @type [Hash{String => Gem::Specification}]
+        deps_so_far = {}
+
+        # @param runtime_dep [Gem::Dependency]
+        # @param deps [Hash{String => Gem::Specification}]
+        gem_dep_gemspecs = only_runtime_dependencies(gemspec).each_with_object(deps_so_far) do |runtime_dep, deps|
+          next if deps[runtime_dep.name]
+
+          Solargraph.logger.info "Adding #{runtime_dep.name} dependency for #{gemspec.name}"
+          dep = gemspecs.find { |dep| dep.name == runtime_dep.name }
+          dep ||= Gem::Specification.find_by_name(runtime_dep.name, runtime_dep.requirement)
         rescue Gem::MissingSpecError
-          Solargraph.logger.warn "Gem dependency #{spec.name} #{spec.requirement} for " \
-                                 "#{gemspec.name} not found in RubyGems."
-        end.to_a
+          dep = resolve_gem_ignoring_local_bundle runtime_dep.name, out: out
+        ensure
+          next unless dep
+
+          fetch_dependencies(dep, out: out).each { |sub_dep| deps[sub_dep.name] ||= sub_dep }
+          deps[dep.name] ||= dep
+        end
+
+        gem_dep_gemspecs.values.compact.uniq(&:name)
+      end
+
+      # Returns all gemspecs directly depended on by this workspace's
+      # bundle (does not include transitive dependencies).
+      #
+      # @return [Array<Gem::Specification, Bundler::LazySpecification, Bundler::StubSpecification>]
+      def all_gemspecs_from_bundle
+        return [] unless directory
+
+        @all_gemspecs_from_bundle ||=
+          if in_this_bundle?
+            all_gemspecs_from_this_bundle
+          else
+            all_gemspecs_from_external_bundle
+          end
+      end
+
+      # @return [Hash{Gem::Specification, Bundler::LazySpecification, Bundler::StubSpecification => Gem::Specification}]
+      def self.gem_specification_cache
+        @gem_specification_cache ||= {}
       end
 
       private
 
-      # True if the workspace has a root Gemfile.
+      # @param specish [Gem::Specification, Bundler::LazySpecification, Bundler::StubSpecification]
+      # @return [Gem::Specification, nil]
+      def to_gem_specification specish
+        # print time including milliseconds
+        self.class.gem_specification_cache[specish] ||= case specish
+                                                        when Gem::Specification
+                                                          @@warned_on_rubygems ||= false
+                                                          if specish.respond_to?(:identifier)
+                                                            specish
+                                                          else
+                                                            # see https://github.com/castwide/solargraph/actions/runs/17588131738/job/49961580698?pr=1006 - happened on Ruby 3.0
+                                                            unless @@warned_on_rubygems
+                                                              logger.warn "Incomplete Gem::Specification encountered - recommend upgrading rubygems"
+                                                              @@warned_on_rubygems = true
+                                                            end
+                                                            nil
+                                                          end
+                                                          # yay!
+
+                                                        when Bundler::LazySpecification
+                                                          # materializing didn't work.  Let's look in the local
+                                                          # rubygems without bundler's help
+                                                          resolve_gem_ignoring_local_bundle specish.name,
+                                                                                            specish.version
+                                                        when Bundler::StubSpecification
+                                                          # turns a Bundler::StubSpecification into a
+                                                          # Gem::StubSpecification into a Gem::Specification
+                                                          specish = specish.stub
+                                                          if specish.respond_to?(:spec)
+                                                            specish.spec
+                                                          else
+                                                            # turn the crank again
+                                                            to_gem_specification(specish)
+                                                          end
+                                                        else
+                                                          @@warned_on_gem_type ||= false
+                                                          unless @@warned_on_gem_type
+                                                            logger.warn 'Unexpected type while resolving gem: ' \
+                                                                        "#{specish.class}"
+                                                            @@warned_on_gem_type = true
+                                                          end
+                                                          nil
+                                                        end
+      end
+
+      # @param command [String] The expression to evaluate in the external bundle
+      # @sg-ignore Need a JSON type
+      # @yield [undefined, nil]
+      def query_external_bundle command
+        Solargraph.with_clean_env do
+          cmd = [
+            'ruby', '-e',
+            "require 'bundler'; require 'json'; Dir.chdir('#{directory}') { puts begin; #{command}; end.to_json }"
+          ]
+          # @sg-ignore Unresolved call to capture3 on Module<Open3>
+          o, e, s = Open3.capture3(*cmd)
+          if s.success?
+            Solargraph.logger.debug "External bundle: #{o}"
+            o && !o.empty? ? JSON.parse(o.split("\n").last) : nil
+          else
+            Solargraph.logger.warn e
+            raise BundleNotFoundError, "Failed to load gems from bundle at #{directory}"
+          end
+        end
+      end
+
+      def in_this_bundle?
+        Bundler.definition&.lockfile&.to_s&.start_with?(directory)
+      end
+
+      # @return [Array<Gem::Specification, Bundler::LazySpecification, Bundler::StubSpecification>]
+      def all_gemspecs_from_this_bundle
+        # Find only the gems bundler is now using
+        specish_objects = Bundler.definition.locked_gems.specs
+        if specish_objects.first.respond_to?(:materialize_for_installation)
+          specish_objects = specish_objects.map(&:materialize_for_installation)
+        end
+        specish_objects.map do |specish|
+          if specish.respond_to?(:name) && specish.respond_to?(:version) && specish.respond_to?(:gem_dir)
+            # duck type is good enough for outside uses!
+            specish
+          else
+            to_gem_specification(specish)
+          end
+        end.compact
+      end
+
+      # @return [Array<Gem::Specification, Bundler::LazySpecification, Bundler::StubSpecification>]
+      def auto_required_gemspecs_from_bundler
+        return [] unless directory
+
+        logger.info 'Fetching gemspecs autorequired from Bundler (bundler/require)'
+        @auto_required_gemspecs_from_bundler ||=
+          if in_this_bundle?
+            auto_required_gemspecs_from_this_bundle
+          else
+            auto_required_gemspecs_from_external_bundle
+          end
+      end
+
+      # @return [Array<Gem::Specification, Bundler::LazySpecification, Bundler::StubSpecification>]
+      def auto_required_gemspecs_from_this_bundle
+        # Adapted from require() in lib/bundler/runtime.rb
+        dep_names = Bundler.definition.dependencies.select do |dep|
+          dep.groups.include?(:default) && dep.should_include?
+        end.map(&:name)
+
+        all_gemspecs_from_bundle.select { |gemspec| dep_names.include?(gemspec.name) }
+      end
+
+      # @return [Array<Gem::Specification, Bundler::LazySpecification, Bundler::StubSpecification>]
+      def auto_required_gemspecs_from_external_bundle
+        @auto_required_gemspecs_from_external_bundle ||=
+          begin
+            logger.info 'Fetching auto-required gemspecs from Bundler (bundler/require)'
+            command =
+              'Bundler.definition.dependencies' \
+              '.select { |dep| dep.groups.include?(:default) && dep.should_include? }' \
+              '.map(&:name)'
+            # @sg-ignore
+            # @type [Array<String>]
+            dep_names = query_external_bundle command
+
+            all_gemspecs_from_bundle.select { |gemspec| dep_names.include?(gemspec.name) }
+          end
+      end
+
+      # @param gemspec [Gem::Specification]
+      # @return [Array<Gem::Dependency>]
+      def only_runtime_dependencies gemspec
+        unless gemspec.respond_to?(:dependencies) && gemspec.respond_to?(:development_dependencies)
+          gemspec = to_gem_specification(gemspec)
+        end
+        return [] if gemspec.nil?
+
+        gemspec.dependencies - gemspec.development_dependencies
+      end
+
+      # @todo Should this be using Gem::SpecFetcher and pull them automatically?
       #
-      # @todo Handle projects with custom Bundler/Gemfile setups (see #auto_required_gemspecs_from_bundler)
+      # @param name [String]
+      # @param version [String, nil]
+      # @param out [IO, nil] output stream for logging
       #
-      def gemfile?
-        directory && File.file?(File.join(directory, 'Gemfile'))
+      # @return [Gem::Specification, nil]
+      def resolve_gem_ignoring_local_bundle name, version = nil, out: $stderr
+        Gem::Specification.find_by_name(name, version)
+      rescue Gem::MissingSpecError
+        begin
+          Gem::Specification.find_by_name(name)
+        rescue Gem::MissingSpecError
+          stdlibmap = RbsMap::StdlibMap.new(name)
+          unless stdlibmap.resolved?
+            gem_desc = name
+            gem_desc += ":#{version}" if version
+            out&.puts "Please install the gem #{gem_desc} in Solargraph's Ruby environment"
+          end
+          nil # either not here or in stdlib
+        end
+      end
+
+      # @return [Array<Gem::Specification>]
+      def all_gemspecs_from_external_bundle
+        @all_gemspecs_from_external_bundle ||=
+          begin
+            logger.info 'Fetching gemspecs required from external bundle'
+
+            command = 'specish_objects = Bundler.definition.locked_gems&.specs; ' \
+                      'if specish_objects.first.respond_to?(:materialize_for_installation);' \
+                      'specish_objects = specish_objects.map(&:materialize_for_installation);' \
+                      'end;' \
+                      'specish_objects.map { |specish| [specish.name, specish.version] }'
+            query_external_bundle(command).map do |name, version|
+              resolve_gem_ignoring_local_bundle(name, version)
+            end.compact
+          rescue Solargraph::BundleNotFoundError => e
+            Solargraph.logger.info e.message
+            Solargraph.logger.debug e.backtrace.join("\n")
+            []
+          end
       end
 
       # @return [Hash{String => Gem::Specification}]
@@ -113,6 +335,7 @@ def preference_map
       end
 
       # @param gemspec [Gem::Specification]
+      #
       # @return [Gem::Specification]
       def gemspec_or_preference gemspec
         return gemspec unless preference_map.key?(gemspec.name)
@@ -122,83 +345,15 @@ def gemspec_or_preference gemspec
       end
 
       # @param gemspec [Gem::Specification]
-      # @param version [Gem::Version]
+      # @param version [String]
       # @return [Gem::Specification]
       def change_gemspec_version gemspec, version
         Gem::Specification.find_by_name(gemspec.name, "= #{version}")
       rescue Gem::MissingSpecError
-        Solargraph.logger.info "Gem #{gemspec.name} version #{version} not found. Using #{gemspec.version} instead"
+        Solargraph.logger.info "Gem #{gemspec.name} version #{version.inspect} not found. " \
+                               "Using #{gemspec.version} instead"
         gemspec
       end
-
-      # @param gemspec [Gem::Specification]
-      # @return [Array<Gem::Dependency>]
-      def only_runtime_dependencies gemspec
-        gemspec.dependencies - gemspec.development_dependencies
-      end
-
-      # Return the gems which would be required by Bundler.require
-      #
-      # @see https://bundler.io/guides/groups.html
-      # @return [Array<Gem::Specification>]
-      def auto_required_gemspecs_from_bundler
-        # @todo Handle projects with custom Bundler/Gemfile setups
-        return unless gemfile?
-
-        if gemfile? && Bundler.definition&.lockfile&.to_s&.start_with?(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
-            # TODO: should this be resolve_require or find_gem?
-            specs = resolve_require lazy_spec.name
-            logger.warn "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
-
-      # @return [Array<Gem::Specification>]
-      def gemspecs_required_from_external_bundle
-        logger.info 'Fetching gemspecs required from external bundle'
-        return [] unless directory
-
-        Solargraph.with_clean_env do
-          cmd = [
-            'ruby', '-e',
-            "require 'bundler'; " \
-            "require 'json'; " \
-            "Dir.chdir('#{directory}') { " \
-            'puts Bundler.definition.locked_gems.specs.map { |spec| [spec.name, spec.version] }' \
-            '.to_h.to_json }'
-          ]
-          # @sg-ignore Unresolved call to capture3 on Module<Open3>
-          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.flat_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
-              # TODO: should this be resolve_require or find_gem?
-              specs = resolve_require name
-              logger.warn "Gem #{name} #{version} from bundle not found: #{e}" if specs.nil?
-              next specs
-            end.compact
-          else
-            Solargraph.logger.warn "Failed to load gems from bundle at #{directory}: #{e}"
-          end
-        end
-      end
     end
   end
 end
diff --git a/spec/api_map_method_spec.rb b/spec/api_map_method_spec.rb
index dadc6c93c..ce7c42a62 100644
--- a/spec/api_map_method_spec.rb
+++ b/spec/api_map_method_spec.rb
@@ -110,15 +110,15 @@ class B
     end
   end
 
-  describe '#get_method_stack' do
+  describe '#get_method_stack', time_limit_seconds: 240 do
     let(:out) { StringIO.new }
     let(:api_map) { Solargraph::ApiMap.load_with_cache(Dir.pwd, out) }
 
-    context 'with stdlib that has vital dependencies' do
+    context 'with stdlib that has vital dependencies', time_limit_seconds: 240 do
       let(:external_requires) { ['yaml'] }
       let(:method_stack) { api_map.get_method_stack('YAML', 'safe_load', scope: :class) }
 
-      it 'handles the YAML gem aliased to Psych' do
+      it 'handles the YAML gem aliased to Psych', time_limit_seconds: 240 do
         expect(method_stack).not_to be_empty
       end
     end
@@ -146,7 +146,8 @@ class B
   describe '#cache_gem' do
     it 'can cache gem without a bench' do
       api_map = Solargraph::ApiMap.new
-      expect { api_map.cache_gem('rake', out: StringIO.new) }.not_to raise_error
+      gemspec = Gem::Specification.find_by_name('backport')
+      expect { api_map.cache_gem(gemspec, out: StringIO.new) }.not_to raise_error
     end
   end
 
diff --git a/spec/doc_map_spec.rb b/spec/doc_map_spec.rb
index d7f40f585..24854d271 100644
--- a/spec/doc_map_spec.rb
+++ b/spec/doc_map_spec.rb
@@ -33,6 +33,17 @@
     end
   end
 
+  context 'understands rspec + rspec-mocks require pattern' do
+    let(:requires) do
+      ['rspec-mocks']
+    end
+
+    it 'generates pins from gems' do
+      ns_pin = doc_map.pins.find { |pin| pin.path == 'RSpec::Mocks' }
+      expect(ns_pin).to be_a(Solargraph::Pin::Namespace)
+    end
+  end
+
   context 'with an invalid require' do
     let(:requires) do
       ['not_a_gem']
@@ -42,17 +53,13 @@
       # These are auto-required by solargraph-rspec in case the bundle
       # includes these gems.  In our case, it doesn't!
       unprovided_solargraph_rspec_requires = [
+        'rspec-rails',
         'actionmailer',
-        'actionpack',
         'activerecord',
-        'activesupport',
-        'airborne',
-        'rspec-core',
-        'rspec-expectations',
-        'rspec-mocks',
-        'rspec-rails',
+        'shoulda-matchers',
         'rspec-sidekiq',
-        'shoulda-matchers'
+        'airborne',
+        'activesupport'
       ]
       expect(doc_map.unresolved_requires - unprovided_solargraph_rspec_requires)
         .to eq(['not_a_gem'])
diff --git a/spec/workspace/gemspecs_fetch_dependencies_spec.rb b/spec/workspace/gemspecs_fetch_dependencies_spec.rb
index 6ead1060a..c1911ad42 100644
--- a/spec/workspace/gemspecs_fetch_dependencies_spec.rb
+++ b/spec/workspace/gemspecs_fetch_dependencies_spec.rb
@@ -17,7 +17,6 @@
       end
 
       it 'finds a known dependency' do
-        pending('https://github.com/castwide/solargraph/pull/1006')
         expect(deps.map(&:name)).to include('backport')
       end
     end
@@ -43,8 +42,6 @@
       let(:gem_name) { 'my_fake_gem' }
 
       it 'gives a useful message' do
-        pending('https://github.com/castwide/solargraph/pull/1006')
-
         output = capture_both { deps.map(&:name) }
         expect(output).to include('Please install the gem activerecord')
       end
@@ -55,7 +52,7 @@
     let(:dir_path) { File.realpath(Dir.mktmpdir).to_s }
 
     let(:gemspec) do
-      Gem::Specification.find_by_name(gem_name)
+      Bundler::LazySpecification.new(gem_name, nil, nil)
     end
 
     before do
@@ -80,22 +77,15 @@
     context 'with gem that exists in our bundle' do
       let(:gem_name) { 'undercover' }
 
-      it 'finds dependencies' do
+      it 'finds dependencies', time_limit_seconds: 120 do
         expect(deps.map(&:name)).to include('ast')
       end
     end
 
     context 'with gem does not exist in our bundle' do
-      let(:gemspec) do
-        Gem::Specification.new(fake_gem_name)
-      end
+      let(:gem_name) { 'activerecord' }
 
-      let(:gem_name) { 'undercover' }
-
-      let(:fake_gem_name) { 'faaaaaake912' }
-
-      it 'gives a useful message' do
-        pending('https://github.com/castwide/solargraph/pull/1006')
+      it 'gives a useful message', time_limit_seconds: 120 do
         dep_names = nil
         output = capture_both { dep_names = deps.map(&:name) }
         expect(output).to include('Please install the gem activerecord')
diff --git a/spec/workspace/gemspecs_find_gem_spec.rb b/spec/workspace/gemspecs_find_gem_spec.rb
index 76caddab3..35f5e7a15 100644
--- a/spec/workspace/gemspecs_find_gem_spec.rb
+++ b/spec/workspace/gemspecs_find_gem_spec.rb
@@ -62,7 +62,6 @@
       end
 
       it 'complains' do
-        pending("implementation")
         gemspec
 
         expect(out.string).to include('install the gem checkoff ')
@@ -92,7 +91,6 @@
       end
 
       it 'complains' do
-        pending("implementation")
         gemspec
 
         expect(out.string).to include('install the gem checkoff:1.0.0')
diff --git a/spec/workspace/gemspecs_resolve_require_spec.rb b/spec/workspace/gemspecs_resolve_require_spec.rb
index aa7b8d79d..d53638600 100644
--- a/spec/workspace/gemspecs_resolve_require_spec.rb
+++ b/spec/workspace/gemspecs_resolve_require_spec.rb
@@ -180,7 +180,7 @@ def configure_bundler_spec stub_value
       let(:require) { 'bundler/require' }
 
       it 'finds nothing' do
-        expect(specs).to be_nil
+        expect(specs).to be_empty
       end
     end
   end
@@ -192,8 +192,6 @@ def configure_bundler_spec stub_value
       let(:require) { 'bundler/require' }
 
       it 'raises' do
-        pending('https://github.com/castwide/solargraph/pull/1006')
-
         expect { specs }.to raise_error(Solargraph::BundleNotFoundError)
       end
     end
@@ -217,9 +215,7 @@ def configure_bundler_spec stub_value
 
       let(:require) { 'bundler/gem_tasks' }
 
-      xit 'returns gems' do
-        pending('improved logic for require lookups')
-
+      it 'returns gems' do
         expect(specs&.map(&:name)).to include('bundler')
       end
     end
diff --git a/spec/yard_map/mapper_spec.rb b/spec/yard_map/mapper_spec.rb
index 6b00e5c33..1dfe64ae7 100644
--- a/spec/yard_map/mapper_spec.rb
+++ b/spec/yard_map/mapper_spec.rb
@@ -1,4 +1,14 @@
 describe Solargraph::YardMap::Mapper do
+  before :all do # rubocop:disable RSpec/BeforeAfterAll
+    @api_map = Solargraph::ApiMap.load('.')
+  end
+
+  def pins_with require
+    doc_map = Solargraph::DocMap.new([require], @api_map.workspace, out: nil)
+    doc_map.cache_all!(nil)
+    doc_map.pins
+  end
+
   it 'converts nil docstrings to empty strings' do
     dir = File.absolute_path(File.join('spec', 'fixtures', 'yard_map'))
     Dir.chdir dir do
@@ -14,50 +24,33 @@
 
   it 'marks explicit methods' do
     # Using rspec-expectations because it's a known dependency
-    rspec = Gem::Specification.find_by_name('rspec-expectations')
-    Solargraph::Yardoc.cache([], rspec)
-    Solargraph::Yardoc.load!(rspec)
-    pins = Solargraph::YardMap::Mapper.new(YARD::Registry.all).map
-    pin = pins.find { |pin| pin.path == 'RSpec::Matchers#be_truthy' }
+    pin = pins_with('rspec-expectations').find { |pin| pin.path == 'RSpec::Matchers#be_truthy' }
+    expect(pin).not_to be_nil
     expect(pin.explicit?).to be(true)
   end
 
   it 'marks correct return type from Logger.new' do
     # Using logger because it's a known dependency
-    logger = Gem::Specification.find_by_name('logger')
-    Solargraph::Yardoc.cache([], logger)
-    registry = Solargraph::Yardoc.load!(logger)
-    pins = Solargraph::YardMap::Mapper.new(registry).map
-    pins = pins.select { |pin| pin.path == 'Logger.new' }
+    pins = pins_with('logger').select { |pin| pin.path == 'Logger.new' }
     expect(pins.map(&:return_type).uniq.map(&:to_s)).to eq(['self'])
   end
 
   it 'marks correct return type from RuboCop::Options.new' do
     # Using rubocop because it's a known dependency
-    rubocop = Gem::Specification.find_by_name('rubocop')
-    Solargraph::Yardoc.cache([], rubocop)
-    Solargraph::Yardoc.load!(rubocop)
-    pins = Solargraph::YardMap::Mapper.new(YARD::Registry.all).map
-    pins = pins.select { |pin| pin.path == 'RuboCop::Options.new' }
+    pins = pins_with('rubocop').select { |pin| pin.path == 'RuboCop::Options.new' }
     expect(pins.map(&:return_type).uniq.map(&:to_s)).to eq(['self'])
     expect(pins.flat_map(&:signatures).map(&:return_type).uniq.map(&:to_s)).to eq(['self'])
   end
 
   it 'marks non-explicit methods' do
     # Using rspec-expectations because it's a known dependency
-    rspec = Gem::Specification.find_by_name('rspec-expectations')
-    Solargraph::Yardoc.load!(rspec)
-    pins = Solargraph::YardMap::Mapper.new(YARD::Registry.all).map
-    pin = pins.find { |pin| pin.path == 'RSpec::Matchers#expect' }
+    pin = pins_with('rspec-expectations').find { |pin| pin.path == 'RSpec::Matchers#expect' }
     expect(pin.explicit?).to be(false)
   end
 
   it 'adds superclass references' do
     # Asssuming the yard gem exists because it's a known dependency
-    gemspec = Gem::Specification.find_by_name('yard')
-    Solargraph::Yardoc.cache([], gemspec)
-    pins = Solargraph::YardMap::Mapper.new(Solargraph::Yardoc.load!(gemspec)).map
-    pin = pins.find do |pin|
+    pin = pins_with('yard').find do |pin|
       pin.is_a?(Solargraph::Pin::Reference::Superclass) && pin.name == 'YARD::CodeObjects::NamespaceObject'
     end
     expect(pin.closure.path).to eq('YARD::CodeObjects::ClassObject')
@@ -65,21 +58,23 @@
 
   it 'adds include references' do
     # Asssuming the ast gem exists because it's a known dependency
-    gemspec = Gem::Specification.find_by_name('ast')
-    Solargraph::Yardoc.cache([], gemspec)
-    pins = Solargraph::YardMap::Mapper.new(Solargraph::Yardoc.load!(gemspec)).map
-    inc= pins.find do |pin|
+    inc = pins_with('ast').find do |pin|
       pin.is_a?(Solargraph::Pin::Reference::Include) && pin.name == 'AST::Processor::Mixin' && pin.closure.path == 'AST::Processor'
     end
     expect(inc).to be_a(Solargraph::Pin::Reference::Include)
   end
 
+  it 'adds corect gates' do
+    # Asssuming the ast gem exists because it's a known dependency
+    inc = pins_with('ast').find do |pin|
+      pin.is_a?(Solargraph::Pin::Namespace) && pin.name == 'Mixin' && pin.closure.path == 'AST::Processor'
+    end
+    expect(inc.gates).to eq(['AST::Processor::Mixin', 'AST::Processor', 'AST', ''])
+  end
+
   it 'adds extend references' do
     # Asssuming the yard gem exists because it's a known dependency
-    gemspec = Gem::Specification.find_by_name('yard')
-    Solargraph::Yardoc.cache([], gemspec)
-    pins = Solargraph::YardMap::Mapper.new(Solargraph::Yardoc.load!(gemspec)).map
-    ext = pins.find do |pin|
+    ext = pins_with('yard').find do |pin|
       pin.is_a?(Solargraph::Pin::Reference::Extend) && pin.name == 'Enumerable' && pin.closure.path == 'YARD::Registry'
     end
     expect(ext).to be_a(Solargraph::Pin::Reference::Extend)

From 2c7079c618d1fdc4eede72f35ac77d95d9119368 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 6 Oct 2025 12:25:33 -0400
Subject: [PATCH 108/172] Handle LazySpecification issue

---
 lib/solargraph/doc_map.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/solargraph/doc_map.rb b/lib/solargraph/doc_map.rb
index ac6b4cd79..009ca8941 100644
--- a/lib/solargraph/doc_map.rb
+++ b/lib/solargraph/doc_map.rb
@@ -23,7 +23,7 @@ class DocMap
     # @return [Array<Gem::Specification>]
     def uncached_gemspecs
       uncached_yard_gemspecs.concat(uncached_rbs_collection_gemspecs)
-                            .sort
+                            .sort_by { |gemspec| "#{gemspec.name}:#{gemspec.version}" }
                             .uniq { |gemspec| "#{gemspec.name}:#{gemspec.version}" }
     end
 

From 5a982ad8cd644542409268c7f7c91e1c3c011efd Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 6 Oct 2025 12:26:15 -0400
Subject: [PATCH 109/172] Drop @sg-ignore

---
 lib/solargraph/workspace/gemspecs.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index 55dac6c6a..d1db9dc20 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -201,7 +201,6 @@ def query_external_bundle command
             'ruby', '-e',
             "require 'bundler'; require 'json'; Dir.chdir('#{directory}') { puts begin; #{command}; end.to_json }"
           ]
-          # @sg-ignore Unresolved call to capture3 on Module<Open3>
           o, e, s = Open3.capture3(*cmd)
           if s.success?
             Solargraph.logger.debug "External bundle: #{o}"

From 57af0ebffe1f226c5ea25f44cbc7ac15859c8102 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 6 Oct 2025 12:29:38 -0400
Subject: [PATCH 110/172] Handle LazySpecification issue

---
 lib/solargraph/doc_map.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/solargraph/doc_map.rb b/lib/solargraph/doc_map.rb
index 009ca8941..57706d212 100644
--- a/lib/solargraph/doc_map.rb
+++ b/lib/solargraph/doc_map.rb
@@ -105,7 +105,7 @@ def cache_rbs_collection_pins(gemspec, out)
     # @param out [IO, nil] output stream for logging
     # @return [void]
     def cache(gemspec, rebuild: false, out: nil)
-      build_yard = uncached_yard_gemspecs.include?(gemspec) || rebuild
+      build_yard = uncached_yard_gemspecs.map { |gs| "#{gs.name}:#{gs.version}" }.include?("#{gemspec.name}:#{gemspec.version}") || rebuild
       build_rbs_collection = uncached_rbs_collection_gemspecs.include?(gemspec) || rebuild
       if build_yard || build_rbs_collection
         type = []

From e1db9a858f5eb3cb330f1c612cae9348351acf7a Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 6 Oct 2025 12:38:27 -0400
Subject: [PATCH 111/172] Handle LazySpecification issue

---
 lib/solargraph/doc_map.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/solargraph/doc_map.rb b/lib/solargraph/doc_map.rb
index 57706d212..5c4db1cdf 100644
--- a/lib/solargraph/doc_map.rb
+++ b/lib/solargraph/doc_map.rb
@@ -106,7 +106,7 @@ def cache_rbs_collection_pins(gemspec, out)
     # @return [void]
     def cache(gemspec, rebuild: false, out: nil)
       build_yard = uncached_yard_gemspecs.map { |gs| "#{gs.name}:#{gs.version}" }.include?("#{gemspec.name}:#{gemspec.version}") || rebuild
-      build_rbs_collection = uncached_rbs_collection_gemspecs.include?(gemspec) || rebuild
+      build_rbs_collection = uncached_rbs_collection_gemspecs.map { |gs| "#{gs.name}:#{gs.version}" }.include?("#{gemspec.name}:#{gemspec.version}") || rebuild
       if build_yard || build_rbs_collection
         type = []
         type << 'YARD' if build_yard

From 719f44130ab9b07f06fa724eabd588df1a10b9df Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 6 Oct 2025 13:11:20 -0400
Subject: [PATCH 112/172] Adjust specs

---
 spec/doc_map_spec.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/spec/doc_map_spec.rb b/spec/doc_map_spec.rb
index 24854d271..40e53ee1c 100644
--- a/spec/doc_map_spec.rb
+++ b/spec/doc_map_spec.rb
@@ -59,7 +59,8 @@
         'shoulda-matchers',
         'rspec-sidekiq',
         'airborne',
-        'activesupport'
+        'activesupport',
+        'actionpack'
       ]
       expect(doc_map.unresolved_requires - unprovided_solargraph_rspec_requires)
         .to eq(['not_a_gem'])
@@ -125,7 +126,9 @@
     let(:requires) { ['rspec'] }
 
     it 'collects dependencies' do
-      expect(doc_map.dependencies.map(&:name)).to include('rspec-core')
+      # we include doc_map.requires as solargraph-rspec will bring it
+      # in directly and we exclude it from dependencies
+      expect(doc_map.dependencies.map(&:name) + doc_map.requires).to include('rspec-core')
     end
   end
 

From b2a562afd0d282a8eb9282783b994d16b6186fa0 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 8 Oct 2025 07:41:51 -0400
Subject: [PATCH 113/172] Add space for better future merge

---
 lib/solargraph/workspace.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/solargraph/workspace.rb b/lib/solargraph/workspace.rb
index e2d3d7495..dfe27dee8 100644
--- a/lib/solargraph/workspace.rb
+++ b/lib/solargraph/workspace.rb
@@ -162,6 +162,11 @@ def rbs_collection_config_path
       end
     end
 
+    # @return [Array<Gem::Specification>]
+    def all_gemspecs_from_bundle
+      gemspecs.all_gemspecs_from_bundle
+    end
+
     # Synchronize the workspace from the provided updater.
     #
     # @param updater [Source::Updater]

From 6e8339946db3b0a21592ece09bcd9f8e33777186 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 8 Oct 2025 07:50:40 -0400
Subject: [PATCH 114/172] Revert

---
 lib/solargraph/workspace.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/solargraph/workspace.rb b/lib/solargraph/workspace.rb
index dfe27dee8..e2d3d7495 100644
--- a/lib/solargraph/workspace.rb
+++ b/lib/solargraph/workspace.rb
@@ -162,11 +162,6 @@ def rbs_collection_config_path
       end
     end
 
-    # @return [Array<Gem::Specification>]
-    def all_gemspecs_from_bundle
-      gemspecs.all_gemspecs_from_bundle
-    end
-
     # Synchronize the workspace from the provided updater.
     #
     # @param updater [Source::Updater]

From 71ac7b56c7fabdde2f5eb7bbdb7a1f54a3edf4fe Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 8 Oct 2025 07:52:07 -0400
Subject: [PATCH 115/172] Add space for better future merge

---
 lib/solargraph/workspace.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/solargraph/workspace.rb b/lib/solargraph/workspace.rb
index 69ad12bae..c44bfb36d 100644
--- a/lib/solargraph/workspace.rb
+++ b/lib/solargraph/workspace.rb
@@ -170,6 +170,11 @@ def find_gem name, version = nil
       gemspecs.find_gem(name, version)
     end
 
+    # @return [Array<Gem::Specification>]
+    def all_gemspecs_from_bundle
+      gemspecs.all_gemspecs_from_bundle
+    end
+
     # Synchronize the workspace from the provided updater.
     #
     # @param updater [Source::Updater]

From 9d7ed97bf0f80b6191afdc1d698c4c79934d53ae Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 8 Oct 2025 08:08:35 -0400
Subject: [PATCH 116/172] Add space for better future merge

---
 lib/solargraph/workspace.rb          | 7 +++++++
 lib/solargraph/workspace/gemspecs.rb | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/lib/solargraph/workspace.rb b/lib/solargraph/workspace.rb
index c44bfb36d..50c9f4519 100644
--- a/lib/solargraph/workspace.rb
+++ b/lib/solargraph/workspace.rb
@@ -47,6 +47,13 @@ def config
       @config ||= Solargraph::Workspace::Config.new(directory)
     end
 
+    # @param stdlib_name [String]
+    #
+    # @return [Array<String>]
+    def stdlib_dependencies stdlib_name
+      gemspecs.stdlib_dependencies(stdlib_name)
+    end
+
     # @param out [IO, nil] output stream for logging
     # @param gemspec [Gem::Specification]
     # @return [Array<Gem::Specification>]
diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index d1db9dc20..c6ed33d58 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -80,6 +80,15 @@ def resolve_require require
         nil
       end
 
+      # @todo space for future expansion from other merges
+      #
+      # @param stdlib_name [String]
+      #
+      # @return [Array<String>]
+      def stdlib_dependencies stdlib_name
+        []
+      end
+
       # @param name [String]
       # @param version [String, nil]
       # @param out [IO, nil] output stream for logging

From 66870f09e727bce634ae0a72a88d6eebf7370b2a Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 8 Oct 2025 08:25:43 -0400
Subject: [PATCH 117/172] Add more space for future merges

---
 lib/solargraph/workspace/gemspecs.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index c6ed33d58..46c92ed4e 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -83,9 +83,10 @@ def resolve_require require
       # @todo space for future expansion from other merges
       #
       # @param stdlib_name [String]
+      # @param stdlib_version [String, nil]
       #
       # @return [Array<String>]
-      def stdlib_dependencies stdlib_name
+      def stdlib_dependencies stdlib_name, stdlib_version = nil
         []
       end
 
@@ -119,6 +120,7 @@ def fetch_dependencies gemspec, out: $stderr
         gem_dep_gemspecs = only_runtime_dependencies(gemspec).each_with_object(deps_so_far) do |runtime_dep, deps|
           next if deps[runtime_dep.name]
 
+          # TODO Why doesn't this just delegate to find_gem?  Add comment or change
           Solargraph.logger.info "Adding #{runtime_dep.name} dependency for #{gemspec.name}"
           dep = gemspecs.find { |dep| dep.name == runtime_dep.name }
           dep ||= Gem::Specification.find_by_name(runtime_dep.name, runtime_dep.requirement)
@@ -131,7 +133,10 @@ def fetch_dependencies gemspec, out: $stderr
           deps[dep.name] ||= dep
         end
 
-        gem_dep_gemspecs.values.compact.uniq(&:name)
+        (gem_dep_gemspecs.values.compact +
+         # try stdlib as well
+         stdlib_dependencies(gemspec.name, gemspec.version)).
+           uniq(&:name)
       end
 
       # Returns all gemspecs directly depended on by this workspace's

From 7365c35b986b1c07d4a59ab5e514a509092d212e Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 8 Oct 2025 10:37:12 -0400
Subject: [PATCH 118/172] Simplify code with find_gem, satisfy rubocop

---
 lib/solargraph/workspace/gemspecs.rb | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index 46c92ed4e..9fe2c60fb 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -118,25 +118,18 @@ def fetch_dependencies gemspec, out: $stderr
         # @param runtime_dep [Gem::Dependency]
         # @param deps [Hash{String => Gem::Specification}]
         gem_dep_gemspecs = only_runtime_dependencies(gemspec).each_with_object(deps_so_far) do |runtime_dep, deps|
-          next if deps[runtime_dep.name]
-
-          # TODO Why doesn't this just delegate to find_gem?  Add comment or change
-          Solargraph.logger.info "Adding #{runtime_dep.name} dependency for #{gemspec.name}"
-          dep = gemspecs.find { |dep| dep.name == runtime_dep.name }
-          dep ||= Gem::Specification.find_by_name(runtime_dep.name, runtime_dep.requirement)
-        rescue Gem::MissingSpecError
-          dep = resolve_gem_ignoring_local_bundle runtime_dep.name, out: out
-        ensure
+          dep = find_gem(runtime_dep.name, runtime_dep.requirement)
           next unless dep
 
           fetch_dependencies(dep, out: out).each { |sub_dep| deps[sub_dep.name] ||= sub_dep }
+
           deps[dep.name] ||= dep
         end
 
         (gem_dep_gemspecs.values.compact +
          # try stdlib as well
-         stdlib_dependencies(gemspec.name, gemspec.version)).
-           uniq(&:name)
+         stdlib_dependencies(gemspec.name, gemspec.version))
+          .uniq(&:name)
       end
 
       # Returns all gemspecs directly depended on by this workspace's
@@ -301,12 +294,12 @@ def only_runtime_dependencies gemspec
       # @todo Should this be using Gem::SpecFetcher and pull them automatically?
       #
       # @param name [String]
-      # @param version [String, nil]
+      # @param version_or_requirement [String, nil]
       # @param out [IO, nil] output stream for logging
       #
       # @return [Gem::Specification, nil]
-      def resolve_gem_ignoring_local_bundle name, version = nil, out: $stderr
-        Gem::Specification.find_by_name(name, version)
+      def resolve_gem_ignoring_local_bundle name, version_or_requirement = nil, out: $stderr
+        Gem::Specification.find_by_name(name, version_or_requirement)
       rescue Gem::MissingSpecError
         begin
           Gem::Specification.find_by_name(name)
@@ -314,7 +307,7 @@ def resolve_gem_ignoring_local_bundle name, version = nil, out: $stderr
           stdlibmap = RbsMap::StdlibMap.new(name)
           unless stdlibmap.resolved?
             gem_desc = name
-            gem_desc += ":#{version}" if version
+            gem_desc += ":#{version_or_requirement}" if version_or_requirement
             out&.puts "Please install the gem #{gem_desc} in Solargraph's Ruby environment"
           end
           nil # either not here or in stdlib

From ba1400cb3c9a0a1e45a05899e12fac62b62c6a5a Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 8 Oct 2025 11:01:48 -0400
Subject: [PATCH 119/172] Don't rely on gemspec being hashable

---
 lib/solargraph/doc_map.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/solargraph/doc_map.rb b/lib/solargraph/doc_map.rb
index 5c4db1cdf..95ee9daf3 100644
--- a/lib/solargraph/doc_map.rb
+++ b/lib/solargraph/doc_map.rb
@@ -288,11 +288,12 @@ def deserialize_stdlib_rbs_map path
     # @param rbs_version_cache_key [String]
     # @return [Array<Pin::Base>, nil]
     def deserialize_rbs_collection_cache gemspec, rbs_version_cache_key
-      return if rbs_collection_pins_in_memory.key?([gemspec, rbs_version_cache_key])
+      key = "#{gemspec.name}:#{gemspec.version}"
+      return if rbs_collection_pins_in_memory.key?([key, rbs_version_cache_key])
       cached = PinCache.deserialize_rbs_collection_gem(gemspec, rbs_version_cache_key)
       if cached
         logger.info { "Loaded #{cached.length} pins from RBS collection cache for #{gemspec.name}:#{gemspec.version}" } unless cached.empty?
-        rbs_collection_pins_in_memory[[gemspec, rbs_version_cache_key]] = cached
+        rbs_collection_pins_in_memory[[key, rbs_version_cache_key]] = cached
         cached
       else
         logger.debug "No RBS collection pin cache for #{gemspec.name} #{gemspec.version}"

From fa96091426d4e3e1badd4d48314c58ea737df41c Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 8 Oct 2025 13:11:00 -0400
Subject: [PATCH 120/172] Remove unused methods

---
 lib/solargraph/rbs_map/stdlib_map.rb | 16 ++++++++++++++++
 lib/solargraph/workspace.rb          |  7 -------
 lib/solargraph/workspace/gemspecs.rb | 19 +++++--------------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/lib/solargraph/rbs_map/stdlib_map.rb b/lib/solargraph/rbs_map/stdlib_map.rb
index b6804157f..9308e8041 100644
--- a/lib/solargraph/rbs_map/stdlib_map.rb
+++ b/lib/solargraph/rbs_map/stdlib_map.rb
@@ -33,6 +33,22 @@ def initialize library
         end
       end
 
+      # @return [RBS::Collection::Sources::Stdlib]
+      def self.source
+        @source ||= RBS::Collection::Sources::Stdlib.instance
+      end
+
+      # @param name [String]
+      # @param version [String, nil]
+      # @return [Array<Hash{String => String}>, nil]
+      def self.stdlib_dependencies name, version = nil
+        if source.has?(name, version)
+          source.dependencies_of(name, version)
+        else
+          []
+        end
+      end
+
       # @param library [String]
       # @return [StdlibMap]
       def self.load library
diff --git a/lib/solargraph/workspace.rb b/lib/solargraph/workspace.rb
index 50c9f4519..c44bfb36d 100644
--- a/lib/solargraph/workspace.rb
+++ b/lib/solargraph/workspace.rb
@@ -47,13 +47,6 @@ def config
       @config ||= Solargraph::Workspace::Config.new(directory)
     end
 
-    # @param stdlib_name [String]
-    #
-    # @return [Array<String>]
-    def stdlib_dependencies stdlib_name
-      gemspecs.stdlib_dependencies(stdlib_name)
-    end
-
     # @param out [IO, nil] output stream for logging
     # @param gemspec [Gem::Specification]
     # @return [Array<Gem::Specification>]
diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index 9fe2c60fb..4482f63e7 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -80,16 +80,6 @@ def resolve_require require
         nil
       end
 
-      # @todo space for future expansion from other merges
-      #
-      # @param stdlib_name [String]
-      # @param stdlib_version [String, nil]
-      #
-      # @return [Array<String>]
-      def stdlib_dependencies stdlib_name, stdlib_version = nil
-        []
-      end
-
       # @param name [String]
       # @param version [String, nil]
       # @param out [IO, nil] output stream for logging
@@ -126,10 +116,11 @@ def fetch_dependencies gemspec, out: $stderr
           deps[dep.name] ||= dep
         end
 
-        (gem_dep_gemspecs.values.compact +
-         # try stdlib as well
-         stdlib_dependencies(gemspec.name, gemspec.version))
-          .uniq(&:name)
+        # RBS tracks implicit dependencies, like how the YAML standard
+        # library implies pulling in the psych library.
+        stdlib_deps = RbsMap::StdlibMap.stdlib_dependencies(gemspec.name, gemspec.version) || []
+        stdlib_dep_gemspecs = stdlib_deps.map { |dep| find_gem(dep['name'], dep['version']) }.compact
+        (gem_dep_gemspecs.values.compact + stdlib_dep_gemspecs).uniq(&:name)
       end
 
       # Returns all gemspecs directly depended on by this workspace's

From 7d8b5a36aecb8103c7cb353f132fad99dd49b7ff Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 8 Oct 2025 13:53:08 -0400
Subject: [PATCH 121/172] Add back stdlib_dependencies() for use in future
 merge

---
 lib/solargraph/workspace.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/solargraph/workspace.rb b/lib/solargraph/workspace.rb
index c44bfb36d..50c9f4519 100644
--- a/lib/solargraph/workspace.rb
+++ b/lib/solargraph/workspace.rb
@@ -47,6 +47,13 @@ def config
       @config ||= Solargraph::Workspace::Config.new(directory)
     end
 
+    # @param stdlib_name [String]
+    #
+    # @return [Array<String>]
+    def stdlib_dependencies stdlib_name
+      gemspecs.stdlib_dependencies(stdlib_name)
+    end
+
     # @param out [IO, nil] output stream for logging
     # @param gemspec [Gem::Specification]
     # @return [Array<Gem::Specification>]

From 149962da4c4610ee976b6d7c95cf0dcbbd98d621 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 8 Oct 2025 13:53:26 -0400
Subject: [PATCH 122/172] Add back stdlib_dependencies() for use in future
 merge

---
 lib/solargraph/workspace/gemspecs.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index 4482f63e7..c34120451 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -80,6 +80,14 @@ def resolve_require require
         nil
       end
 
+      # @param stdlib_name [String]
+      #
+      # @return [Array<String>]
+      def stdlib_dependencies stdlib_name
+        deps = RbsMap::StdlibMap.stdlib_dependencies(stdlib_name, nil) || []
+        deps.map { |dep| dep['name'] }.compact
+      end
+
       # @param name [String]
       # @param version [String, nil]
       # @param out [IO, nil] output stream for logging

From 5ea669e6b34d9f54ec3b4a275388997a83ec47c4 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 9 Oct 2025 07:17:23 -0400
Subject: [PATCH 123/172] Remove temporary changes

---
 .github/workflows/linting.yml   | 5 ++---
 .github/workflows/plugins.yml   | 4 +---
 .github/workflows/rspec.yml     | 4 +---
 .github/workflows/typecheck.yml | 3 +--
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index aaefe0c16..ae885b4db 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -8,11 +8,10 @@ name: Linting
 on:
   workflow_dispatch: {}
   pull_request:
-    branches:
-      - '*'
+    branches: [ master ]
   push:
     branches:
-      - 'main'
+      - 'master'
     tags:
       - 'v*'
 
diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index 01169ce7f..b862c8343 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -8,9 +8,7 @@ name: Plugin
 on:
   push:
     branches: [master]
-  pull_request:
-    branches:
-      - '*'
+  pull_request: [master]
 
 permissions:
   contents: read
diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index 8b7e87f79..fc4eee47a 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -10,9 +10,7 @@ name: RSpec
 on:
   push:
     branches: [ master ]
-  pull_request:
-    branches:
-      - '*'
+  pull_request: [ master ]
 
 permissions:
   contents: read
diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml
index 26eb75a17..0ae8a3d8a 100644
--- a/.github/workflows/typecheck.yml
+++ b/.github/workflows/typecheck.yml
@@ -11,8 +11,7 @@ on:
   push:
     branches: [ master ]
   pull_request:
-    branches:
-      - '*'
+    branches: [ master ]
 
 permissions:
   contents: read

From 642163756e9a5fe3f34857b513fc8f299ecd3e4c Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 9 Oct 2025 07:20:14 -0400
Subject: [PATCH 124/172] Remove temporary changes

---
 Rakefile                                           | 2 +-
 spec/api_map_method_spec.rb                        | 6 +++---
 spec/workspace/gemspecs_fetch_dependencies_spec.rb | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Rakefile b/Rakefile
index 793831b14..d731fc786 100755
--- a/Rakefile
+++ b/Rakefile
@@ -54,7 +54,7 @@ def undercover
   cmd = 'bundle exec undercover ' \
         '--simplecov coverage/combined/coverage.json ' \
         '--exclude-files "Rakefile,spec/*,spec/**/*,lib/solargraph/version.rb" ' \
-        '--compare origin/extract_gemspecs_logic_from_doc_map'
+        '--compare origin/master'
   output, status = Bundler.with_unbundled_env do
     Open3.capture2e(cmd)
   end
diff --git a/spec/api_map_method_spec.rb b/spec/api_map_method_spec.rb
index ce7c42a62..610ab5484 100644
--- a/spec/api_map_method_spec.rb
+++ b/spec/api_map_method_spec.rb
@@ -110,15 +110,15 @@ class B
     end
   end
 
-  describe '#get_method_stack', time_limit_seconds: 240 do
+  describe '#get_method_stack' do
     let(:out) { StringIO.new }
     let(:api_map) { Solargraph::ApiMap.load_with_cache(Dir.pwd, out) }
 
-    context 'with stdlib that has vital dependencies', time_limit_seconds: 240 do
+    context 'with stdlib that has vital dependencies' do
       let(:external_requires) { ['yaml'] }
       let(:method_stack) { api_map.get_method_stack('YAML', 'safe_load', scope: :class) }
 
-      it 'handles the YAML gem aliased to Psych', time_limit_seconds: 240 do
+      it 'handles the YAML gem aliased to Psych' do
         expect(method_stack).not_to be_empty
       end
     end
diff --git a/spec/workspace/gemspecs_fetch_dependencies_spec.rb b/spec/workspace/gemspecs_fetch_dependencies_spec.rb
index c1911ad42..56504e7dd 100644
--- a/spec/workspace/gemspecs_fetch_dependencies_spec.rb
+++ b/spec/workspace/gemspecs_fetch_dependencies_spec.rb
@@ -77,7 +77,7 @@
     context 'with gem that exists in our bundle' do
       let(:gem_name) { 'undercover' }
 
-      it 'finds dependencies', time_limit_seconds: 120 do
+      it 'finds dependencies' do
         expect(deps.map(&:name)).to include('ast')
       end
     end
@@ -85,7 +85,7 @@
     context 'with gem does not exist in our bundle' do
       let(:gem_name) { 'activerecord' }
 
-      it 'gives a useful message', time_limit_seconds: 120 do
+      it 'gives a useful message' do
         dep_names = nil
         output = capture_both { dep_names = deps.map(&:name) }
         expect(output).to include('Please install the gem activerecord')

From d45652b82abdead4dd9b954e10f4e7fcec605e67 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 9 Oct 2025 07:21:11 -0400
Subject: [PATCH 125/172] Remove temporary changes

---
 .github/workflows/plugins.yml | 4 ++--
 .github/workflows/rspec.yml   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index b862c8343..142b3d5b0 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -8,8 +8,8 @@ name: Plugin
 on:
   push:
     branches: [master]
-  pull_request: [master]
-
+  pull_request:
+    branches: [master]
 permissions:
   contents: read
 
diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index fc4eee47a..bf812da99 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -10,7 +10,8 @@ name: RSpec
 on:
   push:
     branches: [ master ]
-  pull_request: [ master ]
+  pull_request:
+    branches: [ master ]
 
 permissions:
   contents: read

From f3ca90cf3ab7c5991905646767e6714f06f8f5b8 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 9 Oct 2025 07:21:40 -0400
Subject: [PATCH 126/172] Remove temporary changes

---
 .github/workflows/rspec.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index bf812da99..cc4efda4b 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -86,4 +86,4 @@ jobs:
       run: bundle exec rake spec
     - name: Check PR coverage
       run: bundle exec rake undercover
-      # continue-on-error: true TODO: Restore before merging
+      continue-on-error: true

From d6aacef9439fb15dd25bae49ff824993860eef3a Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 9 Oct 2025 07:29:06 -0400
Subject: [PATCH 127/172] Remove temporary changes

---
 .github/workflows/plugins.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index 142b3d5b0..b5984f3cb 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -10,6 +10,7 @@ on:
     branches: [master]
   pull_request:
     branches: [master]
+
 permissions:
   contents: read
 

From ed2381371b008165a1c2fdb992bcac7bda1d6a23 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 3 Nov 2025 09:25:02 -0500
Subject: [PATCH 128/172] Reproduce solargraph-rspec rspec failure

---
 .github/workflows/plugins.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index b5984f3cb..2619b9ff8 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -143,6 +143,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
+
         # solargraph-rails supports Ruby 3.0+
         ruby-version: '3.0'
         bundler-cache: false

From c6dbe4d0899255deaa596f08b92494f90ef2886d Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 15 Nov 2025 11:19:09 -0500
Subject: [PATCH 129/172] Trigger build

---
 .github/workflows/plugins.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index 2619b9ff8..b5984f3cb 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -143,7 +143,6 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-
         # solargraph-rails supports Ruby 3.0+
         ruby-version: '3.0'
         bundler-cache: false

From 9d2686301d53487871584ab3cbb690c256e44114 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 15 Nov 2025 11:22:22 -0500
Subject: [PATCH 130/172] Fix new bundler issue

---
 .github/workflows/rspec.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index ecc3d9771..b213c5ed0 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -35,6 +35,10 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
+        # see https://github.com/castwide/solargraph/actions/runs/19391419903/job/55485410493?pr=1119
+        #
+        # match version in Gemfile.lock and use same version below
+        bundler: 2.5.23
         bundler-cache: false
     - name: Set rbs version
       run: echo "gem 'rbs', '${{ matrix.rbs-version }}'" >> .Gemfile
@@ -46,7 +50,7 @@ jobs:
       run: echo "gem 'tsort'" >> .Gemfile
     - name: Install gems
       run: |
-        bundle install
+        bundle _2.5.23_ install
         bundle update rbs # use latest available for this Ruby version
     - name: Run tests
       run: bundle exec rake spec

From 87ec9b35adfa75103bb0702282874a806ef7c054 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 15 Nov 2025 11:42:41 -0500
Subject: [PATCH 131/172] Debug

---
 .github/workflows/rspec.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index b213c5ed0..073594aac 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -52,6 +52,7 @@ jobs:
       run: |
         bundle _2.5.23_ install
         bundle update rbs # use latest available for this Ruby version
+        bundle list
     - name: Run tests
       run: bundle exec rake spec
   undercover:

From 6a14bd7e09899beaaa9ee0370a42366ee81596f2 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 15 Nov 2025 12:28:38 -0500
Subject: [PATCH 132/172] Turn off warning diagnostics in CLI

---
 bin/solargraph | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/solargraph b/bin/solargraph
index d85561700..248dc42fd 100755
--- a/bin/solargraph
+++ b/bin/solargraph
@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 
+# turn off warning diagnostics from Ruby
+$VERBOSE=nil
+
 require 'solargraph'
 
 Solargraph::Shell.start(ARGV)

From 7e7604bdfc5d76af86c5b7f5b25ade3d2201b52e Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 15 Nov 2025 13:38:08 -0500
Subject: [PATCH 133/172] Debug

---
 .github/workflows/rspec.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index 7b8ba9bfb..2743ca84f 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -61,6 +61,7 @@ jobs:
         bundle _2.5.23_ install
         bundle update rbs # use latest available for this Ruby version
         bundle list
+        bundle exec solargraph pin 'Bundler::Dsl#source'
     - name: Update types
       run: |
         bundle exec rbs collection update

From 91d3cd4a981dcf651d1fa45ad78b96e2dd8bedbf Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 15 Nov 2025 18:12:51 -0500
Subject: [PATCH 134/172] Fix pin merging bug

---
 lib/solargraph/pin/base_variable.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/solargraph/pin/base_variable.rb b/lib/solargraph/pin/base_variable.rb
index 764c1fb39..fbf22cbaa 100644
--- a/lib/solargraph/pin/base_variable.rb
+++ b/lib/solargraph/pin/base_variable.rb
@@ -12,8 +12,9 @@ class BaseVariable < Base
       attr_accessor :mass_assignment
 
       # @param return_type [ComplexType, nil]
+      # @param mass_assignment [::Array(Parser::AST::Node, Integer), nil]
       # @param assignment [Parser::AST::Node, nil]
-      def initialize assignment: nil, return_type: nil, **splat
+      def initialize assignment: nil, return_type: nil, mass_assignment: nil, **splat
         super(**splat)
         @assignment = assignment
         # @type [nil, ::Array(Parser::AST::Node, Integer)]
@@ -22,12 +23,12 @@ def initialize assignment: nil, return_type: nil, **splat
       end
 
       def combine_with(other, attrs={})
-        attrs.merge({
+        new_attrs = attrs.merge({
           assignment: assert_same(other, :assignment),
           mass_assignment: assert_same(other, :mass_assignment),
           return_type: combine_return_type(other),
         })
-        super(other, attrs)
+        super(other, new_attrs)
       end
 
       def completion_item_kind

From 652fcd218c0532455baf88c0f05295f862f3dbf3 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 15 Nov 2025 18:32:44 -0500
Subject: [PATCH 135/172] Add @sg-ignore

---
 lib/solargraph/pin/base_variable.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/solargraph/pin/base_variable.rb b/lib/solargraph/pin/base_variable.rb
index fbf22cbaa..da1f15cb2 100644
--- a/lib/solargraph/pin/base_variable.rb
+++ b/lib/solargraph/pin/base_variable.rb
@@ -28,6 +28,7 @@ def combine_with(other, attrs={})
           mass_assignment: assert_same(other, :mass_assignment),
           return_type: combine_return_type(other),
         })
+        # @sg-ignore https://github.com/castwide/solargraph/pull/1050
         super(other, new_attrs)
       end
 

From 76c6d7f6d9a1b6e585b8437e996c03d9380d45ba Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 1 Dec 2025 15:45:23 -0500
Subject: [PATCH 136/172] Add fix that this PR revealed on future branch

---
 lib/solargraph/pin/callable.rb  | 5 +++++
 lib/solargraph/pin/parameter.rb | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/lib/solargraph/pin/callable.rb b/lib/solargraph/pin/callable.rb
index 207c2619b..93a69687b 100644
--- a/lib/solargraph/pin/callable.rb
+++ b/lib/solargraph/pin/callable.rb
@@ -21,6 +21,11 @@ def initialize block: nil, return_type: nil, parameters: [], **splat
         @parameters = parameters
       end
 
+      def reset_generated!
+        parameters.each(&:reset_generated!)
+        super
+      end
+
       # @return [String]
       def method_namespace
         closure.namespace
diff --git a/lib/solargraph/pin/parameter.rb b/lib/solargraph/pin/parameter.rb
index 947513689..ae7cc5416 100644
--- a/lib/solargraph/pin/parameter.rb
+++ b/lib/solargraph/pin/parameter.rb
@@ -135,6 +135,11 @@ def full
                     end
       end
 
+      def reset_generated!
+        @return_type = nil
+        super
+      end
+
       # @return [ComplexType]
       def return_type
         if @return_type.nil?

From 892630cf68a19058297f2d2e8ea1d9d66e7cb464 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 1 Dec 2025 16:03:58 -0500
Subject: [PATCH 137/172] Add fix that this PR revealed on future branch

---
 lib/solargraph/pin/parameter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/solargraph/pin/parameter.rb b/lib/solargraph/pin/parameter.rb
index ae7cc5416..9d7ab1c89 100644
--- a/lib/solargraph/pin/parameter.rb
+++ b/lib/solargraph/pin/parameter.rb
@@ -136,7 +136,7 @@ def full
       end
 
       def reset_generated!
-        @return_type = nil
+        @return_type = nil if param_tag
         super
       end
 

From f879eb2c8c15e4e29083fb21995bcb1cc9d0fbc2 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 1 Dec 2025 16:19:16 -0500
Subject: [PATCH 138/172] Add @sg-ignore

---
 lib/solargraph/yardoc.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/solargraph/yardoc.rb b/lib/solargraph/yardoc.rb
index 09bcd4586..0afdf1482 100644
--- a/lib/solargraph/yardoc.rb
+++ b/lib/solargraph/yardoc.rb
@@ -23,6 +23,7 @@ def cache(yard_plugins, gemspec)
       yard_plugins.each { |plugin| cmd << " --plugin #{plugin}" }
       Solargraph.logger.debug { "Running: #{cmd}" }
       # @todo set these up to run in parallel
+      # @sg-ignore Unrecognized keyword argument chdir to Open3.capture2e
       stdout_and_stderr_str, status = Open3.capture2e(current_bundle_env_tweaks, cmd, chdir: gemspec.gem_dir)
       unless status.success?
         Solargraph.logger.warn { "YARD failed running #{cmd.inspect} in #{gemspec.gem_dir}" }

From 5600ee1ff7275cd0f624a904392d53bc40076248 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 1 Dec 2025 16:30:42 -0500
Subject: [PATCH 139/172] Remove @sg-ignores

---
 lib/solargraph/shell.rb | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/lib/solargraph/shell.rb b/lib/solargraph/shell.rb
index 046a74296..3b1c4952d 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -241,24 +241,17 @@ def list
       puts "#{workspace.filenames.length} files total."
     end
 
-    # @sg-ignore Unresolved call to desc
     desc 'pin [PATH]', 'Describe a pin', hide: true
-    # @sg-ignore Unresolved call to option
     option :rbs, type: :boolean, desc: 'Output the pin as RBS', default: false
-    # @sg-ignore Unresolved call to option
     option :typify, type: :boolean, desc: 'Output the calculated return type of the pin from annotations', default: false
-    # @sg-ignore Unresolved call to option
     option :references, type: :boolean, desc: 'Show references', default: false
-    # @sg-ignore Unresolved call to option
     option :probe, type: :boolean, desc: 'Output the calculated return type of the pin from annotations and inference', default: false
-    # @sg-ignore Unresolved call to option
     option :stack, type: :boolean, desc: 'Show entire stack of a method pin by including definitions in superclasses', default: false
     # @param path [String] The path to the method pin, e.g. 'Class#method' or 'Class.method'
     # @return [void]
     def pin path
       api_map = Solargraph::ApiMap.load_with_cache('.', $stderr)
       is_method = path.include?('#') || path.include?('.')
-      # @sg-ignore Unresolved call to options
       if is_method && options[:stack]
         scope, ns, meth = if path.include? '#'
                             [:instance, *path.split('#', 2)]
@@ -280,7 +273,6 @@ def pin path
         $stderr.puts "Pin not found for path '#{path}'"
         exit 1
       when Pin::Namespace
-        # @sg-ignore Unresolved call to options
         if options[:references]
           superclass_tag = api_map.qualify_superclass(pin.return_type.tag)
           superclass_pin = api_map.get_path_pins(superclass_tag).first if superclass_tag
@@ -289,12 +281,9 @@ def pin path
       end
 
       pins.each do |pin|
-        # @sg-ignore Unresolved call to options
         if options[:typify] || options[:probe]
           type = ComplexType::UNDEFINED
-          # @sg-ignore Unresolved call to options
           type = pin.typify(api_map) if options[:typify]
-          # @sg-ignore Unresolved call to options
           type = pin.probe(api_map) if options[:probe] && type.undefined?
           print_type(type)
           next
@@ -338,7 +327,6 @@ def do_cache gemspec, api_map
     # @param type [ComplexType]
     # @return [void]
     def print_type(type)
-      # @sg-ignore Unresolved call to options
       if options[:rbs]
         puts type.to_rbs
       else
@@ -349,7 +337,6 @@ def print_type(type)
     # @param pin [Solargraph::Pin::Base]
     # @return [void]
     def print_pin(pin)
-      # @sg-ignore Unresolved call to options
       if options[:rbs]
         puts pin.to_rbs
       else

From 939786ed30bce6718895f5cc1b5cfcb395fb4ac7 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 1 Dec 2025 16:38:44 -0500
Subject: [PATCH 140/172] Remove @sg-ignores

---
 lib/solargraph/yardoc.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/solargraph/yardoc.rb b/lib/solargraph/yardoc.rb
index 0afdf1482..09bcd4586 100644
--- a/lib/solargraph/yardoc.rb
+++ b/lib/solargraph/yardoc.rb
@@ -23,7 +23,6 @@ def cache(yard_plugins, gemspec)
       yard_plugins.each { |plugin| cmd << " --plugin #{plugin}" }
       Solargraph.logger.debug { "Running: #{cmd}" }
       # @todo set these up to run in parallel
-      # @sg-ignore Unrecognized keyword argument chdir to Open3.capture2e
       stdout_and_stderr_str, status = Open3.capture2e(current_bundle_env_tweaks, cmd, chdir: gemspec.gem_dir)
       unless status.success?
         Solargraph.logger.warn { "YARD failed running #{cmd.inspect} in #{gemspec.gem_dir}" }

From d87f222640e484df7c67092d804b3a7b96210697 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 1 Dec 2025 16:47:40 -0500
Subject: [PATCH 141/172] Use consistent Ruby versions for typechecking

---
 .github/workflows/plugins.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index b5984f3cb..d1d6b9be6 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -23,7 +23,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.0'
+        ruby-version: 3.4
         bundler-cache: true
     - uses: awalsh128/cache-apt-pkgs-action@latest
       with:
@@ -54,7 +54,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.0'
+        ruby-version: 3.4
         bundler-cache: false
     - uses: awalsh128/cache-apt-pkgs-action@latest
       with:
@@ -83,7 +83,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.0'
+        ruby-version: 3.4
         bundler-cache: false
     - uses: awalsh128/cache-apt-pkgs-action@latest
       with:

From aa4000614189c0c61c641de22e413632517431fe Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 1 Dec 2025 20:09:38 -0500
Subject: [PATCH 142/172] Bring in fixes for strong typechecking issues

---
 lib/solargraph/pin/parameter.rb   | 2 +-
 lib/solargraph/yard_map/mapper.rb | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/solargraph/pin/parameter.rb b/lib/solargraph/pin/parameter.rb
index 9d7ab1c89..7daa34d32 100644
--- a/lib/solargraph/pin/parameter.rb
+++ b/lib/solargraph/pin/parameter.rb
@@ -205,7 +205,7 @@ def param_tag
       # @return [ComplexType]
       def typify_block_param api_map
         block_pin = closure
-        if block_pin.is_a?(Pin::Block) && block_pin.receiver
+        if block_pin.is_a?(Pin::Block) && block_pin.receiver && index
           return block_pin.typify_parameters(api_map)[index]
         end
         ComplexType::UNDEFINED
diff --git a/lib/solargraph/yard_map/mapper.rb b/lib/solargraph/yard_map/mapper.rb
index 592b3805e..d9cf90a5f 100644
--- a/lib/solargraph/yard_map/mapper.rb
+++ b/lib/solargraph/yard_map/mapper.rb
@@ -39,10 +39,11 @@ def generate_pins code_object
           @namespace_pins[code_object.path] = nspin
           result.push nspin
           if code_object.is_a?(YARD::CodeObjects::ClassObject) and !code_object.superclass.nil?
-            # This method of superclass detection is a bit of a hack. If
-            # the superclass is a Proxy, it is assumed to be undefined in its
-            # yardoc and converted to a fully qualified namespace.
-            superclass = if code_object.superclass.is_a?(YARD::CodeObjects::Proxy)
+            # This method of superclass detection is a bit of a
+            # hack. If the superclass is a Proxy that can't be
+            # resolved', it is assumed to be undefined in its yardoc
+            # and converted to a fully qualified namespace.
+            superclass = if code_object.superclass.is_a?(YARD::CodeObjects::Proxy) && code_object.type == :proxy
               "::#{code_object.superclass}"
             else
               code_object.superclass.to_s

From 95d0280c1480db02d558681c019f165650a1ef0f Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 30 Dec 2025 23:52:34 -0500
Subject: [PATCH 143/172] Fix merge

---
 lib/solargraph/workspace/gemspecs.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index 38b46da30..f832cf57f 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -67,13 +67,16 @@ def resolve_require require
       # @return [Array<Gem::Specification>]
       def fetch_dependencies gemspec, out: $stderr
         # @param spec [Gem::Dependency]
+        # @param deps [Set<Gem::Specification>]
         only_runtime_dependencies(gemspec).each_with_object(Set.new) do |spec, deps|
           Solargraph.logger.info "Adding #{spec.name} dependency for #{gemspec.name}"
           dep = Gem.loaded_specs[spec.name]
           # @todo is next line necessary?
+          # @sg-ignore Unresolved call to requirement on Gem::Dependency
           dep ||= Gem::Specification.find_by_name(spec.name, spec.requirement)
           deps.merge fetch_dependencies(dep) if deps.add?(dep)
         rescue Gem::MissingSpecError
+          # @sg-ignore Unresolved call to requirement on Gem::Dependency
           Solargraph.logger.warn "Gem dependency #{spec.name} #{spec.requirement} for " \
                                  "#{gemspec.name} not found in RubyGems."
         end.to_a

From 4663e7d796724f99bac82f9b18b6ba22d37e9455 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 31 Dec 2025 11:00:44 -0500
Subject: [PATCH 144/172] Fix some @sg-ignores

---
 lib/solargraph/pin/parameter.rb      |  1 +
 lib/solargraph/workspace/gemspecs.rb | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/solargraph/pin/parameter.rb b/lib/solargraph/pin/parameter.rb
index 018926563..08b371129 100644
--- a/lib/solargraph/pin/parameter.rb
+++ b/lib/solargraph/pin/parameter.rb
@@ -206,6 +206,7 @@ def param_tag
       def typify_block_param api_map
         block_pin = closure
         if block_pin.is_a?(Pin::Block) && block_pin.receiver && index
+          # @sg-ignore flow-sensivie typing should handle is_a? with &&
           return block_pin.typify_parameters(api_map)[index]
         end
         ComplexType::UNDEFINED
diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index c34120451..20fe350ae 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -116,6 +116,7 @@ def fetch_dependencies gemspec, out: $stderr
         # @param runtime_dep [Gem::Dependency]
         # @param deps [Hash{String => Gem::Specification}]
         gem_dep_gemspecs = only_runtime_dependencies(gemspec).each_with_object(deps_so_far) do |runtime_dep, deps|
+          # @sg-ignore Unresolved call to requirement on Gem::Dependency
           dep = find_gem(runtime_dep.name, runtime_dep.requirement)
           next unless dep
 
@@ -170,7 +171,7 @@ def to_gem_specification specish
                                                             end
                                                             nil
                                                           end
-                                                          # yay!
+                                                        # yay!
 
                                                         when Bundler::LazySpecification
                                                           # materializing didn't work.  Let's look in the local
@@ -180,8 +181,11 @@ def to_gem_specification specish
                                                         when Bundler::StubSpecification
                                                           # turns a Bundler::StubSpecification into a
                                                           # Gem::StubSpecification into a Gem::Specification
+                                                          # @sg-ignore Flow-sensitive typing ought to be able to handle 'when ClassName'
                                                           specish = specish.stub
+                                                          # @sg-ignore Flow-sensitive typing ought to be able to handle 'when ClassName'
                                                           if specish.respond_to?(:spec)
+                                                            # @sg-ignore Flow-sensitive typing ought to be able to handle 'when ClassName'
                                                             specish.spec
                                                           else
                                                             # turn the crank again
@@ -190,8 +194,8 @@ def to_gem_specification specish
                                                         else
                                                           @@warned_on_gem_type ||= false
                                                           unless @@warned_on_gem_type
-                                                            logger.warn 'Unexpected type while resolving gem: ' \
-                                                                        "#{specish.class}"
+                                                            # @sg-ignore Unresolved call to class on Gem::Specification, Bundler::LazySpecification, Bundler::StubSpecification
+                                                            logger.warn "Unexpected type while resolving gem: #{specish.class}"
                                                             @@warned_on_gem_type = true
                                                           end
                                                           nil

From a48c40a5b879c95548c8e7a59d91cdd51973e0bc Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 31 Dec 2025 11:05:15 -0500
Subject: [PATCH 145/172] Fix merge

---
 spec/shell_spec.rb | 110 ---------------------------------------------
 1 file changed, 110 deletions(-)

diff --git a/spec/shell_spec.rb b/spec/shell_spec.rb
index c28403c7b..12daabe99 100644
--- a/spec/shell_spec.rb
+++ b/spec/shell_spec.rb
@@ -297,114 +297,4 @@ def bundle_exec(*cmd)
       end
     end
   end
-
-  # @type cmd [Array<String>]
-  # @return [String]
-  def bundle_exec(*cmd)
-    # run the command in the temporary directory with bundle exec
-    Bundler.with_unbundled_env do
-      output, status = Open3.capture2e("bundle exec #{cmd.join(' ')}")
-      expect(status.success?).to be(true), "Command failed: #{output}"
-      output
-    end
-  end
-
-  describe 'pin' do
-    let(:api_map) { instance_double(Solargraph::ApiMap) }
-    let(:to_s_pin) { instance_double(Solargraph::Pin::Method, return_type: Solargraph::ComplexType.parse('String')) }
-
-    before do
-      allow(Solargraph::Pin::Method).to receive(:===).with(to_s_pin).and_return(true)
-      allow(Solargraph::ApiMap).to receive(:load_with_cache).and_return(api_map)
-      allow(api_map).to receive(:get_path_pins).with('String#to_s').and_return([to_s_pin])
-    end
-
-    context 'with no options' do
-      it 'prints a pin' do
-        allow(to_s_pin).to receive(:inspect).and_return('pin inspect result')
-
-        out = capture_both { shell.pin('String#to_s') }
-
-        expect(out).to eq("pin inspect result\n")
-      end
-    end
-
-    context 'with --rbs option' do
-      it 'prints a pin with RBS type' do
-        allow(to_s_pin).to receive(:to_rbs).and_return('pin RBS result')
-
-        out = capture_both do
-          shell.options = { rbs: true }
-          shell.pin('String#to_s')
-        end
-        expect(out).to eq("pin RBS result\n")
-      end
-    end
-
-    context 'with --stack option' do
-      it 'prints a pin using stack results' do
-        allow(to_s_pin).to receive(:to_rbs).and_return('pin RBS result')
-
-        allow(api_map).to receive(:get_method_stack).and_return([to_s_pin])
-        capture_both do
-          shell.options = { stack: true }
-          shell.pin('String#to_s')
-        end
-        expect(api_map).to have_received(:get_method_stack).with('String', 'to_s', scope: :instance)
-      end
-
-      it 'prints a static pin using stack results' do
-        # allow(to_s_pin).to receive(:to_rbs).and_return('pin RBS result')
-        string_new_pin = instance_double(Solargraph::Pin::Method, return_type: Solargraph::ComplexType.parse('String'))
-
-        allow(api_map).to receive(:get_method_stack).with('String', 'new', scope: :class).and_return([string_new_pin])
-        allow(Solargraph::Pin::Method).to receive(:===).with(string_new_pin).and_return(true)
-        allow(api_map).to receive(:get_path_pins).with('String.new').and_return([string_new_pin])
-        capture_both do
-          shell.options = { stack: true }
-          shell.pin('String.new')
-        end
-        expect(api_map).to have_received(:get_method_stack).with('String', 'new', scope: :class)
-      end
-    end
-
-    context 'with --typify option' do
-      it 'prints a pin with typify type' do
-        allow(to_s_pin).to receive(:typify).and_return(Solargraph::ComplexType.parse('::String'))
-
-        out = capture_both do
-          shell.options = { typify: true }
-          shell.pin('String#to_s')
-        end
-        expect(out).to eq("::String\n")
-      end
-    end
-
-    context 'with --typify --rbs options' do
-      it 'prints a pin with typify type' do
-        allow(to_s_pin).to receive(:typify).and_return(Solargraph::ComplexType.parse('::String'))
-
-        out = capture_both do
-          shell.options = { typify: true, rbs: true }
-          shell.pin('String#to_s')
-        end
-        expect(out).to eq("::String\n")
-      end
-    end
-
-    context 'with no pin' do
-      it 'prints error' do
-        allow(api_map).to receive(:get_path_pins).with('Not#found').and_return([])
-        allow(Solargraph::Pin::Method).to receive(:===).with(nil).and_return(false)
-
-        out = capture_both do
-          shell.options = {}
-          shell.pin('Not#found')
-        rescue SystemExit
-          # Ignore the SystemExit raised by the shell when no pin is found
-        end
-        expect(out).to include("Pin not found for path 'Not#found'")
-      end
-    end
-  end
 end

From 2b753e87d0ded080af7fa5c4afa7b22f6ff84e87 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 31 Dec 2025 16:47:28 -0500
Subject: [PATCH 146/172] Bump RBS versions in rspec test

---
 .github/workflows/rspec.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index 73edd47a3..db84786dd 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -21,8 +21,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4', '4.0']
-        rbs-version: ['3.6.1', '3.9.5', '4.0.0.dev.4']
+        ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4', '4.0', 'head']
+        rbs-version: ['3.6.1', '3.8.1', '3.9.5', '3.10.0', '4.0.0.dev.4']
         # Ruby 3.0 doesn't work with RBS 3.9.4 or 4.0.0.dev.4
         exclude:
           # Ruby 3.0 doesn't work with RBS 3.9.4 or 4.0.0.dev.4
@@ -42,16 +42,19 @@ jobs:
           # fixed in next RBS release
           - ruby-version: '4.0'
             rbs-version: '3.6.1'
-          - ruby-version: '4.0'
+          - ruby-version: 'head'
+            rbs-version: '3.6.1'
         include:
           - ruby-version: '3.1'
             rbs-version: '3.6.1'
           - ruby-version: '3.2'
-            rbs-version: '3.9.4'
+            rbs-version: '3.8.1'
           - ruby-version: '3.3'
-            rbs-version: '4.0.0.dev.4'
+            rbs-version: '3.8.5'
           - ruby-version: '3.4'
-            rbs-version: '4.0.0.dev.4'
+            rbs-version: '3.10.0'
+          - ruby-version: '3.4'
+            rbs-version: '4.0.0.dev'
     steps:
     - uses: actions/checkout@v3
     - name: Set up Ruby

From e182a53fe173d866e6d7ca4c256a5cdf7d774c55 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 31 Dec 2025 16:48:26 -0500
Subject: [PATCH 147/172] Fix version

---
 .github/workflows/rspec.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index db84786dd..95d721900 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -54,7 +54,7 @@ jobs:
           - ruby-version: '3.4'
             rbs-version: '3.10.0'
           - ruby-version: '3.4'
-            rbs-version: '4.0.0.dev'
+            rbs-version: '4.0.0.dev.4'
     steps:
     - uses: actions/checkout@v3
     - name: Set up Ruby

From 34cdf784ad06ae9688c04a65af12310859ebca5a Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 31 Dec 2025 16:50:37 -0500
Subject: [PATCH 148/172] Fix version matrix

---
 .github/workflows/rspec.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index 95d721900..406268714 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -25,9 +25,11 @@ jobs:
         rbs-version: ['3.6.1', '3.8.1', '3.9.5', '3.10.0', '4.0.0.dev.4']
         # Ruby 3.0 doesn't work with RBS 3.9.4 or 4.0.0.dev.4
         exclude:
-          # Ruby 3.0 doesn't work with RBS 3.9.4 or 4.0.0.dev.4
+          # Ruby 3.0 doesn't work with RBS >=3.9
           - ruby-version: '3.0'
             rbs-version: '3.9.5'
+          - ruby-version: '3.0'
+            rbs-version: '3.8.1'
           - ruby-version: '3.0'
             rbs-version: '4.0.0.dev.4'
           # only include the 3.1 variants we include later
@@ -38,12 +40,10 @@ jobs:
           - ruby-version: '3.3'
           # only include the 3.4 variants we include later
           - ruby-version: '3.4'
-          # Missing require in 'rbs collection update' - hopefully
-          # fixed in next RBS release
-          - ruby-version: '4.0'
-            rbs-version: '3.6.1'
-          - ruby-version: 'head'
-            rbs-version: '3.6.1'
+          # - ruby-version: '4.0'
+          #   rbs-version: '3.6.1'
+          # - ruby-version: 'head'
+          #   rbs-version: '3.6.1'
         include:
           - ruby-version: '3.1'
             rbs-version: '3.6.1'

From 851d142473fd362a04c0c3bca6aad97e3c06224e Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 31 Dec 2025 16:58:47 -0500
Subject: [PATCH 149/172] Fix version matrix

---
 .github/workflows/rspec.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index 406268714..7913bdabf 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -25,13 +25,8 @@ jobs:
         rbs-version: ['3.6.1', '3.8.1', '3.9.5', '3.10.0', '4.0.0.dev.4']
         # Ruby 3.0 doesn't work with RBS 3.9.4 or 4.0.0.dev.4
         exclude:
-          # Ruby 3.0 doesn't work with RBS >=3.9
-          - ruby-version: '3.0'
-            rbs-version: '3.9.5'
-          - ruby-version: '3.0'
-            rbs-version: '3.8.1'
-          - ruby-version: '3.0'
-            rbs-version: '4.0.0.dev.4'
+          # only include the 3.0 variants we include later
+          - ruby-version: '3.1'
           # only include the 3.1 variants we include later
           - ruby-version: '3.1'
           # only include the 3.2 variants we include later
@@ -40,11 +35,18 @@ jobs:
           - ruby-version: '3.3'
           # only include the 3.4 variants we include later
           - ruby-version: '3.4'
+          # only include the 4.0 variants we include later
+          - ruby-version: '4.0'
+          # Don't exclude 'head' - let's test all RBS versions we
+          # can there
+
           # - ruby-version: '4.0'
           #   rbs-version: '3.6.1'
           # - ruby-version: 'head'
           #   rbs-version: '3.6.1'
         include:
+          - ruby-version: '3.0'
+            rbs-version: '3.6.1'
           - ruby-version: '3.1'
             rbs-version: '3.6.1'
           - ruby-version: '3.2'

From e2d27c9dcaec14b90cd8f3e262dc8ca36d3a28c3 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 31 Dec 2025 16:59:50 -0500
Subject: [PATCH 150/172] Fix version matrix

---
 .github/workflows/rspec.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index 7913bdabf..94a714508 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -26,7 +26,7 @@ jobs:
         # Ruby 3.0 doesn't work with RBS 3.9.4 or 4.0.0.dev.4
         exclude:
           # only include the 3.0 variants we include later
-          - ruby-version: '3.1'
+          - ruby-version: '3.0'
           # only include the 3.1 variants we include later
           - ruby-version: '3.1'
           # only include the 3.2 variants we include later

From 8df808a8bf5cf3b13c3a46d41e4c1ff88286e122 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 31 Dec 2025 17:01:05 -0500
Subject: [PATCH 151/172] Fix version matrix

---
 .github/workflows/rspec.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index 94a714508..dcb726445 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -52,7 +52,7 @@ jobs:
           - ruby-version: '3.2'
             rbs-version: '3.8.1'
           - ruby-version: '3.3'
-            rbs-version: '3.8.5'
+            rbs-version: '3.9.5'
           - ruby-version: '3.4'
             rbs-version: '3.10.0'
           - ruby-version: '3.4'

From 9974481a534d2e7c386121c01142c933f90c120b Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 31 Dec 2025 17:10:50 -0500
Subject: [PATCH 152/172] Fix version matrix

---
 .github/workflows/rspec.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index dcb726445..ced8df10d 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -40,10 +40,12 @@ jobs:
           # Don't exclude 'head' - let's test all RBS versions we
           # can there
 
-          # - ruby-version: '4.0'
-          #   rbs-version: '3.6.1'
-          # - ruby-version: 'head'
-          #   rbs-version: '3.6.1'
+          # For some reason 'rbs collection install' is broken in
+          # 4.0.0.dev.4 on newer Rubies:
+          #
+          # https://github.com/castwide/solargraph/actions/runs/20627923548/job/59241444380?pr=1102
+          - ruby-version: 'head'
+            rbs-version: '4.0.0.dev.4'
         include:
           - ruby-version: '3.0'
             rbs-version: '3.6.1'

From 56e25350a0bffe071172d3f563bf4935f6290e56 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 31 Dec 2025 17:22:43 -0500
Subject: [PATCH 153/172] Exclude another

---
 .github/workflows/rspec.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index ced8df10d..65eb8cac8 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -40,10 +40,9 @@ jobs:
           # Don't exclude 'head' - let's test all RBS versions we
           # can there
 
-          # For some reason 'rbs collection install' is broken in
-          # 4.0.0.dev.4 on newer Rubies:
-          #
           # https://github.com/castwide/solargraph/actions/runs/20627923548/job/59241444380?pr=1102
+          - ruby-version: 'head'
+            rbs-version: '3.8.1'
           - ruby-version: 'head'
             rbs-version: '4.0.0.dev.4'
         include:

From d9e49366f2de9f8093c3bd48eecb566ddc751af2 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 31 Dec 2025 17:29:22 -0500
Subject: [PATCH 154/172] Exclude another

---
 .github/workflows/rspec.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index 65eb8cac8..39475cc1d 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -41,6 +41,8 @@ jobs:
           # can there
 
           # https://github.com/castwide/solargraph/actions/runs/20627923548/job/59241444380?pr=1102
+          - ruby-version: 'head'
+            rbs-version: '3.6.1'
           - ruby-version: 'head'
             rbs-version: '3.8.1'
           - ruby-version: 'head'

From 751430271fbb5ac9b899923508200605171320b0 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 31 Dec 2025 17:52:29 -0500
Subject: [PATCH 155/172] Add version, fix doc

---
 .github/workflows/rspec.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index 39475cc1d..f761b61aa 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -38,8 +38,12 @@ jobs:
           # only include the 4.0 variants we include later
           - ruby-version: '4.0'
           # Don't exclude 'head' - let's test all RBS versions we
-          # can there
-
+          # can there.
+          #
+          #
+          # Just exclude some odd-ball compatibility issues we can't
+          # work around:
+          #
           # https://github.com/castwide/solargraph/actions/runs/20627923548/job/59241444380?pr=1102
           - ruby-version: 'head'
             rbs-version: '3.6.1'
@@ -56,6 +60,8 @@ jobs:
             rbs-version: '3.8.1'
           - ruby-version: '3.3'
             rbs-version: '3.9.5'
+          - ruby-version: '3.3'
+            rbs-version: '3.10.0'
           - ruby-version: '3.4'
             rbs-version: '3.10.0'
           - ruby-version: '3.4'

From 0d6b68b01c70fd72582c2bfdf4dfef44998fa501 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 2 Jan 2026 17:23:43 -0500
Subject: [PATCH 156/172] Update rubocop todo

---
 .rubocop_todo.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 3e8845df2..6406cc522 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -106,7 +106,6 @@ Layout/EndOfLine:
   Exclude:
     - 'Gemfile'
     - 'Rakefile'
-    - 'lib/solargraph/source/encoding_fixes.rb'
     - 'solargraph.gemspec'
 
 # This cop supports safe autocorrection (--autocorrect).
@@ -575,7 +574,6 @@ RSpec/BeforeAfterAll:
     - '**/spec/rails_helper.rb'
     - '**/spec/support/**/*.rb'
     - 'spec/api_map_spec.rb'
-    - 'spec/doc_map_spec.rb'
     - 'spec/language_server/host/dispatch_spec.rb'
     - 'spec/language_server/protocol_spec.rb'
 
@@ -1174,7 +1172,6 @@ Style/StringLiterals:
 # This cop supports safe autocorrection (--autocorrect).
 Style/SuperArguments:
   Exclude:
-    - 'lib/solargraph/pin/base_variable.rb'
     - 'lib/solargraph/pin/callable.rb'
     - 'lib/solargraph/pin/method.rb'
     - 'lib/solargraph/pin/signature.rb'

From d5d619e3445a166462de76a4f564877bec1556c4 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 2 Jan 2026 19:42:53 -0500
Subject: [PATCH 157/172] Revert change

---
 lib/solargraph/yard_map/mapper.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/solargraph/yard_map/mapper.rb b/lib/solargraph/yard_map/mapper.rb
index d9cf90a5f..74584d603 100644
--- a/lib/solargraph/yard_map/mapper.rb
+++ b/lib/solargraph/yard_map/mapper.rb
@@ -43,7 +43,8 @@ def generate_pins code_object
             # hack. If the superclass is a Proxy that can't be
             # resolved', it is assumed to be undefined in its yardoc
             # and converted to a fully qualified namespace.
-            superclass = if code_object.superclass.is_a?(YARD::CodeObjects::Proxy) && code_object.type == :proxy
+            #
+            superclass = if code_object.superclass.is_a?(YARD::CodeObjects::Proxy)
               "::#{code_object.superclass}"
             else
               code_object.superclass.to_s

From 0ac3cb444c962beea001daca71f64ab07650a681 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 4 Jan 2026 12:08:44 -0500
Subject: [PATCH 158/172] Add Ruby 4.0 jobs

---
 .github/workflows/rspec.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index f761b61aa..b9848b7ab 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -35,8 +35,6 @@ jobs:
           - ruby-version: '3.3'
           # only include the 3.4 variants we include later
           - ruby-version: '3.4'
-          # only include the 4.0 variants we include later
-          - ruby-version: '4.0'
           # Don't exclude 'head' - let's test all RBS versions we
           # can there.
           #
@@ -64,8 +62,6 @@ jobs:
             rbs-version: '3.10.0'
           - ruby-version: '3.4'
             rbs-version: '3.10.0'
-          - ruby-version: '3.4'
-            rbs-version: '4.0.0.dev.4'
     steps:
     - uses: actions/checkout@v3
     - name: Set up Ruby

From 3e3e4d9ea08b46da2c050c43376384ff52777dd0 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 4 Jan 2026 12:56:49 -0500
Subject: [PATCH 159/172] Exclude another combo

---
 .github/workflows/rspec.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index b9848b7ab..a5af74830 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -43,6 +43,8 @@ jobs:
           # work around:
           #
           # https://github.com/castwide/solargraph/actions/runs/20627923548/job/59241444380?pr=1102
+          - ruby-version: '4.0'
+            rbs-version: '4.0.0.dev.4'
           - ruby-version: 'head'
             rbs-version: '3.6.1'
           - ruby-version: 'head'

From c7eefc29b1a4768049ea59c521c147a7288ec42f Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 4 Jan 2026 13:06:09 -0500
Subject: [PATCH 160/172] Exclude another combo

---
 .github/workflows/rspec.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index a5af74830..25ab551b2 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -35,6 +35,8 @@ jobs:
           - ruby-version: '3.3'
           # only include the 3.4 variants we include later
           - ruby-version: '3.4'
+          # only include the 4.0 variants we include later
+          - ruby-version: '4.0'
           # Don't exclude 'head' - let's test all RBS versions we
           # can there.
           #
@@ -43,8 +45,6 @@ jobs:
           # work around:
           #
           # https://github.com/castwide/solargraph/actions/runs/20627923548/job/59241444380?pr=1102
-          - ruby-version: '4.0'
-            rbs-version: '4.0.0.dev.4'
           - ruby-version: 'head'
             rbs-version: '3.6.1'
           - ruby-version: 'head'
@@ -63,6 +63,8 @@ jobs:
           - ruby-version: '3.3'
             rbs-version: '3.10.0'
           - ruby-version: '3.4'
+            rbs-version: '4.0.0.dev.4'
+          - ruby-version: '4.0'
             rbs-version: '3.10.0'
     steps:
     - uses: actions/checkout@v3

From caa81d466d8f9414951ce13bdb29d9687e5c913f Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 4 Jan 2026 19:09:23 -0500
Subject: [PATCH 161/172] Drop dead code

---
 lib/solargraph/api_map.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 04cfed55d..6c145e618 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -23,9 +23,6 @@ class ApiMap
     # @return [Array<String>]
     attr_reader :missing_docs
 
-    # @return [Solargraph::Workspace::Gemspecs]
-    attr_reader :gemspecs
-
     # @param pins [Array<Solargraph::Pin::Base>]
     def initialize pins: []
       @source_map_hash = {}

From 3c947d299df4adc9dc0943ecdb2b796dd201446b Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 7 Jan 2026 08:04:06 -0500
Subject: [PATCH 162/172] Revert doc

---
 lib/solargraph/yard_map/mapper.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/solargraph/yard_map/mapper.rb b/lib/solargraph/yard_map/mapper.rb
index 74584d603..592b3805e 100644
--- a/lib/solargraph/yard_map/mapper.rb
+++ b/lib/solargraph/yard_map/mapper.rb
@@ -39,11 +39,9 @@ def generate_pins code_object
           @namespace_pins[code_object.path] = nspin
           result.push nspin
           if code_object.is_a?(YARD::CodeObjects::ClassObject) and !code_object.superclass.nil?
-            # This method of superclass detection is a bit of a
-            # hack. If the superclass is a Proxy that can't be
-            # resolved', it is assumed to be undefined in its yardoc
-            # and converted to a fully qualified namespace.
-            #
+            # This method of superclass detection is a bit of a hack. If
+            # the superclass is a Proxy, it is assumed to be undefined in its
+            # yardoc and converted to a fully qualified namespace.
             superclass = if code_object.superclass.is_a?(YARD::CodeObjects::Proxy)
               "::#{code_object.superclass}"
             else

From 19b28ada7e4a12c4634c2c4a576134c7b1af317f Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 7 Jan 2026 08:07:09 -0500
Subject: [PATCH 163/172] Fix spelling

---
 lib/solargraph/pin/parameter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/solargraph/pin/parameter.rb b/lib/solargraph/pin/parameter.rb
index 08b371129..e4d5b474a 100644
--- a/lib/solargraph/pin/parameter.rb
+++ b/lib/solargraph/pin/parameter.rb
@@ -206,7 +206,7 @@ def param_tag
       def typify_block_param api_map
         block_pin = closure
         if block_pin.is_a?(Pin::Block) && block_pin.receiver && index
-          # @sg-ignore flow-sensivie typing should handle is_a? with &&
+          # @sg-ignore flow-sensitive typing should handle is_a? with &&
           return block_pin.typify_parameters(api_map)[index]
         end
         ComplexType::UNDEFINED

From 6b5d2c3204e4ea29278ecf510b3965545e708eec Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 7 Jan 2026 08:10:18 -0500
Subject: [PATCH 164/172] Fix merge issue

---
 lib/solargraph/shell.rb | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/lib/solargraph/shell.rb b/lib/solargraph/shell.rb
index 42a027144..d6420a26e 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -350,25 +350,5 @@ def print_pin(pin)
         puts pin.inspect
       end
     end
-
-    # @param type [ComplexType]
-    # @return [void]
-    def print_type(type)
-      if options[:rbs]
-        puts type.to_rbs
-      else
-        puts type.rooted_tag
-      end
-    end
-
-    # @param pin [Solargraph::Pin::Base]
-    # @return [void]
-    def print_pin(pin)
-      if options[:rbs]
-        puts pin.to_rbs
-      else
-        puts pin.inspect
-      end
-    end
   end
 end

From 4f4b6a05b6154f8d6461248f6f47705dc478c9e7 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 11 Jan 2026 17:58:09 -0500
Subject: [PATCH 165/172] Add error handling

---
 lib/solargraph/shell.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/solargraph/shell.rb b/lib/solargraph/shell.rb
index d6420a26e..9983f82cf 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -132,6 +132,8 @@ def uncache *gems
         end
 
         spec = workspace.find_gem(gem)
+        raise Thor::InvocationError, "Gem '#{gem}' not found" if spec.nil?
+
         PinCache.uncache_gem(spec, out: $stdout)
       end
     end

From 458efed2e4591949052c47073932887dc6b7e6b9 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 11 Jan 2026 20:36:13 -0500
Subject: [PATCH 166/172] Fix some types based on future branch feedback

---
 lib/solargraph/workspace/gemspecs.rb | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index 20fe350ae..e44103c58 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -94,11 +94,11 @@ def stdlib_dependencies stdlib_name
       #
       # @return [Gem::Specification, nil]
       def find_gem name, version = nil, out: $stderr
-        gemspec = all_gemspecs_from_bundle.find { |gemspec| gemspec.name == name && gemspec.version == version }
-        return gemspec if gemspec
+        specish = all_gemspecs_from_bundle.find { |specish| specish.name == name && specish.version == version }
+        return to_gem_specification specish if specish
 
-        gemspec = all_gemspecs_from_bundle.find { |gemspec| gemspec.name == name }
-        return gemspec if gemspec
+        specish = all_gemspecs_from_bundle.find { |specish| specish.name == name }
+        return to_gem_specification specish if specish
 
         resolve_gem_ignoring_local_bundle name, version, out: out
       end
@@ -116,7 +116,6 @@ def fetch_dependencies gemspec, out: $stderr
         # @param runtime_dep [Gem::Dependency]
         # @param deps [Hash{String => Gem::Specification}]
         gem_dep_gemspecs = only_runtime_dependencies(gemspec).each_with_object(deps_so_far) do |runtime_dep, deps|
-          # @sg-ignore Unresolved call to requirement on Gem::Dependency
           dep = find_gem(runtime_dep.name, runtime_dep.requirement)
           next unless dep
 
@@ -155,6 +154,7 @@ def self.gem_specification_cache
       private
 
       # @param specish [Gem::Specification, Bundler::LazySpecification, Bundler::StubSpecification]
+      #
       # @return [Gem::Specification, nil]
       def to_gem_specification specish
         # print time including milliseconds
@@ -162,6 +162,7 @@ def to_gem_specification specish
                                                         when Gem::Specification
                                                           @@warned_on_rubygems ||= false
                                                           if specish.respond_to?(:identifier)
+                                                            # @type [Gem::Specification]
                                                             specish
                                                           else
                                                             # see https://github.com/castwide/solargraph/actions/runs/17588131738/job/49961580698?pr=1006 - happened on Ruby 3.0
@@ -181,11 +182,12 @@ def to_gem_specification specish
                                                         when Bundler::StubSpecification
                                                           # turns a Bundler::StubSpecification into a
                                                           # Gem::StubSpecification into a Gem::Specification
-                                                          # @sg-ignore Flow-sensitive typing ought to be able to handle 'when ClassName'
+                                                          # @sg-ignore flow sensitive typing ought to be able to handle 'when ClassName'
                                                           specish = specish.stub
-                                                          # @sg-ignore Flow-sensitive typing ought to be able to handle 'when ClassName'
+                                                          # @sg-ignore flow sensitive typing ought to be able to handle 'when ClassName'
                                                           if specish.respond_to?(:spec)
-                                                            # @sg-ignore Flow-sensitive typing ought to be able to handle 'when ClassName'
+                                                            # @sg-ignore flow sensitive typing ought to be able to handle 'when ClassName'
+                                                            # @type [Gem::Specification]
                                                             specish.spec
                                                           else
                                                             # turn the crank again
@@ -328,6 +330,7 @@ def all_gemspecs_from_external_bundle
                       'specish_objects = specish_objects.map(&:materialize_for_installation);' \
                       'end;' \
                       'specish_objects.map { |specish| [specish.name, specish.version] }'
+            # @type [Array<Gem::Specification>]
             query_external_bundle(command).map do |name, version|
               resolve_gem_ignoring_local_bundle(name, version)
             end.compact

From 45e5eca22dd540deda022fc28bd87728925d4c1f Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 11 Jan 2026 21:20:39 -0500
Subject: [PATCH 167/172] Provide Gem::Specification to outside interface

---
 lib/solargraph/workspace/gemspecs.rb          | 28 ++++---------------
 .../gemspecs_resolve_require_spec.rb          |  8 ++----
 2 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index e44103c58..030707db7 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -116,6 +116,7 @@ def fetch_dependencies gemspec, out: $stderr
         # @param runtime_dep [Gem::Dependency]
         # @param deps [Hash{String => Gem::Specification}]
         gem_dep_gemspecs = only_runtime_dependencies(gemspec).each_with_object(deps_so_far) do |runtime_dep, deps|
+          # @sg-ignore Unresolved call to requirement on Gem::Dependency
           dep = find_gem(runtime_dep.name, runtime_dep.requirement)
           next unless dep
 
@@ -155,25 +156,12 @@ def self.gem_specification_cache
 
       # @param specish [Gem::Specification, Bundler::LazySpecification, Bundler::StubSpecification]
       #
-      # @return [Gem::Specification, nil]
+      # @return [Gem::Specification]
       def to_gem_specification specish
         # print time including milliseconds
         self.class.gem_specification_cache[specish] ||= case specish
                                                         when Gem::Specification
-                                                          @@warned_on_rubygems ||= false
-                                                          if specish.respond_to?(:identifier)
-                                                            # @type [Gem::Specification]
-                                                            specish
-                                                          else
-                                                            # see https://github.com/castwide/solargraph/actions/runs/17588131738/job/49961580698?pr=1006 - happened on Ruby 3.0
-                                                            unless @@warned_on_rubygems
-                                                              logger.warn "Incomplete Gem::Specification encountered - recommend upgrading rubygems"
-                                                              @@warned_on_rubygems = true
-                                                            end
-                                                            nil
-                                                          end
-                                                        # yay!
-
+                                                          specish
                                                         when Bundler::LazySpecification
                                                           # materializing didn't work.  Let's look in the local
                                                           # rubygems without bundler's help
@@ -194,13 +182,9 @@ def to_gem_specification specish
                                                             to_gem_specification(specish)
                                                           end
                                                         else
-                                                          @@warned_on_gem_type ||= false
-                                                          unless @@warned_on_gem_type
-                                                            # @sg-ignore Unresolved call to class on Gem::Specification, Bundler::LazySpecification, Bundler::StubSpecification
-                                                            logger.warn "Unexpected type while resolving gem: #{specish.class}"
-                                                            @@warned_on_gem_type = true
-                                                          end
-                                                          nil
+                                                          # @sg-ignore Unresolved call to class on Gem::Specification, Bundler::LazySpecification,
+                                                          #   Bundler::StubSpecification
+                                                          raise "Unexpected type while resolving gem: #{specish.class}"
                                                         end
       end
 
diff --git a/spec/workspace/gemspecs_resolve_require_spec.rb b/spec/workspace/gemspecs_resolve_require_spec.rb
index d53638600..e13166bf3 100644
--- a/spec/workspace/gemspecs_resolve_require_spec.rb
+++ b/spec/workspace/gemspecs_resolve_require_spec.rb
@@ -71,12 +71,8 @@ def install_gem gem_name, version
         allow(lockfile).to receive(:to_s).and_return(dir_path)
       end
 
-      it 'returns a single spec' do
-        expect(specs.size).to eq(1)
-      end
-
-      it 'resolves to the right known gem' do
-        expect(specs.map(&:name)).to eq(['solargraph'])
+      it 'raises a StandardException' do
+        expect { specs.size }.to raise_error(StandardError)
       end
     end
 

From 2d5456a28a88c27276d2db5411067a21f126bb51 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 11 Jan 2026 21:25:38 -0500
Subject: [PATCH 168/172] Provide Gem::Specification to outside interface

---
 lib/solargraph/workspace/gemspecs.rb | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index 030707db7..9feba7524 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -169,21 +169,12 @@ def to_gem_specification specish
                                                                                             specish.version
                                                         when Bundler::StubSpecification
                                                           # turns a Bundler::StubSpecification into a
-                                                          # Gem::StubSpecification into a Gem::Specification
+                                                          # Gem::StubSpecification
+                                                          to_gem_specification specish.stub
+                                                        when Gem::StubSpecification
                                                           # @sg-ignore flow sensitive typing ought to be able to handle 'when ClassName'
-                                                          specish = specish.stub
-                                                          # @sg-ignore flow sensitive typing ought to be able to handle 'when ClassName'
-                                                          if specish.respond_to?(:spec)
-                                                            # @sg-ignore flow sensitive typing ought to be able to handle 'when ClassName'
-                                                            # @type [Gem::Specification]
-                                                            specish.spec
-                                                          else
-                                                            # turn the crank again
-                                                            to_gem_specification(specish)
-                                                          end
+                                                          specish.spec
                                                         else
-                                                          # @sg-ignore Unresolved call to class on Gem::Specification, Bundler::LazySpecification,
-                                                          #   Bundler::StubSpecification
                                                           raise "Unexpected type while resolving gem: #{specish.class}"
                                                         end
       end

From 4ce641d4cec01d174c688dd9ea6d0aa7cca70a2c Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 11 Jan 2026 21:33:24 -0500
Subject: [PATCH 169/172] Use #to_spec

---
 lib/solargraph/workspace/gemspecs.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index 9feba7524..7494f96e0 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -172,8 +172,7 @@ def to_gem_specification specish
                                                           # Gem::StubSpecification
                                                           to_gem_specification specish.stub
                                                         when Gem::StubSpecification
-                                                          # @sg-ignore flow sensitive typing ought to be able to handle 'when ClassName'
-                                                          specish.spec
+                                                          specish.to_spec
                                                         else
                                                           raise "Unexpected type while resolving gem: #{specish.class}"
                                                         end

From aa99710e02aad4e476c665a3bddb696ed75c3cf3 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 11 Jan 2026 21:57:41 -0500
Subject: [PATCH 170/172] Provide Gem::Specification to outside interface

---
 lib/solargraph/workspace/gemspecs.rb            | 13 ++++++++++---
 spec/workspace/gemspecs_resolve_require_spec.rb |  1 +
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index 7494f96e0..e15f4da90 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -156,7 +156,7 @@ def self.gem_specification_cache
 
       # @param specish [Gem::Specification, Bundler::LazySpecification, Bundler::StubSpecification]
       #
-      # @return [Gem::Specification]
+      # @return [Gem::Specification, nil]
       def to_gem_specification specish
         # print time including milliseconds
         self.class.gem_specification_cache[specish] ||= case specish
@@ -169,8 +169,15 @@ def to_gem_specification specish
                                                                                             specish.version
                                                         when Bundler::StubSpecification
                                                           # turns a Bundler::StubSpecification into a
-                                                          # Gem::StubSpecification
-                                                          to_gem_specification specish.stub
+                                                          # Gem::StubSpecification if we can
+                                                          if specish.respond_to?(:stub)
+                                                            to_gem_specification specish.stub
+                                                          else
+                                                            # A Bundler::StubSpecification is a Bundler::
+                                                            # RemoteSpecification which ought to proxy a Gem::
+                                                            # Specification
+                                                            specish
+                                                          end
                                                         when Gem::StubSpecification
                                                           specish.to_spec
                                                         else
diff --git a/spec/workspace/gemspecs_resolve_require_spec.rb b/spec/workspace/gemspecs_resolve_require_spec.rb
index e13166bf3..8deba9ff8 100644
--- a/spec/workspace/gemspecs_resolve_require_spec.rb
+++ b/spec/workspace/gemspecs_resolve_require_spec.rb
@@ -92,6 +92,7 @@ def configure_bundler_spec stub_value
       allow(bundler_stub_spec).to receive(:respond_to?).with(:version).and_return(true)
       allow(bundler_stub_spec).to receive(:respond_to?).with(:gem_dir).and_return(false)
       allow(bundler_stub_spec).to receive(:respond_to?).with(:materialize_for_installation).and_return(false)
+      allow(bundler_stub_spec).to receive(:respond_to?).with(:stub).and_return(false)
       allow(bundler_stub_spec).to receive_messages(name: 'solargraph', stub: stub_value)
     end
 

From d9188e7f14e16c383333e221ebe5381852401922 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 11 Jan 2026 22:08:37 -0500
Subject: [PATCH 171/172] Fix typechecking error

---
 lib/solargraph/workspace/gemspecs.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/solargraph/workspace/gemspecs.rb b/lib/solargraph/workspace/gemspecs.rb
index e15f4da90..feddf641b 100644
--- a/lib/solargraph/workspace/gemspecs.rb
+++ b/lib/solargraph/workspace/gemspecs.rb
@@ -178,6 +178,7 @@ def to_gem_specification specish
                                                             # Specification
                                                             specish
                                                           end
+                                                        # @sg-ignore Unresolved constant Gem::StubSpecification
                                                         when Gem::StubSpecification
                                                           specish.to_spec
                                                         else

From 8eea21f8bbe6f735ef9915095a597d192af937a6 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 11 Jan 2026 22:17:29 -0500
Subject: [PATCH 172/172] Use consistent bundler versions

---
 .github/workflows/linting.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index ae885b4db..faeb330bf 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -31,9 +31,8 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 3.4
-          bundler: latest
           bundler-cache: true
-          cache-version: 2025-06-06
+          cache-version: 2026-01-11
 
       - name: Update to best available RBS
         run: |