From 87c7e4f6b8d55b241742d0430767036f2864f3c5 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 18 Apr 2025 10:06:04 -0400
Subject: [PATCH 001/327] Allow log level to be overridden per file

Useful for debug-level logging being turned on selectively at dev time
---
 lib/solargraph/logging.rb | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/lib/solargraph/logging.rb b/lib/solargraph/logging.rb
index 4dce90f77..e3173e78c 100644
--- a/lib/solargraph/logging.rb
+++ b/lib/solargraph/logging.rb
@@ -16,12 +16,29 @@ module Logging
     @@logger.formatter = proc do |severity, datetime, progname, msg|
       "[#{severity}] #{msg}\n"
     end
+    @@dev_null_logger = Logger.new('/dev/null')
+
 
     module_function
 
+    # override this in your class to temporarily set a custom
+    # filtering log level for the class (e.g., suppress any debug
+    # message by setting it to :info even if it is set elsewhere, or
+    # show existing debug messages by setting to :debug).  @return
+    # [Symbol]
+    def log_level
+      @@logger.level
+    end
+
     # @return [Logger]
     def logger
-      @@logger
+      @logger ||= if log_level == @@logger.level
+                    @@logger
+                  else
+                    logger = Logger.new(STDERR, log_level)
+                    logger.formatter = @@logger.formatter
+                    logger
+                  end
     end
   end
 end

From 67dab545260166f904d643f033b92ff40ab2f8db Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 20 Apr 2025 11:17:45 -0400
Subject: [PATCH 002/327] Fix numeric vs symbol logic

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

diff --git a/lib/solargraph/logging.rb b/lib/solargraph/logging.rb
index e3173e78c..9640be39a 100644
--- a/lib/solargraph/logging.rb
+++ b/lib/solargraph/logging.rb
@@ -27,15 +27,16 @@ module Logging
     # show existing debug messages by setting to :debug).  @return
     # [Symbol]
     def log_level
-      @@logger.level
+      :warn
     end
 
     # @return [Logger]
     def logger
-      @logger ||= if log_level == @@logger.level
+      @logger ||= if LOG_LEVELS[log_level.to_s] == @@logger.level
                     @@logger
                   else
-                    logger = Logger.new(STDERR, log_level)
+                    new_log_level = LOG_LEVELS[log_level.to_s]
+                    logger = Logger.new(STDERR, level: new_log_level)
                     logger.formatter = @@logger.formatter
                     logger
                   end

From eb49ddbf1279a9be25c98c062491c5d78d6bfa1c Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 21 Apr 2025 07:20:07 -0400
Subject: [PATCH 003/327] Avoid marshaling issues

---
 lib/solargraph/logging.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/solargraph/logging.rb b/lib/solargraph/logging.rb
index 9640be39a..7c7531aea 100644
--- a/lib/solargraph/logging.rb
+++ b/lib/solargraph/logging.rb
@@ -32,14 +32,14 @@ def log_level
 
     # @return [Logger]
     def logger
-      @logger ||= if LOG_LEVELS[log_level.to_s] == @@logger.level
-                    @@logger
-                  else
-                    new_log_level = LOG_LEVELS[log_level.to_s]
-                    logger = Logger.new(STDERR, level: new_log_level)
-                    logger.formatter = @@logger.formatter
-                    logger
-                  end
+      if LOG_LEVELS[log_level.to_s] == DEFAULT_LOG_LEVEL
+        @@logger
+      else
+        new_log_level = LOG_LEVELS[log_level.to_s]
+        logger = Logger.new(STDERR, level: new_log_level)
+        logger.formatter = @@logger.formatter
+        logger
+      end
     end
   end
 end

From df1334b7ff02bfaa637ba2fe180c3a8ea966f6da Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 6 May 2025 12:39:50 -0400
Subject: [PATCH 004/327] Enable strict type checking in CI

---
 .github/workflows/typecheck.yml | 2 +-
 Rakefile                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml
index 5b1b5e151..8f9119592 100644
--- a/.github/workflows/typecheck.yml
+++ b/.github/workflows/typecheck.yml
@@ -31,4 +31,4 @@ jobs:
     - name: Install gems
       run: bundle install
     - name: Typecheck self
-      run: bundle exec solargraph typecheck --level typed
+      run: bundle exec solargraph typecheck --level strict
diff --git a/Rakefile b/Rakefile
index 33b91bfa4..a7fea9b13 100755
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,7 @@ end
 
 desc "Run the type checker"
 task :typecheck do
-  sh "bundle exec solargraph typecheck --level typed"
+  sh "bundle exec solargraph typecheck --level strict"
 end
 
 desc "Run all tests"

From 16b4a0d2700d293b4dc23bd4631f80b13daa9190 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 22 May 2025 14:20:29 -0400
Subject: [PATCH 005/327] Add assertions around method aliases

---
 lib/solargraph.rb         | 19 +++++++++++++++++++
 lib/solargraph/api_map.rb | 10 ++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/lib/solargraph.rb b/lib/solargraph.rb
index 352b0eaad..8834fc3fb 100755
--- a/lib/solargraph.rb
+++ b/lib/solargraph.rb
@@ -52,6 +52,25 @@ class InvalidRubocopVersionError < RuntimeError;  end
   dir = File.dirname(__FILE__)
   VIEWS_PATH = File.join(dir, 'solargraph', 'views')
 
+  # @param type [Symbol] Type of assert.  Not used yet, but may be
+  #   used in the future to allow configurable asserts mixes for
+  #   different situations.
+  def self.asserts_on?(type)
+    if ENV['SOLARGRAPH_ASSERTS'].nil? || ENV['SOLARGRAPH_ASSERTS'].empty?
+      false
+    elsif ENV['SOLARGRAPH_ASSERTS'] == 'on'
+      true
+    else
+      logger.warn "Unrecognized SOLARGRAPH_ASSERTS value: #{ENV['SOLARGRAPH_ASSERTS']}"
+      false
+    end
+  end
+
+  def self.assert_or_log(type, msg = nil, &block)
+    raise (msg || block.call) if asserts_on?(type) && ![:combine_with_visibility].include?(type)
+    logger.info msg, &block
+  end
+
   # A convenience method for Solargraph::Logging.logger.
   #
   # @return [Logger]
diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 9443e8529..b0225305e 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -808,7 +808,10 @@ def prefer_non_nil_variables pins
     def resolve_method_aliases pins, visibility = [:public, :private, :protected]
       pins.map do |pin|
         resolved = resolve_method_alias(pin)
-        next pin if resolved.respond_to?(:visibility) && !visibility.include?(resolved.visibility)
+        if resolved.respond_to?(:visibility) && !visibility.include?(resolved.visibility)
+          Solargraph.assert_or_log(:alias_visibility) { "Rejecting alias - visibility of target is #{resolved.visibility}, looking for visibility #{visibility}" }
+          next pin
+        end
         resolved
       end.compact
     end
@@ -821,7 +824,10 @@ def resolve_method_alias pin
       @method_alias_stack.push pin.path
       origin = get_method_stack(pin.full_context.tag, pin.original, scope: pin.scope).first
       @method_alias_stack.pop
-      return nil if origin.nil?
+      if origin.nil?
+        Solargraph.assert_or_log(:alias_target_missing) { "Rejecting alias - target is missing = #{pin.inspect}" }
+        return nil
+      end
       args = {
         location: pin.location,
         closure: pin.closure,

From 65e3c0b4309271c6a962dff123f1d77632f93e36 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 9 Jul 2025 16:00:55 -0400
Subject: [PATCH 006/327] Suppress some known problematic aliases

---
 lib/solargraph.rb | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/lib/solargraph.rb b/lib/solargraph.rb
index 2b975a66c..4a674877c 100755
--- a/lib/solargraph.rb
+++ b/lib/solargraph.rb
@@ -54,19 +54,28 @@ class InvalidRubocopVersionError < RuntimeError;  end
   VIEWS_PATH = File.join(dir, 'solargraph', 'views')
 
   # @param type [Symbol] Type of assert.
-  def self.asserts_on?(type)
-    if ENV['SOLARGRAPH_ASSERTS'].nil? || ENV['SOLARGRAPH_ASSERTS'].empty?
-      false
-    elsif ENV['SOLARGRAPH_ASSERTS'] == 'on'
-      true
-    else
-      logger.warn "Unrecognized SOLARGRAPH_ASSERTS value: #{ENV['SOLARGRAPH_ASSERTS']}"
-      false
-    end
+  def self.asserts_on?
+    @asserts_on ||= if ENV['SOLARGRAPH_ASSERTS'].nil? || ENV['SOLARGRAPH_ASSERTS'].empty?
+                      false
+                    elsif ENV['SOLARGRAPH_ASSERTS'] == 'on'
+                      true
+                    else
+                      logger.warn "Unrecognized SOLARGRAPH_ASSERTS value: #{ENV['SOLARGRAPH_ASSERTS']}"
+                      false
+                    end
   end
 
   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?
+      msg ||= block.call
+
+      # not ready for prime time
+      return if [:combine_with_visibility].include?(type)
+      # conditional aliases to handle compatibility corner cases
+      return if type == :alias_target_missing && msg.include?('highline/compatibility.rb')
+      return if type == :alias_target_missing && msg.include?('lib/json/add/date.rb')
+      raise msg
+    end
     logger.info msg, &block
   end
 

From 336305f1d4b5eb88524dc3a4a85f445ab22ad03f Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 9 Jul 2025 16:03:01 -0400
Subject: [PATCH 007/327] Drop unintended change

---
 lib/solargraph.rb | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/solargraph.rb b/lib/solargraph.rb
index 4a674877c..8295945cd 100755
--- a/lib/solargraph.rb
+++ b/lib/solargraph.rb
@@ -53,16 +53,15 @@ class InvalidRubocopVersionError < RuntimeError;  end
   dir = File.dirname(__FILE__)
   VIEWS_PATH = File.join(dir, 'solargraph', 'views')
 
-  # @param type [Symbol] Type of assert.
   def self.asserts_on?
-    @asserts_on ||= if ENV['SOLARGRAPH_ASSERTS'].nil? || ENV['SOLARGRAPH_ASSERTS'].empty?
-                      false
-                    elsif ENV['SOLARGRAPH_ASSERTS'] == 'on'
-                      true
-                    else
-                      logger.warn "Unrecognized SOLARGRAPH_ASSERTS value: #{ENV['SOLARGRAPH_ASSERTS']}"
-                      false
-                    end
+    if ENV['SOLARGRAPH_ASSERTS'].nil? || ENV['SOLARGRAPH_ASSERTS'].empty?
+      false
+    elsif ENV['SOLARGRAPH_ASSERTS'] == 'on'
+      true
+    else
+      logger.warn "Unrecognized SOLARGRAPH_ASSERTS value: #{ENV['SOLARGRAPH_ASSERTS']}"
+      false
+    end
   end
 
   def self.assert_or_log(type, msg = nil, &block)

From c7079d50c3aad7b69a83496a2a25f3da1a7e6e8c Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 9 Jul 2025 16:06:03 -0400
Subject: [PATCH 008/327] Update spec

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

diff --git a/spec/pin/local_variable_spec.rb b/spec/pin/local_variable_spec.rb
index 88075efb9..369a58bc4 100644
--- a/spec/pin/local_variable_spec.rb
+++ b/spec/pin/local_variable_spec.rb
@@ -46,7 +46,7 @@ class Bar
     # set env variable 'FOO' to 'true' in block
 
     with_env_var('SOLARGRAPH_ASSERTS', 'on') do
-      expect(Solargraph.asserts_on?(:combine_with_closure_name)).to be true
+      expect(Solargraph.asserts_on?).to be true
       expect { pin1.combine_with(pin2) }.to raise_error(RuntimeError, /Inconsistent :closure name/)
     end
   end

From 5afc7a31c04f4d93704dc237db3d6cd5cc18726c Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 10 Jul 2025 16:03:31 -0400
Subject: [PATCH 009/327] Drop unneeded code

---
 lib/solargraph/logging.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/solargraph/logging.rb b/lib/solargraph/logging.rb
index 8ff297077..a0dbff3bb 100644
--- a/lib/solargraph/logging.rb
+++ b/lib/solargraph/logging.rb
@@ -17,8 +17,6 @@ module Logging
     @@logger.formatter = proc do |severity, datetime, progname, msg|
       "[#{severity}] #{msg}\n"
     end
-    @@dev_null_logger = Logger.new('/dev/null')
-
 
     module_function
 

From 404e686fb331835dfd212d4407f62d77a1578269 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 10 Jul 2025 16:21:18 -0400
Subject: [PATCH 010/327] Fix return tag

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

diff --git a/lib/solargraph/logging.rb b/lib/solargraph/logging.rb
index a0dbff3bb..35473f6df 100644
--- a/lib/solargraph/logging.rb
+++ b/lib/solargraph/logging.rb
@@ -23,8 +23,9 @@ module Logging
     # override this in your class to temporarily set a custom
     # filtering log level for the class (e.g., suppress any debug
     # message by setting it to :info even if it is set elsewhere, or
-    # show existing debug messages by setting to :debug).  @return
-    # [Symbol]
+    # show existing debug messages by setting to :debug).
+    #
+    # @return [Symbol]
     def log_level
       :warn
     end

From 9a2db0c0c053b72fa4bf7da239b9d1dc20b08242 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 11 Jul 2025 17:22:07 -0400
Subject: [PATCH 011/327] Fix type issues

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

diff --git a/lib/solargraph.rb b/lib/solargraph.rb
index 8295945cd..f5348ded6 100755
--- a/lib/solargraph.rb
+++ b/lib/solargraph.rb
@@ -66,8 +66,11 @@ def self.asserts_on?
 
   def self.assert_or_log(type, msg = nil, &block)
     if asserts_on?
+      # @type [String, nil]
       msg ||= block.call
 
+      raise "No message given for #{type.inspect}" if msg.nil?
+
       # not ready for prime time
       return if [:combine_with_visibility].include?(type)
       # conditional aliases to handle compatibility corner cases

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 012/327] 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 ca88ad8c43ef25ed5323f90de6a9c3b3eab71d8b Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 13 Jul 2025 13:25:22 -0400
Subject: [PATCH 013/327] More logging

---
 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 34ad11d1b..0c77ab06a 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -894,7 +894,7 @@ def resolve_method_alias pin
       origin = get_method_stack(pin.full_context.tag, pin.original, scope: pin.scope, preserve_generics: true).first
       @method_alias_stack.pop
       if origin.nil?
-        Solargraph.assert_or_log(:alias_target_missing) { "Rejecting alias - target is missing = #{pin.inspect}" }
+        Solargraph.assert_or_log(:alias_target_missing) { "Rejecting alias - target is missing while looking for #{pin.full_context.tag} #{pin.original}() in #{pin.scope} scope = #{pin.inspect}" }
         return nil
       end
       args = {

From da58721a8d80ec78416a037bf3133d832f5f001f Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 13 Jul 2025 13:25:45 -0400
Subject: [PATCH 014/327] Improve RBS definition for aliases

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

diff --git a/lib/solargraph/pin/method_alias.rb b/lib/solargraph/pin/method_alias.rb
index 8636169a8..5428ec46e 100644
--- a/lib/solargraph/pin/method_alias.rb
+++ b/lib/solargraph/pin/method_alias.rb
@@ -23,6 +23,14 @@ def visibility
         :public
       end
 
+      def to_rbs
+        if scope == :class
+          rbs = "alias self.#{name} self.#{original}"
+        else
+          rbs = "alias #{name} #{original}"
+        end
+      end
+
       def path
         @path ||= namespace + (scope == :instance ? '#' : '.') + name
       end

From 6eccf31316c9692d8a22d7640bf14a0ac210a360 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 13 Jul 2025 13:26:01 -0400
Subject: [PATCH 015/327] Avoid unnecessary alias assertions while combining
 pins

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

diff --git a/lib/solargraph/gem_pins.rb b/lib/solargraph/gem_pins.rb
index d24ace8e4..08ac99da7 100644
--- a/lib/solargraph/gem_pins.rb
+++ b/lib/solargraph/gem_pins.rb
@@ -54,9 +54,10 @@ def self.combine_method_pins(*pins)
     # @return [Array<Pin::Base>]
     def self.combine(yard_pins, rbs_map)
       in_yard = Set.new
-      rbs_api_map = Solargraph::ApiMap.new(pins: rbs_map.pins)
+      rbs_store = Solargraph::ApiMap::Store.new(rbs_pins)
       combined = yard_pins.map do |yard_pin|
-        next yard_pin unless yard_pin.class == Pin::Method
+        rbs_pin = rbs_store.get_path_pins(yard_pin.path).filter { |pin| pin.is_a? Pin::Method }.first
+        next yard_pin unless rbs_pin && yard_pin.class == Pin::Method
 
         in_yard.add yard_pin.path
 

From e3ecdc93f9e5d2b03255e0c39d32ae21e846965f Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 13 Jul 2025 13:28:01 -0400
Subject: [PATCH 016/327] Apply suggestion from @apiology

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

diff --git a/lib/solargraph/gem_pins.rb b/lib/solargraph/gem_pins.rb
index 3ee6c30b3..bc4ec9666 100644
--- a/lib/solargraph/gem_pins.rb
+++ b/lib/solargraph/gem_pins.rb
@@ -52,7 +52,7 @@ def self.combine(yard_pins, rbs_pins)
       in_yard = Set.new
       rbs_store = Solargraph::ApiMap::Store.new(rbs_pins)
       combined = yard_pins.map do |yard_pin|
-        in_yard.add yard_pin.path        
+        in_yard.add yard_pin.path
         rbs_pin = rbs_store.get_path_pins(yard_pin.path).filter { |pin| pin.is_a? Pin::Method }.first
         next yard_pin unless rbs_pin && yard_pin.class == Pin::Method
 

From 91defa6f65cf55f9052ca434cd0b0261c48a761e Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 13 Jul 2025 14:28:12 -0400
Subject: [PATCH 017/327] Fix RuboCop complaint

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

diff --git a/lib/solargraph/pin/method_alias.rb b/lib/solargraph/pin/method_alias.rb
index 5428ec46e..8cc656d23 100644
--- a/lib/solargraph/pin/method_alias.rb
+++ b/lib/solargraph/pin/method_alias.rb
@@ -25,9 +25,9 @@ def visibility
 
       def to_rbs
         if scope == :class
-          rbs = "alias self.#{name} self.#{original}"
+          "alias self.#{name} self.#{original}"
         else
-          rbs = "alias #{name} #{original}"
+          "alias #{name} #{original}"
         end
       end
 

From 2be3a790e50c11cf812bf00d60b34bff3297a7c7 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 13 Jul 2025 14:49:03 -0400
Subject: [PATCH 018/327] Clarify logic in yard/rbs merging

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

diff --git a/lib/solargraph/gem_pins.rb b/lib/solargraph/gem_pins.rb
index bc4ec9666..9f965f6f8 100644
--- a/lib/solargraph/gem_pins.rb
+++ b/lib/solargraph/gem_pins.rb
@@ -30,6 +30,8 @@ def self.combine_method_pins_by_path(pins)
       by_path.values + alias_pins
     end
 
+    # @param pins [Pin::Method]
+    # @return [Pin::Base, nil]
     def self.combine_method_pins(*pins)
       out = pins.reduce(nil) do |memo, pin|
         next pin if memo.nil?
@@ -54,13 +56,21 @@ def self.combine(yard_pins, rbs_pins)
       combined = yard_pins.map do |yard_pin|
         in_yard.add yard_pin.path
         rbs_pin = rbs_store.get_path_pins(yard_pin.path).filter { |pin| pin.is_a? Pin::Method }.first
-        next yard_pin unless rbs_pin && yard_pin.class == Pin::Method
+
+        next yard_pin unless rbs_pin && yard_pin.is_a?(Pin::Method)
 
         unless rbs_pin
           logger.debug { "GemPins.combine: No rbs pin for #{yard_pin.path} - using YARD's '#{yard_pin.inspect} (return_type=#{yard_pin.return_type}; signatures=#{yard_pin.signatures})" }
           next yard_pin
         end
 
+        # at this point both yard_pins and rbs_pins are methods or
+        # method aliases.  if not plain methods, prefer the YARD one
+        next yard_pin if rbs_pin.class != Pin::Method
+
+        next rbs_pin if yard_pin.class != Pin::Method
+
+        # both are method pins
         out = combine_method_pins(rbs_pin, yard_pin)
         logger.debug { "GemPins.combine: Combining yard.path=#{yard_pin.path} - rbs=#{rbs_pin.inspect} with yard=#{yard_pin.inspect} into #{out}" }
         out

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 019/327] 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 90e93c67f9d7de6ceb135b6827cc2b07bc72eff5 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 18 Jul 2025 18:31:46 -0400
Subject: [PATCH 020/327] Improve typechecking of generics

---
 lib/solargraph/complex_type.rb                |  57 +++++-
 lib/solargraph/complex_type/type_methods.rb   |   9 +
 lib/solargraph/complex_type/unique_type.rb    | 173 ++++++++++++++++--
 lib/solargraph/gem_pins.rb                    |   3 +-
 lib/solargraph/parser/node_methods.rb         |   2 +-
 .../parser/parser_gem/node_methods.rb         |   2 +-
 lib/solargraph/pin/parameter.rb               |  12 +-
 lib/solargraph/range.rb                       |   3 +-
 lib/solargraph/source.rb                      |   2 +-
 lib/solargraph/type_checker.rb                |  40 +++-
 lib/solargraph/type_checker/checks.rb         | 124 -------------
 lib/solargraph/type_checker/rules.rb          |   6 +-
 spec/complex_type_spec.rb                     |  28 +++
 spec/type_checker/levels/strong_spec.rb       |  16 ++
 spec/type_checker/levels/typed_spec.rb        |  49 +++++
 15 files changed, 373 insertions(+), 153 deletions(-)
 delete mode 100644 lib/solargraph/type_checker/checks.rb

diff --git a/lib/solargraph/complex_type.rb b/lib/solargraph/complex_type.rb
index 9e23eb502..53c28ed6e 100644
--- a/lib/solargraph/complex_type.rb
+++ b/lib/solargraph/complex_type.rb
@@ -102,7 +102,7 @@ def each_unique_type &block
     # @param atype [ComplexType] type which may be assigned to this type
     # @param api_map [ApiMap] The ApiMap that performs qualification
     def can_assign?(api_map, atype)
-      any? { |ut| ut.can_assign?(api_map, atype) }
+      atype.conforms_to?(api_map, self, :assignment)
     end
 
     # @return [Integer]
@@ -176,6 +176,61 @@ def desc
       rooted_tags
     end
 
+    # @param api_map [ApiMap]
+    # @param expected [ComplexType, ComplexType::UniqueType]
+    # @param situation [:method_call, :return_type, :assignment]
+    # @param allow_subtype_skew [Boolean] if false, check if any
+    #   subtypes of the expected type match the inferred type
+    # @param allow_reverse_match [Boolean] if true, check if any subtypes
+    #   of the expected type match the inferred type
+    # @param allow_empty_params [Boolean] if true, allow a general
+    #   inferred type without parameters to allow a more specific
+    #   expcted type
+    # @param allow_any_match [Boolean] if true, any unique type
+    #   matched in the expected qualifies as a match
+    # @return [Boolean]
+    def conforms_to? api_map, expected,
+                     situation,
+                     variance: erased_variance(situation),
+                     allow_subtype_skew: false,
+                     allow_empty_params: false,
+                     allow_reverse_match: false,
+                     allow_any_match: false #,
+#                     allow_undefined_in_expected: false
+      expected = expected.downcast_to_literal_if_possible
+      inferred = downcast_to_literal_if_possible
+
+      return duck_types_match?(api_map, expected, inferred) if expected.duck_type?
+
+      if allow_any_match
+        inferred.any? { |inf| inf.conforms_to?(api_map, expected, situation,
+                                               allow_subtype_skew: allow_subtype_skew,
+                                               allow_empty_params: allow_empty_params,
+                                               allow_reverse_match: allow_reverse_match,
+                                               allow_any_match: allow_any_match) }
+      else
+        inferred.all? { |inf| inf.conforms_to?(api_map, expected, situation,
+                                               allow_subtype_skew: allow_subtype_skew,
+                                               allow_empty_params: allow_empty_params,
+                                               allow_reverse_match: allow_reverse_match,
+                                               allow_any_match: allow_any_match) }
+      end
+    end
+
+    # @param api_map [ApiMap]
+    # @param expected [ComplexType]
+    # @param inferred [ComplexType]
+    # @return [Boolean]
+    def duck_types_match? api_map, expected, inferred
+      raise ArgumentError, 'Expected type must be duck type' unless expected.duck_type?
+      expected.each do |exp|
+        next unless exp.duck_type?
+        quack = exp.to_s[1..-1]
+        return false if api_map.get_method_stack(inferred.namespace, quack, scope: inferred.scope).empty?
+      end
+      true
+    end
+
     def rooted_tags
       map(&:rooted_tag).join(', ')
     end
diff --git a/lib/solargraph/complex_type/type_methods.rb b/lib/solargraph/complex_type/type_methods.rb
index e6d596244..4fcaadb7f 100644
--- a/lib/solargraph/complex_type/type_methods.rb
+++ b/lib/solargraph/complex_type/type_methods.rb
@@ -69,6 +69,15 @@ def undefined?
         name == 'undefined'
       end
 
+      # Variance of the type ignoring any type parameters
+      def erased_variance situation = :method_call
+        if [:method_call, :return_type, :assignment].include?(situation)
+          :covariant
+        else
+          raise "Unknown situation: #{situation.inspect}"
+        end
+      end
+
       # @param generics_to_erase [Enumerable<String>]
       # @return [self]
       def erase_generics(generics_to_erase)
diff --git a/lib/solargraph/complex_type/unique_type.rb b/lib/solargraph/complex_type/unique_type.rb
index 0f4ec430d..1023d080e 100644
--- a/lib/solargraph/complex_type/unique_type.rb
+++ b/lib/solargraph/complex_type/unique_type.rb
@@ -151,10 +151,167 @@ def ==(other)
         eql?(other)
       end
 
+      # https://www.playfulpython.com/type-hinting-covariance-contra-variance/
+
+      # "[Expected] type variables that are COVARIANT can be substituted with
+      #  a more specific [inferred] type without causing errors"
+      #
+      # "[Expected] type variables that are CONTRAVARIANT can be substituted
+      #   with a more general [inferred] type without causing errors"
+      #
+      # "[Expected] types where neither is possible are INVARIANT"
+      #
+      # @param situation [:method_call]
+      # @param default [Symbol] The default variance to return if the type is not one of the special cases
+      #
+      # @return [:invariant, :covariant, :contravariant]
+      def parameter_variance situation, default = :covariant
+        # @todo RBS can specify variance - maybe we can use that info
+        #   and also let folks specify?
+        #
+        # Array/Set: ideally invariant, since we don't know if user is
+        #   going to add new stuff into it or read it.  But we don't
+        #   have a way to specify, so we use covariant
+        # Enumerable: covariant:  can't be changed, so we can pass
+        #   in more specific subtypes
+        # Hash: read-only would be covariant, read-write would be
+        #   invariant if we could distinguish that - should default to
+        #   covariant
+        # contravariant?: Proc - can be changed, so we can pass
+        #   in less specific super types
+        if ['Hash', 'Tuple', 'Array', 'Set', 'Enumerable'].include?(name) && fixed_parameters?
+          :covariant
+        else
+          default
+        end
+      end
+
+      # @param api_map [ApiMap]
+      # @param expected [ComplexType, ComplexType::UniqueType]
+      # @param situation [:method_call, :return_type]
+      # @param allow_subtype_skew [Boolean] if false, check if any
+      #   subtypes of the expected type match the inferred type
+      # @param allow_empty_params [Boolean] if true, allow a general
+      #   inferred type without parameters to allow a more specific
+      #   expcted type
+      # @param allow_reverse_match [Boolean] if true, check if any subtypes
+      #   of the expected type match the inferred type
+      # @param allow_any_match [Boolean] if true, any unique type
+      #   matched in the expected qualifies as a match
+      def conforms_to_unique_type?(api_map, expected, situation = :method_call,
+                                   variance: erased_variance(situation),
+                                   allow_subtype_skew: allow_subtype_skew,
+                                   allow_empty_params: allow_empty_params,
+                                   allow_reverse_match: allow_reverse_match,
+                                   allow_any_match: allow_any_match)
+        expected = expected.downcast_to_literal_if_possible
+        inferred = downcast_to_literal_if_possible
+
+        if allow_subtype_skew
+          # parameters are not considered in this case
+          expected = expected.erase_parameters
+        end
+
+        if !expected.parameters? && inferred.parameters?
+          inferred = inferred.erase_parameters
+        end
+
+        return true if inferred == expected
+
+        if variance == :invariant
+          return false unless inferred.name == expected.name
+        elsif erased_variance == :covariant
+          # covariant: we can pass in a more specific type
+
+          # we contain the expected mix-in, or we have a more specific type
+          return false unless api_map.type_include?(inferred.name, expected.name) ||
+                              api_map.super_and_sub?(expected.name, inferred.name) ||
+                              inferred.name == expected.name
+
+        elsif erased_variance == :contravariant
+          # contravariant: we can pass in a more general type
+
+          # we contain the expected mix-in, or we have a more general type
+          return false unless api_map.type_include?(inferred.name, expected.name) ||
+                              map.super_and_sub?(inferred.name, expected.name) ||
+                              inferred.name == expected.name
+        else
+          raise "Unknown erased variance: #{erased_variance.inspect}"
+        end
+
+        return true if inferred.all_params.empty? && allow_empty_params
+
+        # at this point we know the erased type is fine - time to look at parameters
+
+        # there's an implicit 'any' on the expectation parameters
+        # if there are none specified
+        return true if expected.all_params.empty?
+
+        unless expected.key_types.empty?
+          return false if inferred.key_types.empty?
+
+          return false unless ComplexType.new(inferred.key_types).conforms_to?(api_map,
+                                                                               ComplexType.new(expected.key_types),
+                                                                               situation,
+                                                                               variance: parameter_variance(situation),
+                                                                               allow_subtype_skew: allow_subtype_skew,
+                                                                                  allow_empty_params: allow_empty_params,
+                                                                               allow_reverse_match: allow_reverse_match,
+                                                                               allow_any_match: allow_any_match)
+        end
+
+        return true if expected.subtypes.empty?
+
+        return false if inferred.subtypes.empty?
+
+        ComplexType.new(inferred.subtypes).conforms_to?(api_map, ComplexType.new(expected.subtypes), situation,
+                                                                            variance: parameter_variance(situation),
+                                                                            allow_subtype_skew: allow_subtype_skew,
+                                                                            allow_empty_params: allow_empty_params,
+                                                                            allow_reverse_match: allow_reverse_match,
+                                                                            allow_any_match: allow_any_match)
+      end
+
+      # @param api_map [ApiMap]
+      # @param expected [ComplexType::UniqueType]
+      # @param situation [:method_call, :assignment, :return]
+      # @param allow_subtype_skew [Boolean] if false, check if any
+      #   subtypes of the expected type match the inferred type
+      # @param allow_empty_params [Boolean] if true, allow a general
+      #   inferred type without parameters to allow a more specific
+      #   expcted type
+      # @param allow_reverse_match [Boolean] if true, check if any subtypes
+      #   of the expected type match the inferred type
+      # @param allow_any_match [Boolean] if true, any unique type
+      #   matched in the expected qualifies as a match
+      def conforms_to?(api_map, expected,
+                       situation = :method_call,
+                       allow_subtype_skew:,
+                       allow_empty_params:,
+                       allow_reverse_match:,
+                       allow_any_match:)
+        # @todo teach this to validate duck types as inferred type
+        return true if duck_type?
+
+        # complex types as expectations are unions - we only need to
+        # match one of their unique types
+        expected.any? do |expected_unique_type|
+          conforms_to_unique_type?(api_map, expected_unique_type, situation,
+                                   allow_subtype_skew: allow_subtype_skew,
+                                   allow_empty_params: allow_empty_params,
+                                   allow_reverse_match: allow_reverse_match,
+                                   allow_any_match: allow_any_match)
+        end
+      end
+
       def hash
         [self.class, @name, @key_types, @sub_types, @rooted, @all_params, @parameters_type].hash
       end
 
+      def erase_parameters
+        UniqueType.new(name, rooted: rooted?, parameters_type: parameters_type)
+      end
+
       # @return [Array<UniqueType>]
       def items
         [self]
@@ -236,18 +393,6 @@ def generic?
         name == GENERIC_TAG_NAME || all_params.any?(&:generic?)
       end
 
-      # @param api_map [ApiMap] The ApiMap that performs qualification
-      # @param atype [ComplexType] type which may be assigned to this type
-      def can_assign?(api_map, atype)
-        logger.debug { "UniqueType#can_assign?(self=#{rooted_tags.inspect}, atype=#{atype.rooted_tags.inspect})" }
-        downcasted_atype = atype.downcast_to_literal_if_possible
-        out = downcasted_atype.all? do |autype|
-          autype.name == name || api_map.super_and_sub?(name, autype.name)
-        end
-        logger.debug { "UniqueType#can_assign?(self=#{rooted_tags.inspect}, atype=#{atype.rooted_tags.inspect}) => #{out}" }
-        out
-      end
-
       # @return [UniqueType]
       def downcast_to_literal_if_possible
         SINGLE_SUBTYPE.fetch(rooted_tag, self)
@@ -437,6 +582,10 @@ def self_to_type dst
         end
       end
 
+      def any? &block
+        block.yield self
+      end
+
       def all_rooted?
         return true if name == GENERIC_TAG_NAME
         rooted? && all_params.all?(&:rooted?)
diff --git a/lib/solargraph/gem_pins.rb b/lib/solargraph/gem_pins.rb
index b92cbd6af..f1dd25a9f 100644
--- a/lib/solargraph/gem_pins.rb
+++ b/lib/solargraph/gem_pins.rb
@@ -19,7 +19,8 @@ def self.build_yard_pins(gemspec)
       YardMap::Mapper.new(yardoc, gemspec).map
     end
 
-    # @param pins [Array<Pin::Base>]
+    # @param pins [Array<Pin::Method>]
+    # @return [Array<Pin::Method>]
     def self.combine_method_pins_by_path(pins)
       # bad_pins = pins.select { |pin| pin.is_a?(Pin::Method) && pin.path == 'StringIO.open' && pin.source == :rbs }; raise "wtf: #{bad_pins}" if bad_pins.length > 1
       method_pins, alias_pins = pins.partition { |pin| pin.class == Pin::Method }
diff --git a/lib/solargraph/parser/node_methods.rb b/lib/solargraph/parser/node_methods.rb
index 12e974c16..2712f2867 100644
--- a/lib/solargraph/parser/node_methods.rb
+++ b/lib/solargraph/parser/node_methods.rb
@@ -74,7 +74,7 @@ def process node
 
       # @abstract
       # @param node [Parser::AST::Node]
-      # @return [Hash{Parser::AST::Node => Source::Chain}]
+      # @return [Hash{Parser::AST::Node, Symbol => Source::Chain}]
       def convert_hash node
         raise NotImplementedError
       end
diff --git a/lib/solargraph/parser/parser_gem/node_methods.rb b/lib/solargraph/parser/parser_gem/node_methods.rb
index b716b352d..bc0c37eb6 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 => 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/parameter.rb b/lib/solargraph/pin/parameter.rb
index bc802b748..b4fc3d9b2 100644
--- a/lib/solargraph/pin/parameter.rb
+++ b/lib/solargraph/pin/parameter.rb
@@ -166,7 +166,17 @@ def compatible_arg?(atype, api_map)
         # make sure we get types from up the method
         # inheritance chain if we don't have them on this pin
         ptype = typify api_map
-        ptype.undefined? || ptype.can_assign?(api_map, atype) || ptype.generic?
+        return true if ptype.undefined?
+
+        return true if atype.conforms_to?(api_map,
+                                          ptype,
+                                          :method_call,
+                                          allow_subtype_skew: false,
+                                          allow_reverse_match: false,
+                                          allow_empty_params: true,
+                                          allow_any_match: false)
+
+        ptype.generic?
       end
 
       def documentation
diff --git a/lib/solargraph/range.rb b/lib/solargraph/range.rb
index 615f180af..c508e48fa 100644
--- a/lib/solargraph/range.rb
+++ b/lib/solargraph/range.rb
@@ -24,6 +24,7 @@ def initialize start, ending
       [start, ending]
     end
 
+    # @param other [Object]
     def <=>(other)
       return nil unless other.is_a?(Range)
       if start == other.start
@@ -78,7 +79,7 @@ def self.from_to l1, c1, l2, c2
 
     # Get a range from a node.
     #
-    # @param node [Parser::AST::Node]
+    # @param node [AST::Node]
     # @return [Range, nil]
     def self.from_node node
       if node&.loc && node.loc.expression
diff --git a/lib/solargraph/source.rb b/lib/solargraph/source.rb
index 11ab215ed..d4e0c3994 100644
--- a/lib/solargraph/source.rb
+++ b/lib/solargraph/source.rb
@@ -187,7 +187,7 @@ def code_for(node)
       frag.strip.gsub(/,$/, '')
     end
 
-    # @param node [Parser::AST::Node]
+    # @param node [AST::Node]
     # @return [String, nil]
     def comments_for node
       rng = Range.from_node(node)
diff --git a/lib/solargraph/type_checker.rb b/lib/solargraph/type_checker.rb
index aa215f97b..ab87d5863 100644
--- a/lib/solargraph/type_checker.rb
+++ b/lib/solargraph/type_checker.rb
@@ -7,9 +7,7 @@ class TypeChecker
     autoload :Problem,  'solargraph/type_checker/problem'
     autoload :ParamDef, 'solargraph/type_checker/param_def'
     autoload :Rules,    'solargraph/type_checker/rules'
-    autoload :Checks,   'solargraph/type_checker/checks'
 
-    include Checks
     include Parser::NodeMethods
 
     # @return [String]
@@ -113,7 +111,11 @@ def method_return_type_problems_for pin
               result.push Problem.new(pin.location, "#{pin.path} return type could not be inferred", pin: pin)
             end
           else
-            unless (rules.require_all_return_types_match_inferred? ? all_types_match?(api_map, inferred, declared) : any_types_match?(api_map, declared, inferred))
+            unless inferred.conforms_to?(api_map, declared, :return_type,
+                                         allow_subtype_skew: false,
+                                         allow_empty_params: !rules.require_inferred_type_params,
+                                         allow_reverse_match: false,
+                                         allow_any_match: !rules.require_all_unique_types_match_declared?)
               result.push Problem.new(pin.location, "Declared return type #{declared.rooted_tags} does not match inferred type #{inferred.rooted_tags} for #{pin.path}", pin: pin)
             end
           end
@@ -202,7 +204,11 @@ def variable_type_tag_problems
                   result.push Problem.new(pin.location, "Variable type could not be inferred for #{pin.name}", pin: pin)
                 end
               else
-                unless any_types_match?(api_map, declared, inferred)
+                unless inferred.conforms_to?(api_map, declared, :assignment,
+                                             allow_subtype_skew: false,
+                                             allow_empty_params: !rules.require_inferred_type_params,
+                                             allow_reverse_match: false,
+                                             allow_any_match: !rules.require_all_unique_types_match_declared?)
                   result.push Problem.new(pin.location, "Declared type #{declared} does not match inferred type #{inferred} for variable #{pin.name}", pin: pin)
                 end
               end
@@ -284,8 +290,8 @@ def call_problems
 
     # @param chain [Solargraph::Source::Chain]
     # @param api_map [Solargraph::ApiMap]
-    # @param block_pin [Solargraph::Pin::Base]
-    # @param locals [Array<Solargraph::Pin::Base>]
+    # @param closure_pin [Solargraph::Pin::Closure]
+    # @param locals [Array<Solargraph::Pin::LocalVariable>]
     # @param location [Solargraph::Location]
     # @return [Array<Problem>]
     def argument_problems_for chain, api_map, block_pin, locals, location
@@ -383,7 +389,11 @@ def argument_problems_for chain, api_map, block_pin, locals, location
                     # @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)
+                    if argtype.defined? && ptype.defined? && !argtype.conforms_to?(api_map, ptype, :method_call,
+                                                                                   allow_subtype_skew: false,
+                                                                                   allow_empty_params: !rules.require_inferred_type_params,
+                                                                                   allow_reverse_match: false,
+                                                                                   allow_any_match: !rules.require_all_unique_types_match_declared?)
                       errors.push Problem.new(location, "Wrong argument type for #{pin.path}: #{par.name} expected #{ptype}, received #{argtype}")
                       next
                     end
@@ -433,8 +443,13 @@ def kwarg_problems_for sig, argchain, api_map, block_pin, locals, location, pin,
           else
             ptype = data[:qualified]
             unless ptype.undefined?
+
               argtype = argchain.infer(api_map, block_pin, locals)
-              if argtype.defined? && ptype && !any_types_match?(api_map, ptype, argtype)
+              if argtype.defined? && ptype && !argtype.conforms_to?(api_map, ptype, :method_call,
+                                                                    allow_subtype_skew: false,
+                                                                    allow_empty_params: !rules.require_inferred_type_params,
+                                                                    allow_reverse_match: false,
+                                                                    allow_any_match: !rules.require_all_unique_types_match_declared?)
                 result.push Problem.new(location, "Wrong argument type for #{pin.path}: #{par.name} expected #{ptype}, received #{argtype}")
               end
             end
@@ -460,7 +475,12 @@ def kwrestarg_problems_for(api_map, block_pin, locals, location, pin, params, kw
         next unless params.key?(pname.to_s)
         ptype = params[pname.to_s][:qualified]
         argtype = argchain.infer(api_map, block_pin, locals)
-        if argtype.defined? && ptype && !any_types_match?(api_map, ptype, argtype)
+        if argtype.defined? && ptype && !argtype.conforms_to?(api_map, ptype, :method_call,
+                                                              allow_subtype_skew: false,
+                                                              allow_empty_params: !rules.require_inferred_type_params,
+                                                              allow_reverse_match: false,
+                                                              allow_any_match: !rules.require_all_unique_types_match_declared?)
+
           result.push Problem.new(location, "Wrong argument type for #{pin.path}: #{pname} expected #{ptype}, received #{argtype}")
         end
       end
@@ -495,6 +515,8 @@ def param_hash(pin)
     end
 
     # @param pins [Array<Pin::Method>]
+    # @param method_pin_stack [Array<Pin::Method>]
+    #
     # @return [Hash{String => Hash{Symbol => String, ComplexType}}]
     def first_param_hash(pins)
       return {} if pins.empty?
diff --git a/lib/solargraph/type_checker/checks.rb b/lib/solargraph/type_checker/checks.rb
deleted file mode 100644
index de402978b..000000000
--- a/lib/solargraph/type_checker/checks.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-# frozen_string_literal: true
-
-module Solargraph
-  class TypeChecker
-    # Helper methods for performing type checks
-    #
-    module Checks
-      module_function
-
-      # Compare an expected type with an inferred type. Common usage is to
-      # check if the type declared in a method's @return tag matches the type
-      # inferred from static analysis of the code.
-      #
-      # @param api_map [ApiMap]
-      # @param expected [ComplexType]
-      # @param inferred [ComplexType]
-      # @return [Boolean]
-      def types_match? api_map, expected, inferred
-        return true if expected.to_s == inferred.to_s
-        matches = []
-        expected.each do |exp|
-          found = false
-          inferred.each do |inf|
-            # if api_map.super_and_sub?(fuzz(inf), fuzz(exp))
-            if either_way?(api_map, inf, exp)
-              found = true
-              matches.push inf
-              break
-            end
-          end
-          return false unless found
-        end
-        inferred.each do |inf|
-          next if matches.include?(inf)
-          found = false
-          expected.each do |exp|
-            # if api_map.super_and_sub?(fuzz(inf), fuzz(exp))
-            if either_way?(api_map, inf, exp)
-              found = true
-              break
-            end
-          end
-          return false unless found
-        end
-        true
-      end
-
-      # @param api_map [ApiMap]
-      # @param expected [ComplexType]
-      # @param inferred [ComplexType]
-      # @return [Boolean]
-      def any_types_match? api_map, expected, inferred
-        expected = expected.downcast_to_literal_if_possible
-        inferred = inferred.downcast_to_literal_if_possible
-        return duck_types_match?(api_map, expected, inferred) if expected.duck_type?
-        # walk through the union expected type and see if any members
-        # of the union match the inferred type
-        expected.each do |exp|
-          next if exp.duck_type?
-          # @todo: there should be a level of typechecking where all
-          #   unique types in the inferred must match one of the
-          #   expected unique types
-          inferred.each do |inf|
-            # return true if exp == inf || api_map.super_and_sub?(fuzz(inf), fuzz(exp))
-            return true if exp == inf || either_way?(api_map, inf, exp)
-          end
-        end
-        false
-      end
-
-      # @param api_map [ApiMap]
-      # @param inferred [ComplexType]
-      # @param expected [ComplexType]
-      # @return [Boolean]
-      def all_types_match? api_map, inferred, expected
-        expected = expected.downcast_to_literal_if_possible
-        inferred = inferred.downcast_to_literal_if_possible
-        return duck_types_match?(api_map, expected, inferred) if expected.duck_type?
-        inferred.each do |inf|
-          next if inf.duck_type?
-          return false unless expected.any? { |exp| exp == inf || either_way?(api_map, inf, exp) }
-        end
-        true
-      end
-
-      # @param api_map [ApiMap]
-      # @param expected [ComplexType]
-      # @param inferred [ComplexType]
-      # @return [Boolean]
-      def duck_types_match? api_map, expected, inferred
-        raise ArgumentError, 'Expected type must be duck type' unless expected.duck_type?
-        expected.each do |exp|
-          next unless exp.duck_type?
-          quack = exp.to_s[1..-1]
-          return false if api_map.get_method_stack(inferred.namespace, quack, scope: inferred.scope).empty?
-        end
-        true
-      end
-
-      # @param type [ComplexType::UniqueType]
-      # @return [String]
-      def fuzz type
-        if type.parameters?
-          type.name
-        else
-          type.tag
-        end
-      end
-
-      # @param api_map [ApiMap]
-      # @param cls1 [ComplexType::UniqueType]
-      # @param cls2 [ComplexType::UniqueType]
-      # @return [Boolean]
-      def either_way?(api_map, cls1, cls2)
-        # @todo there should be a level of typechecking which uses the
-        #   full tag with parameters to determine compatibility
-        f1 = cls1.name
-        f2 = cls2.name
-        api_map.type_include?(f1, f2) || api_map.super_and_sub?(f1, f2) || api_map.super_and_sub?(f2, f1)
-        # api_map.type_include?(f1, f2) || api_map.super_and_sub?(f1, f2) || api_map.super_and_sub?(f2, f1)
-      end
-    end
-  end
-end
diff --git a/lib/solargraph/type_checker/rules.rb b/lib/solargraph/type_checker/rules.rb
index 0aad5ed8a..8f2027d30 100644
--- a/lib/solargraph/type_checker/rules.rb
+++ b/lib/solargraph/type_checker/rules.rb
@@ -54,7 +54,11 @@ def validate_tags?
         rank > LEVELS[:normal]
       end
 
-      def require_all_return_types_match_inferred?
+      def require_inferred_type_params
+        rank >= LEVELS[:alpha]
+      end
+
+      def require_all_unique_types_match_declared?
         rank >= LEVELS[:alpha]
       end
     end
diff --git a/spec/complex_type_spec.rb b/spec/complex_type_spec.rb
index f876d642f..2c060ceed 100644
--- a/spec/complex_type_spec.rb
+++ b/spec/complex_type_spec.rb
@@ -733,5 +733,33 @@ def make_bar
       expect(type.to_rbs).to eq('[Symbol, String, [Integer, Integer]]')
       expect(type.to_s).to eq('Array(Symbol, String, Array(Integer, Integer))')
     end
+
+    it 'recognizes String conforms with itself' do
+      api_map = Solargraph::ApiMap.new
+      ptype = Solargraph::ComplexType.parse('String')
+      atype = Solargraph::ComplexType.parse('String')
+      expect(ptype.conforms_to?(api_map, atype, :method_call)).to be(true)
+    end
+
+    it 'recognizes an erased container type conforms with itself' do
+      api_map = Solargraph::ApiMap.new
+      ptype = Solargraph::ComplexType.parse('Hash')
+      atype = Solargraph::ComplexType.parse('Hash')
+      expect(ptype.conforms_to?(api_map, atype, :method_call)).to be(true)
+    end
+
+    it 'recognizes an unerased container type conforms with itself' do
+      api_map = Solargraph::ApiMap.new
+      ptype = Solargraph::ComplexType.parse('Array<Integer>')
+      atype = Solargraph::ComplexType.parse('Array<Integer>')
+      expect(ptype.conforms_to?(api_map, atype, :method_call)).to be(true)
+    end
+
+    it 'recognizes a literal conforms with its type' do
+      api_map = Solargraph::ApiMap.new
+      ptype = Solargraph::ComplexType.parse('Symbol')
+      atype = Solargraph::ComplexType.parse(':foo')
+      expect(ptype.conforms_to?(api_map, atype, :method_call)).to be(true)
+    end
   end
 end
diff --git a/spec/type_checker/levels/strong_spec.rb b/spec/type_checker/levels/strong_spec.rb
index 12db1e442..054a09efa 100644
--- a/spec/type_checker/levels/strong_spec.rb
+++ b/spec/type_checker/levels/strong_spec.rb
@@ -14,6 +14,22 @@ 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 'reports missing param tags' do
       checker = type_checker(%(
         class Foo
diff --git a/spec/type_checker/levels/typed_spec.rb b/spec/type_checker/levels/typed_spec.rb
index b10bbd42c..659ccee39 100644
--- a/spec/type_checker/levels/typed_spec.rb
+++ b/spec/type_checker/levels/typed_spec.rb
@@ -38,6 +38,19 @@ def bar
       expect(checker.problems.first.message).to include('does not match')
     end
 
+    it 'reports mismatched key and subtypes ' do
+      checker = type_checker(%(
+        # @return [Hash{String => String}]
+        def foo
+          # @type h [Hash{Integer => String}]
+          h = {}
+          h
+        end
+      ))
+      expect(checker.problems).to be_one
+      expect(checker.problems.first.message).to include('does not match')
+    end
+
     it 'reports mismatched inherited return tags' do
       checker = type_checker(%(
         class Sup
@@ -189,6 +202,42 @@ def foo
       expect(checker.problems).to be_empty
     end
 
+    it 'validates parameters in function calls' do
+      checker = type_checker(%(
+        # @param bar [String]
+        def foo(bar); end
+
+        def baz
+          foo(123)
+        end
+        ))
+      expect(checker.problems.map(&:message)).to eq(['123'])
+    end
+
+    it 'validates default values of parameters' do
+      checker = type_checker(%(
+        # @param bar [String]
+        def foo(bar = 123); end
+        ))
+      expect(checker.problems.map(&:message)).to eq(['Declared type String does not match inferred type 123 for variable bar'])
+    end
+
+    it 'validates string default values of parameters' do
+      checker = type_checker(%(
+        # @param bar [String]
+        def foo(bar = 'foo'); end
+        ))
+      expect(checker.problems.map(&:message)).to be_empty
+    end
+
+    it 'validates symbol default values of parameters' do
+      checker = type_checker(%(
+        # @param bar [Symbol]
+        def foo(bar = :baz); end
+        ))
+      expect(checker.problems.map(&:message)).to eq([])
+    end
+
     it 'validates subclass arguments of param types' do
       checker = type_checker(%(
         class Sup

From 8e9cb6f19710bb9bdaefa09dbcb350b4a90685e8 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 18 Jul 2025 18:37:35 -0400
Subject: [PATCH 021/327] Add alpha typechecking spec

---
 spec/type_checker/levels/alpha_spec.rb | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 spec/type_checker/levels/alpha_spec.rb

diff --git a/spec/type_checker/levels/alpha_spec.rb b/spec/type_checker/levels/alpha_spec.rb
new file mode 100644
index 000000000..d700ea3b7
--- /dev/null
+++ b/spec/type_checker/levels/alpha_spec.rb
@@ -0,0 +1,22 @@
+describe Solargraph::TypeChecker do
+  context 'alpha level' do
+    def type_checker(code)
+      Solargraph::TypeChecker.load_string(code, 'test.rb', :alpha)
+    end
+
+    it 'reports 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(["Wrong argument type for #foo: a expected String, received String, nil"])
+    end
+  end
+end

From b9afcf7197159b5bcb30b0bd83cab8bebf7f4138 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 20 Jul 2025 17:21:56 -0400
Subject: [PATCH 022/327] Fix function defaults

---
 lib/solargraph/complex_type/unique_type.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/solargraph/complex_type/unique_type.rb b/lib/solargraph/complex_type/unique_type.rb
index 1023d080e..972bb0dbb 100644
--- a/lib/solargraph/complex_type/unique_type.rb
+++ b/lib/solargraph/complex_type/unique_type.rb
@@ -200,10 +200,10 @@ def parameter_variance situation, default = :covariant
       #   matched in the expected qualifies as a match
       def conforms_to_unique_type?(api_map, expected, situation = :method_call,
                                    variance: erased_variance(situation),
-                                   allow_subtype_skew: allow_subtype_skew,
-                                   allow_empty_params: allow_empty_params,
-                                   allow_reverse_match: allow_reverse_match,
-                                   allow_any_match: allow_any_match)
+                                   allow_subtype_skew:,
+                                   allow_empty_params:,
+                                   allow_reverse_match:,
+                                   allow_any_match:)
         expected = expected.downcast_to_literal_if_possible
         inferred = downcast_to_literal_if_possible
 

From c2f4d73dc435b7fe591f8c92a5a40dc2866b821a Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 20 Jul 2025 17:34:59 -0400
Subject: [PATCH 023/327] Adapt specs

---
 lib/solargraph/complex_type/unique_type.rb    |  7 ++++
 .../conforms_to_spec.rb}                      | 42 +++++++++++--------
 2 files changed, 32 insertions(+), 17 deletions(-)
 rename spec/{type_checker/checks_spec.rb => complex_type/conforms_to_spec.rb} (75%)

diff --git a/lib/solargraph/complex_type/unique_type.rb b/lib/solargraph/complex_type/unique_type.rb
index 972bb0dbb..6bbe9a1bd 100644
--- a/lib/solargraph/complex_type/unique_type.rb
+++ b/lib/solargraph/complex_type/unique_type.rb
@@ -204,6 +204,13 @@ def conforms_to_unique_type?(api_map, expected, situation = :method_call,
                                    allow_empty_params:,
                                    allow_reverse_match:,
                                    allow_any_match:)
+        if allow_reverse_match
+          reversed_match = expected.conforms_to_unique_type? api_map, self, situation, allow_subtype_skew: allow_subtype_skew,
+                                                             allow_empty_params: allow_empty_params,
+                                                             allow_reverse_match: false,
+                                                             allow_any_match: allow_any_match
+          return true if reversed_match
+        end
         expected = expected.downcast_to_literal_if_possible
         inferred = downcast_to_literal_if_possible
 
diff --git a/spec/type_checker/checks_spec.rb b/spec/complex_type/conforms_to_spec.rb
similarity index 75%
rename from spec/type_checker/checks_spec.rb
rename to spec/complex_type/conforms_to_spec.rb
index 41119cefd..847da8563 100644
--- a/spec/type_checker/checks_spec.rb
+++ b/spec/complex_type/conforms_to_spec.rb
@@ -1,9 +1,9 @@
-describe Solargraph::TypeChecker::Checks do
+describe Solargraph::ComplexType do
   it 'validates simple core types' do
     api_map = Solargraph::ApiMap.new
     exp = Solargraph::ComplexType.parse('String')
     inf = Solargraph::ComplexType.parse('String')
-    match = Solargraph::TypeChecker::Checks.types_match?(api_map, exp, inf)
+    match = inf.conforms_to?(api_map, exp, :method_call)
     expect(match).to be(true)
   end
 
@@ -11,7 +11,7 @@
     api_map = Solargraph::ApiMap.new
     exp = Solargraph::ComplexType.parse('String')
     inf = Solargraph::ComplexType.parse('Integer')
-    match = Solargraph::TypeChecker::Checks.types_match?(api_map, exp, inf)
+    match = inf.conforms_to?(api_map, exp, :method_call)
     expect(match).to be(false)
   end
 
@@ -24,7 +24,7 @@ class Sub < Sup; end
     api_map.map source
     sup = Solargraph::ComplexType.parse('Sup')
     sub = Solargraph::ComplexType.parse('Sub')
-    match = Solargraph::TypeChecker::Checks.types_match?(api_map, sup, sub)
+    match = sub.conforms_to?(api_map, sup, :method_call)
     expect(match).to be(true)
   end
 
@@ -48,7 +48,7 @@ class Sub < Sup; end
     api_map = Solargraph::ApiMap.new
     exp = Solargraph::ComplexType.parse('Array')
     inf = Solargraph::ComplexType.parse('Array<String>')
-    match = Solargraph::TypeChecker::Checks.types_match?(api_map, exp, inf)
+    match = inf.conforms_to?(api_map, exp, :method_call)
     expect(match).to be(true)
   end
 
@@ -59,7 +59,7 @@ class Sub < Sup; end
     api_map.catalog Solargraph::Bench.new(source_maps: [source_map], external_requires: ['set'])
     exp = Solargraph::ComplexType.parse('Set')
     inf = Solargraph::ComplexType.parse('Set<String>')
-    match = Solargraph::TypeChecker::Checks.types_match?(api_map, exp, inf)
+    match = inf.conforms_to?(api_map, exp, :method_call)
     expect(match).to be(true)
   end
 
@@ -67,7 +67,7 @@ class Sub < Sup; end
     api_map = Solargraph::ApiMap.new
     exp = Solargraph::ComplexType.parse('Hash{ Symbol => String}')
     inf = Solargraph::ComplexType.parse('Hash')
-    match = Solargraph::TypeChecker::Checks.types_match?(api_map, exp, inf)
+    match = inf.conforms_to?(api_map, exp, :method_call, allow_empty_params: true)
     expect(match).to be(true)
   end
 
@@ -75,7 +75,7 @@ class Sub < Sup; end
     api_map = Solargraph::ApiMap.new
     exp = Solargraph::ComplexType.parse('String, Integer')
     inf = Solargraph::ComplexType.parse('String, Integer')
-    match = Solargraph::TypeChecker::Checks.types_match?(api_map, exp, inf)
+    match = inf.conforms_to?(api_map, exp, :method_call)
     expect(match).to be(true)
   end
 
@@ -83,7 +83,7 @@ class Sub < Sup; end
     api_map = Solargraph::ApiMap.new
     exp = Solargraph::ComplexType.parse('String, Integer')
     inf = Solargraph::ComplexType.parse('Integer, String')
-    match = Solargraph::TypeChecker::Checks.types_match?(api_map, exp, inf)
+    match = inf.conforms_to?(api_map, exp, :method_call)
     expect(match).to be(true)
   end
 
@@ -91,7 +91,7 @@ class Sub < Sup; end
     api_map = Solargraph::ApiMap.new
     exp = Solargraph::ComplexType.parse('String')
     inf = Solargraph::ComplexType.parse('String, Integer')
-    match = Solargraph::TypeChecker::Checks.types_match?(api_map, exp, inf)
+    match = inf.conforms_to?(api_map, exp, :method_call)
     expect(match).to be(false)
   end
 
@@ -99,7 +99,7 @@ class Sub < Sup; end
     api_map = Solargraph::ApiMap.new
     exp = Solargraph::ComplexType.parse('nil')
     inf = Solargraph::ComplexType.parse('nil')
-    match = Solargraph::TypeChecker::Checks.types_match?(api_map, exp, inf)
+    match = inf.conforms_to?(api_map, exp, :method_call)
     expect(match).to be(true)
   end
 
@@ -107,7 +107,7 @@ class Sub < Sup; end
     api_map = Solargraph::ApiMap.new
     exp = Solargraph::ComplexType.parse('Class<Object>')
     inf = Solargraph::ComplexType.parse('Class<String>')
-    match = Solargraph::TypeChecker::Checks.types_match?(api_map, exp, inf)
+    match = inf.conforms_to?(api_map, exp, :method_call)
     expect(match).to be(true)
   end
 
@@ -115,7 +115,15 @@ class Sub < Sup; end
     api_map = Solargraph::ApiMap.new
     exp = Solargraph::ComplexType.parse('Class<String>')
     inf = Solargraph::ComplexType.parse('Class')
-    match = Solargraph::TypeChecker::Checks.types_match?(api_map, exp, inf)
+    match = inf.conforms_to?(api_map, exp, :method_call, allow_empty_params: true)
+    expect(match).to be(true)
+  end
+
+  it 'validates generic classes with expected Class' do
+    api_map = Solargraph::ApiMap.new
+    inf = Solargraph::ComplexType.parse('Class<String>')
+    exp = Solargraph::ComplexType.parse('Class')
+    match = inf.conforms_to?(api_map, exp, :method_call)
     expect(match).to be(true)
   end
 
@@ -128,9 +136,9 @@ class Sub < Sup; end
     api_map.map source
     sup = Solargraph::ComplexType.parse('Sup')
     sub = Solargraph::ComplexType.parse('Sub')
-    match = Solargraph::TypeChecker::Checks.either_way?(api_map, sup, sub)
+    match = sub.conforms_to?(api_map, sup, :method_call, allow_reverse_match: true)
     expect(match).to be(true)
-    match = Solargraph::TypeChecker::Checks.either_way?(api_map, sub, sup)
+    match = sup.conforms_to?(api_map, sub, :method_call, allow_reverse_match: true)
     expect(match).to be(true)
   end
 
@@ -138,9 +146,9 @@ class Sub < Sup; end
     api_map = Solargraph::ApiMap.new
     sup = Solargraph::ComplexType.parse('String')
     sub = Solargraph::ComplexType.parse('Array')
-    match = Solargraph::TypeChecker::Checks.either_way?(api_map, sup, sub)
+    match = sub.conforms_to?(api_map, sup, :method_call, allow_reverse_match: true)
     expect(match).to be(false)
-    match = Solargraph::TypeChecker::Checks.either_way?(api_map, sub, sup)
+    match = sup.conforms_to?(api_map, sub, :method_call, allow_reverse_match: true)
     expect(match).to be(false)
   end
 end

From e0cead948bde8952ebd9241dfd41ff96a0a92887 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 20 Jul 2025 18:41:10 -0400
Subject: [PATCH 024/327] Fix some annotations

---
 lib/solargraph/api_map/store.rb | 2 +-
 lib/solargraph/pin/method.rb    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index 47f92194c..15fb00827 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -116,7 +116,7 @@ def get_instance_variables(fqns, scope = :instance)
       end
 
       # @param fqns [String]
-      # @return [Enumerable<Solargraph::Pin::Base>]
+      # @return [Enumerable<Solargraph::Pin::ClassVariable>]
       def get_class_variables(fqns)
         namespace_children(fqns).select { |pin| pin.is_a?(Pin::ClassVariable)}
       end
diff --git a/lib/solargraph/pin/method.rb b/lib/solargraph/pin/method.rb
index 2f807f444..749868246 100644
--- a/lib/solargraph/pin/method.rb
+++ b/lib/solargraph/pin/method.rb
@@ -385,7 +385,7 @@ def probe api_map
         attribute? ? infer_from_iv(api_map) : infer_from_return_nodes(api_map)
       end
 
-      # @return [::Array<Pin::Method>]
+      # @return [::Array<Pin::Signature>]
       def overloads
         # Ignore overload tags with nil parameters. If it's not an array, the
         # tag's source is likely malformed.

From e6c5a589fc1351baae3e45d8c107c93450da50fd Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 22 Jul 2025 08:43:45 -0400
Subject: [PATCH 025/327] Generic typechecking improvements

---
 lib/solargraph/api_map/index.rb               |  19 ++-
 lib/solargraph/complex_type.rb                |  57 ++++---
 lib/solargraph/complex_type/unique_type.rb    | 120 +++++++------
 .../data_definition/data_assignment_node.rb   |   1 +
 .../data_definition/data_definition_node.rb   |   3 +-
 .../struct_assignment_node.rb                 |   2 +
 .../struct_definition_node.rb                 |   3 +-
 lib/solargraph/gem_pins.rb                    |   5 +-
 lib/solargraph/language_server/host.rb        |   3 +-
 .../parser/flow_sensitive_typing.rb           |   6 +
 lib/solargraph/parser/node_processor.rb       |   5 +-
 .../parser/parser_gem/node_methods.rb         |   2 +-
 .../parser_gem/node_processors/if_node.rb     |   2 +
 lib/solargraph/parser/snippet.rb              |   2 +-
 lib/solargraph/pin/base.rb                    |   8 +-
 lib/solargraph/pin/method.rb                  |   2 +-
 lib/solargraph/pin/parameter.rb               |   6 +-
 lib/solargraph/rbs_map/conversions.rb         |   6 +-
 lib/solargraph/source/chain/if.rb             |   2 +-
 lib/solargraph/source/chain/or.rb             |   2 +-
 lib/solargraph/type_checker.rb                |  61 ++++---
 lib/solargraph/type_checker/rules.rb          |  26 ++-
 lib/solargraph/yard_map/mapper/to_method.rb   |   4 +-
 spec/complex_type/conforms_to_spec.rb         |  12 +-
 spec/complex_type_spec.rb                     |   8 +-
 spec/rbs_map/conversions_spec.rb              |  87 ++++++----
 spec/type_checker/levels/strong_spec.rb       | 161 ++++++++++++++++++
 27 files changed, 435 insertions(+), 180 deletions(-)

diff --git a/lib/solargraph/api_map/index.rb b/lib/solargraph/api_map/index.rb
index 810600534..42bb6cc32 100644
--- a/lib/solargraph/api_map/index.rb
+++ b/lib/solargraph/api_map/index.rb
@@ -34,7 +34,7 @@ def path_pin_hash
       # @param klass [Class<generic<T>>]
       # @return [Set<generic<T>>]
       def pins_by_class klass
-        # @type [Set<Solargraph::Pin::Base>]
+        # @type [Set<generic<T>>]
         s = Set.new
         @pin_select_cache[klass] ||= pin_class_hash.each_with_object(s) { |(key, o), n| n.merge(o) if key <= klass }
       end
@@ -59,7 +59,8 @@ def superclass_references
         @superclass_references ||= Hash.new { |h, k| h[k] = [] }
       end
 
-      # @param pins [Array<Pin::Base>]
+      # @param pins [Enumerable<Pin::Base>]
+      # @return [self]
       def merge pins
         deep_clone.catalog pins
       end
@@ -69,8 +70,9 @@ def merge pins
       attr_writer :pins, :pin_select_cache, :namespace_hash, :pin_class_hash, :path_pin_hash, :include_references,
                   :extend_references, :prepend_references, :superclass_references
 
+      # @return [Solargraph::ApiMap::Index]
       def deep_clone
-        Index.allocate.tap do |copy|
+        out = Index.allocate.tap do |copy|
           copy.pin_select_cache = {}
           copy.pins = pins.clone
           %i[
@@ -81,9 +83,11 @@ def deep_clone
             copy.send(sym)&.transform_values!(&:clone)
           end
         end
+        out
       end
 
-      # @param new_pins [Array<Pin::Base>]
+      # @param new_pins [Enumerable<Pin::Base>]
+      # @return [self]
       def catalog new_pins
         @pin_select_cache = {}
         pins.concat new_pins
@@ -104,7 +108,7 @@ def catalog new_pins
       end
 
       # @param klass [Class<Pin::Reference>]
-      # @param hash [Hash{String => Array<Pin::Reference>}]
+      # @param hash [Hash{String => Array<String>}]
       # @return [void]
       def map_references klass, hash
         pins_by_class(klass).each do |pin|
@@ -114,7 +118,7 @@ def map_references klass, hash
 
       # Add references to a map
       #
-      # @param hash [Hash{String => Array<Pin::Reference>}]
+      # @param hash [Hash{String => Array<String>}]
       # @param reference_pin [Pin::Reference]
       #
       # @return [void]
@@ -138,9 +142,12 @@ def map_overrides
           pins = path_pin_hash[ovr.name]
           logger.debug { "ApiMap::Index#map_overrides: pins for path=#{ovr.name}: #{pins}" }
           pins.each do |pin|
+            next unless pin.is_a?(Pin::Reference::Override)
+
             new_pin = if pin.path.end_with?('#initialize')
                         path_pin_hash[pin.path.sub(/#initialize/, '.new')].first
                       end
+            next unless new_pin.nil? || new_pin.is_a?(Pin::Method)
             (ovr.tags.map(&:tag_name) + ovr.delete).uniq.each do |tag|
               pin.docstring.delete_tags tag
               new_pin.docstring.delete_tags tag if new_pin
diff --git a/lib/solargraph/complex_type.rb b/lib/solargraph/complex_type.rb
index 53c28ed6e..05e499998 100644
--- a/lib/solargraph/complex_type.rb
+++ b/lib/solargraph/complex_type.rb
@@ -17,15 +17,15 @@ def initialize types = [UniqueType::UNDEFINED]
       # @todo @items here should not need an annotation
       # @type [Array<UniqueType>]
       items = types.flat_map(&:items).uniq(&:to_s)
+
       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)
+        items.unshift(UniqueType::BOOLEAN)
       end
       items = [UniqueType::UNDEFINED] if items.any?(&:undefined?)
       @items = items
     end
 
-    # @sg-ignore Fix "Not enough arguments to Module#protected"
     protected def equality_fields
       [self.class, items]
     end
@@ -76,9 +76,13 @@ def self_to_type dst
     end
 
     # @yieldparam [UniqueType]
+    # @yieldreturn [UniqueType]
     # @return [Array<UniqueType>]
-    def map &block
-      @items.map &block
+    # @sg-ignore Declared return type
+    #   ::Array<::Solargraph::ComplexType::UniqueType> does not match
+    #   inferred type ::Array<::Proc> for Solargraph::ComplexType#map
+    def map(&block)
+      @items.map(&block)
     end
 
     # @yieldparam [UniqueType]
@@ -155,10 +159,12 @@ def to_s
       map(&:tag).join(', ')
     end
 
+    # @return [String]
     def tags
       map(&:tag).join(', ')
     end
 
+    # @return [String]
     def simple_tags
       simplify_literals.tags
     end
@@ -172,6 +178,7 @@ def downcast_to_literal_if_possible
       ComplexType.new(items.map(&:downcast_to_literal_if_possible))
     end
 
+    # @return [String]
     def desc
       rooted_tags
     end
@@ -184,36 +191,34 @@ def desc
     # @param allow_reverse_match [Boolean] if true, check if any subtypes
     #   of the expected type match the inferred type
     # @param allow_empty_params [Boolean] if true, allow a general
-    #   inferred type without parameters to allow a more specific
-    #   expcted type
+    #   inferred type without parameters to conform to a more specific
+    #   expected type
     # @param allow_any_match [Boolean] if true, any unique type
-    #   matched in the expected qualifies as a match
+    #   matched in the inferred qualifies as a match
+    # @param allow_undefined [Boolean] if true, treat undefined as a
+    #   wildcard that matches anything
+    # @param rules [Array<:allow_subtype_skew, :allow_empty_params, :allow_reverse_match, :allow_any_match, :allow_undefined, :allow_unresolved_generic, :allow_unmatched_interface>]
+    # @param variance [:invariant, :covariant, :contravariant]
     # @return [Boolean]
-    def conforms_to? api_map, expected,
+    def conforms_to?(api_map, expected,
                      situation,
-                     variance: erased_variance(situation),
-                     allow_subtype_skew: false,
-                     allow_empty_params: false,
-                     allow_reverse_match: false,
-                     allow_any_match: false #,
-#                     allow_undefined_in_expected: false
+                     rules = [],
+                     variance: erased_variance(situation))
       expected = expected.downcast_to_literal_if_possible
       inferred = downcast_to_literal_if_possible
 
       return duck_types_match?(api_map, expected, inferred) if expected.duck_type?
 
-      if allow_any_match
-        inferred.any? { |inf| inf.conforms_to?(api_map, expected, situation,
-                                               allow_subtype_skew: allow_subtype_skew,
-                                               allow_empty_params: allow_empty_params,
-                                               allow_reverse_match: allow_reverse_match,
-                                               allow_any_match: allow_any_match) }
+      if rules.include? :allow_any_match
+        inferred.any? do |inf|
+          inf.conforms_to?(api_map, expected, situation, rules,
+                           variance: variance)
+        end
       else
-        inferred.all? { |inf| inf.conforms_to?(api_map, expected, situation,
-                                               allow_subtype_skew: allow_subtype_skew,
-                                               allow_empty_params: allow_empty_params,
-                                               allow_reverse_match: allow_reverse_match,
-                                               allow_any_match: allow_any_match) }
+        inferred.all? do |inf|
+          inf.conforms_to?(api_map, expected, situation, rules,
+                           variance: variance)
+        end
       end
     end
 
@@ -231,6 +236,7 @@ def duck_types_match? api_map, expected, inferred
       true
     end
 
+    # @return [String]
     def rooted_tags
       map(&:rooted_tag).join(', ')
     end
@@ -255,6 +261,7 @@ def generic?
       any?(&:generic?)
     end
 
+    # @return [ComplexType]
     def simplify_literals
       ComplexType.new(map(&:simplify_literals))
     end
diff --git a/lib/solargraph/complex_type/unique_type.rb b/lib/solargraph/complex_type/unique_type.rb
index 6bbe9a1bd..361fe06bb 100644
--- a/lib/solargraph/complex_type/unique_type.rb
+++ b/lib/solargraph/complex_type/unique_type.rb
@@ -11,7 +11,6 @@ class UniqueType
 
       attr_reader :all_params, :subtypes, :key_types
 
-      # @sg-ignore Fix "Not enough arguments to Module#protected"
       protected def equality_fields
         [@name, @all_params, @subtypes, @key_types]
       end
@@ -78,6 +77,7 @@ 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 "Please remove leading :: and set rooted instead - #{name.inspect}" if name.start_with?('::')
         @name = name
         @parameters_type = parameters_type
@@ -105,6 +105,7 @@ def to_s
         tag
       end
 
+      # @return [self]
       def simplify_literals
         transform do |t|
           next t unless t.literal?
@@ -116,10 +117,12 @@ def literal?
         non_literal_name != name
       end
 
+      # @return [String]
       def non_literal_name
         @non_literal_name ||= determine_non_literal_name
       end
 
+      # @return [String]
       def determine_non_literal_name
         # https://github.com/ruby/rbs/blob/master/docs/syntax.md
         #
@@ -186,35 +189,37 @@ def parameter_variance situation, default = :covariant
         end
       end
 
+      # Whether this is an RBS interface like _ToAry or _Each.
+      def interface?
+        name.start_with?('_')
+      end
+
       # @param api_map [ApiMap]
-      # @param expected [ComplexType, ComplexType::UniqueType]
+      # @param expected [ComplexType::UniqueType]
       # @param situation [:method_call, :return_type]
-      # @param allow_subtype_skew [Boolean] if false, check if any
-      #   subtypes of the expected type match the inferred type
-      # @param allow_empty_params [Boolean] if true, allow a general
-      #   inferred type without parameters to allow a more specific
-      #   expcted type
-      # @param allow_reverse_match [Boolean] if true, check if any subtypes
-      #   of the expected type match the inferred type
-      # @param allow_any_match [Boolean] if true, any unique type
-      #   matched in the expected qualifies as a match
+      # @param rules [Array<:allow_subtype_skew, :allow_empty_params, :allow_reverse_match, :allow_any_match, :allow_undefined, :allow_unresolved_generic, :allow_unmatched_interface>]
+      # @param variance [:invariant, :covariant, :contravariant]
       def conforms_to_unique_type?(api_map, expected, situation = :method_call,
-                                   variance: erased_variance(situation),
-                                   allow_subtype_skew:,
-                                   allow_empty_params:,
-                                   allow_reverse_match:,
-                                   allow_any_match:)
-        if allow_reverse_match
-          reversed_match = expected.conforms_to_unique_type? api_map, self, situation, allow_subtype_skew: allow_subtype_skew,
-                                                             allow_empty_params: allow_empty_params,
-                                                             allow_reverse_match: false,
-                                                             allow_any_match: allow_any_match
+                                   rules = [],
+                                   variance: erased_variance(situation))
+        raise "Expected type must be a UniqueType, got #{expected.class} in #{expected.inspect}" unless expected.is_a?(UniqueType)
+        if literal? && !expected.literal?
+          return simplify_literals.conforms_to_unique_type?(api_map, expected, situation,
+                                                            rules, variance: variance)
+        end
+        return true if expected.any?(&:interface?) && rules.include?(:allow_unmatched_interface)
+        return true if interface? && rules.include?(:allow_unmatched_interface)
+
+        if rules.include? :allow_reverse_match
+          reversed_match = expected.conforms_to?(api_map, self, situation,
+                                                 rules - [:allow_reverse_match],
+                                                 variance: variance)
           return true if reversed_match
         end
         expected = expected.downcast_to_literal_if_possible
         inferred = downcast_to_literal_if_possible
 
-        if allow_subtype_skew
+        if rules.include? :allow_subtype_skew
           # parameters are not considered in this case
           expected = expected.erase_parameters
         end
@@ -223,6 +228,10 @@ def conforms_to_unique_type?(api_map, expected, situation = :method_call,
           inferred = inferred.erase_parameters
         end
 
+        if expected.parameters? && !inferred.parameters? && rules.include?(:allow_empty_params)
+          expected = expected.erase_parameters
+        end
+
         return true if inferred == expected
 
         if variance == :invariant
@@ -240,13 +249,13 @@ def conforms_to_unique_type?(api_map, expected, situation = :method_call,
 
           # we contain the expected mix-in, or we have a more general type
           return false unless api_map.type_include?(inferred.name, expected.name) ||
-                              map.super_and_sub?(inferred.name, expected.name) ||
+                              api_map.super_and_sub?(inferred.name, expected.name) ||
                               inferred.name == expected.name
         else
           raise "Unknown erased variance: #{erased_variance.inspect}"
         end
 
-        return true if inferred.all_params.empty? && allow_empty_params
+        return true if inferred.all_params.empty? && rules.include?(:allow_empty_params)
 
         # at this point we know the erased type is fine - time to look at parameters
 
@@ -260,54 +269,50 @@ def conforms_to_unique_type?(api_map, expected, situation = :method_call,
           return false unless ComplexType.new(inferred.key_types).conforms_to?(api_map,
                                                                                ComplexType.new(expected.key_types),
                                                                                situation,
-                                                                               variance: parameter_variance(situation),
-                                                                               allow_subtype_skew: allow_subtype_skew,
-                                                                                  allow_empty_params: allow_empty_params,
-                                                                               allow_reverse_match: allow_reverse_match,
-                                                                               allow_any_match: allow_any_match)
+                                                                               rules,
+                                                                               variance: parameter_variance(situation))
         end
 
         return true if expected.subtypes.empty?
 
+        return true if expected.subtypes.any?(&:undefined?) && rules.include?(:allow_undefined)
+
+        return true if inferred.subtypes.any?(&:undefined?) && rules.include?(:allow_undefined)
+
+        return true if inferred.subtypes.all?(&:generic?) && rules.include?(:allow_unresolved_generic)
+
+        return true if expected.subtypes.all?(&:generic?) && rules.include?(:allow_unresolved_generic)
+
         return false if inferred.subtypes.empty?
 
-        ComplexType.new(inferred.subtypes).conforms_to?(api_map, ComplexType.new(expected.subtypes), situation,
-                                                                            variance: parameter_variance(situation),
-                                                                            allow_subtype_skew: allow_subtype_skew,
-                                                                            allow_empty_params: allow_empty_params,
-                                                                            allow_reverse_match: allow_reverse_match,
-                                                                            allow_any_match: allow_any_match)
+        ComplexType.new(inferred.subtypes).conforms_to?(api_map,
+                                                        ComplexType.new(expected.subtypes),
+                                                        situation,
+                                                        rules,
+                                                        variance: parameter_variance(situation))
       end
 
       # @param api_map [ApiMap]
-      # @param expected [ComplexType::UniqueType]
+      # @param expected [ComplexType::UniqueType, ComplexType]
       # @param situation [:method_call, :assignment, :return]
-      # @param allow_subtype_skew [Boolean] if false, check if any
-      #   subtypes of the expected type match the inferred type
-      # @param allow_empty_params [Boolean] if true, allow a general
-      #   inferred type without parameters to allow a more specific
-      #   expcted type
-      # @param allow_reverse_match [Boolean] if true, check if any subtypes
-      #   of the expected type match the inferred type
-      # @param allow_any_match [Boolean] if true, any unique type
-      #   matched in the expected qualifies as a match
+      # @param rules [Array<:allow_subtype_skew, :allow_empty_params, :allow_reverse_match, :allow_any_match, :allow_undefined, :allow_unresolved_generic>]
+      # @param variance [:invariant, :covariant, :contravariant]
       def conforms_to?(api_map, expected,
                        situation = :method_call,
-                       allow_subtype_skew:,
-                       allow_empty_params:,
-                       allow_reverse_match:,
-                       allow_any_match:)
+                       rules,
+                       variance:)
+
+        return true if undefined? && rules.include?(:allow_undefined)
+
         # @todo teach this to validate duck types as inferred type
         return true if duck_type?
 
         # complex types as expectations are unions - we only need to
         # match one of their unique types
         expected.any? do |expected_unique_type|
+          raise "Expected type must be a UniqueType, got #{expected_unique_type.class} in #{expected.inspect}" unless expected.is_a?(UniqueType) unless expected_unique_type.instance_of?(UniqueType)
           conforms_to_unique_type?(api_map, expected_unique_type, situation,
-                                   allow_subtype_skew: allow_subtype_skew,
-                                   allow_empty_params: allow_empty_params,
-                                   allow_reverse_match: allow_reverse_match,
-                                   allow_any_match: allow_any_match)
+                                   rules, variance: variance)
         end
       end
 
@@ -315,6 +320,7 @@ def hash
         [self.class, @name, @key_types, @sub_types, @rooted, @all_params, @parameters_type].hash
       end
 
+      # @return [self]
       def erase_parameters
         UniqueType.new(name, rooted: rooted?, parameters_type: parameters_type)
       end
@@ -335,6 +341,7 @@ def rbs_name
         end
       end
 
+      # @return [String]
       def desc
         rooted_tags
       end
@@ -407,7 +414,7 @@ def downcast_to_literal_if_possible
 
       # @param generics_to_resolve [Enumerable<String>]
       # @param context_type [UniqueType, nil]
-      # @param resolved_generic_values [Hash{String => ComplexType}] Added to as types are encountered or resolved
+      # @param resolved_generic_values [Hash{String => ComplexType, UniqueType}] Added to as types are encountered or resolved
       # @return [UniqueType, ComplexType]
       def resolve_generics_from_context generics_to_resolve, context_type, resolved_generic_values: {}
         if name == ComplexType::GENERIC_TAG_NAME
@@ -505,9 +512,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?('::')
@@ -589,6 +596,7 @@ def self_to_type dst
         end
       end
 
+      # @yieldreturn [Boolean]
       def any? &block
         block.yield self
       end
diff --git a/lib/solargraph/convention/data_definition/data_assignment_node.rb b/lib/solargraph/convention/data_definition/data_assignment_node.rb
index 7aadcf190..0ecfb88eb 100644
--- a/lib/solargraph/convention/data_definition/data_assignment_node.rb
+++ b/lib/solargraph/convention/data_definition/data_assignment_node.rb
@@ -22,6 +22,7 @@ class << self
           #     s(:def, :foo,
           #       s(:args),
           #       s(:send, nil, :bar))))
+          # @param node [Parser::AST::Node]
           def match?(node)
             return false unless node&.type == :casgn
             return false if node.children[2].nil?
diff --git a/lib/solargraph/convention/data_definition/data_definition_node.rb b/lib/solargraph/convention/data_definition/data_definition_node.rb
index dd5929822..5ee79b73d 100644
--- a/lib/solargraph/convention/data_definition/data_definition_node.rb
+++ b/lib/solargraph/convention/data_definition/data_definition_node.rb
@@ -25,6 +25,7 @@ class << self
           #     s(:def, :foo,
           #       s(:args),
           #       s(:send, nil, :bar)))
+          # @param node [Parser::AST::Node]
           def match?(node)
             return false unless node&.type == :class
 
@@ -46,7 +47,7 @@ def data_definition_node?(data_node)
           end
         end
 
-        # @return [Parser::AST::Node]
+        # @param node [Parser::AST::Node]
         def initialize(node)
           @node = node
         end
diff --git a/lib/solargraph/convention/struct_definition/struct_assignment_node.rb b/lib/solargraph/convention/struct_definition/struct_assignment_node.rb
index 04f96d40e..2816de6ed 100644
--- a/lib/solargraph/convention/struct_definition/struct_assignment_node.rb
+++ b/lib/solargraph/convention/struct_definition/struct_assignment_node.rb
@@ -22,6 +22,8 @@ class << self
           #     s(:def, :foo,
           #       s(:args),
           #       s(:send, nil, :bar))))
+          #
+          # @param node [Parser::AST::Node]
           def match?(node)
             return false unless node&.type == :casgn
             return false if node.children[2].nil?
diff --git a/lib/solargraph/convention/struct_definition/struct_definition_node.rb b/lib/solargraph/convention/struct_definition/struct_definition_node.rb
index 540320c37..7c3d722d0 100644
--- a/lib/solargraph/convention/struct_definition/struct_definition_node.rb
+++ b/lib/solargraph/convention/struct_definition/struct_definition_node.rb
@@ -25,6 +25,7 @@ class << self
           #     s(:def, :foo,
           #       s(:args),
           #       s(:send, nil, :bar)))
+          # @param node [Parser::AST::Node]
           def match?(node)
             return false unless node&.type == :class
 
@@ -46,7 +47,7 @@ def struct_definition_node?(struct_node)
           end
         end
 
-        # @return [Parser::AST::Node]
+        # @param node [Parser::AST::Node]
         def initialize(node)
           @node = node
         end
diff --git a/lib/solargraph/gem_pins.rb b/lib/solargraph/gem_pins.rb
index f1dd25a9f..2a3f392f6 100644
--- a/lib/solargraph/gem_pins.rb
+++ b/lib/solargraph/gem_pins.rb
@@ -25,13 +25,14 @@ def self.combine_method_pins_by_path(pins)
       # bad_pins = pins.select { |pin| pin.is_a?(Pin::Method) && pin.path == 'StringIO.open' && pin.source == :rbs }; raise "wtf: #{bad_pins}" if bad_pins.length > 1
       method_pins, alias_pins = pins.partition { |pin| pin.class == Pin::Method }
       by_path = method_pins.group_by(&:path)
-      by_path.transform_values! do |pins|
+      combined_by_path = by_path.transform_values do |pins|
         GemPins.combine_method_pins(*pins)
       end
-      by_path.values + alias_pins
+      combined_by_path.values + alias_pins
     end
 
     def self.combine_method_pins(*pins)
+      # @type [Pin::Method, nil]
       out = pins.reduce(nil) do |memo, pin|
         next pin if memo.nil?
         if memo == pin && memo.source != :combined
diff --git a/lib/solargraph/language_server/host.rb b/lib/solargraph/language_server/host.rb
index 1c5831bda..e85fc813a 100644
--- a/lib/solargraph/language_server/host.rb
+++ b/lib/solargraph/language_server/host.rb
@@ -299,6 +299,7 @@ def prepare directory, name = nil
         end
       end
 
+      # @return [String]
       def command_path
         options['commandPath'] || 'solargraph'
       end
@@ -716,7 +717,7 @@ def diagnoser
       # A hash of client requests by ID. The host uses this to keep track of
       # pending responses.
       #
-      # @return [Hash{Integer => Solargraph::LanguageServer::Host}]
+      # @return [Hash{Integer => Request}]
       def requests
         @requests ||= {}
       end
diff --git a/lib/solargraph/parser/flow_sensitive_typing.rb b/lib/solargraph/parser/flow_sensitive_typing.rb
index 8fb26d498..8dd80a5a0 100644
--- a/lib/solargraph/parser/flow_sensitive_typing.rb
+++ b/lib/solargraph/parser/flow_sensitive_typing.rb
@@ -11,7 +11,9 @@ def initialize(locals, enclosing_breakable_pin = nil)
 
       # @param and_node [Parser::AST::Node]
       def process_and(and_node, true_ranges = [])
+        # @type [Parser::AST::Node]
         lhs = and_node.children[0]
+        # @type [Parser::AST::Node]
         rhs = and_node.children[1]
 
         before_rhs_loc = rhs.location.expression.adjust(begin_pos: -1)
@@ -36,7 +38,9 @@ def process_if(if_node)
         #   s(:send, nil, :bar))
         # [4] pry(main)>
         conditional_node = if_node.children[0]
+        # @type [Parser::AST::Node]
         then_clause = if_node.children[1]
+        # @type [Parser::AST::Node]
         else_clause = if_node.children[2]
 
         true_ranges = []
@@ -142,6 +146,8 @@ def process_facts(facts_by_pin, presences)
       end
 
       # @param conditional_node [Parser::AST::Node]
+      # @param true_ranges [Array<Range>]
+      # @return [void]
       def process_conditional(conditional_node, true_ranges)
         if conditional_node.type == :send
           process_isa(conditional_node, true_ranges)
diff --git a/lib/solargraph/parser/node_processor.rb b/lib/solargraph/parser/node_processor.rb
index a55b7120b..a1a4d811f 100644
--- a/lib/solargraph/parser/node_processor.rb
+++ b/lib/solargraph/parser/node_processor.rb
@@ -23,6 +23,9 @@ def register type, cls
           @@processors[type] << cls
         end
 
+        # @param type [Symbol]
+        # @param cls [Class<NodeProcessor::Base>]
+        # @return [void]
         def deregister type, cls
           @@processors[type].delete(cls)
         end
@@ -31,7 +34,7 @@ def deregister type, cls
       # @param node [Parser::AST::Node]
       # @param region [Region]
       # @param pins [Array<Pin::Base>]
-      # @param locals [Array<Pin::BaseVariable>]
+      # @param locals [Array<Pin::LocalVariable>]
       # @return [Array(Array<Pin::Base>, Array<Pin::Base>)]
       def self.process node, region = Region.new, pins = [], locals = []
         if pins.empty?
diff --git a/lib/solargraph/parser/parser_gem/node_methods.rb b/lib/solargraph/parser/parser_gem/node_methods.rb
index bc0c37eb6..674013257 100644
--- a/lib/solargraph/parser/parser_gem/node_methods.rb
+++ b/lib/solargraph/parser/parser_gem/node_methods.rb
@@ -345,7 +345,7 @@ def value_position_nodes_only(node)
             # Look at known control statements and use them to find
             # more specific return nodes.
             #
-            # @param node [Parser::AST::Node] Statement which is in
+            # @param node [AST::Node] Statement which is in
             #    value position for a method body
             # @param include_explicit_returns [Boolean] If true,
             #    include the value nodes of the parameter of the
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/parser/snippet.rb b/lib/solargraph/parser/snippet.rb
index d28c57c8c..3b609d31b 100644
--- a/lib/solargraph/parser/snippet.rb
+++ b/lib/solargraph/parser/snippet.rb
@@ -1,7 +1,7 @@
 module Solargraph
   module Parser
     class Snippet
-      # @return [Range]
+      # @return [Solargraph::Range]
       attr_reader :range
       # @return [String]
       attr_reader :text
diff --git a/lib/solargraph/pin/base.rb b/lib/solargraph/pin/base.rb
index cdd6a5ace..c9e308056 100644
--- a/lib/solargraph/pin/base.rb
+++ b/lib/solargraph/pin/base.rb
@@ -269,9 +269,13 @@ def assert_same_count(other, attr)
       # @param other [self]
       # @param attr [::Symbol]
       #
-      # @return [Object, nil]
+      # @return [undefined]
       def assert_same(other, attr)
-        return false if other.nil?
+        if other.nil?
+          Solargraph.assert_or_log("combine_with_#{attr}".to_sym,
+                                   "Inconsistent #{attr.inspect} values between \nself =#{inspect} and \nother=#{other.inspect}:\n\n self.#{attr} = #{val1.inspect}\nother.#{attr} = #{val2.inspect}")
+          return send(attr)
+        end
         val1 = send(attr)
         val2 = other.send(attr)
         return val1 if val1 == val2
diff --git a/lib/solargraph/pin/method.rb b/lib/solargraph/pin/method.rb
index 749868246..c3e29b8e3 100644
--- a/lib/solargraph/pin/method.rb
+++ b/lib/solargraph/pin/method.rb
@@ -50,7 +50,7 @@ def combine_all_signature_pins(*signature_pins)
       end
 
       # @param other [Pin::Method]
-      # @return [Symbol]
+      # @return [::Symbol]
       def combine_visibility(other)
         if dodgy_visibility_source? && !other.dodgy_visibility_source?
           other.visibility
diff --git a/lib/solargraph/pin/parameter.rb b/lib/solargraph/pin/parameter.rb
index b4fc3d9b2..d806d6de1 100644
--- a/lib/solargraph/pin/parameter.rb
+++ b/lib/solargraph/pin/parameter.rb
@@ -171,11 +171,7 @@ def compatible_arg?(atype, api_map)
         return true if atype.conforms_to?(api_map,
                                           ptype,
                                           :method_call,
-                                          allow_subtype_skew: false,
-                                          allow_reverse_match: false,
-                                          allow_empty_params: true,
-                                          allow_any_match: false)
-
+                                          [:allow_empty_params, :allow_undefined])
         ptype.generic?
       end
 
diff --git a/lib/solargraph/rbs_map/conversions.rb b/lib/solargraph/rbs_map/conversions.rb
index 6e50c022a..44fb72946 100644
--- a/lib/solargraph/rbs_map/conversions.rb
+++ b/lib/solargraph/rbs_map/conversions.rb
@@ -95,7 +95,7 @@ def convert_self_type_to_pins decl, closure
         type = build_type(decl.name, decl.args)
         generic_values = type.all_params.map(&:to_s)
         include_pin = Solargraph::Pin::Reference::Include.new(
-          name: decl.name.relative!.to_s,
+          name: type.rooted_name,
           type_location: location_decl_to_pin_location(decl.location),
           generic_values: generic_values,
           closure: closure,
@@ -184,7 +184,7 @@ def class_decl_to_pin decl
             type_location: location_decl_to_pin_location(decl.super_class.location),
             closure: class_pin,
             generic_values: generic_values,
-            name: decl.super_class.name.relative!.to_s,
+            name: type.rooted_name,
             source: :rbs
           )
         end
@@ -229,6 +229,8 @@ def module_decl_to_pin decl
         convert_self_types_to_pins decl, module_pin
         convert_members_to_pins decl, module_pin
 
+        raise "Invalid type for module declaration: #{module_pin.class}" unless module_pin.is_a?(Pin::Namespace)
+
         add_mixins decl, module_pin.closure
       end
 
diff --git a/lib/solargraph/source/chain/if.rb b/lib/solargraph/source/chain/if.rb
index c14d00ddf..3a7fa0ca9 100644
--- a/lib/solargraph/source/chain/if.rb
+++ b/lib/solargraph/source/chain/if.rb
@@ -8,7 +8,7 @@ def word
           '<if>'
         end
 
-        # @param links [::Array<Link>]
+        # @param links [::Array<Chain>]
         def initialize links
           @links = links
         end
diff --git a/lib/solargraph/source/chain/or.rb b/lib/solargraph/source/chain/or.rb
index 1e3a70f40..9264d4107 100644
--- a/lib/solargraph/source/chain/or.rb
+++ b/lib/solargraph/source/chain/or.rb
@@ -8,7 +8,7 @@ def word
           '<or>'
         end
 
-        # @param links [::Array<Link>]
+        # @param links [::Array<Chain>]
         def initialize links
           @links = links
         end
diff --git a/lib/solargraph/type_checker.rb b/lib/solargraph/type_checker.rb
index ab87d5863..953832a36 100644
--- a/lib/solargraph/type_checker.rb
+++ b/lib/solargraph/type_checker.rb
@@ -36,6 +36,35 @@ def source_map
       @source_map ||= api_map.source_map(filename)
     end
 
+    # @return [Source]
+    def source
+      @source_map.source
+    end
+
+    def return_type_conforms_to?(inferred, expected)
+      conforms_to?(inferred, expected, :return_type)
+    end
+
+    def arg_conforms_to?(inferred, expected)
+      conforms_to?(inferred, expected, :method_call)
+    end
+
+    def assignment_conforms_to?(inferred, expected)
+      conforms_to?(inferred, expected, :assignment)
+    end
+
+    def conforms_to?(inferred, expected, scenario)
+      rules_arr = []
+      rules_arr << :allow_empty_params unless rules.require_inferred_type_params?
+      rules_arr << :allow_any_match unless rules.require_all_unique_types_match_declared?
+      rules_arr << :allow_undefined unless rules.require_no_undefined_args?
+      rules_arr << :allow_unresolved_generic unless rules.require_generics_resolved?
+      rules_arr << :allow_unmatched_interface unless rules.require_interfaces_resolved?
+      rules_arr << :allow_reverse_match unless rules.require_downcasts?
+      inferred.conforms_to?(api_map, expected, scenario,
+                            rules_arr)
+    end
+
     # @return [Array<Problem>]
     def problems
       @problems ||= begin
@@ -111,11 +140,7 @@ def method_return_type_problems_for pin
               result.push Problem.new(pin.location, "#{pin.path} return type could not be inferred", pin: pin)
             end
           else
-            unless inferred.conforms_to?(api_map, declared, :return_type,
-                                         allow_subtype_skew: false,
-                                         allow_empty_params: !rules.require_inferred_type_params,
-                                         allow_reverse_match: false,
-                                         allow_any_match: !rules.require_all_unique_types_match_declared?)
+            unless return_type_conforms_to?(inferred, declared)
               result.push Problem.new(pin.location, "Declared return type #{declared.rooted_tags} does not match inferred type #{inferred.rooted_tags} for #{pin.path}", pin: pin)
             end
           end
@@ -204,11 +229,7 @@ def variable_type_tag_problems
                   result.push Problem.new(pin.location, "Variable type could not be inferred for #{pin.name}", pin: pin)
                 end
               else
-                unless inferred.conforms_to?(api_map, declared, :assignment,
-                                             allow_subtype_skew: false,
-                                             allow_empty_params: !rules.require_inferred_type_params,
-                                             allow_reverse_match: false,
-                                             allow_any_match: !rules.require_all_unique_types_match_declared?)
+                unless assignment_conforms_to?(inferred, declared)
                   result.push Problem.new(pin.location, "Declared type #{declared} does not match inferred type #{inferred} for variable #{pin.name}", pin: pin)
                 end
               end
@@ -389,11 +410,7 @@ def argument_problems_for chain, api_map, block_pin, locals, location
                     # @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? && !argtype.conforms_to?(api_map, ptype, :method_call,
-                                                                                   allow_subtype_skew: false,
-                                                                                   allow_empty_params: !rules.require_inferred_type_params,
-                                                                                   allow_reverse_match: false,
-                                                                                   allow_any_match: !rules.require_all_unique_types_match_declared?)
+                    if argtype.defined? && ptype.defined? && !arg_conforms_to?(argtype, ptype)
                       errors.push Problem.new(location, "Wrong argument type for #{pin.path}: #{par.name} expected #{ptype}, received #{argtype}")
                       next
                     end
@@ -443,13 +460,8 @@ def kwarg_problems_for sig, argchain, api_map, block_pin, locals, location, pin,
           else
             ptype = data[:qualified]
             unless ptype.undefined?
-
               argtype = argchain.infer(api_map, block_pin, locals)
-              if argtype.defined? && ptype && !argtype.conforms_to?(api_map, ptype, :method_call,
-                                                                    allow_subtype_skew: false,
-                                                                    allow_empty_params: !rules.require_inferred_type_params,
-                                                                    allow_reverse_match: false,
-                                                                    allow_any_match: !rules.require_all_unique_types_match_declared?)
+              if argtype.defined? && ptype && !arg_conforms_to?(argtype, ptype)
                 result.push Problem.new(location, "Wrong argument type for #{pin.path}: #{par.name} expected #{ptype}, received #{argtype}")
               end
             end
@@ -475,12 +487,7 @@ def kwrestarg_problems_for(api_map, block_pin, locals, location, pin, params, kw
         next unless params.key?(pname.to_s)
         ptype = params[pname.to_s][:qualified]
         argtype = argchain.infer(api_map, block_pin, locals)
-        if argtype.defined? && ptype && !argtype.conforms_to?(api_map, ptype, :method_call,
-                                                              allow_subtype_skew: false,
-                                                              allow_empty_params: !rules.require_inferred_type_params,
-                                                              allow_reverse_match: false,
-                                                              allow_any_match: !rules.require_all_unique_types_match_declared?)
-
+        if argtype.defined? && ptype && !arg_conforms_to?(argtype, ptype)
           result.push Problem.new(location, "Wrong argument type for #{pin.path}: #{pname} expected #{ptype}, received #{argtype}")
         end
       end
diff --git a/lib/solargraph/type_checker/rules.rb b/lib/solargraph/type_checker/rules.rb
index 8f2027d30..33ec0c4d0 100644
--- a/lib/solargraph/type_checker/rules.rb
+++ b/lib/solargraph/type_checker/rules.rb
@@ -54,13 +54,37 @@ def validate_tags?
         rank > LEVELS[:normal]
       end
 
-      def require_inferred_type_params
+      def require_inferred_type_params?
         rank >= LEVELS[:alpha]
       end
 
       def require_all_unique_types_match_declared?
         rank >= LEVELS[:alpha]
       end
+
+      def require_no_undefined_args?
+        rank >= LEVELS[:alpha]
+      end
+
+      def require_generics_resolved?
+        rank >= LEVELS[:alpha]
+      end
+
+      def require_interfaces_resolved?
+        rank >= LEVELS[:alpha]
+      end
+
+      def require_downcasts?
+        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/yard_map/mapper/to_method.rb b/lib/solargraph/yard_map/mapper/to_method.rb
index df431bb3c..d8e3b8b43 100644
--- a/lib/solargraph/yard_map/mapper/to_method.rb
+++ b/lib/solargraph/yard_map/mapper/to_method.rb
@@ -27,8 +27,8 @@ 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 ||= :private if closure.path == 'Kernel' && Kernel.private_instance_methods(false).include?(name)
+          final_visibility ||= VISIBILITY_OVERRIDE[[closure.path, final_scope]]
+          final_visibility ||= :private if closure.path == 'Kernel' && Kernel.private_instance_methods(false).include?(name.to_sym)
           final_visibility ||= visibility
           final_visibility ||= :private if code_object.module_function? && final_scope == :instance
           final_visibility ||= :public if code_object.module_function? && final_scope == :class
diff --git a/spec/complex_type/conforms_to_spec.rb b/spec/complex_type/conforms_to_spec.rb
index 847da8563..5755721b4 100644
--- a/spec/complex_type/conforms_to_spec.rb
+++ b/spec/complex_type/conforms_to_spec.rb
@@ -67,7 +67,7 @@ class Sub < Sup; end
     api_map = Solargraph::ApiMap.new
     exp = Solargraph::ComplexType.parse('Hash{ Symbol => String}')
     inf = Solargraph::ComplexType.parse('Hash')
-    match = inf.conforms_to?(api_map, exp, :method_call, allow_empty_params: true)
+    match = inf.conforms_to?(api_map, exp, :method_call, [:allow_empty_params])
     expect(match).to be(true)
   end
 
@@ -115,7 +115,7 @@ class Sub < Sup; end
     api_map = Solargraph::ApiMap.new
     exp = Solargraph::ComplexType.parse('Class<String>')
     inf = Solargraph::ComplexType.parse('Class')
-    match = inf.conforms_to?(api_map, exp, :method_call, allow_empty_params: true)
+    match = inf.conforms_to?(api_map, exp, :method_call, [:allow_empty_params])
     expect(match).to be(true)
   end
 
@@ -136,9 +136,9 @@ class Sub < Sup; end
     api_map.map source
     sup = Solargraph::ComplexType.parse('Sup')
     sub = Solargraph::ComplexType.parse('Sub')
-    match = sub.conforms_to?(api_map, sup, :method_call, allow_reverse_match: true)
+    match = sub.conforms_to?(api_map, sup, :method_call, [:allow_reverse_match])
     expect(match).to be(true)
-    match = sup.conforms_to?(api_map, sub, :method_call, allow_reverse_match: true)
+    match = sup.conforms_to?(api_map, sub, :method_call, [:allow_reverse_match])
     expect(match).to be(true)
   end
 
@@ -146,9 +146,9 @@ class Sub < Sup; end
     api_map = Solargraph::ApiMap.new
     sup = Solargraph::ComplexType.parse('String')
     sub = Solargraph::ComplexType.parse('Array')
-    match = sub.conforms_to?(api_map, sup, :method_call, allow_reverse_match: true)
+    match = sub.conforms_to?(api_map, sup, :method_call, [:allow_reverse_match])
     expect(match).to be(false)
-    match = sup.conforms_to?(api_map, sub, :method_call, allow_reverse_match: true)
+    match = sup.conforms_to?(api_map, sub, :method_call, [:allow_reverse_match])
     expect(match).to be(false)
   end
 end
diff --git a/spec/complex_type_spec.rb b/spec/complex_type_spec.rb
index 2c060ceed..dd20099eb 100644
--- a/spec/complex_type_spec.rb
+++ b/spec/complex_type_spec.rb
@@ -738,28 +738,28 @@ def make_bar
       api_map = Solargraph::ApiMap.new
       ptype = Solargraph::ComplexType.parse('String')
       atype = Solargraph::ComplexType.parse('String')
-      expect(ptype.conforms_to?(api_map, atype, :method_call)).to be(true)
+      expect(atype.conforms_to?(api_map, ptype, :method_call)).to be(true)
     end
 
     it 'recognizes an erased container type conforms with itself' do
       api_map = Solargraph::ApiMap.new
       ptype = Solargraph::ComplexType.parse('Hash')
       atype = Solargraph::ComplexType.parse('Hash')
-      expect(ptype.conforms_to?(api_map, atype, :method_call)).to be(true)
+      expect(atype.conforms_to?(api_map, ptype, :method_call)).to be(true)
     end
 
     it 'recognizes an unerased container type conforms with itself' do
       api_map = Solargraph::ApiMap.new
       ptype = Solargraph::ComplexType.parse('Array<Integer>')
       atype = Solargraph::ComplexType.parse('Array<Integer>')
-      expect(ptype.conforms_to?(api_map, atype, :method_call)).to be(true)
+      expect(atype.conforms_to?(api_map, ptype, :method_call)).to be(true)
     end
 
     it 'recognizes a literal conforms with its type' do
       api_map = Solargraph::ApiMap.new
       ptype = Solargraph::ComplexType.parse('Symbol')
       atype = Solargraph::ComplexType.parse(':foo')
-      expect(ptype.conforms_to?(api_map, atype, :method_call)).to be(true)
+      expect(atype.conforms_to?(api_map, ptype, :method_call)).to be(true)
     end
   end
 end
diff --git a/spec/rbs_map/conversions_spec.rb b/spec/rbs_map/conversions_spec.rb
index 09c203687..75ec1c311 100644
--- a/spec/rbs_map/conversions_spec.rb
+++ b/spec/rbs_map/conversions_spec.rb
@@ -1,54 +1,75 @@
 describe Solargraph::RbsMap::Conversions do
-  # create a temporary directory with the scope of the spec
-  around do |example|
-    require 'tmpdir'
-    Dir.mktmpdir("rspec-solargraph-") do |dir|
-      @temp_dir = dir
-      example.run
+  context 'with custom RBS files' do
+    # create a temporary directory with the scope of the spec
+    around do |example|
+      require 'tmpdir'
+      Dir.mktmpdir("rspec-solargraph-") do |dir|
+        @temp_dir = dir
+        example.run
+      end
     end
-  end
 
-  let(:rbs_repo) do
-    RBS::Repository.new(no_stdlib: false)
-  end
+    let(:rbs_repo) do
+      RBS::Repository.new(no_stdlib: false)
+    end
 
-  let(:loader) do
-    RBS::EnvironmentLoader.new(core_root: nil, repository: rbs_repo)
-  end
+    let(:loader) do
+      RBS::EnvironmentLoader.new(core_root: nil, repository: rbs_repo)
+    end
 
-  let(:conversions) do
-    Solargraph::RbsMap::Conversions.new(loader: loader)
-  end
+    let(:conversions) do
+      Solargraph::RbsMap::Conversions.new(loader: loader)
+    end
 
-  let(:pins) do
-    conversions.pins
-  end
+    let(:pins) do
+      conversions.pins
+    end
 
-  before do
-    rbs_file = File.join(temp_dir, 'foo.rbs')
-    File.write(rbs_file, rbs)
-    loader.add(path: Pathname(temp_dir))
-  end
+    before do
+      rbs_file = File.join(temp_dir, 'foo.rbs')
+      File.write(rbs_file, rbs)
+      loader.add(path: Pathname(temp_dir))
+    end
 
-  attr_reader :temp_dir
+    attr_reader :temp_dir
 
-  context 'with untyped response' do
-    let(:rbs) do
-      <<~RBS
+    context 'with untyped response' do
+      let(:rbs) do
+        <<~RBS
           class Foo
             def bar: () -> untyped
           end
         RBS
+      end
+
+      subject(:method_pin) { pins.find { |pin| pin.path == 'Foo#bar' } }
+
+      it { should_not be_nil }
+
+      it { should be_a(Solargraph::Pin::Method) }
+
+      it 'maps untyped in RBS to undefined in Solargraph 'do
+        expect(method_pin.return_type.tag).to eq('undefined')
+      end
     end
+  end
 
-    subject(:method_pin) { pins.find { |pin| pin.path == 'Foo#bar' } }
+  context 'with standard loads for solargraph project' do
+    let(:api_map) { Solargraph::ApiMap.load('.') }
 
-    it { should_not be_nil }
+    let(:superclass_pin) do
+      api_map.pins.find do |pin|
+        pin.is_a?(Solargraph::Pin::Reference::Superclass) && pin.context.namespace == 'Parser::AST::Node'
+      end
+    end
 
-    it { should be_a(Solargraph::Pin::Method) }
+    it 'finds a superclass pin for Parser::AST::Node' do
+      expect(superclass_pin).not_to be_nil
+    end
 
-    it 'maps untyped in RBS to undefined in Solargraph 'do
-      expect(method_pin.return_type.tag).to eq('undefined')
+    it 'generates a rooted pin for superclass of Parser::AST::Node' do
+      # rooted!
+      expect(superclass_pin.name) .to eq('::AST::Node')
     end
   end
 end
diff --git a/spec/type_checker/levels/strong_spec.rb b/spec/type_checker/levels/strong_spec.rb
index 054a09efa..4c45056ea 100644
--- a/spec/type_checker/levels/strong_spec.rb
+++ b/spec/type_checker/levels/strong_spec.rb
@@ -141,6 +141,167 @@ def bar &block
       expect(checker.problems).to be_empty
     end
 
+    it 'does not need fully specified container types' do
+      checker = type_checker(%(
+        class Foo
+          # @param foo [Array<String>]
+          # @return [void]
+          def bar foo: []; end
+
+          # @param bing [Array]
+          # @return [void]
+          def baz(bing)
+            bar(foo: bing)
+            generic_values = [1,2,3].map(&:to_s)
+            bar(foo: generic_values)
+          end
+        end
+      ))
+      expect(checker.problems.map(&:message)).to be_empty
+    end
+
+    it 'treats a parameter type of undefined as not provided' do
+      checker = type_checker(%(
+        class Foo
+          # @param foo [Array<String>]
+          # @return [void]
+          def bar foo: []; end
+
+          # @param bing [Array<undefind>]
+          # @return [void]
+          def baz(bing)
+            bar(foo: bing)
+            generic_values = [1,2,3].map(&:to_s)
+            bar(foo: generic_values)
+          end
+        end
+      ))
+      expect(checker.problems.map(&:message)).to be_empty
+    end
+
+    it 'treats a parameter type of undefined as not provided' do
+      checker = type_checker(%(
+        class Foo
+          # @param foo [Class<String>]
+          # @return [void]
+          def bar foo:; end
+
+          # @param bing [Class<undefind>]
+          # @return [void]
+          def baz(bing)
+            bar(foo: bing)
+          end
+        end
+      ))
+      expect(checker.problems.map(&:message)).to be_empty
+    end
+
+    it 'ignores generic resolution failures' do
+      checker = type_checker(%(
+        class Foo
+          # @param foo [Class<String>]
+          # @return [void]
+          def bar foo:; end
+
+          # @param bing [Class<generic<T>>]
+          # @return [void]
+          def baz(bing)
+            bar(foo: bing)
+          end
+        end
+      ))
+      expect(checker.problems.map(&:message)).to be_empty
+    end
+
+    it 'ignores undefined resolution failures' do
+      checker = type_checker(%(
+        class Foo
+          # @generic T
+          # @param klass [Class<undefined>>]
+          # @return [Set<generic<T>>]
+          def pins_by_class klass; [].to_set; end
+        end
+        class Bar
+          # @return [Enumerable<Integer>]
+          def block_pins
+            foo = Foo.new
+            foo.pins_by_class(Integer)
+          end
+        end
+      ))
+      expect(checker.problems.map(&:message)).to be_empty
+    end
+
+
+    it 'ignores generic resolution failures' do
+      checker = type_checker(%(
+        class Foo
+          # @generic T
+          # @param klass [Class<generic<T>>]
+          # @return [Set<generic<T>>]
+          def pins_by_class klass; [].to_set; end
+        end
+        class Bar
+          # @return [Enumerable<Integer>]
+          def block_pins
+            foo = Foo.new
+            foo.pins_by_class(Integer)
+          end
+        end
+      ))
+      expect(checker.problems.map(&:message)).to be_empty
+    end
+
+    it 'ignores generic resolution failures' do
+      checker = type_checker(%(
+        # @generic T
+        # @param path [String]
+        # @param klass [Class<generic<T>>]
+        # @return [void]
+        def code_object_at path, klass = Integer
+        end
+      ))
+      expect(checker.problems.map(&:message)).to be_empty
+    end
+
+    it 'does not complain on select { is_a? } pattern' do
+      checker = type_checker(%(
+        # @param arr [Enumerable<Object>}
+        # @return [Enumerable<Integer>]
+        def downcast_arr(arr)
+          arr.select { |pin| pin.is_a?(Integer) }
+        end
+      ))
+      expect(checker.problems.map(&:message)).to be_empty
+    end
+
+    it 'does not complain on adding nil to types via return value' do
+      checker = type_checker(%(
+        # @param bar [Integer]
+        # @return [Integer, nil]
+        def foo(bar)
+          bar
+        end
+      ))
+      expect(checker.problems.map(&:message)).to be_empty
+    end
+
+    it 'does not complain on adding nil to types via select' do
+      checker = type_checker(%(
+        # @return [Float, nil]}
+        def bar; rand; end
+
+        # @param arr [Enumerable<Object>}
+        # @return [Integer, nil]
+        def downcast_arr(arr)
+          # @type [Object, nil]
+          foo = arr.select { |pin| pin.is_a?(Integer) && bar }.last
+          foo
+        end
+      ))
+      expect(checker.problems.map(&:message)).to be_empty
+    end
+
     it 'inherits param tags from superclass methods' do
       checker = type_checker(%(
         class Foo

From 898bb87e30bdf9f9837bb986deb467e7b5324404 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 22 Jul 2025 09:11:41 -0400
Subject: [PATCH 026/327] Fix specs

---
 lib/solargraph/api_map/index.rb         | 11 ++++-------
 lib/solargraph/doc_map.rb               |  2 ++
 lib/solargraph/rbs_map/core_map.rb      |  5 ++++-
 spec/rbs_map/core_map_spec.rb           |  2 +-
 spec/type_checker/levels/strict_spec.rb | 13 +++++++++++++
 spec/type_checker/levels/typed_spec.rb  | 12 ------------
 6 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/lib/solargraph/api_map/index.rb b/lib/solargraph/api_map/index.rb
index 42bb6cc32..9015cd6d5 100644
--- a/lib/solargraph/api_map/index.rb
+++ b/lib/solargraph/api_map/index.rb
@@ -39,22 +39,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
@@ -142,12 +142,9 @@ def map_overrides
           pins = path_pin_hash[ovr.name]
           logger.debug { "ApiMap::Index#map_overrides: pins for path=#{ovr.name}: #{pins}" }
           pins.each do |pin|
-            next unless pin.is_a?(Pin::Reference::Override)
-
             new_pin = if pin.path.end_with?('#initialize')
                         path_pin_hash[pin.path.sub(/#initialize/, '.new')].first
                       end
-            next unless new_pin.nil? || new_pin.is_a?(Pin::Method)
             (ovr.tags.map(&:tag_name) + ovr.delete).uniq.each do |tag|
               pin.docstring.delete_tags tag
               new_pin.docstring.delete_tags tag if new_pin
diff --git a/lib/solargraph/doc_map.rb b/lib/solargraph/doc_map.rb
index d51fc3022..186037460 100644
--- a/lib/solargraph/doc_map.rb
+++ b/lib/solargraph/doc_map.rb
@@ -150,6 +150,8 @@ def load_serialized_gem_pins
       @uncached_yard_gemspecs = []
       @uncached_rbs_collection_gemspecs = []
       with_gemspecs, without_gemspecs = required_gems_map.partition { |_, v| v }
+      # @sg-ignore Need Hash[] support
+      # @type [Array<String>]
       paths = Hash[without_gemspecs].keys
       gemspecs = Hash[with_gemspecs].values.flatten.compact + dependencies.to_a
 
diff --git a/lib/solargraph/rbs_map/core_map.rb b/lib/solargraph/rbs_map/core_map.rb
index 0d265d773..5e030d9f6 100644
--- a/lib/solargraph/rbs_map/core_map.rb
+++ b/lib/solargraph/rbs_map/core_map.rb
@@ -24,8 +24,11 @@ def pins
         else
           loader.add(path: Pathname(FILLS_DIRECTORY))
           @pins = conversions.pins
+          # add some overrides
           @pins.concat RbsMap::CoreFills::ALL
-          processed = ApiMap::Store.new(pins).pins.reject { |p| p.is_a?(Solargraph::Pin::Reference::Override) }
+          # process overrides, then remove any which couldn't be resolved
+          processed = ApiMap::Store.new(@pins).pins.reject { |p| p.is_a?(Solargraph::Pin::Reference::Override) }
+          STDOUT.puts "RBS core pins cache size: #{@pins.size}"
           @pins.replace processed
 
           PinCache.serialize_core @pins
diff --git a/spec/rbs_map/core_map_spec.rb b/spec/rbs_map/core_map_spec.rb
index 352d29937..88590925b 100644
--- a/spec/rbs_map/core_map_spec.rb
+++ b/spec/rbs_map/core_map_spec.rb
@@ -6,7 +6,7 @@
       pin = store.get_path_pins("Errno::#{const}").first
       expect(pin).to be_a(Solargraph::Pin::Namespace)
       superclass = store.get_superclass(pin.path)
-      expect(superclass).to eq('SystemCallError')
+      expect(superclass).to eq('::SystemCallError')
     end
   end
 
diff --git a/spec/type_checker/levels/strict_spec.rb b/spec/type_checker/levels/strict_spec.rb
index b198cec89..7861c8817 100644
--- a/spec/type_checker/levels/strict_spec.rb
+++ b/spec/type_checker/levels/strict_spec.rb
@@ -666,6 +666,19 @@ def test(foo: nil)
       expect(checker.problems).to be_empty
     end
 
+
+    it 'validates parameters in function calls' do
+      checker = type_checker(%(
+        # @param bar [String]
+        def foo(bar); end
+
+        def baz
+          foo(123)
+        end
+        ))
+      expect(checker.problems.map(&:message)).to eq(['Wrong argument type for #foo: bar expected String, received 123'])
+    end
+
     it 'validates inferred return types with complex tags' do
       checker = type_checker(%(
         # @param foo [Numeric, nil] a foo
diff --git a/spec/type_checker/levels/typed_spec.rb b/spec/type_checker/levels/typed_spec.rb
index 659ccee39..6e71ee9ff 100644
--- a/spec/type_checker/levels/typed_spec.rb
+++ b/spec/type_checker/levels/typed_spec.rb
@@ -202,18 +202,6 @@ def foo
       expect(checker.problems).to be_empty
     end
 
-    it 'validates parameters in function calls' do
-      checker = type_checker(%(
-        # @param bar [String]
-        def foo(bar); end
-
-        def baz
-          foo(123)
-        end
-        ))
-      expect(checker.problems.map(&:message)).to eq(['123'])
-    end
-
     it 'validates default values of parameters' do
       checker = type_checker(%(
         # @param bar [String]

From b6bfe7b4fd9c8a52038cc096bd29050e244b6fed Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 22 Jul 2025 10:11:45 -0400
Subject: [PATCH 027/327] Generic typechecking improvements

---
 .../language_server/message/base.rb           |   2 +-
 .../message/extended/check_gem_version.rb     |   6 -
 rbs/fills/rubygems/0/spec_fetcher.rbs         | 107 ++++++++++++++++++
 3 files changed, 108 insertions(+), 7 deletions(-)
 create mode 100644 rbs/fills/rubygems/0/spec_fetcher.rbs

diff --git a/lib/solargraph/language_server/message/base.rb b/lib/solargraph/language_server/message/base.rb
index fbc55ccbd..b2df0c46a 100644
--- a/lib/solargraph/language_server/message/base.rb
+++ b/lib/solargraph/language_server/message/base.rb
@@ -16,7 +16,7 @@ class Base
         # @return [String]
         attr_reader :method
 
-        # @return [Hash{String => Array<undefined>, Hash{String => undefined}, String, Integer}]
+        # @return [Hash{String => undefined}]
         attr_reader :params
 
         # @return [Hash, Array, nil]
diff --git a/lib/solargraph/language_server/message/extended/check_gem_version.rb b/lib/solargraph/language_server/message/extended/check_gem_version.rb
index 2e80f40c6..06892ed19 100644
--- a/lib/solargraph/language_server/message/extended/check_gem_version.rb
+++ b/lib/solargraph/language_server/message/extended/check_gem_version.rb
@@ -1,12 +1,6 @@
 # frozen_string_literal: true
 
 
-# @todo PR the RBS gem to add this
-# @!parse
-#   module ::Gem
-#    class SpecFetcher; end
-#   end
-
 module Solargraph
   module LanguageServer
     module Message
diff --git a/rbs/fills/rubygems/0/spec_fetcher.rbs b/rbs/fills/rubygems/0/spec_fetcher.rbs
new file mode 100644
index 000000000..9914dc85d
--- /dev/null
+++ b/rbs/fills/rubygems/0/spec_fetcher.rbs
@@ -0,0 +1,107 @@
+# <!-- rdoc-file=lib/rubygems/spec_fetcher.rb -->
+# SpecFetcher handles metadata updates from remote gem repositories.
+#
+class Gem::SpecFetcher
+  self.@fetcher: untyped
+
+  @sources: untyped
+
+  @update_cache: untyped
+
+  @specs: untyped
+
+  @latest_specs: untyped
+
+  @prerelease_specs: untyped
+
+  @caches: untyped
+
+  @fetcher: untyped
+
+  include Gem::UserInteraction
+
+  include Gem::Text
+
+  attr_reader latest_specs: untyped
+
+  attr_reader sources: untyped
+
+  attr_reader specs: untyped
+
+  attr_reader prerelease_specs: untyped
+
+  # <!--
+  #   rdoc-file=lib/rubygems/spec_fetcher.rb
+  #   - fetcher()
+  # -->
+  # Default fetcher instance.  Use this instead of ::new to reduce object
+  # allocation.
+  #
+  def self.fetcher: () -> untyped
+
+  def self.fetcher=: (untyped fetcher) -> untyped
+
+  # <!--
+  #   rdoc-file=lib/rubygems/spec_fetcher.rb
+  #   - new(sources = nil)
+  # -->
+  # Creates a new SpecFetcher.  Ordinarily you want to use the default fetcher
+  # from Gem::SpecFetcher::fetcher which uses the Gem.sources.
+  #
+  # If you need to retrieve specifications from a different `source`, you can send
+  # it as an argument.
+  #
+  def initialize: (?untyped? sources) -> void
+
+  # <!--
+  #   rdoc-file=lib/rubygems/spec_fetcher.rb
+  #   - search_for_dependency(dependency, matching_platform=true)
+  # -->
+  # Find and fetch gem name tuples that match `dependency`.
+  #
+  # If `matching_platform` is false, gems for all platforms are returned.
+  #
+  def search_for_dependency: (untyped dependency, ?bool matching_platform) -> ::Array[untyped]
+
+  # <!--
+  #   rdoc-file=lib/rubygems/spec_fetcher.rb
+  #   - detect(type=:complete) { |tup| ... }
+  # -->
+  # Return all gem name tuples who's names match `obj`
+  #
+  def detect: (?::Symbol type) { (untyped) -> untyped } -> untyped
+
+  # <!--
+  #   rdoc-file=lib/rubygems/spec_fetcher.rb
+  #   - spec_for_dependency(dependency, matching_platform=true)
+  # -->
+  # Find and fetch specs that match `dependency`.
+  #
+  # If `matching_platform` is false, gems for all platforms are returned.
+  #
+  def spec_for_dependency: (untyped dependency, ?bool matching_platform) -> ::Array[untyped]
+
+  # <!--
+  #   rdoc-file=lib/rubygems/spec_fetcher.rb
+  #   - suggest_gems_from_name(gem_name, type = :latest, num_results = 5)
+  # -->
+  # Suggests gems based on the supplied `gem_name`. Returns an array of
+  # alternative gem names.
+  #
+  def suggest_gems_from_name: (untyped gem_name, ?::Symbol type, ?::Integer num_results) -> (::Array[untyped] | untyped)
+
+  # <!--
+  #   rdoc-file=lib/rubygems/spec_fetcher.rb
+  #   - available_specs(type)
+  # -->
+  # Returns a list of gems available for each source in Gem::sources.
+  #
+  # `type` can be one of 3 values: :released   => Return the list of all released
+  # specs :complete   => Return the list of all specs :latest     => Return the
+  # list of only the highest version of each gem :prerelease => Return the list of
+  # all prerelease only specs
+  #
+  def available_specs: (untyped type) -> ::Array[untyped]
+
+  def tuples_for: (untyped source, untyped type, ?bool gracefully_ignore) -> untyped
+end

From 1d0b23d13f20646992a4b17a44c492826f433cab Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 22 Jul 2025 17:53:02 -0400
Subject: [PATCH 028/327] Generic typechecking improvements

---
 lib/solargraph/api_map/index.rb             |  3 +--
 lib/solargraph/complex_type/type_methods.rb |  2 ++
 lib/solargraph/doc_map.rb                   |  1 +
 lib/solargraph/location.rb                  |  1 -
 lib/solargraph/position.rb                  |  1 -
 lib/solargraph/range.rb                     |  1 -
 lib/solargraph/type_checker.rb              | 11 +++++++++++
 lib/solargraph/type_checker/rules.rb        |  2 +-
 8 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/lib/solargraph/api_map/index.rb b/lib/solargraph/api_map/index.rb
index 9015cd6d5..fbfb5c218 100644
--- a/lib/solargraph/api_map/index.rb
+++ b/lib/solargraph/api_map/index.rb
@@ -72,7 +72,7 @@ def merge pins
 
       # @return [Solargraph::ApiMap::Index]
       def deep_clone
-        out = Index.allocate.tap do |copy|
+        Index.allocate.tap do |copy|
           copy.pin_select_cache = {}
           copy.pins = pins.clone
           %i[
@@ -83,7 +83,6 @@ def deep_clone
             copy.send(sym)&.transform_values!(&:clone)
           end
         end
-        out
       end
 
       # @param new_pins [Enumerable<Pin::Base>]
diff --git a/lib/solargraph/complex_type/type_methods.rb b/lib/solargraph/complex_type/type_methods.rb
index 4fcaadb7f..791ab80b0 100644
--- a/lib/solargraph/complex_type/type_methods.rb
+++ b/lib/solargraph/complex_type/type_methods.rb
@@ -70,6 +70,8 @@ def undefined?
       end
 
       # Variance of the type ignoring any type parameters
+      # @return [Symbol]
+      # @param situation [Symbol] The situation in which the variance is being considered.
       def erased_variance situation = :method_call
         if [:method_call, :return_type, :assignment].include?(situation)
           :covariant
diff --git a/lib/solargraph/doc_map.rb b/lib/solargraph/doc_map.rb
index 186037460..9136da26b 100644
--- a/lib/solargraph/doc_map.rb
+++ b/lib/solargraph/doc_map.rb
@@ -153,6 +153,7 @@ def load_serialized_gem_pins
       # @sg-ignore Need Hash[] support
       # @type [Array<String>]
       paths = Hash[without_gemspecs].keys
+      # @type [Array<Gem::Specification>]
       gemspecs = Hash[with_gemspecs].values.flatten.compact + dependencies.to_a
 
       paths.each do |path|
diff --git a/lib/solargraph/location.rb b/lib/solargraph/location.rb
index 74d1318df..3af8016b3 100644
--- a/lib/solargraph/location.rb
+++ b/lib/solargraph/location.rb
@@ -20,7 +20,6 @@ def initialize filename, range
       @range = range
     end
 
-    # @sg-ignore Fix "Not enough arguments to Module#protected"
     protected def equality_fields
       [filename, range]
     end
diff --git a/lib/solargraph/position.rb b/lib/solargraph/position.rb
index 1bd31e0f5..27289d28f 100644
--- a/lib/solargraph/position.rb
+++ b/lib/solargraph/position.rb
@@ -21,7 +21,6 @@ def initialize line, character
       @character = character
     end
 
-    # @sg-ignore Fix "Not enough arguments to Module#protected"
     protected def equality_fields
       [line, character]
     end
diff --git a/lib/solargraph/range.rb b/lib/solargraph/range.rb
index c508e48fa..2bea62797 100644
--- a/lib/solargraph/range.rb
+++ b/lib/solargraph/range.rb
@@ -19,7 +19,6 @@ def initialize start, ending
       @ending = ending
     end
 
-    # @sg-ignore Fix "Not enough arguments to Module#protected"
     protected def equality_fields
       [start, ending]
     end
diff --git a/lib/solargraph/type_checker.rb b/lib/solargraph/type_checker.rb
index 953832a36..8b86f02df 100644
--- a/lib/solargraph/type_checker.rb
+++ b/lib/solargraph/type_checker.rb
@@ -41,18 +41,27 @@ def source
       @source_map.source
     end
 
+    # @param inferred [ComplexType]
+    # @param expected [ComplexType]
     def return_type_conforms_to?(inferred, expected)
       conforms_to?(inferred, expected, :return_type)
     end
 
+    # @param inferred [ComplexType]
+    # @param expected [ComplexType]
     def arg_conforms_to?(inferred, expected)
       conforms_to?(inferred, expected, :method_call)
     end
 
+    # @param inferred [ComplexType]
+    # @param expected [ComplexType]
     def assignment_conforms_to?(inferred, expected)
       conforms_to?(inferred, expected, :assignment)
     end
 
+    # @param inferred [ComplexType]
+    # @param expected [ComplexType]
+    # @param scenario [Symbol]
     def conforms_to?(inferred, expected, scenario)
       rules_arr = []
       rules_arr << :allow_empty_params unless rules.require_inferred_type_params?
@@ -486,7 +495,9 @@ def kwrestarg_problems_for(api_map, block_pin, locals, location, pin, params, kw
       kwargs.each_pair do |pname, argchain|
         next unless params.key?(pname.to_s)
         ptype = params[pname.to_s][:qualified]
+        ptype = ptype.self_to_type(pin.context)
         argtype = argchain.infer(api_map, block_pin, locals)
+        argtype = argtype.self_to_type(block_pin.context)
         if argtype.defined? && ptype && !arg_conforms_to?(argtype, ptype)
           result.push Problem.new(location, "Wrong argument type for #{pin.path}: #{pname} expected #{ptype}, received #{argtype}")
         end
diff --git a/lib/solargraph/type_checker/rules.rb b/lib/solargraph/type_checker/rules.rb
index 33ec0c4d0..5290c8c12 100644
--- a/lib/solargraph/type_checker/rules.rb
+++ b/lib/solargraph/type_checker/rules.rb
@@ -78,7 +78,7 @@ def require_downcasts?
         rank >= LEVELS[:alpha]
       end
 
-      # We keep this at strong because if you added an @sg-ignore to
+      # 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

From 3850399ccf0fd63e5ccaff9a32751a9633bbac59 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 22 Jul 2025 21:16:31 -0400
Subject: [PATCH 029/327] Generic typechecking improvements

---
 lib/solargraph/complex_type.rb             | 7 +++++++
 lib/solargraph/complex_type/unique_type.rb | 5 +++++
 lib/solargraph/pin/base.rb                 | 4 ++++
 3 files changed, 16 insertions(+)

diff --git a/lib/solargraph/complex_type.rb b/lib/solargraph/complex_type.rb
index 05e499998..a558f3ba5 100644
--- a/lib/solargraph/complex_type.rb
+++ b/lib/solargraph/complex_type.rb
@@ -315,6 +315,13 @@ def all_rooted?
       all?(&:all_rooted?)
     end
 
+    # @param other [ComplexType, UniqueType]
+    def erased_version_of?(other)
+      return false if items.length != 1 || other.items.length != 1
+
+      @items.first.erased_version_of?(other.items.first)
+    end
+
     # every top-level type has resolved to be fully qualified; see
     # #all_rooted? to check their subtypes as well
     def rooted?
diff --git a/lib/solargraph/complex_type/unique_type.rb b/lib/solargraph/complex_type/unique_type.rb
index 361fe06bb..39e5e728f 100644
--- a/lib/solargraph/complex_type/unique_type.rb
+++ b/lib/solargraph/complex_type/unique_type.rb
@@ -194,6 +194,11 @@ def interface?
         name.start_with?('_')
       end
 
+      # @param other [UniqueType]
+      def erased_version_of?(other)
+        return name == other.name && (all_params.empty? || all_params.all?(&:undefined?))
+      end
+
       # @param api_map [ApiMap]
       # @param expected [ComplexType::UniqueType]
       # @param situation [:method_call, :return_type]
diff --git a/lib/solargraph/pin/base.rb b/lib/solargraph/pin/base.rb
index c9e308056..14d324273 100644
--- a/lib/solargraph/pin/base.rb
+++ b/lib/solargraph/pin/base.rb
@@ -152,6 +152,10 @@ def combine_return_type(other)
           other.return_type
         elsif other.return_type.undefined?
           return_type
+        elsif return_type.erased_version_of?(other.return_type)
+          other.return_type
+        elsif other.return_type.erased_version_of?(return_type)
+          return_type
         elsif dodgy_return_type_source? && !other.dodgy_return_type_source?
           other.return_type
         elsif other.dodgy_return_type_source? && !dodgy_return_type_source?

From b6b66f397732f43f161c3e7ddc245b5318c34fbe Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 30 Jul 2025 07:59:13 -0400
Subject: [PATCH 030/327] Fix flaky spec

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

diff --git a/spec/rbs_map/conversions_spec.rb b/spec/rbs_map/conversions_spec.rb
index 75ec1c311..d9570ae0f 100644
--- a/spec/rbs_map/conversions_spec.rb
+++ b/spec/rbs_map/conversions_spec.rb
@@ -55,7 +55,7 @@ def bar: () -> untyped
   end
 
   context 'with standard loads for solargraph project' do
-    let(:api_map) { Solargraph::ApiMap.load('.') }
+    let(:api_map) { Solargraph::ApiMap.load_with_cache('.') }
 
     let(:superclass_pin) do
       api_map.pins.find do |pin|

From d506f434e71646b678eb2bfd0a90b637d13e566e Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 3 Aug 2025 20:10:19 -0400
Subject: [PATCH 031/327] Linting fixes

---
 lib/solargraph/api_map.rb                   |   2 +-
 lib/solargraph/complex_type.rb              |   6 -
 lib/solargraph/complex_type/type_methods.rb |   7 +-
 lib/solargraph/complex_type/unique_type.rb  |  21 ++-
 lib/solargraph/type_checker.rb              |   5 +-
 lib/solargraph/type_checker/param_def.rb    |  35 ----
 spec/complex_type/conforms_to_spec.rb       | 179 ++++++++++++--------
 spec/source_map/clip_spec.rb                |  17 ++
 spec/type_checker/levels/alpha_spec.rb      |   9 +-
 spec/type_checker/levels/strict_spec.rb     |   2 +-
 spec/type_checker/levels/strong_spec.rb     |  68 +++++---
 spec/type_checker/levels/typed_spec.rb      |   5 +-
 12 files changed, 206 insertions(+), 150 deletions(-)
 delete mode 100644 lib/solargraph/type_checker/param_def.rb

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 6a0edc5a4..8610e2bc1 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -208,7 +208,7 @@ class << self
     # @param directory [String]
     # @param out [IO] The output stream for messages
     # @return [ApiMap]
-    def self.load_with_cache directory, out
+    def self.load_with_cache directory, out = $stdout
       api_map = load(directory)
       if api_map.uncached_gemspecs.empty?
         logger.info { "All gems cached for #{directory}" }
diff --git a/lib/solargraph/complex_type.rb b/lib/solargraph/complex_type.rb
index a558f3ba5..8167339e0 100644
--- a/lib/solargraph/complex_type.rb
+++ b/lib/solargraph/complex_type.rb
@@ -103,12 +103,6 @@ def each_unique_type &block
       end
     end
 
-    # @param atype [ComplexType] type which may be assigned to this type
-    # @param api_map [ApiMap] The ApiMap that performs qualification
-    def can_assign?(api_map, atype)
-      atype.conforms_to?(api_map, self, :assignment)
-    end
-
     # @return [Integer]
     def length
       @items.length
diff --git a/lib/solargraph/complex_type/type_methods.rb b/lib/solargraph/complex_type/type_methods.rb
index 791ab80b0..5496f1125 100644
--- a/lib/solargraph/complex_type/type_methods.rb
+++ b/lib/solargraph/complex_type/type_methods.rb
@@ -73,11 +73,12 @@ def undefined?
       # @return [Symbol]
       # @param situation [Symbol] The situation in which the variance is being considered.
       def erased_variance situation = :method_call
-        if [:method_call, :return_type, :assignment].include?(situation)
-          :covariant
-        else
+        # :nocov:
+        unless %i[method_call return_type assignment].include?(situation)
           raise "Unknown situation: #{situation.inspect}"
         end
+        # :nocov:
+        :covariant
       end
 
       # @param generics_to_erase [Enumerable<String>]
diff --git a/lib/solargraph/complex_type/unique_type.rb b/lib/solargraph/complex_type/unique_type.rb
index 39e5e728f..a9f2a899b 100644
--- a/lib/solargraph/complex_type/unique_type.rb
+++ b/lib/solargraph/complex_type/unique_type.rb
@@ -164,11 +164,11 @@ def ==(other)
       #
       # "[Expected] types where neither is possible are INVARIANT"
       #
-      # @param situation [:method_call]
+      # @param _situation [:method_call]
       # @param default [Symbol] The default variance to return if the type is not one of the special cases
       #
       # @return [:invariant, :covariant, :contravariant]
-      def parameter_variance situation, default = :covariant
+      def parameter_variance _situation, default = :covariant
         # @todo RBS can specify variance - maybe we can use that info
         #   and also let folks specify?
         #
@@ -196,7 +196,7 @@ def interface?
 
       # @param other [UniqueType]
       def erased_version_of?(other)
-        return name == other.name && (all_params.empty? || all_params.all?(&:undefined?))
+        name == other.name && (all_params.empty? || all_params.all?(&:undefined?))
       end
 
       # @param api_map [ApiMap]
@@ -257,7 +257,9 @@ def conforms_to_unique_type?(api_map, expected, situation = :method_call,
                               api_map.super_and_sub?(inferred.name, expected.name) ||
                               inferred.name == expected.name
         else
+          # :nocov:
           raise "Unknown erased variance: #{erased_variance.inspect}"
+          # :nocov:
         end
 
         return true if inferred.all_params.empty? && rules.include?(:allow_empty_params)
@@ -302,11 +304,8 @@ def conforms_to_unique_type?(api_map, expected, situation = :method_call,
       # @param situation [:method_call, :assignment, :return]
       # @param rules [Array<:allow_subtype_skew, :allow_empty_params, :allow_reverse_match, :allow_any_match, :allow_undefined, :allow_unresolved_generic>]
       # @param variance [:invariant, :covariant, :contravariant]
-      def conforms_to?(api_map, expected,
-                       situation = :method_call,
-                       rules,
+      def conforms_to?(api_map, expected, situation, rules,
                        variance:)
-
         return true if undefined? && rules.include?(:allow_undefined)
 
         # @todo teach this to validate duck types as inferred type
@@ -315,7 +314,11 @@ def conforms_to?(api_map, expected,
         # complex types as expectations are unions - we only need to
         # match one of their unique types
         expected.any? do |expected_unique_type|
-          raise "Expected type must be a UniqueType, got #{expected_unique_type.class} in #{expected.inspect}" unless expected.is_a?(UniqueType) unless expected_unique_type.instance_of?(UniqueType)
+          # :nocov:
+          unless expected_unique_type.instance_of?(UniqueType)
+            raise "Expected type must be a UniqueType, got #{expected_unique_type.class} in #{expected.inspect}"
+          end
+          # :nocov:
           conforms_to_unique_type?(api_map, expected_unique_type, situation,
                                    rules, variance: variance)
         end
@@ -360,7 +363,7 @@ def to_rbs
         elsif name.downcase == 'nil'
           'nil'
         elsif name == GENERIC_TAG_NAME
-          all_params.first.name
+          all_params.first&.name
         elsif ['Class', 'Module'].include?(name)
           rbs_name
         elsif ['Tuple', 'Array'].include?(name) && fixed_parameters?
diff --git a/lib/solargraph/type_checker.rb b/lib/solargraph/type_checker.rb
index 8b86f02df..3b555bae7 100644
--- a/lib/solargraph/type_checker.rb
+++ b/lib/solargraph/type_checker.rb
@@ -5,7 +5,6 @@ module Solargraph
   #
   class TypeChecker
     autoload :Problem,  'solargraph/type_checker/problem'
-    autoload :ParamDef, 'solargraph/type_checker/param_def'
     autoload :Rules,    'solargraph/type_checker/rules'
 
     include Parser::NodeMethods
@@ -100,10 +99,10 @@ def load filename, level = :normal
       # @param code [String]
       # @param filename [String, nil]
       # @param level [Symbol]
+      # @param api_map [Solargraph::ApiMap]
       # @return [self]
-      def load_string code, filename = nil, level = :normal
+      def load_string code, filename = nil, level = :normal, api_map: Solargraph::ApiMap.new
         source = Solargraph::Source.load_string(code, filename)
-        api_map = Solargraph::ApiMap.new
         api_map.map(source)
         new(filename, api_map: api_map, level: level)
       end
diff --git a/lib/solargraph/type_checker/param_def.rb b/lib/solargraph/type_checker/param_def.rb
deleted file mode 100644
index 2c626270a..000000000
--- a/lib/solargraph/type_checker/param_def.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module Solargraph
-  class TypeChecker
-    # Data about a method parameter definition. This is the information from
-    # the args list in the def call, not the `@param` tags.
-    #
-    class ParamDef
-      # @return [String]
-      attr_reader :name
-
-      # @return [Symbol]
-      attr_reader :type
-
-      def initialize name, type
-        @name = name
-        @type = type
-      end
-
-      class << self
-        # Get an array of ParamDefs from a method pin.
-        #
-        # @param pin [Solargraph::Pin::Method]
-        # @return [Array<ParamDef>]
-        def from pin
-          result = []
-          pin.parameters.each do |par|
-            result.push ParamDef.new(par.name, par.decl)
-          end
-          result
-        end
-      end
-    end
-  end
-end
diff --git a/spec/complex_type/conforms_to_spec.rb b/spec/complex_type/conforms_to_spec.rb
index 5755721b4..581ce1d34 100644
--- a/spec/complex_type/conforms_to_spec.rb
+++ b/spec/complex_type/conforms_to_spec.rb
@@ -1,20 +1,54 @@
+# frozen_string_literal: true
+
 describe Solargraph::ComplexType do
   it 'validates simple core types' do
     api_map = Solargraph::ApiMap.new
-    exp = Solargraph::ComplexType.parse('String')
-    inf = Solargraph::ComplexType.parse('String')
+    exp = described_class.parse('String')
+    inf = described_class.parse('String')
     match = inf.conforms_to?(api_map, exp, :method_call)
     expect(match).to be(true)
   end
 
   it 'invalidates simple core types' do
     api_map = Solargraph::ApiMap.new
-    exp = Solargraph::ComplexType.parse('String')
-    inf = Solargraph::ComplexType.parse('Integer')
+    exp = described_class.parse('String')
+    inf = described_class.parse('Integer')
+    match = inf.conforms_to?(api_map, exp, :method_call)
+    expect(match).to be(false)
+  end
+
+  it 'allows subtype skew if told' do
+    api_map = Solargraph::ApiMap.new
+    exp = described_class.parse('Array<Integer>')
+    inf = described_class.parse('Array<String>')
+    match = inf.conforms_to?(api_map, exp, :method_call, [:allow_subtype_skew])
+    expect(match).to be(true)
+  end
+
+  it 'accepts valid tuple conformance' do
+    api_map = Solargraph::ApiMap.new
+    exp = described_class.parse('Array(Integer, Integer)')
+    inf = described_class.parse('Array(Integer, Integer)')
+    match = inf.conforms_to?(api_map, exp, :method_call)
+    expect(match).to be(true)
+  end
+
+  it 'rejects invalid tuple conformance' do
+    api_map = Solargraph::ApiMap.new
+    exp = described_class.parse('Array(Integer, Integer)')
+    inf = described_class.parse('Array(Integer, String)')
     match = inf.conforms_to?(api_map, exp, :method_call)
     expect(match).to be(false)
   end
 
+  it 'allows empty params when specified' do
+    api_map = Solargraph::ApiMap.new
+    exp = described_class.parse('Array(Integer, Integer)')
+    inf = described_class.parse('Array')
+    match = inf.conforms_to?(api_map, exp, :method_call, [:allow_empty_params])
+    expect(match).to be(true)
+  end
+
   it 'validates expected superclasses' do
     source = Solargraph::Source.load_string(%(
       class Sup; end
@@ -22,32 +56,32 @@ class Sub < Sup; end
     ))
     api_map = Solargraph::ApiMap.new
     api_map.map source
-    sup = Solargraph::ComplexType.parse('Sup')
-    sub = Solargraph::ComplexType.parse('Sub')
+    sup = described_class.parse('Sup')
+    sub = described_class.parse('Sub')
     match = sub.conforms_to?(api_map, sup, :method_call)
     expect(match).to be(true)
   end
 
-  it 'invalidates inferred superclasses (expected must be super)' do
-    # @todo This test might be invalid. There are use cases where inheritance
-    #   between inferred and expected classes should be acceptable in either
-    #   direction.
-    # source = Solargraph::Source.load_string(%(
-    #   class Sup; end
-    #   class Sub < Sup; end
-    # ))
-    # api_map = Solargraph::ApiMap.new
-    # api_map.map source
-    # sup = Solargraph::ComplexType.parse('Sup')
-    # sub = Solargraph::ComplexType.parse('Sub')
-    # match = Solargraph::TypeChecker::Checks.types_match?(api_map, sub, sup)
-    # expect(match).to be(false)
-  end
+  # it 'invalidates inferred superclasses (expected must be super)' do
+  # # @todo This test might be invalid. There are use cases where inheritance
+  # #   between inferred and expected classes should be acceptable in either
+  # #   direction.
+  # # source = Solargraph::Source.load_string(%(
+  # #   class Sup; end
+  # #   class Sub < Sup; end
+  # # ))
+  # # api_map = Solargraph::ApiMap.new
+  # # api_map.map source
+  # # sup = described_class.parse('Sup')
+  # # sub = described_class.parse('Sub')
+  # # match = Solargraph::TypeChecker::Checks.types_match?(api_map, sub, sup)
+  # # expect(match).to be(false)
+  # end
 
   it 'fuzzy matches arrays with parameters' do
     api_map = Solargraph::ApiMap.new
-    exp = Solargraph::ComplexType.parse('Array')
-    inf = Solargraph::ComplexType.parse('Array<String>')
+    exp = described_class.parse('Array')
+    inf = described_class.parse('Array<String>')
     match = inf.conforms_to?(api_map, exp, :method_call)
     expect(match).to be(true)
   end
@@ -57,98 +91,107 @@ class Sub < Sup; end
     source_map = Solargraph::SourceMap.map(source)
     api_map = Solargraph::ApiMap.new
     api_map.catalog Solargraph::Bench.new(source_maps: [source_map], external_requires: ['set'])
-    exp = Solargraph::ComplexType.parse('Set')
-    inf = Solargraph::ComplexType.parse('Set<String>')
+    exp = described_class.parse('Set')
+    inf = described_class.parse('Set<String>')
     match = inf.conforms_to?(api_map, exp, :method_call)
     expect(match).to be(true)
   end
 
   it 'fuzzy matches hashes with parameters' do
     api_map = Solargraph::ApiMap.new
-    exp = Solargraph::ComplexType.parse('Hash{ Symbol => String}')
-    inf = Solargraph::ComplexType.parse('Hash')
+    exp = described_class.parse('Hash{ Symbol => String}')
+    inf = described_class.parse('Hash')
     match = inf.conforms_to?(api_map, exp, :method_call, [:allow_empty_params])
     expect(match).to be(true)
   end
 
   it 'matches multiple types' do
     api_map = Solargraph::ApiMap.new
-    exp = Solargraph::ComplexType.parse('String, Integer')
-    inf = Solargraph::ComplexType.parse('String, Integer')
+    exp = described_class.parse('String, Integer')
+    inf = described_class.parse('String, Integer')
     match = inf.conforms_to?(api_map, exp, :method_call)
     expect(match).to be(true)
   end
 
   it 'matches multiple types out of order' do
     api_map = Solargraph::ApiMap.new
-    exp = Solargraph::ComplexType.parse('String, Integer')
-    inf = Solargraph::ComplexType.parse('Integer, String')
+    exp = described_class.parse('String, Integer')
+    inf = described_class.parse('Integer, String')
     match = inf.conforms_to?(api_map, exp, :method_call)
     expect(match).to be(true)
   end
 
   it 'invalidates inferred types missing from expected' do
     api_map = Solargraph::ApiMap.new
-    exp = Solargraph::ComplexType.parse('String')
-    inf = Solargraph::ComplexType.parse('String, Integer')
+    exp = described_class.parse('String')
+    inf = described_class.parse('String, Integer')
     match = inf.conforms_to?(api_map, exp, :method_call)
     expect(match).to be(false)
   end
 
   it 'matches nil' do
     api_map = Solargraph::ApiMap.new
-    exp = Solargraph::ComplexType.parse('nil')
-    inf = Solargraph::ComplexType.parse('nil')
+    exp = described_class.parse('nil')
+    inf = described_class.parse('nil')
     match = inf.conforms_to?(api_map, exp, :method_call)
     expect(match).to be(true)
   end
 
   it 'validates classes with expected superclasses' do
     api_map = Solargraph::ApiMap.new
-    exp = Solargraph::ComplexType.parse('Class<Object>')
-    inf = Solargraph::ComplexType.parse('Class<String>')
+    exp = described_class.parse('Class<Object>')
+    inf = described_class.parse('Class<String>')
     match = inf.conforms_to?(api_map, exp, :method_call)
     expect(match).to be(true)
   end
 
   it 'validates generic classes with expected Class' do
     api_map = Solargraph::ApiMap.new
-    exp = Solargraph::ComplexType.parse('Class<String>')
-    inf = Solargraph::ComplexType.parse('Class')
-    match = inf.conforms_to?(api_map, exp, :method_call, [:allow_empty_params])
-    expect(match).to be(true)
-  end
-
-  it 'validates generic classes with expected Class' do
-    api_map = Solargraph::ApiMap.new
-    inf = Solargraph::ComplexType.parse('Class<String>')
-    exp = Solargraph::ComplexType.parse('Class')
+    inf = described_class.parse('Class<String>')
+    exp = described_class.parse('Class')
     match = inf.conforms_to?(api_map, exp, :method_call)
     expect(match).to be(true)
   end
 
-  it 'validates inheritance in both directions' do
-    source = Solargraph::Source.load_string(%(
-      class Sup; end
-      class Sub < Sup; end
-    ))
-    api_map = Solargraph::ApiMap.new
-    api_map.map source
-    sup = Solargraph::ComplexType.parse('Sup')
-    sub = Solargraph::ComplexType.parse('Sub')
-    match = sub.conforms_to?(api_map, sup, :method_call, [:allow_reverse_match])
-    expect(match).to be(true)
-    match = sup.conforms_to?(api_map, sub, :method_call, [:allow_reverse_match])
-    expect(match).to be(true)
+  context 'with an inheritence relationship' do
+    let(:source) do
+      Solargraph::Source.load_string(%(
+        class Sup; end
+        class Sub < Sup; end
+      ))
+    end
+    let(:sup) { described_class.parse('Sup') }
+    let(:sub) { described_class.parse('Sub') }
+    let(:api_map) { Solargraph::ApiMap.new }
+
+    before do
+      api_map.map source
+    end
+
+    it 'validates inheritance in one way' do
+      match = sub.conforms_to?(api_map, sup, :method_call, [:allow_reverse_match])
+      expect(match).to be(true)
+    end
+
+    it 'validates inheritance the other way' do
+      match = sup.conforms_to?(api_map, sub, :method_call, [:allow_reverse_match])
+      expect(match).to be(true)
+    end
   end
 
-  it 'invalidates inheritance in both directions' do
-    api_map = Solargraph::ApiMap.new
-    sup = Solargraph::ComplexType.parse('String')
-    sub = Solargraph::ComplexType.parse('Array')
-    match = sub.conforms_to?(api_map, sup, :method_call, [:allow_reverse_match])
-    expect(match).to be(false)
-    match = sup.conforms_to?(api_map, sub, :method_call, [:allow_reverse_match])
-    expect(match).to be(false)
+  context 'with inheritance relationship in allow_reverse_match mode' do
+    let(:api_map) { Solargraph::ApiMap.new }
+    let(:sup) { described_class.parse('String') }
+    let(:sub) { described_class.parse('Array') }
+
+    it 'conforms one way' do
+      match = sub.conforms_to?(api_map, sup, :method_call, [:allow_reverse_match])
+      expect(match).to be(false)
+    end
+
+    it 'conforms the other way' do
+      match = sup.conforms_to?(api_map, sub, :method_call, [:allow_reverse_match])
+      expect(match).to be(false)
+    end
   end
 end
diff --git a/spec/source_map/clip_spec.rb b/spec/source_map/clip_spec.rb
index 0f83331ec..801edefa7 100644
--- a/spec/source_map/clip_spec.rb
+++ b/spec/source_map/clip_spec.rb
@@ -302,6 +302,23 @@ def foo
     expect(type.tag).to eq('String')
   end
 
+  it 'infers method types from return nodes' do
+    source = Solargraph::Source.load_string(%(
+      class Foo
+        # @return [self]
+        def foo
+          bar
+        end
+      end
+      Foo.new.foo
+    ), 'test.rb')
+    map = Solargraph::ApiMap.new
+    map.map source
+    clip = map.clip_at('test.rb', Solargraph::Position.new(7, 10))
+    type = clip.infer
+    expect(type.tag).to eq('Foo')
+  end
+
   it 'infers multiple method types from return nodes' do
     source = Solargraph::Source.load_string(%(
       def foo
diff --git a/spec/type_checker/levels/alpha_spec.rb b/spec/type_checker/levels/alpha_spec.rb
index d700ea3b7..3ff5aa6c3 100644
--- a/spec/type_checker/levels/alpha_spec.rb
+++ b/spec/type_checker/levels/alpha_spec.rb
@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 describe Solargraph::TypeChecker do
-  context 'alpha level' do
-    def type_checker(code)
+  context 'when at alpha level' do
+    def type_checker code
       Solargraph::TypeChecker.load_string(code, 'test.rb', :alpha)
     end
 
@@ -16,7 +18,8 @@ def bar(b)
          foo(b)
         end
       ))
-      expect(checker.problems.map(&:message)).to eq(["Wrong argument type for #foo: a expected String, received String, nil"])
+      expect(checker.problems.map(&:message))
+        .to eq(['Wrong argument type for #foo: a expected String, received String, nil'])
     end
   end
 end
diff --git a/spec/type_checker/levels/strict_spec.rb b/spec/type_checker/levels/strict_spec.rb
index 7861c8817..9992b43e9 100644
--- a/spec/type_checker/levels/strict_spec.rb
+++ b/spec/type_checker/levels/strict_spec.rb
@@ -59,7 +59,7 @@ def bar(a); end
         require 'kramdown-parser-gfm'
         Kramdown::Parser::GFM.undefined_call
       ), 'test.rb')
-      api_map = Solargraph::ApiMap.load_with_cache('.', $stdout)
+      api_map = Solargraph::ApiMap.load '.'
       api_map.catalog Solargraph::Bench.new(source_maps: [source_map], external_requires: ['kramdown-parser-gfm'])
       checker = Solargraph::TypeChecker.new('test.rb', api_map: api_map, level: :strict)
       expect(checker.problems).to be_empty
diff --git a/spec/type_checker/levels/strong_spec.rb b/spec/type_checker/levels/strong_spec.rb
index 4c45056ea..68a62d395 100644
--- a/spec/type_checker/levels/strong_spec.rb
+++ b/spec/type_checker/levels/strong_spec.rb
@@ -14,7 +14,6 @@ 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]
@@ -30,6 +29,54 @@ def bar(b)
       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 'reports missing param tags' do
       checker = type_checker(%(
         class Foo
@@ -179,23 +226,6 @@ def baz(bing)
       expect(checker.problems.map(&:message)).to be_empty
     end
 
-    it 'treats a parameter type of undefined as not provided' do
-      checker = type_checker(%(
-        class Foo
-          # @param foo [Class<String>]
-          # @return [void]
-          def bar foo:; end
-
-          # @param bing [Class<undefind>]
-          # @return [void]
-          def baz(bing)
-            bar(foo: bing)
-          end
-        end
-      ))
-      expect(checker.problems.map(&:message)).to be_empty
-    end
-
     it 'ignores generic resolution failures' do
       checker = type_checker(%(
         class Foo
@@ -252,7 +282,7 @@ def block_pins
       expect(checker.problems.map(&:message)).to be_empty
     end
 
-    it 'ignores generic resolution failures' do
+    it 'ignores generic resolution failures with only one arg' do
       checker = type_checker(%(
         # @generic T
         # @param path [String]
diff --git a/spec/type_checker/levels/typed_spec.rb b/spec/type_checker/levels/typed_spec.rb
index 6e71ee9ff..681d813d5 100644
--- a/spec/type_checker/levels/typed_spec.rb
+++ b/spec/type_checker/levels/typed_spec.rb
@@ -38,7 +38,7 @@ def bar
       expect(checker.problems.first.message).to include('does not match')
     end
 
-    it 'reports mismatched key and subtypes ' do
+    it 'reports mismatched key and subtypes' do
       checker = type_checker(%(
         # @return [Hash{String => String}]
         def foo
@@ -207,7 +207,8 @@ def foo
         # @param bar [String]
         def foo(bar = 123); end
         ))
-      expect(checker.problems.map(&:message)).to eq(['Declared type String does not match inferred type 123 for variable bar'])
+      expect(checker.problems.map(&:message))
+        .to eq(['Declared type String does not match inferred type 123 for variable bar'])
     end
 
     it 'validates string default values of parameters' do

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 032/327] 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 033/327] 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 034/327] 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 592e6bcd89bd0988e1245c6eac8cd14d2f6b621d Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 4 Aug 2025 06:55:28 -0400
Subject: [PATCH 035/327] Speed up spec

---
 spec/rbs_map/conversions_spec.rb | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/spec/rbs_map/conversions_spec.rb b/spec/rbs_map/conversions_spec.rb
index d9570ae0f..008432d68 100644
--- a/spec/rbs_map/conversions_spec.rb
+++ b/spec/rbs_map/conversions_spec.rb
@@ -55,21 +55,23 @@ def bar: () -> untyped
   end
 
   context 'with standard loads for solargraph project' do
-    let(:api_map) { Solargraph::ApiMap.load_with_cache('.') }
-
-    let(:superclass_pin) do
-      api_map.pins.find do |pin|
-        pin.is_a?(Solargraph::Pin::Reference::Superclass) && pin.context.namespace == 'Parser::AST::Node'
-      end
+    before :all do # rubocop:disable RSpec/BeforeAfterAll
+      @api_map = Solargraph::ApiMap.load_with_cache('.')
     end
 
-    it 'finds a superclass pin for Parser::AST::Node' do
-      expect(superclass_pin).not_to be_nil
-    end
+    let(:api_map) { @api_map } # rubocop:disable RSpec/InstanceVariable
 
-    it 'generates a rooted pin for superclass of Parser::AST::Node' do
-      # rooted!
-      expect(superclass_pin.name) .to eq('::AST::Node')
+    context 'with superclass pin for Parser::AST::Node' do
+      let(:superclass_pin) do
+        api_map.pins.find do |pin|
+          pin.is_a?(Solargraph::Pin::Reference::Superclass) && pin.context.namespace == 'Parser::AST::Node'
+        end
+      end
+
+      it 'generates a rooted pin' do
+        # rooted!
+        expect(superclass_pin&.name).to eq('::AST::Node')
+      end
     end
   end
 end

From 14dacc39eba0f1906d2f7f83019d2de3b7217ffa Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 4 Aug 2025 08:04:09 -0400
Subject: [PATCH 036/327] Linting fix

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

diff --git a/lib/solargraph/complex_type.rb b/lib/solargraph/complex_type.rb
index 8167339e0..6203fb5a9 100644
--- a/lib/solargraph/complex_type.rb
+++ b/lib/solargraph/complex_type.rb
@@ -224,7 +224,7 @@ def duck_types_match? api_map, expected, inferred
       raise ArgumentError, 'Expected type must be duck type' unless expected.duck_type?
       expected.each do |exp|
         next unless exp.duck_type?
-        quack = exp.to_s[1..-1]
+        quack = exp.to_s[1..]
         return false if api_map.get_method_stack(inferred.namespace, quack, scope: inferred.scope).empty?
       end
       true

From 883574e3077c57fff1e58969ef06aa5ff5f21795 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 4 Aug 2025 08:53:48 -0400
Subject: [PATCH 037/327] Add spec

---
 spec/complex_type/unique_type_spec.rb | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 spec/complex_type/unique_type_spec.rb

diff --git a/spec/complex_type/unique_type_spec.rb b/spec/complex_type/unique_type_spec.rb
new file mode 100644
index 000000000..2d9812600
--- /dev/null
+++ b/spec/complex_type/unique_type_spec.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+describe Solargraph::ComplexType::UniqueType do
+  describe '#any?' do
+    let(:type) { described_class.parse('String') }
+
+    it 'yields one and only one type, itself' do
+      types_encountered = []
+      type.any? { |t| types_encountered << t }
+      expect(types_encountered).to eq([type])
+    end
+  end
+end

From 637edd0b37caabe007a9539ef8abd4198c73da68 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 4 Aug 2025 09:31:03 -0400
Subject: [PATCH 038/327] Linting fixes

---
 spec/type_checker/levels/strong_spec.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/spec/type_checker/levels/strong_spec.rb b/spec/type_checker/levels/strong_spec.rb
index 68a62d395..1d343c6d9 100644
--- a/spec/type_checker/levels/strong_spec.rb
+++ b/spec/type_checker/levels/strong_spec.rb
@@ -226,7 +226,7 @@ def baz(bing)
       expect(checker.problems.map(&:message)).to be_empty
     end
 
-    it 'ignores generic resolution failures' do
+    it 'ignores generic resolution failure with no generic tag' do
       checker = type_checker(%(
         class Foo
           # @param foo [Class<String>]
@@ -262,8 +262,7 @@ def block_pins
       expect(checker.problems.map(&:message)).to be_empty
     end
 
-
-    it 'ignores generic resolution failures' do
+    it 'ignores generic resolution failures from current Solargraph limitation' do
       checker = type_checker(%(
         class Foo
           # @generic T

From e8c2cca9cf8728b9b7db04fca1238f2ecc234363 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 4 Aug 2025 11:41:10 -0400
Subject: [PATCH 039/327] Improve test coverage and fix bug

---
 lib/solargraph/complex_type/unique_type.rb |  4 +-
 spec/complex_type/conforms_to_spec.rb      | 68 ++++++++++++++++------
 2 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/lib/solargraph/complex_type/unique_type.rb b/lib/solargraph/complex_type/unique_type.rb
index a9f2a899b..13fb7129f 100644
--- a/lib/solargraph/complex_type/unique_type.rb
+++ b/lib/solargraph/complex_type/unique_type.rb
@@ -241,7 +241,7 @@ def conforms_to_unique_type?(api_map, expected, situation = :method_call,
 
         if variance == :invariant
           return false unless inferred.name == expected.name
-        elsif erased_variance == :covariant
+        elsif variance == :covariant
           # covariant: we can pass in a more specific type
 
           # we contain the expected mix-in, or we have a more specific type
@@ -249,7 +249,7 @@ def conforms_to_unique_type?(api_map, expected, situation = :method_call,
                               api_map.super_and_sub?(expected.name, inferred.name) ||
                               inferred.name == expected.name
 
-        elsif erased_variance == :contravariant
+        elsif variance == :contravariant
           # contravariant: we can pass in a more general type
 
           # we contain the expected mix-in, or we have a more general type
diff --git a/spec/complex_type/conforms_to_spec.rb b/spec/complex_type/conforms_to_spec.rb
index 581ce1d34..bacf19b5e 100644
--- a/spec/complex_type/conforms_to_spec.rb
+++ b/spec/complex_type/conforms_to_spec.rb
@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
 describe Solargraph::ComplexType do
+  let(:api_map) do
+    Solargraph::ApiMap.new
+  end
+
   it 'validates simple core types' do
-    api_map = Solargraph::ApiMap.new
     exp = described_class.parse('String')
     inf = described_class.parse('String')
     match = inf.conforms_to?(api_map, exp, :method_call)
@@ -10,7 +13,6 @@
   end
 
   it 'invalidates simple core types' do
-    api_map = Solargraph::ApiMap.new
     exp = described_class.parse('String')
     inf = described_class.parse('Integer')
     match = inf.conforms_to?(api_map, exp, :method_call)
@@ -18,7 +20,6 @@
   end
 
   it 'allows subtype skew if told' do
-    api_map = Solargraph::ApiMap.new
     exp = described_class.parse('Array<Integer>')
     inf = described_class.parse('Array<String>')
     match = inf.conforms_to?(api_map, exp, :method_call, [:allow_subtype_skew])
@@ -26,7 +27,6 @@
   end
 
   it 'accepts valid tuple conformance' do
-    api_map = Solargraph::ApiMap.new
     exp = described_class.parse('Array(Integer, Integer)')
     inf = described_class.parse('Array(Integer, Integer)')
     match = inf.conforms_to?(api_map, exp, :method_call)
@@ -34,7 +34,6 @@
   end
 
   it 'rejects invalid tuple conformance' do
-    api_map = Solargraph::ApiMap.new
     exp = described_class.parse('Array(Integer, Integer)')
     inf = described_class.parse('Array(Integer, String)')
     match = inf.conforms_to?(api_map, exp, :method_call)
@@ -42,7 +41,6 @@
   end
 
   it 'allows empty params when specified' do
-    api_map = Solargraph::ApiMap.new
     exp = described_class.parse('Array(Integer, Integer)')
     inf = described_class.parse('Array')
     match = inf.conforms_to?(api_map, exp, :method_call, [:allow_empty_params])
@@ -54,7 +52,6 @@
       class Sup; end
       class Sub < Sup; end
     ))
-    api_map = Solargraph::ApiMap.new
     api_map.map source
     sup = described_class.parse('Sup')
     sub = described_class.parse('Sub')
@@ -70,7 +67,6 @@ class Sub < Sup; end
   # #   class Sup; end
   # #   class Sub < Sup; end
   # # ))
-  # # api_map = Solargraph::ApiMap.new
   # # api_map.map source
   # # sup = described_class.parse('Sup')
   # # sub = described_class.parse('Sub')
@@ -79,7 +75,6 @@ class Sub < Sup; end
   # end
 
   it 'fuzzy matches arrays with parameters' do
-    api_map = Solargraph::ApiMap.new
     exp = described_class.parse('Array')
     inf = described_class.parse('Array<String>')
     match = inf.conforms_to?(api_map, exp, :method_call)
@@ -89,7 +84,6 @@ class Sub < Sup; end
   it 'fuzzy matches sets with parameters' do
     source = Solargraph::Source.load_string("require 'set'")
     source_map = Solargraph::SourceMap.map(source)
-    api_map = Solargraph::ApiMap.new
     api_map.catalog Solargraph::Bench.new(source_maps: [source_map], external_requires: ['set'])
     exp = described_class.parse('Set')
     inf = described_class.parse('Set<String>')
@@ -98,7 +92,6 @@ class Sub < Sup; end
   end
 
   it 'fuzzy matches hashes with parameters' do
-    api_map = Solargraph::ApiMap.new
     exp = described_class.parse('Hash{ Symbol => String}')
     inf = described_class.parse('Hash')
     match = inf.conforms_to?(api_map, exp, :method_call, [:allow_empty_params])
@@ -106,7 +99,6 @@ class Sub < Sup; end
   end
 
   it 'matches multiple types' do
-    api_map = Solargraph::ApiMap.new
     exp = described_class.parse('String, Integer')
     inf = described_class.parse('String, Integer')
     match = inf.conforms_to?(api_map, exp, :method_call)
@@ -114,7 +106,6 @@ class Sub < Sup; end
   end
 
   it 'matches multiple types out of order' do
-    api_map = Solargraph::ApiMap.new
     exp = described_class.parse('String, Integer')
     inf = described_class.parse('Integer, String')
     match = inf.conforms_to?(api_map, exp, :method_call)
@@ -122,7 +113,6 @@ class Sub < Sup; end
   end
 
   it 'invalidates inferred types missing from expected' do
-    api_map = Solargraph::ApiMap.new
     exp = described_class.parse('String')
     inf = described_class.parse('String, Integer')
     match = inf.conforms_to?(api_map, exp, :method_call)
@@ -130,7 +120,6 @@ class Sub < Sup; end
   end
 
   it 'matches nil' do
-    api_map = Solargraph::ApiMap.new
     exp = described_class.parse('nil')
     inf = described_class.parse('nil')
     match = inf.conforms_to?(api_map, exp, :method_call)
@@ -138,7 +127,6 @@ class Sub < Sup; end
   end
 
   it 'validates classes with expected superclasses' do
-    api_map = Solargraph::ApiMap.new
     exp = described_class.parse('Class<Object>')
     inf = described_class.parse('Class<String>')
     match = inf.conforms_to?(api_map, exp, :method_call)
@@ -146,13 +134,58 @@ class Sub < Sup; end
   end
 
   it 'validates generic classes with expected Class' do
-    api_map = Solargraph::ApiMap.new
     inf = described_class.parse('Class<String>')
     exp = described_class.parse('Class')
     match = inf.conforms_to?(api_map, exp, :method_call)
     expect(match).to be(true)
   end
 
+  context 'with invariant matching' do
+    it 'rejects String matching an Object' do
+      inf = described_class.parse('String')
+      exp = described_class.parse('Object')
+      match = inf.conforms_to?(api_map, exp, :method_call, variance: :invariant)
+      expect(match).to be(false)
+    end
+
+    it 'rejects Object matching an String' do
+      inf = described_class.parse('Object')
+      exp = described_class.parse('String')
+      match = inf.conforms_to?(api_map, exp, :method_call, variance: :invariant)
+      expect(match).to be(false)
+    end
+
+    it 'accepts String matching a String' do
+      inf = described_class.parse('String')
+      exp = described_class.parse('String')
+      match = inf.conforms_to?(api_map, exp, :method_call, variance: :invariant)
+      expect(match).to be(true)
+    end
+  end
+
+  context 'with contravariant matching' do
+    it 'rejects String matching an Objet' do
+      inf = described_class.parse('String')
+      exp = described_class.parse('Object')
+      match = inf.conforms_to?(api_map, exp, :method_call, variance: :contravariant)
+      expect(match).to be(false)
+    end
+
+    it 'accepts Object matching an String' do
+      inf = described_class.parse('Object')
+      exp = described_class.parse('String')
+      match = inf.conforms_to?(api_map, exp, :method_call, variance: :contravariant)
+      expect(match).to be(true)
+    end
+
+    it 'accepts String matching a String' do
+      inf = described_class.parse('String')
+      exp = described_class.parse('String')
+      match = inf.conforms_to?(api_map, exp, :method_call, variance: :contravariant)
+      expect(match).to be(true)
+    end
+  end
+
   context 'with an inheritence relationship' do
     let(:source) do
       Solargraph::Source.load_string(%(
@@ -162,7 +195,6 @@ class Sub < Sup; end
     end
     let(:sup) { described_class.parse('Sup') }
     let(:sub) { described_class.parse('Sub') }
-    let(:api_map) { Solargraph::ApiMap.new }
 
     before do
       api_map.map source

From 13d87eee2fcda17c0fb92e13d14bf82f3c27236c Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 4 Aug 2025 12:16:45 -0400
Subject: [PATCH 040/327] Linting fix

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

diff --git a/lib/solargraph/complex_type/unique_type.rb b/lib/solargraph/complex_type/unique_type.rb
index 13fb7129f..15b7801b1 100644
--- a/lib/solargraph/complex_type/unique_type.rb
+++ b/lib/solargraph/complex_type/unique_type.rb
@@ -239,9 +239,10 @@ def conforms_to_unique_type?(api_map, expected, situation = :method_call,
 
         return true if inferred == expected
 
-        if variance == :invariant
+        case variance
+        when :invariant
           return false unless inferred.name == expected.name
-        elsif variance == :covariant
+        when :covariant
           # covariant: we can pass in a more specific type
 
           # we contain the expected mix-in, or we have a more specific type
@@ -249,7 +250,7 @@ def conforms_to_unique_type?(api_map, expected, situation = :method_call,
                               api_map.super_and_sub?(expected.name, inferred.name) ||
                               inferred.name == expected.name
 
-        elsif variance == :contravariant
+        when :contravariant
           # contravariant: we can pass in a more general type
 
           # we contain the expected mix-in, or we have a more general type

From 6f0a151e9f3948679e64abce802806c7061d52bf Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 4 Aug 2025 13:05:00 -0400
Subject: [PATCH 041/327] Extract method

---
 lib/solargraph/complex_type.rb             |   1 +
 lib/solargraph/complex_type/conformance.rb | 133 +++++++++++++++++++++
 lib/solargraph/complex_type/unique_type.rb | 106 +---------------
 3 files changed, 137 insertions(+), 103 deletions(-)
 create mode 100644 lib/solargraph/complex_type/conformance.rb

diff --git a/lib/solargraph/complex_type.rb b/lib/solargraph/complex_type.rb
index 6203fb5a9..d0f46a28d 100644
--- a/lib/solargraph/complex_type.rb
+++ b/lib/solargraph/complex_type.rb
@@ -9,6 +9,7 @@ class ComplexType
     #   include TypeMethods
     include Equality
 
+    autoload :Conformance, 'solargraph/complex_type/conformance'
     autoload :TypeMethods, 'solargraph/complex_type/type_methods'
     autoload :UniqueType,  'solargraph/complex_type/unique_type'
 
diff --git a/lib/solargraph/complex_type/conformance.rb b/lib/solargraph/complex_type/conformance.rb
new file mode 100644
index 000000000..f4f37bf4f
--- /dev/null
+++ b/lib/solargraph/complex_type/conformance.rb
@@ -0,0 +1,133 @@
+# frozen_string_literal: true
+
+module Solargraph
+  class ComplexType
+    # Checks whether a type can be used in a given situation
+    class Conformance
+      # @param api_map [ApiMap]
+      # @param inferred [ComplexType::UniqueType]
+      # @param expected [ComplexType::UniqueType]
+      # @param situation [:method_call, :return_type]
+      # @param rules [Array<:allow_subtype_skew, :allow_empty_params, :allow_reverse_match,
+      #   :allow_any_match, :allow_undefined, :allow_unresolved_generic, :allow_unmatched_interface>]
+      # @param variance [:invariant, :covariant, :contravariant]
+      def initialize api_map, inferred, expected,
+                     situation = :method_call, rules = [],
+                     variance: inferred.erased_variance(situation)
+        @api_map = api_map
+        @inferred = inferred
+        @expected = expected
+        @situation = situation
+        @rules = rules
+        @variance = variance
+        unless expected.is_a?(UniqueType)
+          raise "Expected type must be a UniqueType, got #{expected.class} in #{expected.inspect}"
+        end
+        return if inferred.is_a?(UniqueType)
+        raise "Inferred type must be a UniqueType, got #{inferred.class} in #{inferred.inspect}"
+      end
+
+      def conforms_to_unique_type?
+        unless expected.is_a?(UniqueType)
+          raise "Expected type must be a UniqueType, got #{expected.class} in #{expected.inspect}"
+        end
+        if inferred.literal? && !expected.literal?
+          conformance =
+            self.class.new(api_map, inferred.simplify_literals, expected, situation, rules,
+                           variance: variance)
+          return conformance.conforms_to_unique_type?
+        end
+        return true if expected.any?(&:interface?) && rules.include?(:allow_unmatched_interface)
+        return true if inferred.interface? && rules.include?(:allow_unmatched_interface)
+
+        if rules.include? :allow_reverse_match
+          reversed_match = expected.conforms_to?(api_map, inferred, situation,
+                                                 rules - [:allow_reverse_match],
+                                                 variance: variance)
+          return true if reversed_match
+        end
+        expected = self.expected.downcast_to_literal_if_possible
+        inferred = self.inferred.downcast_to_literal_if_possible
+
+        if rules.include? :allow_subtype_skew
+          # parameters are not considered in this case
+          expected = expected.erase_parameters
+        end
+
+        inferred = inferred.erase_parameters if !expected.parameters? && inferred.parameters?
+
+        if expected.parameters? && !inferred.parameters? && rules.include?(:allow_empty_params)
+          expected = expected.erase_parameters
+        end
+
+        return true if inferred == expected
+
+        case variance
+        when :invariant
+          return false unless inferred.name == expected.name
+        when :covariant
+          # covariant: we can pass in a more specific type
+
+          # we contain the expected mix-in, or we have a more specific type
+          return false unless api_map.type_include?(inferred.name, expected.name) ||
+                              api_map.super_and_sub?(expected.name, inferred.name) ||
+                              inferred.name == expected.name
+
+        when :contravariant
+          # contravariant: we can pass in a more general type
+
+          # we contain the expected mix-in, or we have a more general type
+          return false unless api_map.type_include?(inferred.name, expected.name) ||
+                              api_map.super_and_sub?(inferred.name, expected.name) ||
+                              inferred.name == expected.name
+        else
+          # :nocov:
+          raise "Unknown variance: #{variance.inspect}"
+          # :nocov:
+        end
+
+        return true if inferred.all_params.empty? && rules.include?(:allow_empty_params)
+
+        # at this point we know the erased type is fine - time to look at parameters
+
+        # there's an implicit 'any' on the expectation parameters
+        # if there are none specified
+        return true if expected.all_params.empty?
+
+        unless expected.key_types.empty?
+          return false if inferred.key_types.empty?
+
+          unless ComplexType.new(inferred.key_types).conforms_to?(api_map,
+                                                                  ComplexType.new(expected.key_types),
+                                                                  situation,
+                                                                  rules,
+                                                                  variance: inferred.parameter_variance(situation))
+            return false
+          end
+        end
+
+        return true if expected.subtypes.empty?
+
+        return true if expected.subtypes.any?(&:undefined?) && rules.include?(:allow_undefined)
+
+        return true if inferred.subtypes.any?(&:undefined?) && rules.include?(:allow_undefined)
+
+        return true if inferred.subtypes.all?(&:generic?) && rules.include?(:allow_unresolved_generic)
+
+        return true if expected.subtypes.all?(&:generic?) && rules.include?(:allow_unresolved_generic)
+
+        return false if inferred.subtypes.empty?
+
+        ComplexType.new(inferred.subtypes).conforms_to?(api_map,
+                                                        ComplexType.new(expected.subtypes),
+                                                        situation,
+                                                        rules,
+                                                        variance: inferred.parameter_variance(situation))
+      end
+
+      private
+
+      attr_reader :api_map, :inferred, :expected, :situation, :rules, :variance
+    end
+  end
+end
diff --git a/lib/solargraph/complex_type/unique_type.rb b/lib/solargraph/complex_type/unique_type.rb
index 15b7801b1..9327d3fc8 100644
--- a/lib/solargraph/complex_type/unique_type.rb
+++ b/lib/solargraph/complex_type/unique_type.rb
@@ -199,107 +199,6 @@ def erased_version_of?(other)
         name == other.name && (all_params.empty? || all_params.all?(&:undefined?))
       end
 
-      # @param api_map [ApiMap]
-      # @param expected [ComplexType::UniqueType]
-      # @param situation [:method_call, :return_type]
-      # @param rules [Array<:allow_subtype_skew, :allow_empty_params, :allow_reverse_match, :allow_any_match, :allow_undefined, :allow_unresolved_generic, :allow_unmatched_interface>]
-      # @param variance [:invariant, :covariant, :contravariant]
-      def conforms_to_unique_type?(api_map, expected, situation = :method_call,
-                                   rules = [],
-                                   variance: erased_variance(situation))
-        raise "Expected type must be a UniqueType, got #{expected.class} in #{expected.inspect}" unless expected.is_a?(UniqueType)
-        if literal? && !expected.literal?
-          return simplify_literals.conforms_to_unique_type?(api_map, expected, situation,
-                                                            rules, variance: variance)
-        end
-        return true if expected.any?(&:interface?) && rules.include?(:allow_unmatched_interface)
-        return true if interface? && rules.include?(:allow_unmatched_interface)
-
-        if rules.include? :allow_reverse_match
-          reversed_match = expected.conforms_to?(api_map, self, situation,
-                                                 rules - [:allow_reverse_match],
-                                                 variance: variance)
-          return true if reversed_match
-        end
-        expected = expected.downcast_to_literal_if_possible
-        inferred = downcast_to_literal_if_possible
-
-        if rules.include? :allow_subtype_skew
-          # parameters are not considered in this case
-          expected = expected.erase_parameters
-        end
-
-        if !expected.parameters? && inferred.parameters?
-          inferred = inferred.erase_parameters
-        end
-
-        if expected.parameters? && !inferred.parameters? && rules.include?(:allow_empty_params)
-          expected = expected.erase_parameters
-        end
-
-        return true if inferred == expected
-
-        case variance
-        when :invariant
-          return false unless inferred.name == expected.name
-        when :covariant
-          # covariant: we can pass in a more specific type
-
-          # we contain the expected mix-in, or we have a more specific type
-          return false unless api_map.type_include?(inferred.name, expected.name) ||
-                              api_map.super_and_sub?(expected.name, inferred.name) ||
-                              inferred.name == expected.name
-
-        when :contravariant
-          # contravariant: we can pass in a more general type
-
-          # we contain the expected mix-in, or we have a more general type
-          return false unless api_map.type_include?(inferred.name, expected.name) ||
-                              api_map.super_and_sub?(inferred.name, expected.name) ||
-                              inferred.name == expected.name
-        else
-          # :nocov:
-          raise "Unknown erased variance: #{erased_variance.inspect}"
-          # :nocov:
-        end
-
-        return true if inferred.all_params.empty? && rules.include?(:allow_empty_params)
-
-        # at this point we know the erased type is fine - time to look at parameters
-
-        # there's an implicit 'any' on the expectation parameters
-        # if there are none specified
-        return true if expected.all_params.empty?
-
-        unless expected.key_types.empty?
-          return false if inferred.key_types.empty?
-
-          return false unless ComplexType.new(inferred.key_types).conforms_to?(api_map,
-                                                                               ComplexType.new(expected.key_types),
-                                                                               situation,
-                                                                               rules,
-                                                                               variance: parameter_variance(situation))
-        end
-
-        return true if expected.subtypes.empty?
-
-        return true if expected.subtypes.any?(&:undefined?) && rules.include?(:allow_undefined)
-
-        return true if inferred.subtypes.any?(&:undefined?) && rules.include?(:allow_undefined)
-
-        return true if inferred.subtypes.all?(&:generic?) && rules.include?(:allow_unresolved_generic)
-
-        return true if expected.subtypes.all?(&:generic?) && rules.include?(:allow_unresolved_generic)
-
-        return false if inferred.subtypes.empty?
-
-        ComplexType.new(inferred.subtypes).conforms_to?(api_map,
-                                                        ComplexType.new(expected.subtypes),
-                                                        situation,
-                                                        rules,
-                                                        variance: parameter_variance(situation))
-      end
-
       # @param api_map [ApiMap]
       # @param expected [ComplexType::UniqueType, ComplexType]
       # @param situation [:method_call, :assignment, :return]
@@ -320,8 +219,9 @@ def conforms_to?(api_map, expected, situation, rules,
             raise "Expected type must be a UniqueType, got #{expected_unique_type.class} in #{expected.inspect}"
           end
           # :nocov:
-          conforms_to_unique_type?(api_map, expected_unique_type, situation,
-                                   rules, variance: variance)
+          conformance = Conformance.new(api_map, self, expected_unique_type, situation,
+                                        rules, variance: variance)
+          conformance.conforms_to_unique_type?
         end
       end
 

From f9a493206a71882eb4603fcdd1055c957cbd91eb Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 4 Aug 2025 13:30:57 -0400
Subject: [PATCH 042/327] Refactors

---
 lib/solargraph/complex_type/conformance.rb | 31 ++++++++++++++--------
 lib/solargraph/complex_type/unique_type.rb |  4 +++
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/lib/solargraph/complex_type/conformance.rb b/lib/solargraph/complex_type/conformance.rb
index f4f37bf4f..a055c297c 100644
--- a/lib/solargraph/complex_type/conformance.rb
+++ b/lib/solargraph/complex_type/conformance.rb
@@ -31,11 +31,8 @@ def conforms_to_unique_type?
         unless expected.is_a?(UniqueType)
           raise "Expected type must be a UniqueType, got #{expected.class} in #{expected.inspect}"
         end
-        if inferred.literal? && !expected.literal?
-          conformance =
-            self.class.new(api_map, inferred.simplify_literals, expected, situation, rules,
-                           variance: variance)
-          return conformance.conforms_to_unique_type?
+        if inferred.simplifyable_literal? && !expected.literal?
+          return with_new_types(inferred.simplify_literals, expected).conforms_to_unique_type?
         end
         return true if expected.any?(&:interface?) && rules.include?(:allow_unmatched_interface)
         return true if inferred.interface? && rules.include?(:allow_unmatched_interface)
@@ -46,18 +43,23 @@ def conforms_to_unique_type?
                                                  variance: variance)
           return true if reversed_match
         end
-        expected = self.expected.downcast_to_literal_if_possible
-        inferred = self.inferred.downcast_to_literal_if_possible
+        if expected != expected.downcast_to_literal_if_possible ||
+           inferred != inferred.downcast_to_literal_if_possible
+          return with_new_types(inferred.downcast_to_literal_if_possible,
+                                expected.downcast_to_literal_if_possible).conforms_to_unique_type?
+        end
 
-        if rules.include? :allow_subtype_skew
+        if rules.include?(:allow_subtype_skew) && !expected.parameters.empty?
           # parameters are not considered in this case
-          expected = expected.erase_parameters
+          return with_new_types(inferred, expected.erase_parameters).conforms_to_unique_type?
         end
 
-        inferred = inferred.erase_parameters if !expected.parameters? && inferred.parameters?
+        if !expected.parameters? && inferred.parameters?
+          return with_new_types(inferred.erase_parameters, expected).conforms_to_unique_type?
+        end
 
         if expected.parameters? && !inferred.parameters? && rules.include?(:allow_empty_params)
-          expected = expected.erase_parameters
+          return with_new_types(inferred, expected.erase_parameters).conforms_to_unique_type?
         end
 
         return true if inferred == expected
@@ -127,6 +129,13 @@ def conforms_to_unique_type?
 
       private
 
+      # @return [self]
+      # @param inferred [ComplexType::UniqueType]
+      # @param expected [ComplexType::UniqueType]
+      def with_new_types inferred, expected
+        self.class.new(api_map, inferred, expected, situation, rules, variance: variance)
+      end
+
       attr_reader :api_map, :inferred, :expected, :situation, :rules, :variance
     end
   end
diff --git a/lib/solargraph/complex_type/unique_type.rb b/lib/solargraph/complex_type/unique_type.rb
index 9327d3fc8..b12ca6332 100644
--- a/lib/solargraph/complex_type/unique_type.rb
+++ b/lib/solargraph/complex_type/unique_type.rb
@@ -113,6 +113,10 @@ def simplify_literals
         end
       end
 
+      def simplifyable_literal?
+        literal? && name != 'nil'
+      end
+
       def literal?
         non_literal_name != name
       end

From bc71924f40e706990a2ad90973e13eba78c35342 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 4 Aug 2025 13:32:26 -0400
Subject: [PATCH 043/327] Coverage fixes

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

diff --git a/lib/solargraph/complex_type/conformance.rb b/lib/solargraph/complex_type/conformance.rb
index a055c297c..8d4b9ec3b 100644
--- a/lib/solargraph/complex_type/conformance.rb
+++ b/lib/solargraph/complex_type/conformance.rb
@@ -20,11 +20,14 @@ def initialize api_map, inferred, expected,
         @situation = situation
         @rules = rules
         @variance = variance
+        # :nocov:
         unless expected.is_a?(UniqueType)
           raise "Expected type must be a UniqueType, got #{expected.class} in #{expected.inspect}"
         end
         return if inferred.is_a?(UniqueType)
+        # :nocov:
         raise "Inferred type must be a UniqueType, got #{inferred.class} in #{inferred.inspect}"
+        # :nocov:
       end
 
       def conforms_to_unique_type?

From 18bbe8a81045138d619d5abda8c4f7ec1477cb9c Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 4 Aug 2025 13:33:27 -0400
Subject: [PATCH 044/327] Coverage fixes

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

diff --git a/lib/solargraph/complex_type/conformance.rb b/lib/solargraph/complex_type/conformance.rb
index 8d4b9ec3b..888d53ec2 100644
--- a/lib/solargraph/complex_type/conformance.rb
+++ b/lib/solargraph/complex_type/conformance.rb
@@ -31,9 +31,11 @@ def initialize api_map, inferred, expected,
       end
 
       def conforms_to_unique_type?
+        # :nocov:
         unless expected.is_a?(UniqueType)
           raise "Expected type must be a UniqueType, got #{expected.class} in #{expected.inspect}"
         end
+        # :nocov:
         if inferred.simplifyable_literal? && !expected.literal?
           return with_new_types(inferred.simplify_literals, expected).conforms_to_unique_type?
         end

From dc50122896e1923242487964b4e3b07ec08903a5 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 4 Aug 2025 15:04:28 -0400
Subject: [PATCH 045/327] Refactor

---
 lib/solargraph/complex_type/conformance.rb | 122 +++++++++++++--------
 1 file changed, 78 insertions(+), 44 deletions(-)

diff --git a/lib/solargraph/complex_type/conformance.rb b/lib/solargraph/complex_type/conformance.rb
index 888d53ec2..6a3d128a7 100644
--- a/lib/solargraph/complex_type/conformance.rb
+++ b/lib/solargraph/complex_type/conformance.rb
@@ -9,7 +9,8 @@ class Conformance
       # @param expected [ComplexType::UniqueType]
       # @param situation [:method_call, :return_type]
       # @param rules [Array<:allow_subtype_skew, :allow_empty_params, :allow_reverse_match,
-      #   :allow_any_match, :allow_undefined, :allow_unresolved_generic, :allow_unmatched_interface>]
+      #   :allow_any_match, :allow_undefined, :allow_unresolved_generic,
+      #   :allow_unmatched_interface>]
       # @param variance [:invariant, :covariant, :contravariant]
       def initialize api_map, inferred, expected,
                      situation = :method_call, rules = [],
@@ -33,56 +34,92 @@ def initialize api_map, inferred, expected,
       def conforms_to_unique_type?
         # :nocov:
         unless expected.is_a?(UniqueType)
+          # :nocov:
           raise "Expected type must be a UniqueType, got #{expected.class} in #{expected.inspect}"
+          # :nocov:
         end
-        # :nocov:
-        if inferred.simplifyable_literal? && !expected.literal?
+
+        if use_simplified_inferred_type?
           return with_new_types(inferred.simplify_literals, expected).conforms_to_unique_type?
         end
-        return true if expected.any?(&:interface?) && rules.include?(:allow_unmatched_interface)
-        return true if inferred.interface? && rules.include?(:allow_unmatched_interface)
-
-        if rules.include? :allow_reverse_match
-          reversed_match = expected.conforms_to?(api_map, inferred, situation,
-                                                 rules - [:allow_reverse_match],
-                                                 variance: variance)
-          return true if reversed_match
-        end
-        if expected != expected.downcast_to_literal_if_possible ||
-           inferred != inferred.downcast_to_literal_if_possible
-          return with_new_types(inferred.downcast_to_literal_if_possible,
-                                expected.downcast_to_literal_if_possible).conforms_to_unique_type?
+        return true if ignore_interface?
+        return true if conforms_via_reverse_match?
+
+        downcast_inferred = inferred.downcast_to_literal_if_possible
+        downcast_expected = expected.downcast_to_literal_if_possible
+        if (downcast_inferred.name != inferred.name) || (downcast_expected.name != expected.name)
+          return with_new_types(downcast_inferred, downcast_expected).conforms_to_unique_type?
         end
 
-        if rules.include?(:allow_subtype_skew) && !expected.parameters.empty?
+        if rules.include?(:allow_subtype_skew) && !expected.all_params.empty?
           # parameters are not considered in this case
           return with_new_types(inferred, expected.erase_parameters).conforms_to_unique_type?
         end
 
-        if !expected.parameters? && inferred.parameters?
-          return with_new_types(inferred.erase_parameters, expected).conforms_to_unique_type?
-        end
+        return with_new_types(inferred.erase_parameters, expected).conforms_to_unique_type? if only_inferred_parameters?
 
-        if expected.parameters? && !inferred.parameters? && rules.include?(:allow_empty_params)
-          return with_new_types(inferred, expected.erase_parameters).conforms_to_unique_type?
-        end
+        return conforms_via_stripped_expected_parameters? if can_strip_expected_parameters?
 
         return true if inferred == expected
 
+        return false unless erased_type_conforms?
+
+        return true if inferred.all_params.empty? && rules.include?(:allow_empty_params)
+
+        # at this point we know the erased type is fine - time to look at parameters
+
+        # there's an implicit 'any' on the expectation parameters
+        # if there are none specified
+        return true if expected.all_params.empty?
+
+        return false unless key_types_conform?
+
+        subtypes_conform?
+      end
+
+      private
+
+      def use_simplified_inferred_type?
+        inferred.simplifyable_literal? && !expected.literal?
+      end
+
+      def only_inferred_parameters?
+        !expected.parameters? && inferred.parameters?
+      end
+
+      def conforms_via_stripped_expected_parameters?
+        with_new_types(inferred, expected.erase_parameters).conforms_to_unique_type?
+      end
+
+      def ignore_interface?
+        (expected.any?(&:interface?) && rules.include?(:allow_unmatched_interface)) ||
+          (inferred.interface? && rules.include?(:allow_unmatched_interface))
+      end
+
+      def can_strip_expected_parameters?
+        expected.parameters? && !inferred.parameters? && rules.include?(:allow_empty_params)
+      end
+
+      def conforms_via_reverse_match?
+        return false unless rules.include? :allow_reverse_match
+
+        expected.conforms_to?(api_map, inferred, situation,
+                              rules - [:allow_reverse_match],
+                              variance: variance)
+      end
+
+      def erased_type_conforms?
         case variance
         when :invariant
           return false unless inferred.name == expected.name
         when :covariant
           # covariant: we can pass in a more specific type
-
           # we contain the expected mix-in, or we have a more specific type
           return false unless api_map.type_include?(inferred.name, expected.name) ||
                               api_map.super_and_sub?(expected.name, inferred.name) ||
                               inferred.name == expected.name
-
         when :contravariant
           # contravariant: we can pass in a more general type
-
           # we contain the expected mix-in, or we have a more general type
           return false unless api_map.type_include?(inferred.name, expected.name) ||
                               api_map.super_and_sub?(inferred.name, expected.name) ||
@@ -92,27 +129,26 @@ def conforms_to_unique_type?
           raise "Unknown variance: #{variance.inspect}"
           # :nocov:
         end
+        true
+      end
 
-        return true if inferred.all_params.empty? && rules.include?(:allow_empty_params)
-
-        # at this point we know the erased type is fine - time to look at parameters
-
-        # there's an implicit 'any' on the expectation parameters
-        # if there are none specified
-        return true if expected.all_params.empty?
+      def key_types_conform?
+        return true if expected.key_types.empty?
 
-        unless expected.key_types.empty?
-          return false if inferred.key_types.empty?
+        return false if inferred.key_types.empty?
 
-          unless ComplexType.new(inferred.key_types).conforms_to?(api_map,
-                                                                  ComplexType.new(expected.key_types),
-                                                                  situation,
-                                                                  rules,
-                                                                  variance: inferred.parameter_variance(situation))
-            return false
-          end
+        unless ComplexType.new(inferred.key_types).conforms_to?(api_map,
+                                                                ComplexType.new(expected.key_types),
+                                                                situation,
+                                                                rules,
+                                                                variance: inferred.parameter_variance(situation))
+          return false
         end
 
+        true
+      end
+
+      def subtypes_conform?
         return true if expected.subtypes.empty?
 
         return true if expected.subtypes.any?(&:undefined?) && rules.include?(:allow_undefined)
@@ -132,8 +168,6 @@ def conforms_to_unique_type?
                                                         variance: inferred.parameter_variance(situation))
       end
 
-      private
-
       # @return [self]
       # @param inferred [ComplexType::UniqueType]
       # @param expected [ComplexType::UniqueType]

From 7fcd43a9d705cf0e30b4c590575ec29a6f2c4ff5 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 4 Aug 2025 15:36:15 -0400
Subject: [PATCH 046/327] Fix nocov markers

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

diff --git a/lib/solargraph/complex_type/conformance.rb b/lib/solargraph/complex_type/conformance.rb
index 6a3d128a7..424413038 100644
--- a/lib/solargraph/complex_type/conformance.rb
+++ b/lib/solargraph/complex_type/conformance.rb
@@ -25,6 +25,7 @@ def initialize api_map, inferred, expected,
         unless expected.is_a?(UniqueType)
           raise "Expected type must be a UniqueType, got #{expected.class} in #{expected.inspect}"
         end
+        # :nocov:
         return if inferred.is_a?(UniqueType)
         # :nocov:
         raise "Inferred type must be a UniqueType, got #{inferred.class} in #{inferred.inspect}"
@@ -32,7 +33,6 @@ def initialize api_map, inferred, expected,
       end
 
       def conforms_to_unique_type?
-        # :nocov:
         unless expected.is_a?(UniqueType)
           # :nocov:
           raise "Expected type must be a UniqueType, got #{expected.class} in #{expected.inspect}"

From bb77106490afd84e82e5660ec8067f12473f65a8 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 4 Aug 2025 16:52:23 -0400
Subject: [PATCH 047/327] Add another spec, fix behavior

---
 lib/solargraph/complex_type/unique_type.rb | 4 ++--
 spec/complex_type/conforms_to_spec.rb      | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/solargraph/complex_type/unique_type.rb b/lib/solargraph/complex_type/unique_type.rb
index b12ca6332..c009a08d9 100644
--- a/lib/solargraph/complex_type/unique_type.rb
+++ b/lib/solargraph/complex_type/unique_type.rb
@@ -208,8 +208,8 @@ def erased_version_of?(other)
       # @param situation [:method_call, :assignment, :return]
       # @param rules [Array<:allow_subtype_skew, :allow_empty_params, :allow_reverse_match, :allow_any_match, :allow_undefined, :allow_unresolved_generic>]
       # @param variance [:invariant, :covariant, :contravariant]
-      def conforms_to?(api_map, expected, situation, rules,
-                       variance:)
+      def conforms_to?(api_map, expected, situation, rules = [],
+                       variance: erased_variance(situation))
         return true if undefined? && rules.include?(:allow_undefined)
 
         # @todo teach this to validate duck types as inferred type
diff --git a/spec/complex_type/conforms_to_spec.rb b/spec/complex_type/conforms_to_spec.rb
index bacf19b5e..c1bba05dc 100644
--- a/spec/complex_type/conforms_to_spec.rb
+++ b/spec/complex_type/conforms_to_spec.rb
@@ -56,6 +56,12 @@ class Sub < Sup; end
     sup = described_class.parse('Sup')
     sub = described_class.parse('Sub')
     match = sub.conforms_to?(api_map, sup, :method_call)
+  end
+
+  it 'handles singleton types compared against their literals' do
+    exp = Solargraph::ComplexType::UniqueType.new('nil', rooted: true)
+    inf = Solargraph::ComplexType::UniqueType.new('NilClass', rooted: true)
+    match = inf.conforms_to?(api_map, exp, :method_call)
     expect(match).to be(true)
   end
 

From ed69326afb742f37e78ce475ed38b40f93ece405 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 4 Aug 2025 16:59:12 -0400
Subject: [PATCH 048/327] Fix merge issue

---
 spec/complex_type/conforms_to_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/complex_type/conforms_to_spec.rb b/spec/complex_type/conforms_to_spec.rb
index c1bba05dc..4ac00e70a 100644
--- a/spec/complex_type/conforms_to_spec.rb
+++ b/spec/complex_type/conforms_to_spec.rb
@@ -56,6 +56,7 @@ class Sub < Sup; end
     sup = described_class.parse('Sup')
     sub = described_class.parse('Sub')
     match = sub.conforms_to?(api_map, sup, :method_call)
+    expect(match).to be(true)
   end
 
   it 'handles singleton types compared against their literals' do

From 1e7c972f314003184ac0a43828986f27fcc4aa32 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 4 Aug 2025 17:13:30 -0400
Subject: [PATCH 049/327] More specs

---
 spec/complex_type/conforms_to_spec.rb | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/spec/complex_type/conforms_to_spec.rb b/spec/complex_type/conforms_to_spec.rb
index 4ac00e70a..f8a623bf0 100644
--- a/spec/complex_type/conforms_to_spec.rb
+++ b/spec/complex_type/conforms_to_spec.rb
@@ -26,6 +26,27 @@
     expect(match).to be(true)
   end
 
+  it 'allows covariant behavior in parameters of Array' do
+    exp = described_class.parse('Array<Object>')
+    inf = described_class.parse('Array<Integer>')
+    match = inf.conforms_to?(api_map, exp, :method_call)
+    expect(match).to be(true)
+  end
+
+  it 'does not allow contravariant behavior in parameters of Array' do
+    exp = described_class.parse('Array<Integer>')
+    inf = described_class.parse('Array<Object>')
+    match = inf.conforms_to?(api_map, exp, :method_call)
+    expect(match).to be(false)
+  end
+
+  it 'allows covariant behavior in key types of Hash' do
+    exp = described_class.parse('Hash{Object => String}')
+    inf = described_class.parse('Hash{Integer => String}')
+    match = inf.conforms_to?(api_map, exp, :method_call)
+    expect(match).to be(true)
+  end
+
   it 'accepts valid tuple conformance' do
     exp = described_class.parse('Array(Integer, Integer)')
     inf = described_class.parse('Array(Integer, Integer)')

From a33381bddc82dfba278193f0b31b27dc988dd89c Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 19 Aug 2025 11:50:00 -0400
Subject: [PATCH 050/327] Linting fixes

---
 lib/solargraph/api_map.rb  | 14 --------------
 lib/solargraph/gem_pins.rb |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index a49ac0a0d..c79c30f60 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -920,20 +920,6 @@ def prefer_non_nil_variables pins
       result + nil_pins
     end
 
-    # @param pins [Enumerable<Pin::Base>]
-    # @param visibility [Enumerable<Symbol>]
-    # @return [Array<Pin::Base>]
-    def resolve_method_aliases pins, visibility = [:public, :private, :protected]
-      pins.map do |pin|
-        resolved = resolve_method_alias(pin)
-        if resolved.respond_to?(:visibility) && !visibility.include?(resolved.visibility)
-          Solargraph.assert_or_log(:alias_visibility) { "Rejecting alias - visibility of target is #{resolved.visibility}, looking for visibility #{visibility}" }
-          next pin
-        end
-        resolved
-      end.compact
-    end
-
     # @param pin [Pin::MethodAlias, Pin::Base]
     # @return [Pin::Method]
     def resolve_method_alias pin
diff --git a/lib/solargraph/gem_pins.rb b/lib/solargraph/gem_pins.rb
index 4bfc1a6d5..fc86a0d92 100644
--- a/lib/solargraph/gem_pins.rb
+++ b/lib/solargraph/gem_pins.rb
@@ -49,7 +49,7 @@ def self.build_yard_pins(yard_plugins, gemspec)
     end
 
     # @param yard_pins [Array<Pin::Base>]
-    # @param rbs_map [RbsMap]
+    # @param rbs_pins [Array<Pin::Base>]
     # @return [Array<Pin::Base>]
     def self.combine(yard_pins, rbs_pins)
       in_yard = Set.new

From 5caa11e79c49f9847996dfa597d6b232b7250a5a Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 19 Aug 2025 12:17:58 -0400
Subject: [PATCH 051/327] Ratchet rubocop todo

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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index d8283c5c6..57b773d40 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -571,7 +571,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'
@@ -639,7 +638,6 @@ Lint/UnusedBlockArgument:
 # 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'
@@ -2135,13 +2133,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 +2228,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).
@@ -2653,7 +2643,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 c2aac2b6c41411d4004538514adfebf7cb96f80f Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 19 Aug 2025 13:29:51 -0400
Subject: [PATCH 052/327] Fix undercover issue

---
 lib/solargraph/api_map.rb     |  2 ++
 spec/pin/method_alias_spec.rb | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 spec/pin/method_alias_spec.rb

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index c79c30f60..23f10b116 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -929,8 +929,10 @@ def resolve_method_alias pin
       origin = get_method_stack(pin.full_context.tag, pin.original, scope: pin.scope, preserve_generics: true).first
       @method_alias_stack.pop
       if origin.nil?
+        # :nocov:
         Solargraph.assert_or_log(:alias_target_missing) { "Rejecting alias - target is missing while looking for #{pin.full_context.tag} #{pin.original}() in #{pin.scope} scope = #{pin.inspect}" }
         return nil
+        # :nocov:
       end
       args = {
         location: pin.location,
diff --git a/spec/pin/method_alias_spec.rb b/spec/pin/method_alias_spec.rb
new file mode 100644
index 000000000..d3b408273
--- /dev/null
+++ b/spec/pin/method_alias_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+describe Solargraph::Pin::MethodAlias do
+  describe '#to_rbs' do
+    it 'generates RBS from simple alias' do
+      method_alias = described_class.new(name: 'name', original: 'original_name')
+
+      expect(method_alias.to_rbs).to eq('alias name original_name')
+    end
+
+    it 'generates RBS from static alias' do
+      method_alias = described_class.new(name: 'name', original: 'original_name', scope: :class)
+
+      expect(method_alias.to_rbs).to eq('alias self.name self.original_name')
+    end
+  end
+end

From a45bc0ac4dad40a7747e737d7c14ccade748b3e3 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 19 Aug 2025 14:05:31 -0400
Subject: [PATCH 053/327] Fix linting issues

---
 .rubocop.yml      |  3 ++
 .rubocop_todo.yml | 97 -----------------------------------------------
 2 files changed, 3 insertions(+), 97 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index a73324db2..185cd8955 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -39,6 +39,9 @@ Metrics/ParameterLists:
 Style/ClassVars:
   Enabled: false
 
+RSpec/SpecFilePathFormat:
+  Enabled: false
+
 #
 # Set a relaxed standard on harder-to-address item for ease of
 # contribution - if you are good at refactoring, we welcome PRs to
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 57b773d40..06bc41596 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1278,103 +1278,6 @@ RSpec/ScatteredLet:
   Exclude:
     - 'spec/complex_type_spec.rb'
 
-# 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'
-
 RSpec/StubbedMock:
   Exclude:
     - 'spec/language_server/host/message_worker_spec.rb'

From 964b2d8d7a2802ed57f96a987105f3bdd8ebe72f Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 24 Aug 2025 15:50:58 -0400
Subject: [PATCH 054/327] Fix merge

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

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 714ca20c8..54f2ab449 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -1028,11 +1028,11 @@ def resolve_method_alias(alias_pin)
       end
       if original.nil?
         # :nocov:
-        Solargraph.assert_or_log(:alias_target_missing) { "Rejecting alias - target is missing while looking for #{pin.full_context.tag} #{pin.original}() in #{pin.scope} scope = #{pin.inspect}" }
+        Solargraph.assert_or_log(:alias_target_missing) { "Rejecting alias - target is missing while looking for #{alias_pin.full_context.tag} #{alias_pin.original} in #{alias_pin.scope} scope = #{alias_pin.inspect}" }
         return nil
         # :nocov:
       end
-     
+
       # @sg-ignore ignore `received nil` for original
       create_resolved_alias_pin(alias_pin, original)
     end

From 9b2ddf6b38865d04266fd093b146f26f72fecf50 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 24 Aug 2025 15:52:07 -0400
Subject: [PATCH 055/327] Bring in new RuboCop version to todo file

---
 .rubocop_todo.yml | 132 ++++------------------------------------------
 1 file changed, 11 insertions(+), 121 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 5f20e3d56..cfa4dd37e 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.0.
 # 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:
@@ -659,13 +652,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'
@@ -696,7 +688,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'
@@ -1008,7 +999,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'
@@ -1108,7 +1098,6 @@ RSpec/LeakyConstantDeclaration:
     - 'spec/complex_type_spec.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AutoCorrect.
 RSpec/LetBeforeExamples:
   Exclude:
     - 'spec/complex_type_spec.rb'
@@ -1266,109 +1255,10 @@ 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
-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'
-    - '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'
-
 RSpec/StubbedMock:
   Exclude:
     - 'spec/language_server/host/message_worker_spec.rb'
@@ -1702,7 +1592,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:
@@ -2233,7 +2123,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'

From c5acdfc8aec9677af0513598b602556758070f50 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 24 Aug 2025 16:50:57 -0400
Subject: [PATCH 056/327] Resolve aliases to .new pins

---
 lib/solargraph/api_map.rb           | 10 +++++++---
 spec/api_map/api_map_method_spec.rb |  7 +++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 54f2ab449..962d8e8cd 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -1005,13 +1005,17 @@ def prefer_non_nil_variables pins
     # @param alias_pin [Pin::MethodAlias]
     # @return [Pin::Method, nil]
     def resolve_method_alias(alias_pin)
-      ancestors = store.get_ancestors(alias_pin.full_context.tag)
+      ancestors = store.get_ancestors(alias_pin.full_context.namespace)
       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}"
+        ancestor_method_path = if alias_pin.original == 'new' && alias_pin.scope == :class
+                                 "#{ancestor_fqns}#initialize"
+                               else
+                                 "#{ancestor_fqns}#{alias_pin.scope == :instance ? '#' : '.'}#{alias_pin.original}"
+                               end
 
         # Search for the original method in the ancestor
         original = store.get_path_pins(ancestor_method_path).find do |candidate_pin|
@@ -1021,7 +1025,7 @@ def resolve_method_alias(alias_pin)
             break resolved if resolved
           end
 
-          candidate_pin.is_a?(Pin::Method) && candidate_pin.scope == alias_pin.scope
+          candidate_pin.is_a?(Pin::Method)
         end
 
         break if original
diff --git a/spec/api_map/api_map_method_spec.rb b/spec/api_map/api_map_method_spec.rb
index a3adc9b94..c599768d8 100644
--- a/spec/api_map/api_map_method_spec.rb
+++ b/spec/api_map/api_map_method_spec.rb
@@ -11,6 +11,13 @@
     api_map.catalog bench
   end
 
+  describe '#resolve_method_alias' do
+    it 'resolves the IO.for_fd alias to IO.new' do
+      stack = api_map.get_method_stack('IO', 'for_fd', scope: :class)
+      expect(stack).not_to be_empty
+    end
+  end
+
   describe '#qualify' do
     let(:external_requires) { ['yaml'] }
 

From 14b794b6b7b6026d81300e9e4b85545f0d01cfd2 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 24 Aug 2025 17:00:54 -0400
Subject: [PATCH 057/327] Improve spec

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

diff --git a/spec/api_map/api_map_method_spec.rb b/spec/api_map/api_map_method_spec.rb
index c599768d8..0ac32d608 100644
--- a/spec/api_map/api_map_method_spec.rb
+++ b/spec/api_map/api_map_method_spec.rb
@@ -14,7 +14,7 @@
   describe '#resolve_method_alias' do
     it 'resolves the IO.for_fd alias to IO.new' do
       stack = api_map.get_method_stack('IO', 'for_fd', scope: :class)
-      expect(stack).not_to be_empty
+      expect(stack.map(&:class).uniq).to eq([Solargraph::Pin::Method])
     end
   end
 

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 058/327] 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 059/327] 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 060/327] 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 061/327] 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 062/327] 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 063/327] 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 064/327] 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 065/327] 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 066/327] 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 067/327] 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 068/327] 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 069/327] 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 070/327] 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 071/327] 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 072/327] 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 6c557803da5b37cee2ecdb5b14de5804e47f8fa5 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 27 Aug 2025 13:02:35 -0400
Subject: [PATCH 073/327] Fix merge issue

---
 lib/solargraph/gem_pins.rb | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/solargraph/gem_pins.rb b/lib/solargraph/gem_pins.rb
index 877eeb15d..43422505b 100644
--- a/lib/solargraph/gem_pins.rb
+++ b/lib/solargraph/gem_pins.rb
@@ -11,29 +11,20 @@ class << self
       include Logging
     end
 
-    # @param gemspec [Gem::Specification]
+    # @param pins [Array<Pin::Base>]
     # @return [Array<Pin::Base>]
-    def self.build_yard_pins(gemspec)
-      Yardoc.cache(gemspec) unless Yardoc.cached?(gemspec)
-      yardoc = Yardoc.load!(gemspec)
-      YardMap::Mapper.new(yardoc, gemspec).map
-    end
-
-    # @param pins [Array<Pin::Method>]
-    # @return [Array<Pin::Method>]
     def self.combine_method_pins_by_path(pins)
       method_pins, alias_pins = pins.partition { |pin| pin.class == Pin::Method }
       by_path = method_pins.group_by(&:path)
-      combined_by_path = by_path.transform_values do |pins|
+      by_path.transform_values! do |pins|
         GemPins.combine_method_pins(*pins)
       end
-      combined_by_path.values + alias_pins
+      by_path.values + alias_pins
     end
 
     # @param pins [Pin::Base]
     # @return [Pin::Base, nil]
     def self.combine_method_pins(*pins)
-      # @type [Pin::Method, nil]
       out = pins.reduce(nil) do |memo, pin|
         next pin if memo.nil?
         if memo == pin && memo.source != :combined
@@ -48,6 +39,15 @@ def self.combine_method_pins(*pins)
       out
     end
 
+    # @param yard_plugins [Array<String>] The names of YARD plugins to use.
+    # @param gemspec [Gem::Specification]
+    # @return [Array<Pin::Base>]
+    def self.build_yard_pins(yard_plugins, gemspec)
+      Yardoc.cache(yard_plugins, gemspec) unless Yardoc.cached?(gemspec)
+      yardoc = Yardoc.load!(gemspec)
+      YardMap::Mapper.new(yardoc, gemspec).map
+    end
+
     # @param yard_pins [Array<Pin::Base>]
     # @param rbs_map [RbsMap]
     # @return [Array<Pin::Base>]

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 074/327] 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 075/327] 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 809ad2711ecbbfef05941192d6a7380fd8e53076 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 27 Aug 2025 13:24:26 -0400
Subject: [PATCH 076/327] Fix merge issue

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

diff --git a/lib/solargraph/type_checker.rb b/lib/solargraph/type_checker.rb
index 2b791e425..0b43c44fe 100644
--- a/lib/solargraph/type_checker.rb
+++ b/lib/solargraph/type_checker.rb
@@ -441,7 +441,7 @@ def signature_argument_problems_for location, locals, closure_pin, params, argum
             # @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)
+              if argtype.defined? && ptype.defined? && !arg_conforms_to?(argtype, ptype)
                 errors.push Problem.new(location, "Wrong argument type for #{pin.path}: #{par.name} expected #{ptype}, received #{argtype}")
                 return errors
               end

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 077/327] 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 ed1c54e12abcf12fc9ab2ccf74d948c6984ecf0f Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 27 Aug 2025 16:21:27 -0400
Subject: [PATCH 078/327] Rebaseline Rubocop todo

---
 .rubocop.yml      |   3 +
 .rubocop_todo.yml | 283 ++++++++++++++--------------------------------
 2 files changed, 86 insertions(+), 200 deletions(-)

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/.rubocop_todo.yml b/.rubocop_todo.yml
index f400dcfaf..4bdf2c073 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'
@@ -71,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.
@@ -233,7 +225,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).
@@ -277,6 +268,77 @@ Layout/LineContinuationSpacing:
   Exclude:
     - 'lib/solargraph/diagnostics/rubocop_helpers.rb'
 
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Max, 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'
+
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: symmetrical, new_line, same_line
@@ -622,7 +684,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 +692,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 +722,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 +758,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'
@@ -998,7 +1058,6 @@ RSpec/DescribedClass:
     - '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'
@@ -1009,7 +1068,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,7 +1167,6 @@ RSpec/LeakyConstantDeclaration:
     - 'spec/complex_type_spec.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AutoCorrect.
 RSpec/LetBeforeExamples:
   Exclude:
     - 'spec/complex_type_spec.rb'
@@ -1179,7 +1236,6 @@ RSpec/MultipleExpectations:
     - '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'
@@ -1204,7 +1260,6 @@ RSpec/NoExpectationExample:
     - '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'
 
 # This cop supports safe autocorrection (--autocorrect).
@@ -1267,109 +1322,10 @@ 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
-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'
-    - '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'
-
 RSpec/StubbedMock:
   Exclude:
     - 'spec/language_server/host/message_worker_spec.rb'
@@ -1703,7 +1659,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:
@@ -1864,7 +1820,6 @@ Style/FrozenStringLiteralComment:
     - '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'
@@ -1989,7 +1944,6 @@ Style/MapIntoArray:
   Exclude:
     - 'lib/solargraph/diagnostics/update_errors.rb'
     - 'lib/solargraph/parser/parser_gem/node_chainer.rb'
-    - 'lib/solargraph/type_checker/param_def.rb'
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/MapToHash:
@@ -2056,7 +2010,6 @@ Style/MethodDefParentheses:
     - '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'
@@ -2139,7 +2092,6 @@ Style/Next:
     - 'lib/solargraph/parser/parser_gem/node_processors/send_node.rb'
     - 'lib/solargraph/pin/signature.rb'
     - 'lib/solargraph/source_map/clip.rb'
-    - 'lib/solargraph/type_checker/checks.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: MinDigits, Strict, AllowedNumbers, AllowedPatterns.
@@ -2234,7 +2186,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'
@@ -2355,7 +2307,6 @@ Style/SlicingWithRange:
     - 'lib/solargraph/source/cursor.rb'
     - 'lib/solargraph/source/source_chainer.rb'
     - 'lib/solargraph/source_map/mapper.rb'
-    - 'lib/solargraph/type_checker/checks.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowModifier.
@@ -2661,77 +2612,9 @@ YARD/MismatchName:
 
 YARD/TagTypeSyntax:
   Exclude:
-    - 'lib/solargraph/language_server/host.rb'
-    - 'lib/solargraph/parser/comment_ripper.rb'
-    - 'lib/solargraph/type_checker.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Max, 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/conformance.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'

From 260f2270bc743c7e3b1d25183a8f706dc8463e8e Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 27 Aug 2025 16:21:48 -0400
Subject: [PATCH 079/327] Fix RuboCop issue

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

diff --git a/lib/solargraph/rbs_map/core_map.rb b/lib/solargraph/rbs_map/core_map.rb
index 5e030d9f6..bff943764 100644
--- a/lib/solargraph/rbs_map/core_map.rb
+++ b/lib/solargraph/rbs_map/core_map.rb
@@ -28,7 +28,7 @@ def pins
           @pins.concat RbsMap::CoreFills::ALL
           # process overrides, then remove any which couldn't be resolved
           processed = ApiMap::Store.new(@pins).pins.reject { |p| p.is_a?(Solargraph::Pin::Reference::Override) }
-          STDOUT.puts "RBS core pins cache size: #{@pins.size}"
+          puts "RBS core pins cache size: #{@pins.size}"
           @pins.replace processed
 
           PinCache.serialize_core @pins

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 080/327] 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 081/327] 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 082/327] 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 083/327] 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 084/327] 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 ce2a106e0be8e7b50ed9ebfd95918d2a03ed6799 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 27 Aug 2025 17:37:26 -0400
Subject: [PATCH 085/327] Drop one of two contradictory strategies

---
 lib/solargraph/complex_type/conformance.rb | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/lib/solargraph/complex_type/conformance.rb b/lib/solargraph/complex_type/conformance.rb
index 424413038..63abad967 100644
--- a/lib/solargraph/complex_type/conformance.rb
+++ b/lib/solargraph/complex_type/conformance.rb
@@ -39,9 +39,6 @@ def conforms_to_unique_type?
           # :nocov:
         end
 
-        if use_simplified_inferred_type?
-          return with_new_types(inferred.simplify_literals, expected).conforms_to_unique_type?
-        end
         return true if ignore_interface?
         return true if conforms_via_reverse_match?
 
@@ -79,10 +76,6 @@ def conforms_to_unique_type?
 
       private
 
-      def use_simplified_inferred_type?
-        inferred.simplifyable_literal? && !expected.literal?
-      end
-
       def only_inferred_parameters?
         !expected.parameters? && inferred.parameters?
       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 086/327] 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 f7e9e606757bbeac8047f154e5b2d63b6884e74c Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 27 Aug 2025 17:47:51 -0400
Subject: [PATCH 087/327] Type fixes

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

diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index 30ef9bdfc..2ac7fdf95 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -283,17 +283,17 @@ def superclass_references
         index.superclass_references
       end
 
-      # @return [Hash{String => Array<Pin::Reference::Include>}]
+      # @return [Hash{String => Array<String>}]
       def include_references
         index.include_references
       end
 
-      # @return [Hash{String => Array<Pin::Reference::Prepend>}]
+      # @return [Hash{String => Array<String>}]
       def prepend_references
         index.prepend_references
       end
 
-      # @return [Hash{String => Array<Pin::Reference::Extend>}]
+      # @return [Hash{String => Array<String>}]
       def extend_references
         index.extend_references
       end

From c96bee732931300a33b986ae158e6afe8b31cfc5 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 27 Aug 2025 17:59:32 -0400
Subject: [PATCH 088/327] Fix type 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 e8619b49e..b39bc72bc 100644
--- a/lib/solargraph/doc_map.rb
+++ b/lib/solargraph/doc_map.rb
@@ -138,7 +138,7 @@ def self.all_rbs_collection_gems_in_memory
       @rbs_collection_gems_in_memory ||= {}
     end
 
-    # @return [Hash{Array(String, String) => Array<Pin::Base>}] Indexed by gemspec name and version
+    # @return [Hash{Array(String, String) => Array<Gem::Specification>}] Indexed by gemspec name and version
     def yard_pins_in_memory
       self.class.all_yard_gems_in_memory
     end

From 447c778642edfef4adc62d2af3526f730417342c Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 29 Aug 2025 12:05:14 -0400
Subject: [PATCH 089/327] Make 'self' types concrete while checking arguments

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

diff --git a/lib/solargraph/type_checker.rb b/lib/solargraph/type_checker.rb
index e0b23f56b..dd13d7ec7 100644
--- a/lib/solargraph/type_checker.rb
+++ b/lib/solargraph/type_checker.rb
@@ -411,6 +411,7 @@ def signature_argument_problems_for location, locals, closure_pin, params, argum
             # @todo Some level (strong, I guess) should require the param here
             else
               argtype = argchain.infer(api_map, closure_pin, locals)
+              argtype = argtype.self_to_type(closure_pin.context)
               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
@@ -450,8 +451,10 @@ def kwarg_problems_for sig, argchain, api_map, block_pin, locals, location, pin,
             # @todo Some level (strong, I guess) should require the param here
           else
             ptype = data[:qualified]
+            ptype = ptype.self_to_type(pin.context)
             unless ptype.undefined?
               argtype = argchain.infer(api_map, block_pin, locals)
+              argtype = argtype.self_to_type(block_pin.context)
               if argtype.defined? && ptype && !any_types_match?(api_map, ptype, argtype)
                 result.push Problem.new(location, "Wrong argument type for #{pin.path}: #{par.name} expected #{ptype}, received #{argtype}")
               end
@@ -477,7 +480,9 @@ def kwrestarg_problems_for(api_map, block_pin, locals, location, pin, params, kw
       kwargs.each_pair do |pname, argchain|
         next unless params.key?(pname.to_s)
         ptype = params[pname.to_s][:qualified]
+        ptype = ptype.self_to_type(pin.context)
         argtype = argchain.infer(api_map, block_pin, locals)
+        argtype = argtype.self_to_type(block_pin.context)
         if argtype.defined? && ptype && !any_types_match?(api_map, ptype, argtype)
           result.push Problem.new(location, "Wrong argument type for #{pin.path}: #{pname} expected #{ptype}, received #{argtype}")
         end

From 36383596fa21593bb6db0f7fffa343b37141aa75 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 29 Aug 2025 12:51:12 -0400
Subject: [PATCH 090/327] strict -> strong

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

diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml
index 4cde97763..f40977acf 100644
--- a/.github/workflows/typecheck.yml
+++ b/.github/workflows/typecheck.yml
@@ -18,7 +18,7 @@ permissions:
 
 jobs:
   solargraph_typed:
-    name: Solargraph / typed
+    name: Solargraph / strong
 
     runs-on: ubuntu-latest
 
@@ -36,4 +36,4 @@ jobs:
     - name: Install gem types
       run: bundle exec rbs collection install
     - name: Typecheck self
-      run: SOLARGRAPH_ASSERTS=on bundle exec solargraph typecheck --level strict
\ No newline at end of file
+      run: SOLARGRAPH_ASSERTS=on bundle exec solargraph typecheck --level strong

From b4a2ab1443bab5bc083339ffcdbc23d81c463959 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 29 Aug 2025 12:53:22 -0400
Subject: [PATCH 091/327] Also change default in Rakefile

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

diff --git a/Rakefile b/Rakefile
index 0e20d1280..c83d9ab6b 100755
--- a/Rakefile
+++ b/Rakefile
@@ -9,7 +9,7 @@ task :console do
 end
 
 desc "Run the type checker"
-task typecheck: [:typecheck_strict]
+task typecheck: [:typecheck_strong]
 
 desc "Run the type checker at typed level - return code issues provable without annotations being correct"
 task :typecheck_typed do

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 092/327] 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 093/327] 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 91ced058c5c81f3b1e63c51b27c08f3ca14c2339 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 30 Aug 2025 21:25:08 -0400
Subject: [PATCH 094/327] Add spec

---
 spec/type_checker/levels/strong_spec.rb | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/spec/type_checker/levels/strong_spec.rb b/spec/type_checker/levels/strong_spec.rb
index a03e6eb5d..94f0f207f 100644
--- a/spec/type_checker/levels/strong_spec.rb
+++ b/spec/type_checker/levels/strong_spec.rb
@@ -97,6 +97,29 @@ def bar
       expect(checker.problems.map(&:message)).to include('Call to #foo is missing keyword argument b')
     end
 
+    it 'understands complex use of other' do
+      checker = type_checker(%(
+        class A
+          # @param other [self]
+          #
+          # @return [void]
+          def foo other; end
+
+          # @param other [self]
+          #
+          # @return [void]
+          def bar(other); end
+        end
+
+        class B < A
+          def bar(other)
+            foo(other)
+          end
+        end
+      ))
+      expect(checker.problems.map(&:message)).to be_empty
+    end
+
     it 'calls out type issues even when keyword issues are there' do
       pending('fixes to arg vs param checking algorithm')
 

From 2702f443f84884bc5a72d84a3da66f5d7df51a51 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 30 Aug 2025 21:39:22 -0400
Subject: [PATCH 095/327] Work around strong typechecking issue

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

diff --git a/lib/solargraph/type_checker.rb b/lib/solargraph/type_checker.rb
index dd13d7ec7..2f9b7da1c 100644
--- a/lib/solargraph/type_checker.rb
+++ b/lib/solargraph/type_checker.rb
@@ -453,8 +453,7 @@ def kwarg_problems_for sig, argchain, api_map, block_pin, locals, location, pin,
             ptype = data[:qualified]
             ptype = ptype.self_to_type(pin.context)
             unless ptype.undefined?
-              argtype = argchain.infer(api_map, block_pin, locals)
-              argtype = argtype.self_to_type(block_pin.context)
+              argtype = argchain.infer(api_map, block_pin, locals).self_to_type(block_pin.context)
               if argtype.defined? && ptype && !any_types_match?(api_map, ptype, argtype)
                 result.push Problem.new(location, "Wrong argument type for #{pin.path}: #{par.name} expected #{ptype}, received #{argtype}")
               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 096/327] 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 097/327] 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 098/327] 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 099/327] 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 100/327] 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 101/327] 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 102/327] 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 e06b4ca3bf1f5bc8fe04987ca00d30b4d232dfdb Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 3 Sep 2025 09:52:33 -0400
Subject: [PATCH 103/327] Cache stdlib/core from command line

This adds the ability to cache both the core and standard libraries
from the command line:

```
$ bundle exec solargraph help gem
Usage:
  solargraph gems [GEM[=VERSION]...] [STDLIB...] [core]

Description:
  This command will cache the generated type documentation for the specified libraries. While Solargraph will generate this on the
  fly when needed, it takes time. This command will generate it in advance, which can be useful for CI scenarios.

  With no arguments, it will cache all libraries in the current workspace. If a gem or standard library name is specified, it will
  cache that library's type documentation.

  An equals sign after a gem will allow a specific gem version to be cached.

  The 'core' argument can be used to cache the type documentation for the core Ruby libraries.

  Cached documentation is stored in /Users/broz/.cache/solargraph, which can be stored between CI runs.
$
```
---
 .rubocop_todo.yml                             |   5 -
 lib/solargraph/doc_map.rb                     |  33 ++-
 lib/solargraph/pin_cache.rb                   |  44 ++-
 lib/solargraph/rbs_map.rb                     |  57 ++--
 lib/solargraph/rbs_map/core_map.rb            |  14 +-
 lib/solargraph/rbs_map/stdlib_map.rb          |  25 +-
 lib/solargraph/shell.rb                       | 156 +++++++++--
 lib/solargraph/workspace.rb                   |  10 +
 spec/doc_map_spec.rb                          |   8 +-
 spec/language_server/host/diagnoser_spec.rb   |   3 +-
 .../host/message_worker_spec.rb               |   3 +-
 spec/shell_spec.rb                            | 254 +++++++++++++++++-
 spec/spec_helper.rb                           |  26 ++
 13 files changed, 561 insertions(+), 77 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/lib/solargraph/doc_map.rb b/lib/solargraph/doc_map.rb
index 5fe5e03f9..d7d08edf5 100644
--- a/lib/solargraph/doc_map.rb
+++ b/lib/solargraph/doc_map.rb
@@ -61,19 +61,27 @@ def initialize(requires, preferences, workspace = nil)
     end
 
     # @param out [IO]
+    # @param rebuild [Boolean] whether to rebuild the pins even if they are cached
+    #
     # @return [void]
-    def cache_all!(out)
-      # if we log at debug level:
-      if logger.info?
-        gem_desc = uncached_gemspecs.map { |gemspec| "#{gemspec.name}:#{gemspec.version}" }.join(', ')
-        logger.info "Caching pins for gems: #{gem_desc}" unless uncached_gemspecs.empty?
-      end
-      logger.debug { "Caching for YARD: #{uncached_yard_gemspecs.map(&:name)}" }
-      logger.debug { "Caching for RBS collection: #{uncached_rbs_collection_gemspecs.map(&:name)}" }
+    def cache_all!(out, rebuild: false)
       load_serialized_gem_pins
-      uncached_gemspecs.each do |gemspec|
+      PinCache.cache_core(out: out) unless PinCache.core?
+      gem_specs = uncached_gemspecs
+      # try any possible standard libraries, but be quiet about it
+      stdlib_specs = PinCache.possible_stdlibs.map { |stdlib| workspace.find_gem(stdlib, out: nil) }.compact
+      specs = (gem_specs + stdlib_specs)
+      specs.each do |gemspec|
         cache(gemspec, out: out)
       end
+      out&.puts "Documentation cached for all #{specs.length} gems."
+
+      # do this after so that we prefer stdlib requires from gems,
+      # which are likely to be newer and have more pins
+      PinCache.cache_all_stdlibs(out: out)
+
+      out&.puts "Documentation cached for core, standard library and gems."
+
       load_serialized_gem_pins
       @uncached_rbs_collection_gemspecs = []
       @uncached_yard_gemspecs = []
@@ -357,7 +365,7 @@ def change_gemspec_version gemspec, version
     # @return [Array<Gem::Specification>]
     def fetch_dependencies gemspec
       # @param spec [Gem::Dependency]
-      only_runtime_dependencies(gemspec).each_with_object(Set.new) do |spec, deps|
+      gem_dep_gemspecs = 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?
@@ -366,6 +374,11 @@ def fetch_dependencies gemspec
       rescue Gem::MissingSpecError
         Solargraph.logger.warn "Gem dependency #{spec.name} #{spec.requirement} for #{gemspec.name} not found in RubyGems."
       end.to_a
+      # 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| workspace.find_gem(dep['name'], dep['version']) }.compact
+      (gem_dep_gemspecs.compact + stdlib_dep_gemspecs).uniq(&:name)
     end
 
     # @param gemspec [Gem::Specification]
diff --git a/lib/solargraph/pin_cache.rb b/lib/solargraph/pin_cache.rb
index 2a0ec4639..a997356b6 100644
--- a/lib/solargraph/pin_cache.rb
+++ b/lib/solargraph/pin_cache.rb
@@ -164,14 +164,16 @@ def has_rbs_collection?(gemspec, hash)
         exist?(rbs_collection_path(gemspec, hash))
       end
 
+      # @param out [IO, nil]
       # @return [void]
-      def uncache_core
-        uncache(core_path)
+      def uncache_core out: nil
+        uncache(core_path, out: out)
       end
 
+      # @param out [IO, nil]
       # @return [void]
-      def uncache_stdlib
-        uncache(stdlib_path)
+      def uncache_stdlib out: nil
+        uncache(stdlib_path, out: out)
       end
 
       # @param gemspec [Gem::Specification]
@@ -189,6 +191,40 @@ def clear
         FileUtils.rm_rf base_dir, secure: true
       end
 
+      def core?
+        File.file?(core_path)
+      end
+
+      # @param out [IO, nil]
+      # @return [Enumerable<Pin::Base>]
+      def cache_core out: nil
+        RbsMap::CoreMap.new.cache_core(out: out)
+      end
+
+      # @param out [IO, nil] output stream for logging
+      #
+      # @return [void]
+      def cache_all_stdlibs out: $stderr
+        possible_stdlibs.each do |stdlib|
+          RbsMap::StdlibMap.new(stdlib, out: out)
+        end
+      end
+
+      # @return [Array<String>] a list of possible standard library names
+      def possible_stdlibs
+        # 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
+
       private
 
       # @param file [String]
diff --git a/lib/solargraph/rbs_map.rb b/lib/solargraph/rbs_map.rb
index c6c10bac6..68514f32a 100644
--- a/lib/solargraph/rbs_map.rb
+++ b/lib/solargraph/rbs_map.rb
@@ -23,10 +23,11 @@ class RbsMap
     attr_reader :rbs_collection_config_path
 
     # @param library [String]
-    # @param version [String, nil
+    # @param version [String, nil]
     # @param rbs_collection_config_path [String, Pathname, nil]
     # @param rbs_collection_paths [Array<Pathname, String>]
-    def initialize library, version = nil, rbs_collection_config_path: nil, rbs_collection_paths: []
+    # @param out [IO, nil] where to log messages
+    def initialize library, version = nil, rbs_collection_config_path: nil, rbs_collection_paths: [], out: $stderr
       if rbs_collection_config_path.nil? && !rbs_collection_paths.empty?
         raise 'Please provide rbs_collection_config_path if you provide rbs_collection_paths'
       end
@@ -37,6 +38,11 @@ def initialize library, version = nil, rbs_collection_config_path: nil, rbs_coll
       add_library loader, library, version
     end
 
+    CACHE_KEY_GEM_EXPORT = 'gem-export'
+    CACHE_KEY_UNRESOLVED = 'unresolved'
+    CACHE_KEY_STDLIB = 'stdlib'
+    CACHE_KEY_LOCAL = 'local'
+
     # @return [RBS::EnvironmentLoader]
     def loader
       @loader ||= RBS::EnvironmentLoader.new(core_root: nil, repository: repository)
@@ -47,9 +53,13 @@ def loader
     #   updated upstream for the same library and version.  May change
     #   if the config for where information comes form changes.
     def cache_key
+      return CACHE_KEY_UNRESOLVED unless resolved?
+
       @hextdigest ||= begin
         # @type [String, nil]
         data = nil
+        # @type gem_config [nil, Hash{String => Hash{String => String}}]
+        gem_config = nil
         if rbs_collection_config_path
           lockfile_path = RBS::Collection::Config.to_lockfile_path(Pathname.new(rbs_collection_config_path))
           if lockfile_path.exist?
@@ -58,21 +68,26 @@ def cache_key
             data = gem_config&.to_s
           end
         end
-        if data.nil? || data.empty?
-          if resolved?
-            # definitely came from the gem itself and not elsewhere -
-            # only one version per gem
-            'gem-export'
+        if gem_config.nil?
+          CACHE_KEY_STDLIB
+        else
+          # @type [String]
+          source = gem_config.dig('source', 'type')
+          case source
+          when 'rubygems'
+            CACHE_KEY_GEM_EXPORT
+          when 'local'
+            CACHE_KEY_LOCAL
+          when 'stdlib'
+            CACHE_KEY_STDLIB
           else
-            'unresolved'
+            Digest::SHA1.hexdigest(data)
           end
-        else
-          Digest::SHA1.hexdigest(data)
         end
       end
     end
 
-    # @param gemspec [Gem::Specification]
+    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
     # @param rbs_collection_path [String, Pathname, nil]
     # @param rbs_collection_config_path [String, Pathname, nil]
     # @return [RbsMap]
@@ -88,9 +103,15 @@ def self.from_gemspec gemspec, rbs_collection_path, rbs_collection_config_path
                  rbs_collection_config_path: rbs_collection_config_path)
     end
 
+    # @param out [IO, nil] where to log messages
     # @return [Array<Pin::Base>]
-    def pins
-      @pins ||= resolved? ? conversions.pins : []
+    def pins out: $stderr
+      @pins ||= if resolved?
+                  loader.libs.each { |lib| log_caching(lib, out: out) }
+                  conversions.pins
+                else
+                  []
+                end
     end
 
     # @generic T
@@ -140,11 +161,17 @@ def conversions
       @conversions ||= Conversions.new(loader: loader)
     end
 
+    # @param lib [RBS::EnvironmentLoader::Library]
+    # @param out [IO, nil] where to log messages
+    # @return [void]
+    def log_caching lib, out:; end
+
     # @param loader [RBS::EnvironmentLoader]
     # @param library [String]
-    # @param version [String, nil]
+    # @param version [String, nil] the version of the library to load, or nil for any
+    # @param out [IO, nil] where to log messages
     # @return [Boolean] true if adding the library succeeded
-    def add_library loader, library, version
+    def add_library loader, library, version, out: $stderr
       @resolved = if loader.has_library?(library: library, version: version)
         loader.add library: library, version: version
         logger.debug { "#{short_name} successfully loaded library #{library}:#{version}" }
diff --git a/lib/solargraph/rbs_map/core_map.rb b/lib/solargraph/rbs_map/core_map.rb
index 8c3d7dbdd..a85cc34d0 100644
--- a/lib/solargraph/rbs_map/core_map.rb
+++ b/lib/solargraph/rbs_map/core_map.rb
@@ -5,25 +5,27 @@ class RbsMap
     # Ruby core pins
     #
     class CoreMap
+      include Logging
 
       def resolved?
         true
       end
 
-      FILLS_DIRECTORY = File.join(File.dirname(__FILE__), '..', '..', '..', 'rbs', 'fills')
+      FILLS_DIRECTORY = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'rbs', 'fills'))
 
       def initialize; end
 
+      # @param out [IO, nil] output stream for logging
       # @return [Enumerable<Pin::Base>]
-      def pins
+      def pins out: $stderr
         return @pins if @pins
-
         @pins = []
         cache = PinCache.deserialize_core
         if cache
           @pins.replace cache
         else
           loader.add(path: Pathname(FILLS_DIRECTORY))
+          out&.puts 'Caching RBS pins for Ruby core'
           @pins = conversions.pins
           @pins.concat RbsMap::CoreFills::ALL
           processed = ApiMap::Store.new(pins).pins.reject { |p| p.is_a?(Solargraph::Pin::Reference::Override) }
@@ -34,6 +36,12 @@ def pins
         @pins
       end
 
+      # @param out [IO, nil] output stream for logging
+      # @return [Enumerable<Pin::Base>]
+      def cache_core out: $stderr
+        pins out: out
+      end
+
       def loader
         @loader ||= RBS::EnvironmentLoader.new(repository: RBS::Repository.new(no_stdlib: false))
       end
diff --git a/lib/solargraph/rbs_map/stdlib_map.rb b/lib/solargraph/rbs_map/stdlib_map.rb
index b6804157f..e7891bfe3 100644
--- a/lib/solargraph/rbs_map/stdlib_map.rb
+++ b/lib/solargraph/rbs_map/stdlib_map.rb
@@ -12,8 +12,13 @@ class StdlibMap < RbsMap
       # @type [Hash{String => RbsMap}]
       @stdlib_maps_hash = {}
 
+      def log_caching lib, out: $stderr
+        out&.puts("Caching RBS pins for standard library #{lib.name}")
+      end
+
       # @param library [String]
-      def initialize library
+      # @param out [IO, nil] where to log messages
+      def initialize library, out: $stderr
         cached_pins = PinCache.deserialize_stdlib_require library
         if cached_pins
           @pins = cached_pins
@@ -24,7 +29,7 @@ def initialize library
           super
           unless resolved?
             @pins = []
-            logger.info { "Could not resolve #{library.inspect}" }
+            logger.debug { "StdlibMap could not resolve #{library.inspect}" }
             return
           end
           generated_pins = pins
@@ -33,6 +38,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/shell.rb b/lib/solargraph/shell.rb
index a005f600b..4f114c5fe 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -15,7 +15,7 @@ def self.exit_on_failure?
 
     map %w[--version -v] => :version
 
-    desc "--version, -v", "Print the version"
+    desc '--version, -v', 'Print the version'
     # @return [void]
     def version
       puts Solargraph::VERSION
@@ -103,12 +103,60 @@ def clear
     # @param gem [String]
     # @param version [String, nil]
     def cache gem, version = nil
+      gems(gem + (version ? "=#{version}" : ''))
+      # '
+    end
+
+    desc 'gems [GEM[=VERSION]...] [STDLIB...] [core]', 'Cache documentation for
+         installed libraries'
+    long_desc %( This command will cache the
+    generated type documentation for the specified libraries.  While
+    Solargraph will generate this on the fly when needed, it takes
+    time.  This command will generate it in advance, which can be
+    useful for CI scenarios.
+
+        With no arguments, it will cache all libraries in the current
+        workspace.  If a gem or standard library name is specified, it
+        will cache that library's type documentation.
+
+        An equals sign after a gem will allow a specific gem version
+        to be cached.
+
+        The 'core' argument can be used to cache the type
+        documentation for the core Ruby libraries.
+
+        Cached documentation is stored in #{PinCache.base_dir}, which
+        can be stored between CI runs.
+    )
+    # @param names [Array<String>]
+    # @return [void]
+    def gems *names
+      $stderr.puts("Caching these gems: #{names}")
+      # print time with ms
+      workspace = Solargraph::Workspace.new('.')
+
       api_map = Solargraph::ApiMap.load(Dir.pwd)
-      spec = Gem::Specification.find_by_name(gem, version)
-      api_map.cache_gem(spec, rebuild: options[:rebuild], out: $stdout)
+      if names.empty?
+        api_map.cache_all!($stdout)
+      else
+        names.each do |name|
+          if name == 'core'
+            PinCache.cache_core(out: $stdout)
+            next
+          end
+
+          gemspec = workspace.find_gem(*name.split('='))
+          if gemspec.nil?
+            warn "Gem '#{name}' not found"
+          else
+            api_map.cache_gem(gemspec, rebuild: options[:rebuild], out: $stdout)
+          end
+        end
+        $stderr.puts "Documentation cached for #{names.count} gems."
+      end
     end
 
-    desc 'uncache GEM [...GEM]', "Delete specific cached gem documentation"
+    desc 'uncache GEM [...GEM]', 'Delete specific cached gem documentation'
     long_desc %(
       Specify one or more gem names to clear. 'core' or 'stdlib' may
       also be specified to clear cached system documentation.
@@ -120,12 +168,12 @@ def uncache *gems
       raise ArgumentError, 'No gems specified.' if gems.empty?
       gems.each do |gem|
         if gem == 'core'
-          PinCache.uncache_core
+          PinCache.uncache_core(out: $stdout)
           next
         end
 
         if gem == 'stdlib'
-          PinCache.uncache_stdlib
+          PinCache.uncache_stdlib(out: $stdout)
           next
         end
 
@@ -134,26 +182,6 @@ def uncache *gems
       end
     end
 
-    desc 'gems [GEM[=VERSION]]', 'Cache documentation for installed gems'
-    option :rebuild, type: :boolean, desc: 'Rebuild existing documentation', default: false
-    # @param names [Array<String>]
-    # @return [void]
-    def gems *names
-      api_map = ApiMap.load('.')
-      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 = Gem::Specification.find_by_name(*name.split('='))
-          do_cache spec, api_map
-        rescue Gem::MissingSpecError
-          warn "Gem '#{name}' not found"
-        end
-        STDERR.puts "Documentation cached for #{names.count} gems."
-      end
-    end
-
     desc 'reporters', 'Get a list of diagnostics reporters'
     # @return [void]
     def reporters
@@ -191,7 +219,6 @@ def typecheck *files
           filecount += 1
           probcount += problems.length
         end
-        # "
       }
       puts "Typecheck finished in #{time.real} seconds."
       puts "#{probcount} problem#{probcount != 1 ? 's' : ''} found#{files.length != 1 ? " in #{filecount} of #{files.length} files" : ''}."
@@ -241,6 +268,61 @@ def list
       puts "#{workspace.filenames.length} files total."
     end
 
+    desc 'pin [PATH]', 'Describe a pin', hide: true
+    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 :references, type: :boolean, desc: 'Show references', 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 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)
+      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|
+        if options[:typify] || options[:probe]
+          type = ComplexType::UNDEFINED
+          type = pin.typify(api_map) if options[:typify]
+          type = pin.probe(api_map) if options[:probe] && type.undefined?
+          print_type(type)
+          next
+        end
+
+        print_pin(pin)
+      end
+      references.each do |key, refpin|
+        puts "\n# #{key.to_s.capitalize}:\n\n"
+        print_pin(refpin)
+      end
+    end
+
     private
 
     # @param pin [Solargraph::Pin::Base]
@@ -267,5 +349,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
diff --git a/lib/solargraph/workspace.rb b/lib/solargraph/workspace.rb
index ffd653d96..046c09b83 100644
--- a/lib/solargraph/workspace.rb
+++ b/lib/solargraph/workspace.rb
@@ -143,6 +143,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]
diff --git a/spec/doc_map_spec.rb b/spec/doc_map_spec.rb
index b03e573f0..2729ab095 100644
--- a/spec/doc_map_spec.rb
+++ b/spec/doc_map_spec.rb
@@ -8,8 +8,10 @@
     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)
@@ -32,7 +34,6 @@
   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)
 
@@ -42,8 +43,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..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
diff --git a/spec/shell_spec.rb b/spec/shell_spec.rb
index 91f84b4c7..46d985c36 100644
--- a/spec/shell_spec.rb
+++ b/spec/shell_spec.rb
@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 require 'tmpdir'
 require 'open3'
 
 describe Solargraph::Shell do
+  let(:shell) { described_class.new }
   let(:temp_dir) { Dir.mktmpdir }
 
   before do
@@ -25,20 +28,259 @@ 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
+        output = capture_both do
+          shell.gems('nonexistentgem')
+        end
+
+        expect(output).to include("Gem 'nonexistentgem' not found")
+      end
+
+      it 'caches core without erroring out' do
+        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
+        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(Dir.pwd).and_return(api_map)
+        allow(api_map).to receive(:cache_gem)
+      end
+
+      it 'caches all without erroring out' do
+        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
+        # capture stderr output
+        expect { call }.to output(/not found/).to_stderr
+      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
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

From f63248177198c73cb9474367bdcdd0adce9f0936 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 3 Sep 2025 18:17:14 -0400
Subject: [PATCH 104/327] Centralize all pin-caching logic in PinCache

---
 .github/workflows/rspec.yml                   |   4 +
 .rubocop.yml                                  |   3 +
 .rubocop_todo.yml                             | 166 +-----
 lib/solargraph/api_map.rb                     |  99 ++--
 lib/solargraph/doc_map.rb                     | 360 ++++---------
 lib/solargraph/gem_pins.rb                    |  13 +-
 lib/solargraph/library.rb                     |  41 +-
 .../parser/parser_gem/class_methods.rb        |   3 +
 lib/solargraph/pin_cache.rb                   | 508 ++++++++++++++++--
 lib/solargraph/rbs_map.rb                     |  91 +++-
 lib/solargraph/rbs_map/core_map.rb            |  43 +-
 lib/solargraph/rbs_map/stdlib_map.rb          |  25 +-
 lib/solargraph/shell.rb                       |   9 +-
 lib/solargraph/workspace.rb                   |  88 ++-
 lib/solargraph/yardoc.rb                      |  79 ++-
 spec/doc_map_spec.rb                          | 149 +++--
 spec/gem_pins_spec.rb                         |  53 +-
 spec/language_server/host/diagnoser_spec.rb   |   3 +-
 .../host/message_worker_spec.rb               |   2 +-
 spec/library_spec.rb                          | 312 +++++++----
 spec/pin_cache_spec.rb                        | 197 +++++++
 spec/rbs_map_spec.rb                          |  13 +-
 spec/shell_spec.rb                            | 117 +++-
 spec/spec_helper.rb                           |  30 +-
 spec/type_checker/levels/normal_spec.rb       |   6 +-
 spec/yard_map/mapper_spec.rb                  |  49 +-
 spec/yardoc_spec.rb                           | 111 ++++
 27 files changed, 1742 insertions(+), 832 deletions(-)
 create mode 100644 spec/pin_cache_spec.rb
 create mode 100644 spec/yardoc_spec.rb

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index ecc3d9771..7b2255b0e 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -48,6 +48,8 @@ jobs:
       run: |
         bundle install
         bundle update rbs # use latest available for this Ruby version
+    - name: Install types
+      run: bundle exec rbs collection update
     - name: Run tests
       run: bundle exec rake spec
   undercover:
@@ -65,6 +67,8 @@ jobs:
         bundler-cache: false
     - name: Install gems
       run: bundle install
+    - name: Install types
+      run: bundle exec rbs collection update
     - name: Run tests
       run: bundle exec rake spec
     - name: Check PR coverage
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/.rubocop_todo.yml b/.rubocop_todo.yml
index b8d123824..f474d025b 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.
@@ -225,7 +224,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).
@@ -241,7 +239,6 @@ Layout/IndentationWidth:
     - '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'
@@ -295,7 +292,6 @@ Layout/MultilineMethodCallIndentation:
 # SupportedStyles: aligned, indented
 Layout/MultilineOperationIndentation:
   Exclude:
-    - 'lib/solargraph/api_map.rb'
     - 'lib/solargraph/language_server/host/dispatch.rb'
     - 'lib/solargraph/source.rb'
 
@@ -336,7 +332,6 @@ Layout/SpaceAroundOperators:
     - 'lib/solargraph/source_map/clip.rb'
     - 'lib/solargraph/workspace/config.rb'
     - 'spec/library_spec.rb'
-    - 'spec/yard_map/mapper_spec.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
@@ -511,7 +506,6 @@ Lint/DuplicateMethods:
     - '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'
 
 # Configuration parameters: AllowComments, AllowEmptyLambdas.
@@ -632,7 +626,6 @@ Lint/UnusedMethodArgument:
     - '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'
@@ -652,12 +645,6 @@ Lint/UnusedMethodArgument:
     - 'lib/solargraph/source/chain/z_super.rb'
     - 'spec/doc_map_spec.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: ContextCreatingMethods, MethodCreatingMethods.
-Lint/UselessAccessModifier:
-  Exclude:
-    - 'lib/solargraph/api_map.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 Lint/UselessAssignment:
   Exclude:
@@ -700,7 +687,6 @@ Metrics/AbcSize:
     - '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'
@@ -770,7 +756,6 @@ Metrics/ModuleLength:
   Exclude:
     - 'lib/solargraph/complex_type/type_methods.rb'
     - 'lib/solargraph/parser/parser_gem/node_methods.rb'
-    - 'lib/solargraph/pin_cache.rb'
 
 # Configuration parameters: Max, CountKeywordArgs, MaxOptionalParameters.
 Metrics/ParameterLists:
@@ -817,7 +802,6 @@ Naming/MemoizedInstanceVariableName:
     - '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'
 
@@ -871,7 +855,6 @@ Naming/VariableName:
 RSpec/Be:
   Exclude:
     - 'spec/rbs_map/stdlib_map_spec.rb'
-    - 'spec/rbs_map_spec.rb'
     - 'spec/source/source_chainer_spec.rb'
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -894,7 +877,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'
 
@@ -907,7 +889,6 @@ RSpec/ContextWording:
     - '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'
@@ -920,9 +901,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.
@@ -941,7 +922,6 @@ RSpec/DescribedClass:
     - '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'
@@ -1045,7 +1025,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 +1065,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'
@@ -1106,11 +1084,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'
@@ -1129,9 +1102,6 @@ RSpec/MultipleExpectations:
     - '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'
@@ -1157,7 +1127,6 @@ RSpec/MultipleExpectations:
     - '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'
@@ -1263,106 +1232,6 @@ RSpec/ScatteredLet:
   Exclude:
     - 'spec/complex_type_spec.rb'
 
-# Configuration parameters: CustomTransform, IgnoreMethods, IgnoreMetadata.
-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'
-
-RSpec/StubbedMock:
-  Exclude:
-    - 'spec/language_server/host/message_worker_spec.rb'
-
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Exclude:
@@ -1833,7 +1702,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'
@@ -1882,7 +1750,6 @@ Style/GuardClause:
     - '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'
@@ -1932,16 +1799,13 @@ Style/IfInsideElse:
 # 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'
@@ -1963,7 +1827,6 @@ Style/IfUnlessModifier:
     - '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'
@@ -2013,7 +1876,6 @@ Style/MethodDefParentheses:
     - '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'
@@ -2050,7 +1912,6 @@ Style/MethodDefParentheses:
     - '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'
@@ -2225,12 +2086,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 +2101,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 +2114,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'
 
@@ -2285,7 +2130,6 @@ 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'
     - 'lib/solargraph/source/chain/z_super.rb'
 
@@ -2322,7 +2166,6 @@ Style/RescueStandardError:
 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'
@@ -2330,7 +2173,6 @@ Style/SafeNavigation:
     - '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'
 
@@ -2403,7 +2245,6 @@ Style/StringLiterals:
     - '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'
@@ -2638,7 +2479,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..94b2c7fa0 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -29,6 +29,12 @@ def initialize pins: []
       index pins
     end
 
+    # @param out [IO, nil] output stream for logging
+    # @return [void]
+    def self.reset_core out: nil
+      @@core_map = RbsMap::CoreMap.new
+    end
+
     #
     # This is a mutable object, which is cached in the Chain class -
     # if you add any fields which change the results of calls (not
@@ -46,6 +52,7 @@ def ==(other)
       self.eql?(other)
     end
 
+    # @return [Integer]
     def hash
       equality_fields.hash
     end
@@ -95,11 +102,12 @@ def catalog bench
       end
       unresolved_requires = (bench.external_requires + implicit.requires + bench.workspace.config.required).to_a.compact.uniq
       recreate_docmap = @unresolved_requires != unresolved_requires ||
-                     @doc_map&.uncached_yard_gemspecs&.any? ||
-                     @doc_map&.uncached_rbs_collection_gemspecs&.any? ||
-                     @doc_map&.rbs_collection_path != bench.workspace.rbs_collection_path
+                        workspace.rbs_collection_path != bench.workspace.rbs_collection_path ||
+                        @doc_map.any_uncached?
+
       if recreate_docmap
-        @doc_map = DocMap.new(unresolved_requires, [], bench.workspace) # @todo Implement gem preferences
+        @doc_map = DocMap.new(unresolved_requires, [], bench.workspace, out: nil) # @todo Implement gem preferences
+        @gemspecs = @doc_map.workspace.gemspecs
         @unresolved_requires = @doc_map.unresolved_requires
       end
       @cache.clear if store.update(@@core_map.pins, @doc_map.pins, implicit.pins, iced_pins, live_pins)
@@ -114,26 +122,14 @@ def catalog bench
       [self.class, @source_map_hash, implicit, @doc_map, @unresolved_requires]
     end
 
-    # @return [DocMap]
-    def doc_map
-      @doc_map ||= DocMap.new([], [])
-    end
+    # @return [DocMap, nil]
+    attr_reader :doc_map
 
     # @return [::Array<Gem::Specification>]
     def uncached_gemspecs
       @doc_map&.uncached_gemspecs || []
     end
 
-    # @return [::Array<Gem::Specification>]
-    def uncached_rbs_collection_gemspecs
-      @doc_map.uncached_rbs_collection_gemspecs
-    end
-
-    # @return [::Array<Gem::Specification>]
-    def uncached_yard_gemspecs
-      @doc_map.uncached_yard_gemspecs
-    end
-
     # @return [Enumerable<Pin::Base>]
     def core_pins
       @@core_map.pins
@@ -177,6 +173,7 @@ def clip_at filename, position
     # Create an ApiMap with a workspace in the specified directory.
     #
     # @param directory [String]
+    #
     # @return [ApiMap]
     def self.load directory
       api_map = new
@@ -190,8 +187,8 @@ def self.load directory
 
     # @param out [IO, nil]
     # @return [void]
-    def cache_all!(out)
-      @doc_map.cache_all!(out)
+    def cache_all_for_doc_map! out
+      @doc_map.cache_doc_map_gems!(out)
     end
 
     # @param gemspec [Gem::Specification]
@@ -212,15 +209,16 @@ class << self
     #
     # @param directory [String]
     # @param out [IO] The output stream for messages
+    #
     # @return [ApiMap]
-    def self.load_with_cache directory, out
+    def self.load_with_cache directory, out = $stderr
       api_map = load(directory)
       if api_map.uncached_gemspecs.empty?
         logger.info { "All gems cached for #{directory}" }
         return api_map
       end
 
-      api_map.cache_all!(out)
+      api_map.cache_all_for_doc_map!(out)
       load(directory)
     end
 
@@ -236,13 +234,6 @@ def keyword_pins
       store.pins_by_class(Pin::Keyword)
     end
 
-    # An array of namespace names defined in the ApiMap.
-    #
-    # @return [Set<String>]
-    def namespaces
-      store.namespaces
-    end
-
     # True if the namespace exists.
     #
     # @param name [String] The namespace to match
@@ -326,7 +317,7 @@ def qualify tag, context_tag = ''
     # @param context_namespace [String] The context namespace in which the
     #   tag was referenced; start from here to resolve the name
     # @return [String, nil] fully qualified namespace
-    def qualify_namespace(namespace, context_namespace = '')
+    def qualify_namespace namespace, context_namespace = ''
       cached = cache.get_qualified_namespace(namespace, context_namespace)
       return cached.clone unless cached.nil?
       result = if namespace.start_with?('::')
@@ -356,7 +347,7 @@ def get_includes(fqns)
     # @param namespace [String] A fully qualified namespace
     # @param scope [Symbol] :instance or :class
     # @return [Array<Solargraph::Pin::InstanceVariable>]
-    def get_instance_variable_pins(namespace, scope = :instance)
+    def get_instance_variable_pins namespace, scope = :instance
       result = []
       used = [namespace]
       result.concat store.get_instance_variables(namespace, scope)
@@ -369,8 +360,10 @@ def get_instance_variable_pins(namespace, scope = :instance)
       result
     end
 
-    # @sg-ignore Missing @return tag for Solargraph::ApiMap#visible_pins
     # @see Solargraph::Parser::FlowSensitiveTyping#visible_pins
+    # @param (see Solargraph::Parser::FlowSensitiveTyping#visible_pins)
+    # @sg-ignore Missing @return tag for Solargraph::ApiMap#visible_pins
+    # @return (see Solargraph::Parser::FlowSensitiveTyping#visible_pins)
     def visible_pins(*args, **kwargs, &blk)
       Solargraph::Parser::FlowSensitiveTyping.visible_pins(*args, **kwargs, &blk)
     end
@@ -379,7 +372,7 @@ def visible_pins(*args, **kwargs, &blk)
     #
     # @param namespace [String] A fully qualified namespace
     # @return [Enumerable<Solargraph::Pin::ClassVariable>]
-    def get_class_variable_pins(namespace)
+    def get_class_variable_pins namespace
       prefer_non_nil_variables(store.get_class_variables(namespace))
     end
 
@@ -533,7 +526,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 +553,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 +562,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 +652,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 +671,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
 
@@ -691,10 +685,17 @@ def resolve_method_aliases pins, visibility = [:public, :private, :protected]
         next nil if resolved.respond_to?(:visibility) && !visibility.include?(resolved.visibility)
         resolved
       end.compact
-      logger.debug { "ApiMap#resolve_method_aliases(pins=#{pins.map(&:name)}, visibility=#{visibility}) => #{with_resolved_aliases.map(&:name)}" }
+      logger.debug do
+        "ApiMap#resolve_method_aliases(pins=#{pins.map(&:name)}, visibility=#{visibility}) => #{with_resolved_aliases.map(&:name)}"
+      end
       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
@@ -802,7 +803,8 @@ def inner_get_methods rooted_tag, scope, visibility, deep, skip, no_core = false
           end
           rooted_sc_tag = qualify_superclass(rooted_tag)
           unless rooted_sc_tag.nil?
-            result.concat inner_get_methods_from_reference(rooted_sc_tag, namespace_pin, rooted_type, scope, visibility, true, skip, no_core)
+            result.concat inner_get_methods_from_reference(rooted_sc_tag, namespace_pin, rooted_type, scope,
+                                                           visibility, true, skip, no_core)
           end
         else
           logger.info { "ApiMap#inner_get_methods(#{fqns}, #{scope}, #{visibility}, #{deep}, #{skip}) - looking for get_extends() from #{fqns}" }
@@ -812,7 +814,8 @@ def inner_get_methods rooted_tag, scope, visibility, deep, skip, no_core = false
           end
           rooted_sc_tag = qualify_superclass(rooted_tag)
           unless rooted_sc_tag.nil?
-            result.concat inner_get_methods_from_reference(rooted_sc_tag, namespace_pin, rooted_type, scope, visibility, true, skip, true)
+            result.concat inner_get_methods_from_reference(rooted_sc_tag, namespace_pin, rooted_type, scope,
+                                                           visibility, true, skip, true)
           end
           unless no_core || fqns.empty?
             type = get_namespace_type(fqns)
@@ -846,9 +849,7 @@ def inner_get_constants fqns, visibility, skip
         result.concat inner_get_constants(qualify(is, fqns), [:public], skip)
       end
       fqsc = qualify_superclass(fqns)
-      unless %w[Object BasicObject].include?(fqsc)
-        result.concat inner_get_constants(fqsc, [:public], skip)
-      end
+      result.concat inner_get_constants(fqsc, [:public], skip) unless %w[Object BasicObject].include?(fqsc)
       result
     end
 
@@ -951,8 +952,6 @@ def prefer_non_nil_variables pins
 
     include Logging
 
-    private
-
     # @param alias_pin [Pin::MethodAlias]
     # @return [Pin::Method, nil]
     def resolve_method_alias(alias_pin)
@@ -1027,7 +1026,7 @@ def create_resolved_alias_pin(alias_pin, original)
     # @param rooted_type [ComplexType]
     # @param pins [Enumerable<Pin::Base>]
     # @return [Array<Pin::Base>]
-    def erase_generics(namespace_pin, rooted_type, pins)
+    def erase_generics namespace_pin, rooted_type, pins
       return pins unless should_erase_generics_when_done?(namespace_pin, rooted_type)
 
       logger.debug("Erasing generics on namespace_pin=#{namespace_pin} / rooted_type=#{rooted_type}")
@@ -1038,18 +1037,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..880451592 100644
--- a/lib/solargraph/doc_map.rb
+++ b/lib/solargraph/doc_map.rb
@@ -5,122 +5,86 @@
 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
 
-    # @return [Array<String>]
-    attr_reader :requires
-    alias required requires
+    # @return [Workspace]
+    attr_reader :workspace
 
     # @return [Array<Gem::Specification>]
     attr_reader :preferences
 
-    # @return [Array<Pin::Base>]
-    attr_reader :pins
-
-    # @return [Array<Gem::Specification>]
-    def uncached_gemspecs
-      uncached_yard_gemspecs.concat(uncached_rbs_collection_gemspecs)
-                            .sort
-                            .uniq { |gemspec| "#{gemspec.name}:#{gemspec.version}" }
-    end
-
-    # @return [Array<Gem::Specification>]
-    attr_reader :uncached_yard_gemspecs
-
-    # @return [Array<Gem::Specification>]
-    attr_reader :uncached_rbs_collection_gemspecs
-
-    # @return [String, nil]
-    attr_reader :rbs_collection_path
-
-    # @return [String, nil]
-    attr_reader :rbs_collection_config_path
-
-    # @return [Workspace, nil]
-    attr_reader :workspace
-
-    # @return [Environ]
-    attr_reader :environ
-
     # @param requires [Array<String>]
     # @param preferences [Array<Gem::Specification>]
-    # @param workspace [Workspace, nil]
-    def initialize(requires, preferences, workspace = nil)
-      @requires = requires.compact
+    # @param workspace [Workspace]
+    # @param out [IO, nil] output stream for logging
+    def initialize requires, preferences, workspace, out: $stderr
+      @provided_requires = requires.compact
       @preferences = preferences.compact
       @workspace = workspace
-      @rbs_collection_path = workspace&.rbs_collection_path
-      @rbs_collection_config_path = workspace&.rbs_collection_config_path
-      @environ = Convention.for_global(self)
-      @requires.concat @environ.requires if @environ
-      load_serialized_gem_pins
-      pins.concat @environ.pins
+      @out = out
     end
 
-    # @param out [IO]
-    # @return [void]
-    def cache_all!(out)
-      # if we log at debug level:
-      if logger.info?
-        gem_desc = uncached_gemspecs.map { |gemspec| "#{gemspec.name}:#{gemspec.version}" }.join(', ')
-        logger.info "Caching pins for gems: #{gem_desc}" unless uncached_gemspecs.empty?
-      end
-      logger.debug { "Caching for YARD: #{uncached_yard_gemspecs.map(&:name)}" }
-      logger.debug { "Caching for RBS collection: #{uncached_rbs_collection_gemspecs.map(&:name)}" }
-      load_serialized_gem_pins
-      uncached_gemspecs.each do |gemspec|
-        cache(gemspec, out: out)
+    # @return [Array<String>]
+    def requires
+      @requires ||= @provided_requires + (workspace.global_environ&.requires || [])
+    end
+    alias required requires
+
+    # @return [Array<Gem::Specification>]
+    def uncached_gemspecs
+      if @uncached_gemspecs.nil?
+        @uncached_gemspecs = []
+        pins # force lazy-loaded pin lookup
       end
-      load_serialized_gem_pins
-      @uncached_rbs_collection_gemspecs = []
-      @uncached_yard_gemspecs = []
+      @uncached_gemspecs
     end
 
-    # @param gemspec [Gem::Specification]
-    # @param out [IO]
-    # @return [void]
-    def cache_yard_pins(gemspec, out)
-      pins = GemPins.build_yard_pins(yard_plugins, gemspec)
-      PinCache.serialize_yard_gem(gemspec, pins)
-      logger.info { "Cached #{pins.length} YARD pins for gem #{gemspec.name}:#{gemspec.version}" } unless pins.empty?
+    # @return [Array<Pin::Base>]
+    def pins
+      @pins ||= load_serialized_gem_pins + (workspace.global_environ&.pins || [])
     end
 
-    # @param gemspec [Gem::Specification]
-    # @param out [IO]
     # @return [void]
-    def cache_rbs_collection_pins(gemspec, out)
-      rbs_map = RbsMap.from_gemspec(gemspec, rbs_collection_path, rbs_collection_config_path)
-      pins = rbs_map.pins
-      rbs_version_cache_key = rbs_map.cache_key
-      # cache pins even if result is zero, so we don't retry building pins
-      pins ||= []
-      PinCache.serialize_rbs_collection_gem(gemspec, rbs_version_cache_key, pins)
-      logger.info { "Cached #{pins.length} RBS collection pins for gem #{gemspec.name} #{gemspec.version} with cache_key #{rbs_version_cache_key.inspect}" unless pins.empty? }
+    def reset_pins!
+      @uncached_gemspecs = nil
+      @pins = nil
     end
 
-    # @param gemspec [Gem::Specification]
-    # @param rebuild [Boolean] whether to rebuild the pins even if they are cached
+    # @return [Solargraph::PinCache]
+    def pin_cache
+      @pin_cache ||= workspace.fresh_pincache
+    end
+
+    def any_uncached?
+      uncached_gemspecs.any?
+    end
+
+    # Cache all pins needed for the sources in this doc_map
     # @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_rbs_collection = uncached_rbs_collection_gemspecs.include?(gemspec) || rebuild
-      if build_yard || build_rbs_collection
-        type = []
-        type << 'YARD' if build_yard
-        type << 'RBS collection' if build_rbs_collection
-        out.puts("Caching #{type.join(' and ')} pins for gem #{gemspec.name}:#{gemspec.version}") if out
+    def cache_doc_map_gems! out
+      unless uncached_gemspecs.empty?
+        logger.info do
+          gem_desc = uncached_gemspecs.map { |gemspec| "#{gemspec.name}:#{gemspec.version}" }.join(', ')
+          "Caching pins for gems: #{gem_desc}"
+        end
       end
-      cache_yard_pins(gemspec, out) if build_yard
-      cache_rbs_collection_pins(gemspec, out) if build_rbs_collection
-    end
-
-    # @return [Array<Gem::Specification>]
-    def gemspecs
-      @gemspecs ||= required_gems_map.values.compact.flatten
+      time = Benchmark.measure do
+        uncached_gemspecs.each do |gemspec|
+          cache(gemspec, out: out)
+        end
+      end
+      milliseconds = (time.real * 1000).round
+      if (milliseconds > 500) && uncached_gemspecs.any? && out && uncached_gemspecs.any?
+        out.puts "Built #{uncached_gemspecs.length} gems in #{milliseconds} ms"
+      end
+      reset_pins!
     end
 
     # @return [Array<String>]
@@ -128,77 +92,81 @@ def unresolved_requires
       @unresolved_requires ||= required_gems_map.select { |_, gemspecs| gemspecs.nil? }.keys
     end
 
-    # @return [Hash{Array(String, String) => Array<Gem::Specification>}] Indexed by gemspec name and version
-    def self.all_yard_gems_in_memory
-      @yard_gems_in_memory ||= {}
-    end
-
-    # @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
-
-    # @return [Hash{Array(String, String) => Array<Pin::Base>}] Indexed by gemspec name and version
-    def yard_pins_in_memory
-      self.class.all_yard_gems_in_memory
-    end
-
-    # @return [Hash{Array(String, String) => Array<Pin::Base>}] Indexed by gemspec name and version
-    def rbs_collection_pins_in_memory
-      self.class.all_rbs_collection_gems_in_memory[rbs_collection_path] ||= {}
-    end
-
-    # @return [Hash{Array(String, String) => Array<Pin::Base>}] Indexed by gemspec name and version
-    def self.all_combined_pins_in_memory
-      @combined_pins_in_memory ||= {}
+    # @return [Set<Gem::Specification>]
+    # @param out [IO]
+    def dependencies out: $stderr
+      @dependencies ||=
+        begin
+          all_deps = gemspecs.flat_map { |spec| fetch_dependencies(spec, out: out) }
+          existing_gems = gemspecs.map(&:name)
+          all_deps.reject { |gemspec| existing_gems.include? gemspec.name }.to_set
+        end
     end
 
-    # @todo this should also include an index by the hash of the RBS collection
-    # @return [Hash{Array(String, String) => Array<Pin::Base>}] Indexed by gemspec name and version
-    def combined_pins_in_memory
-      self.class.all_combined_pins_in_memory
+    # Cache gem documentation if needed for this doc_map
+    #
+    # @param gemspec [Gem::Specification]
+    # @param rebuild [Boolean] whether to rebuild the pins even if they are cached
+    # @param out [IO, nil] output stream for logging
+    #
+    # @return [void]
+    def cache gemspec, rebuild: false, out: nil
+      pin_cache.cache_gem(gemspec: gemspec,
+                          rebuild: rebuild,
+                          out: out)
     end
 
-    # @return [Array<String>]
-    def yard_plugins
-      @environ.yard_plugins
-    end
+    private
 
-    # @return [Set<Gem::Specification>]
-    def dependencies
-      @dependencies ||= (gemspecs.flat_map { |spec| fetch_dependencies(spec) } - gemspecs).to_set
+    # @return [Array<Gem::Specification>]
+    def gemspecs
+      @gemspecs ||= required_gems_map.values.compact.flatten
     end
 
-    private
-
-    # @return [void]
-    def load_serialized_gem_pins
-      @pins = []
-      @uncached_yard_gemspecs = []
-      @uncached_rbs_collection_gemspecs = []
+    # @param out [IO, nil]
+    # @return [Array<Pin::Base>]
+    def load_serialized_gem_pins out: @out
+      serialized_pins = []
       with_gemspecs, without_gemspecs = required_gems_map.partition { |_, v| v }
-      # @sg-ignore Wrong argument type for Hash.[]: arg_0 expected _ToHash<Array(String, Array<Gem::Specification>), undefined>, received Array<Array(String, Array<Gem::Specification>)>
+      # @sg-ignore Need support for RBS duck interfaces like _ToHash
       # @type [Array<String>]
-      paths = Hash[without_gemspecs].keys
-      # @sg-ignore Wrong argument type for Hash.[]: arg_0 expected _ToHash<Array(String, Array<Gem::Specification>), undefined>, received Array<Array(String, Array<Gem::Specification>)>
+      missing_paths = Hash[without_gemspecs].keys
+      # @sg-ignore Need support for RBS duck interfaces like _ToHash
       # @type [Array<Gem::Specification>]
-      gemspecs = Hash[with_gemspecs].values.flatten.compact + dependencies.to_a
-
-      paths.each do |path|
-        rbs_pins = deserialize_stdlib_rbs_map path
+      gemspecs = Hash[with_gemspecs].values.flatten.compact + dependencies(out: out).to_a
+
+      missing_paths.each do |path|
+        # this will load from disk if needed; no need to manage
+        # uncached_gemspecs to trigger that later
+        stdlib_name_guess = path.split('/').first
+
+        # try to resolve the stdlib name
+        deps = workspace.stdlib_dependencies(stdlib_name_guess) || []
+        [stdlib_name_guess, *deps].compact.each do |potential_stdlib_name|
+          rbs_pins = pin_cache.cache_stdlib_rbs_map potential_stdlib_name
+          serialized_pins.concat rbs_pins if rbs_pins
+        end
       end
 
-      logger.debug { "DocMap#load_serialized_gem_pins: Combining pins..." }
+      existing_pin_count = serialized_pins.length
       time = Benchmark.measure do
         gemspecs.each do |gemspec|
-          pins = deserialize_combined_pin_cache gemspec
-          @pins.concat pins if pins
+          # only deserializes already-cached gems
+          gemspec_pins = pin_cache.deserialize_combined_pin_cache gemspec
+          if gemspec_pins
+            serialized_pins.concat gemspec_pins
+          else
+            uncached_gemspecs << gemspec
+          end
         end
       end
-      logger.info { "DocMap#load_serialized_gem_pins: Loaded and processed serialized pins together in #{time.real} seconds" }
-      @uncached_yard_gemspecs.uniq!
-      @uncached_rbs_collection_gemspecs.uniq!
-      nil
+      pins_processed = serialized_pins.length - existing_pin_count
+      milliseconds = (time.real * 1000).round
+      if (milliseconds > 500) && out && gemspecs.any?
+        out.puts "Deserialized #{serialized_pins.length} gem pins from #{PinCache.base_dir} in #{milliseconds} ms"
+      end
+      uncached_gemspecs.uniq! { |gemspec| "#{gemspec.name}:#{gemspec.version}" }
+      serialized_pins
     end
 
     # @return [Hash{String => Array<Gem::Specification>}]
@@ -211,102 +179,6 @@ def preference_map
       @preference_map ||= preferences.to_h { |gemspec| [gemspec.name, gemspec] }
     end
 
-    # @param gemspec [Gem::Specification]
-    # @return [Array<Pin::Base>]
-    def deserialize_yard_pin_cache gemspec
-      if yard_pins_in_memory.key?([gemspec.name, gemspec.version])
-        return yard_pins_in_memory[[gemspec.name, gemspec.version]]
-      end
-
-      cached = PinCache.deserialize_yard_gem(gemspec)
-      if cached
-        logger.info { "Loaded #{cached.length} cached YARD pins from #{gemspec.name}:#{gemspec.version}" }
-        yard_pins_in_memory[[gemspec.name, gemspec.version]] = cached
-        cached
-      else
-        logger.debug "No YARD pin cache for #{gemspec.name}:#{gemspec.version}"
-        @uncached_yard_gemspecs.push gemspec
-        nil
-      end
-    end
-
-    # @param gemspec [Gem::Specification]
-    # @return [void]
-    def deserialize_combined_pin_cache(gemspec)
-      unless combined_pins_in_memory[[gemspec.name, gemspec.version]].nil?
-        return combined_pins_in_memory[[gemspec.name, gemspec.version]]
-      end
-
-      rbs_map = RbsMap.from_gemspec(gemspec, rbs_collection_path, rbs_collection_config_path)
-      rbs_version_cache_key = rbs_map.cache_key
-
-      cached = PinCache.deserialize_combined_gem(gemspec, rbs_version_cache_key)
-      if cached
-        logger.info { "Loaded #{cached.length} cached YARD pins from #{gemspec.name}:#{gemspec.version}" }
-        combined_pins_in_memory[[gemspec.name, gemspec.version]] = cached
-        return combined_pins_in_memory[[gemspec.name, gemspec.version]]
-      end
-
-      rbs_collection_pins = deserialize_rbs_collection_cache gemspec, rbs_version_cache_key
-
-      yard_pins = deserialize_yard_pin_cache gemspec
-
-      if !rbs_collection_pins.nil? && !yard_pins.nil?
-        logger.debug { "Combining pins for #{gemspec.name}:#{gemspec.version}" }
-        combined_pins = GemPins.combine(yard_pins, rbs_collection_pins)
-        PinCache.serialize_combined_gem(gemspec, rbs_version_cache_key, combined_pins)
-        combined_pins_in_memory[[gemspec.name, gemspec.version]] = combined_pins
-        logger.info { "Generated #{combined_pins_in_memory[[gemspec.name, gemspec.version]].length} combined pins for #{gemspec.name} #{gemspec.version}" }
-        return combined_pins
-      end
-
-      if !yard_pins.nil?
-        logger.debug { "Using only YARD pins for #{gemspec.name}:#{gemspec.version}" }
-        combined_pins_in_memory[[gemspec.name, gemspec.version]] = yard_pins
-        return combined_pins_in_memory[[gemspec.name, gemspec.version]]
-      elsif !rbs_collection_pins.nil?
-        logger.debug { "Using only RBS collection pins for #{gemspec.name}:#{gemspec.version}" }
-        combined_pins_in_memory[[gemspec.name, gemspec.version]] = rbs_collection_pins
-        return combined_pins_in_memory[[gemspec.name, gemspec.version]]
-      else
-        logger.debug { "Pins not yet cached for #{gemspec.name}:#{gemspec.version}" }
-        return nil
-      end
-    end
-
-    # @param path [String] require path that might be in the RBS stdlib collection
-    # @return [void]
-    def deserialize_stdlib_rbs_map path
-      map = RbsMap::StdlibMap.load(path)
-      if map.resolved?
-        logger.debug { "Loading stdlib pins for #{path}" }
-        @pins.concat map.pins
-        logger.debug { "Loaded #{map.pins.length} stdlib pins for #{path}" }
-        map.pins
-      else
-        # @todo Temporarily ignoring unresolved `require 'set'`
-        logger.debug { "Require path #{path} could not be resolved in RBS" } unless path == 'set'
-        nil
-      end
-    end
-
-    # @param gemspec [Gem::Specification]
-    # @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])
-      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
-        cached
-      else
-        logger.debug "No RBS collection pin cache for #{gemspec.name} #{gemspec.version}"
-        @uncached_rbs_collection_gemspecs.push gemspec
-        nil
-      end
-    end
-
     # @param path [String]
     # @return [::Array<Gem::Specification>, nil]
     def resolve_path_to_gemspecs path
@@ -354,8 +226,10 @@ def change_gemspec_version gemspec, version
     end
 
     # @param gemspec [Gem::Specification]
+    # @param out [IO, nil]
+    #
     # @return [Array<Gem::Specification>]
-    def fetch_dependencies gemspec
+    def fetch_dependencies gemspec, out: nil
       # @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}"
diff --git a/lib/solargraph/gem_pins.rb b/lib/solargraph/gem_pins.rb
index a193a8a39..3b61b6a65 100644
--- a/lib/solargraph/gem_pins.rb
+++ b/lib/solargraph/gem_pins.rb
@@ -41,15 +41,6 @@ def self.combine_method_pins(*pins)
       out
     end
 
-    # @param yard_plugins [Array<String>] The names of YARD plugins to use.
-    # @param gemspec [Gem::Specification]
-    # @return [Array<Pin::Base>]
-    def self.build_yard_pins(yard_plugins, gemspec)
-      Yardoc.cache(yard_plugins, gemspec) unless Yardoc.cached?(gemspec)
-      yardoc = Yardoc.load!(gemspec)
-      YardMap::Mapper.new(yardoc, gemspec).map
-    end
-
     # @param yard_pins [Array<Pin::Base>]
     # @param rbs_pins [Array<Pin::Base>]
     #
@@ -68,7 +59,9 @@ def self.combine(yard_pins, rbs_pins)
         end
 
         out = combine_method_pins(rbs_pin, yard_pin)
-        logger.debug { "GemPins.combine: Combining yard.path=#{yard_pin.path} - rbs=#{rbs_pin.inspect} with yard=#{yard_pin.inspect} into #{out}" }
+        logger.debug do
+          "GemPins.combine: Combining yard.path=#{yard_pin.path} - rbs=#{rbs_pin.inspect} with yard=#{yard_pin.inspect} into #{out}"
+        end
         out
       end
       in_rbs_only = rbs_pins.select do |pin|
diff --git a/lib/solargraph/library.rb b/lib/solargraph/library.rb
index 9d5162431..9b4072d69 100644
--- a/lib/solargraph/library.rb
+++ b/lib/solargraph/library.rb
@@ -1,9 +1,16 @@
 # frozen_string_literal: true
 
+require 'rubygems'
 require 'pathname'
 require 'observer'
 require 'open3'
 
+# @!parse
+#   class ::Gem::Specification
+#     # @return [String]
+#     def name; end
+#   end
+
 module Solargraph
   # A Library handles coordination between a Workspace and an ApiMap.
   #
@@ -273,12 +280,12 @@ def references_from filename, line, column, strip: false, only: false
         # HACK: for language clients that exclude special characters from the start of variable names
         if strip && match = cursor.word.match(/^[^a-z0-9_]+/i)
           found.map! do |loc|
-            Solargraph::Location.new(loc.filename, Solargraph::Range.from_to(loc.range.start.line, loc.range.start.column + match[0].length, loc.range.ending.line, loc.range.ending.column))
+            Solargraph::Location.new(loc.filename,
+                                     Solargraph::Range.from_to(loc.range.start.line, loc.range.start.column + match[0].length, loc.range.ending.line,
+                                                               loc.range.ending.column))
           end
         end
-        result.concat(found.sort do |a, b|
-          a.range.start.line <=> b.range.start.line
-        end)
+        result.concat(found.sort { |a, b| a.range.start.line <=> b.range.start.line })
       end
       result.uniq
     end
@@ -303,9 +310,7 @@ def locate_ref location
       return nil if pin.nil?
       # @param full [String]
       return_if_match = proc do |full|
-        if source_map_hash.key?(full)
-          return Location.new(full, Solargraph::Range.from_to(0, 0, 0, 0))
-        end
+        return Location.new(full, Solargraph::Range.from_to(0, 0, 0, 0)) if source_map_hash.key?(full)
       end
       workspace.require_paths.each do |path|
         full = File.join path, pin.name
@@ -500,7 +505,12 @@ def external_requires
 
     private
 
-    # @return [Hash{String => Array<String>}]
+    # @return [PinCache]
+    def pin_cache
+      workspace.pin_cache
+    end
+
+    # @return [Hash{String => Set<String>}]
     def source_map_external_require_hash
       @source_map_external_require_hash ||= {}
     end
@@ -580,12 +590,13 @@ def cache_errors
     def cache_next_gemspec
       return if @cache_progress
 
+      # @type [Gem::Specification]
       spec = cacheable_specs.first
       return end_cache_progress unless spec
 
       pending = api_map.uncached_gemspecs.length - cache_errors.length - 1
 
-      if Yardoc.processing?(spec)
+      if pin_cache.yardoc_processing?(spec)
         logger.info "Enqueuing cache of #{spec.name} #{spec.version} (already being processed)"
         queued_gemspec_cache.push(spec)
         return if pending - queued_gemspec_cache.length < 1
@@ -596,7 +607,11 @@ def cache_next_gemspec
         logger.info "Caching #{spec.name} #{spec.version}"
         Thread.new do
           report_cache_progress spec.name, pending
-          _o, e, s = Open3.capture3(workspace.command_path, 'cache', spec.name, spec.version.to_s)
+          kwargs = {}
+          kwargs[:chdir] = workspace.directory.to_s if workspace.directory && !workspace.directory.empty?
+          # @sg-ignore Unresolved call to capture3 on Module<Open3>
+          _o, e, s = Open3.capture3(workspace.command_path, 'cache', spec.name, spec.version.to_s,
+                                    **kwargs)
           if s.success?
             logger.info "Cached #{spec.name} #{spec.version}"
           else
@@ -613,8 +628,7 @@ def cache_next_gemspec
 
     # @return [Array<Gem::Specification>]
     def cacheable_specs
-      cacheable = api_map.uncached_yard_gemspecs +
-                  api_map.uncached_rbs_collection_gemspecs -
+      cacheable = api_map.uncached_gemspecs +
                   queued_gemspec_cache -
                   cache_errors.to_a
       return cacheable unless cacheable.empty?
@@ -673,8 +687,7 @@ def sync_catalog
         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"
+        logger.info "#{api_map.uncached_gemspecs.length} uncached gemspecs"
         cache_next_gemspec
         @sync_count = 0
       end
diff --git a/lib/solargraph/parser/parser_gem/class_methods.rb b/lib/solargraph/parser/parser_gem/class_methods.rb
index ddc742bd8..50c537531 100644
--- a/lib/solargraph/parser/parser_gem/class_methods.rb
+++ b/lib/solargraph/parser/parser_gem/class_methods.rb
@@ -32,6 +32,9 @@ def parse code, filename = nil, line = 0
           buffer = ::Parser::Source::Buffer.new(filename, line)
           buffer.source = code
           parser.parse(buffer)
+        # @sg-ignore Unresolved type Parser::SyntaxError,
+        #   Parser::UnknownEncodingInMagicComment for variable e
+        #   https://github.com/castwide/solargraph/pull/1005
         rescue ::Parser::SyntaxError, ::Parser::UnknownEncodingInMagicComment => e
           raise Parser::SyntaxError, e.message
         end
diff --git a/lib/solargraph/pin_cache.rb b/lib/solargraph/pin_cache.rb
index 2a0ec4639..8c47cfef4 100644
--- a/lib/solargraph/pin_cache.rb
+++ b/lib/solargraph/pin_cache.rb
@@ -1,12 +1,424 @@
-require 'yard-activesupport-concern'
 require 'fileutils'
 require 'rbs'
+require 'rubygems'
 
 module Solargraph
-  module PinCache
+  class PinCache
+    include Logging
+
+    attr_reader :directory, :rbs_collection_path, :rbs_collection_config_path, :yard_plugins
+
+    # @param rbs_collection_path [String, nil]
+    # @param rbs_collection_config_path [String, nil]
+    # @param directory [String, nil]
+    # @param yard_plugins [Array<String>]
+    def initialize rbs_collection_path:, rbs_collection_config_path:,
+                   directory:,
+                   yard_plugins:
+      @rbs_collection_path = rbs_collection_path
+      @rbs_collection_config_path = rbs_collection_config_path
+      @directory = directory
+      @yard_plugins = yard_plugins
+    end
+
+    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
+    def cached? gemspec
+      rbs_version_cache_key = lookup_rbs_version_cache_key(gemspec)
+      combined_gem?(gemspec, rbs_version_cache_key)
+    end
+
+    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
+    # @param rebuild [Boolean] whether to rebuild the cache regardless of whether it already exists
+    # @param out [IO, nil] output stream for logging
+    # @return [void]
+    def cache_gem gemspec:, rebuild: false, out: nil
+      rbs_version_cache_key = lookup_rbs_version_cache_key(gemspec)
+
+      build_yard, build_rbs_collection, build_combined =
+        calculate_build_needs(gemspec,
+                              rebuild: rebuild,
+                              rbs_version_cache_key: rbs_version_cache_key)
+
+      return unless build_yard || build_rbs_collection || build_combined
+
+      build_combine_and_cache(gemspec,
+                              rbs_version_cache_key,
+                              build_yard: build_yard,
+                              build_rbs_collection: build_rbs_collection,
+                              build_combined: build_combined,
+                              out: out)
+    end
+
+    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
+    # @param rbs_version_cache_key [String]
+    def suppress_yard_cache? gemspec, rbs_version_cache_key
+      if gemspec.name == 'parser' && rbs_version_cache_key != RbsMap::CACHE_KEY_UNRESOLVED
+        # parser takes forever to build YARD pins, but has excellent RBS collection pins
+        return true
+      end
+      false
+    end
+
+    # @param out [IO, nil] output stream for logging
+    #
+    # @return [void]
+    def cache_all_stdlibs out: $stderr
+      possible_stdlibs.each do |stdlib|
+        RbsMap::StdlibMap.new(stdlib, out: out)
+      end
+    end
+
+    # @param path [String] require path that might be in the RBS stdlib collection
+    # @return [void]
+    def cache_stdlib_rbs_map path
+      # these are held in memory in RbsMap::StdlibMap
+      map = RbsMap::StdlibMap.load(path)
+      if map.resolved?
+        logger.debug { "Loading stdlib pins for #{path}" }
+        pins = map.pins
+        logger.debug { "Loaded #{pins.length} stdlib pins for #{path}" }
+        pins
+      else
+        # @todo Temporarily ignoring unresolved `require 'set'`
+        logger.debug { "Require path #{path} could not be resolved in RBS" } unless path == 'set'
+        nil
+      end
+    end
+
+    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
+    #
+    # @return [String]
+    def lookup_rbs_version_cache_key gemspec
+      rbs_map = RbsMap.from_gemspec(gemspec, rbs_collection_path, rbs_collection_config_path)
+      rbs_map.cache_key
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @param rbs_version_cache_key [String]
+    # @param yard_pins [Array<Pin::Base>]
+    # @param rbs_collection_pins [Array<Pin::Base>]
+    # @return [void]
+    def cache_combined_pins gemspec, rbs_version_cache_key, yard_pins, rbs_collection_pins
+      combined_pins = GemPins.combine(yard_pins, rbs_collection_pins)
+      serialize_combined_gem(gemspec, rbs_version_cache_key, combined_pins)
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @return [Array<Pin::Base>]
+    def deserialize_combined_pin_cache gemspec
+      rbs_version_cache_key = lookup_rbs_version_cache_key(gemspec)
+
+      load_combined_gem(gemspec, rbs_version_cache_key)
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @param out [IO, nil]
+    # @return [void]
+    def uncache_gem gemspec, out: nil
+      PinCache.uncache(yardoc_path(gemspec), out: out)
+      PinCache.uncache(yard_gem_path(gemspec), out: out)
+      uncache_by_prefix(rbs_collection_pins_path_prefix(gemspec), out: out)
+      uncache_by_prefix(combined_path_prefix(gemspec), out: out)
+      combined_pins_in_memory.delete([gemspec.name, gemspec.version])
+    end
+
+    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
+    def yardoc_processing? gemspec
+      Yardoc.processing?(yardoc_path(gemspec))
+    end
+
+    # @return [Array<String>] a list of possible standard library names
+    def possible_stdlibs
+      # 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
+
+    private
+
+    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
+    # @param rebuild [Boolean] whether to rebuild the cache regardless of whether it already exists
+    # @param rbs_version_cache_key [String, nil] the cache key for the gem in the RBS collection
+    #
+    # @return [Array(Boolean, Boolean, Boolean)] whether to build YARD
+    #   pins, RBS collection pins, and combined pins
+    def calculate_build_needs gemspec, rebuild:, rbs_version_cache_key:
+      if rebuild
+        build_yard = true
+        build_rbs_collection = true
+        build_combined = true
+      else
+        build_yard = !yard_gem?(gemspec)
+        build_rbs_collection = !rbs_collection_pins?(gemspec, rbs_version_cache_key)
+        build_combined = !combined_gem?(gemspec, rbs_version_cache_key) || build_yard || build_rbs_collection
+      end
+
+      build_yard = false if suppress_yard_cache?(gemspec, rbs_version_cache_key)
+
+      [build_yard, build_rbs_collection, build_combined]
+    end
+
+    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
+    # @param rbs_version_cache_key [String, nil]
+    # @param build_yard [Boolean]
+    # @param build_rbs_collection [Boolean]
+    # @param build_combined [Boolean]
+    # @param out [IO, nil]
+    #
+    # @return [void]
+    def build_combine_and_cache gemspec,
+                                rbs_version_cache_key,
+                                build_yard:,
+                                build_rbs_collection:,
+                                build_combined:,
+                                out:
+      log_cache_info(gemspec, rbs_version_cache_key,
+                     build_yard: build_yard,
+                     build_rbs_collection: build_rbs_collection,
+                     build_combined: build_combined,
+                     out: out)
+      cache_yard_pins(gemspec, out) if build_yard
+      # this can be nil even if we aren't told to build it - see suppress_yard_cache?
+      yard_pins = deserialize_yard_pin_cache(gemspec) || []
+      cache_rbs_collection_pins(gemspec, out) if build_rbs_collection
+      rbs_collection_pins = deserialize_rbs_collection_cache(gemspec, rbs_version_cache_key) || []
+      cache_combined_pins(gemspec, rbs_version_cache_key, yard_pins, rbs_collection_pins) if build_combined
+    end
+
+    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
+    # @param rbs_version_cache_key [String, nil]
+    # @param build_yard [Boolean]
+    # @param build_rbs_collection [Boolean]
+    # @param build_combined [Boolean]
+    # @param out [IO, nil]
+    #
+    # @return [void]
+    def log_cache_info gemspec,
+                       rbs_version_cache_key,
+                       build_yard:,
+                       build_rbs_collection:,
+                       build_combined:,
+                       out:
+      type = []
+      type << 'YARD' if build_yard
+      rbs_source_desc = RbsMap.rbs_source_desc(rbs_version_cache_key)
+      type << rbs_source_desc if build_rbs_collection && !rbs_source_desc.nil?
+      # we'll build it anyway, but it won't take long to build with
+      # only a single source
+
+      # 'combining' is awkward terminology in this case
+      just_yard = build_yard && rbs_source_desc.nil?
+
+      type << 'combined' if build_combined && !just_yard
+      out&.puts("Caching #{type.join(' and ')} pins for gem #{gemspec.name}:#{gemspec.version}")
+    end
+
+    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
+    # @param out [IO, nil]
+    # @return [Array<Pin::Base>]
+    def cache_yard_pins gemspec, out
+      gem_yardoc_path = yardoc_path(gemspec)
+      Yardoc.build_docs(gem_yardoc_path, yard_plugins, gemspec) unless Yardoc.docs_built?(gem_yardoc_path)
+      pins = Yardoc.build_pins(gem_yardoc_path, gemspec, out: out)
+      serialize_yard_gem(gemspec, pins)
+      logger.info { "Cached #{pins.length} YARD pins for gem #{gemspec.name}:#{gemspec.version}" } unless pins.empty?
+      pins
+    end
+
+    # @return [Hash{Array(String, String, String) => Array<Pin::Base>}]
+    def combined_pins_in_memory
+      PinCache.all_combined_pins_in_memory[yard_plugins] ||= {}
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @param _out [IO, nil]
+    # @return [Array<Pin::Base>]
+    def cache_rbs_collection_pins gemspec, _out
+      rbs_map = RbsMap.from_gemspec(gemspec, rbs_collection_path, rbs_collection_config_path)
+      pins = rbs_map.pins
+      rbs_version_cache_key = rbs_map.cache_key
+      # cache pins even if result is zero, so we don't retry building pins
+      pins ||= []
+      serialize_rbs_collection_pins(gemspec, rbs_version_cache_key, pins)
+      logger.info do
+        unless pins.empty?
+          "Cached #{pins.length} RBS collection pins for gem #{gemspec.name} #{gemspec.version} with " \
+            "cache_key #{rbs_version_cache_key.inspect}"
+        end
+      end
+      pins
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @return [Array<Pin::Base>]
+    def deserialize_yard_pin_cache gemspec
+      cached = load_yard_gem(gemspec)
+      if cached
+        cached
+      else
+        logger.debug "No YARD pin cache for #{gemspec.name}:#{gemspec.version}"
+        nil
+      end
+    end
+
+    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
+    # @param rbs_version_cache_key [String]
+    # @return [Array<Pin::Base>]
+    def deserialize_rbs_collection_cache gemspec, rbs_version_cache_key
+      cached = load_rbs_collection_pins(gemspec, rbs_version_cache_key)
+      Solargraph.assert_or_log(:pin_cache_rbs_collection, 'Asked for non-existent rbs collection') if cached.nil?
+      logger.info do
+        "Loaded #{cached&.length} pins from RBS collection cache for #{gemspec.name}:#{gemspec.version}"
+      end
+      cached
+    end
+
+    # @return [Array<String>]
+    def yard_path_components
+      ["yard-#{YARD::VERSION}",
+       yard_plugins.sort.uniq.join('-')]
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @return [String]
+    def yardoc_path gemspec
+      File.join(PinCache.base_dir,
+                *yard_path_components,
+                "#{gemspec.name}-#{gemspec.version}.yardoc")
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @return [String]
+    def yard_gem_path gemspec
+      File.join(PinCache.work_dir, *yard_path_components, "#{gemspec.name}-#{gemspec.version}.ser")
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @return [Array<Pin::Base>, nil]
+    def load_yard_gem gemspec
+      PinCache.load(yard_gem_path(gemspec))
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @param pins [Array<Pin::Base>]
+    # @return [void]
+    def serialize_yard_gem gemspec, pins
+      PinCache.save(yard_gem_path(gemspec), pins)
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @return [Boolean]
+    def yard_gem? gemspec
+      exist?(yard_gem_path(gemspec))
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @param hash [String, nil]
+    # @return [String]
+    def rbs_collection_pins_path gemspec, hash
+      rbs_collection_pins_path_prefix(gemspec) + "#{hash || 0}.ser"
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @return [String]
+    def rbs_collection_pins_path_prefix gemspec
+      File.join(PinCache.work_dir, 'rbs', "#{gemspec.name}-#{gemspec.version}-")
+    end
+
+    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
+    # @param hash [String]
+    #
+    # @return [Array<Pin::Base>, nil]
+    def load_rbs_collection_pins gemspec, hash
+      PinCache.load(rbs_collection_pins_path(gemspec, hash))
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @param hash [String, nil]
+    # @param pins [Array<Pin::Base>]
+    # @return [void]
+    def serialize_rbs_collection_pins gemspec, hash, pins
+      PinCache.save(rbs_collection_pins_path(gemspec, hash), pins)
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @param hash [String, nil]
+    # @return [String]
+    def combined_path gemspec, hash
+      File.join(combined_path_prefix(gemspec) + "-#{hash || 0}.ser")
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @return [String]
+    def combined_path_prefix gemspec
+      File.join(PinCache.work_dir, 'combined', yard_plugins.sort.join('-'), "#{gemspec.name}-#{gemspec.version}")
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @param hash [String, nil]
+    # @param pins [Array<Pin::Base>]
+    # @return [void]
+    def serialize_combined_gem gemspec, hash, pins
+      PinCache.save(combined_path(gemspec, hash), pins)
+    end
+
+    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
+    # @param hash [String]
+    def combined_gem? gemspec, hash
+      exist?(combined_path(gemspec, hash))
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @param hash [String, nil]
+    # @return [Array<Pin::Base>, nil]
+    def load_combined_gem gemspec, hash
+      PinCache.load(combined_path(gemspec, hash))
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @param hash [String]
+    def rbs_collection_pins? gemspec, hash
+      exist?(rbs_collection_pins_path(gemspec, hash))
+    end
+
+    include Logging
+
+    # @param path [String]
+    def exist? *path
+      File.file? File.join(*path)
+    end
+
+    # @return [void]
+    # @param path_segments [Array<String>]
+    def uncache_by_prefix *path_segments, out: nil
+      path = File.join(*path_segments)
+      glob = "#{path}*"
+      out&.puts "Clearing pin cache in #{glob}"
+      Dir.glob(glob).each do |file|
+        next unless File.file?(file)
+        FileUtils.rm_rf file, secure: true
+        out&.puts "Clearing pin cache in #{file}"
+      end
+    end
+
     class << self
       include Logging
 
+      # @return [Hash{Array<String> => Hash{Array(String, String) =>
+      #   Array<Pin::Base>}}] yard plugins, then gemspec name and
+      #   version
+      def all_combined_pins_in_memory
+        @all_combined_pins_in_memory ||= {}
+      end
+
       # The base directory where cached YARD documentation and serialized pins are serialized
       #
       # @return [String]
@@ -18,6 +430,32 @@ def base_dir
           File.join(Dir.home, '.cache', 'solargraph')
       end
 
+      # @param path_segments [Array<String>]
+      # @return [void]
+      def uncache *path_segments, out: nil
+        path = File.join(*path_segments)
+        if File.exist?(path)
+          FileUtils.rm_rf path, secure: true
+          out&.puts "Clearing pin cache in #{path}"
+        else
+          out&.puts "Pin cache file #{path} does not exist"
+        end
+      end
+
+      # @param out [IO, nil]
+      # @return [void]
+      def uncache_core out: nil
+        uncache(core_path, out: out)
+        # ApiMap keep this in memory
+        ApiMap.reset_core(out: out)
+      end
+
+      # @param out [IO, nil]
+      # @return [void]
+      def uncache_stdlib out: nil
+        uncache(stdlib_path, out: out)
+      end
+
       # The working directory for the current Ruby, RBS, and Solargraph versions.
       #
       # @return [String]
@@ -27,15 +465,6 @@ def work_dir
         File.join(base_dir, "ruby-#{RUBY_VERSION}", "rbs-#{RBS::VERSION}", "solargraph-#{Solargraph::VERSION}")
       end
 
-      # @param gemspec [Gem::Specification]
-      # @return [String]
-      def yardoc_path gemspec
-        File.join(base_dir,
-                  "yard-#{YARD::VERSION}",
-                  "yard-activesupport-concern-#{YARD::ActiveSupport::Concern::VERSION}",
-                  "#{gemspec.name}-#{gemspec.version}.yardoc")
-      end
-
       # @return [String]
       def stdlib_path
         File.join(work_dir, 'stdlib')
@@ -164,33 +593,11 @@ def has_rbs_collection?(gemspec, hash)
         exist?(rbs_collection_path(gemspec, hash))
       end
 
-      # @return [void]
-      def uncache_core
-        uncache(core_path)
-      end
-
-      # @return [void]
-      def uncache_stdlib
-        uncache(stdlib_path)
-      end
-
-      # @param gemspec [Gem::Specification]
-      # @param out [IO, nil]
-      # @return [void]
-      def uncache_gem(gemspec, out: nil)
-        uncache(yardoc_path(gemspec), out: out)
-        uncache_by_prefix(rbs_collection_path_prefix(gemspec), out: out)
-        uncache(yard_gem_path(gemspec), out: out)
-        uncache_by_prefix(combined_path_prefix(gemspec), out: out)
-      end
-
       # @return [void]
       def clear
         FileUtils.rm_rf base_dir, secure: true
       end
 
-      private
-
       # @param file [String]
       # @return [Array<Solargraph::Pin::Base>, nil]
       def load file
@@ -202,11 +609,6 @@ def load file
         nil
       end
 
-      # @param path [String]
-      def exist? *path
-        File.file? File.join(*path)
-      end
-
       # @param file [String]
       # @param pins [Array<Pin::Base>]
       # @return [void]
@@ -218,27 +620,19 @@ def save file, pins
         logger.debug { "Cache#save: Saved #{pins.length} pins to #{file}" }
       end
 
-      # @param path_segments [Array<String>]
-      # @return [void]
-      def uncache *path_segments, out: nil
-        path = File.join(*path_segments)
-        if File.exist?(path)
-          FileUtils.rm_rf path, secure: true
-          out.puts "Clearing pin cache in #{path}" unless out.nil?
-        end
+      def core?
+        File.file?(core_path)
       end
 
-      # @return [void]
-      # @param path_segments [Array<String>]
-      def uncache_by_prefix *path_segments, out: nil
-        path = File.join(*path_segments)
-        glob = "#{path}*"
-        out.puts "Clearing pin cache in #{glob}" unless out.nil?
-        Dir.glob(glob).each do |file|
-          next unless File.file?(file)
-          FileUtils.rm_rf file, secure: true
-          out.puts "Clearing pin cache in #{file}" unless out.nil?
-        end
+      # @param out [IO, nil]
+      # @return [Array<Pin::Base>]
+      def cache_core out: $stderr
+        RbsMap::CoreMap.new.cache_core(out: out)
+      end
+
+      # @param path [String]
+      def exist? *path
+        File.file? File.join(*path)
       end
     end
   end
diff --git a/lib/solargraph/rbs_map.rb b/lib/solargraph/rbs_map.rb
index c6c10bac6..f6309bb55 100644
--- a/lib/solargraph/rbs_map.rb
+++ b/lib/solargraph/rbs_map.rb
@@ -23,10 +23,11 @@ class RbsMap
     attr_reader :rbs_collection_config_path
 
     # @param library [String]
-    # @param version [String, nil
+    # @param version [String, nil]
     # @param rbs_collection_config_path [String, Pathname, nil]
     # @param rbs_collection_paths [Array<Pathname, String>]
-    def initialize library, version = nil, rbs_collection_config_path: nil, rbs_collection_paths: []
+    # @param out [IO, nil] where to log messages
+    def initialize library, version = nil, rbs_collection_config_path: nil, rbs_collection_paths: [], out: $stderr
       if rbs_collection_config_path.nil? && !rbs_collection_paths.empty?
         raise 'Please provide rbs_collection_config_path if you provide rbs_collection_paths'
       end
@@ -37,6 +38,28 @@ def initialize library, version = nil, rbs_collection_config_path: nil, rbs_coll
       add_library loader, library, version
     end
 
+    CACHE_KEY_GEM_EXPORT = 'gem-export'
+    CACHE_KEY_UNRESOLVED = 'unresolved'
+    CACHE_KEY_STDLIB = 'stdlib'
+    CACHE_KEY_LOCAL = 'local'
+
+    # @param cache_key [String]
+    # @return [String, nil] a description of the source of the RBS info
+    def self.rbs_source_desc cache_key
+      case cache_key
+      when CACHE_KEY_GEM_EXPORT
+        'RBS gem export'
+      when CACHE_KEY_UNRESOLVED
+        nil
+      when CACHE_KEY_STDLIB
+        'RBS standard library'
+      when CACHE_KEY_LOCAL
+        'local RBS shims'
+      else
+        'RBS collection'
+      end
+    end
+
     # @return [RBS::EnvironmentLoader]
     def loader
       @loader ||= RBS::EnvironmentLoader.new(core_root: nil, repository: repository)
@@ -47,9 +70,13 @@ def loader
     #   updated upstream for the same library and version.  May change
     #   if the config for where information comes form changes.
     def cache_key
+      return CACHE_KEY_UNRESOLVED unless resolved?
+
       @hextdigest ||= begin
         # @type [String, nil]
         data = nil
+        # @type gem_config [nil, Hash{String => Hash{String => String}}]
+        gem_config = nil
         if rbs_collection_config_path
           lockfile_path = RBS::Collection::Config.to_lockfile_path(Pathname.new(rbs_collection_config_path))
           if lockfile_path.exist?
@@ -58,21 +85,26 @@ def cache_key
             data = gem_config&.to_s
           end
         end
-        if data.nil? || data.empty?
-          if resolved?
-            # definitely came from the gem itself and not elsewhere -
-            # only one version per gem
-            'gem-export'
+        if gem_config.nil?
+          CACHE_KEY_STDLIB
+        else
+          # @type [String]
+          source = gem_config.dig('source', 'type')
+          case source
+          when 'rubygems'
+            CACHE_KEY_GEM_EXPORT
+          when 'local'
+            CACHE_KEY_LOCAL
+          when 'stdlib'
+            CACHE_KEY_STDLIB
           else
-            'unresolved'
+            Digest::SHA1.hexdigest(data)
           end
-        else
-          Digest::SHA1.hexdigest(data)
         end
       end
     end
 
-    # @param gemspec [Gem::Specification]
+    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
     # @param rbs_collection_path [String, Pathname, nil]
     # @param rbs_collection_config_path [String, Pathname, nil]
     # @return [RbsMap]
@@ -83,14 +115,24 @@ def self.from_gemspec gemspec, rbs_collection_path, rbs_collection_config_path
       return rbs_map if rbs_map.resolved?
 
       # try any version of the gem in the collection
-      RbsMap.new(gemspec.name, nil,
-                 rbs_collection_paths: [rbs_collection_path].compact,
-                 rbs_collection_config_path: rbs_collection_config_path)
+      rbs_map = RbsMap.new(gemspec.name, nil,
+                           rbs_collection_paths: [rbs_collection_path].compact,
+                           rbs_collection_config_path: rbs_collection_config_path)
+
+      return rbs_map if rbs_map.resolved?
+
+      StdlibMap.new(gemspec.name)
     end
 
+    # @param out [IO, nil] where to log messages
     # @return [Array<Pin::Base>]
-    def pins
-      @pins ||= resolved? ? conversions.pins : []
+    def pins out: $stderr
+      @pins ||= if resolved?
+                  loader.libs.each { |lib| log_caching(lib, out: out) }
+                  conversions.pins
+                else
+                  []
+                end
     end
 
     # @generic T
@@ -140,15 +182,22 @@ def conversions
       @conversions ||= Conversions.new(loader: loader)
     end
 
+    # @param lib [RBS::EnvironmentLoader::Library]
+    # @param out [IO, nil] where to log messages
+    # @return [void]
+    def log_caching lib, out:; end
+
     # @param loader [RBS::EnvironmentLoader]
     # @param library [String]
-    # @param version [String, nil]
+    # @param version [String, nil] the version of the library to load, or nil for any
+    # @param out [IO, nil] where to log messages
     # @return [Boolean] true if adding the library succeeded
-    def add_library loader, library, version
+    def add_library loader, library, version, out: $stderr
       @resolved = if loader.has_library?(library: library, version: version)
-        loader.add library: library, version: version
-        logger.debug { "#{short_name} successfully loaded library #{library}:#{version}" }
-        true
+                    # we find our own dependencies from gemfile.lock
+                    loader.add library: library, version: version, resolve_dependencies: false
+                    logger.debug { "#{short_name} successfully loaded library #{library}:#{version}" }
+                    true
       else
         logger.info { "#{short_name} did not find data for library #{library}:#{version}" }
         false
diff --git a/lib/solargraph/rbs_map/core_map.rb b/lib/solargraph/rbs_map/core_map.rb
index 8c3d7dbdd..a9b647b20 100644
--- a/lib/solargraph/rbs_map/core_map.rb
+++ b/lib/solargraph/rbs_map/core_map.rb
@@ -14,28 +14,37 @@ def resolved?
 
       def initialize; end
 
+      # @param out [IO, nil] output stream for logging
       # @return [Enumerable<Pin::Base>]
-      def pins
+      def pins out: $stderr
         return @pins if @pins
+        @pins = cache_core(out: out)
+      end
 
-        @pins = []
+      # @param out [IO, nil] output stream for logging
+      # @return [Array<Pin::Base>]
+      def cache_core out: $stderr
+        new_pins = []
         cache = PinCache.deserialize_core
-        if cache
-          @pins.replace cache
-        else
-          loader.add(path: Pathname(FILLS_DIRECTORY))
-          @pins = conversions.pins
-          @pins.concat RbsMap::CoreFills::ALL
-          processed = ApiMap::Store.new(pins).pins.reject { |p| p.is_a?(Solargraph::Pin::Reference::Override) }
-          @pins.replace processed
-
-          PinCache.serialize_core @pins
-        end
-        @pins
-      end
+        return cache if cache
 
-      def loader
-        @loader ||= RBS::EnvironmentLoader.new(repository: RBS::Repository.new(no_stdlib: false))
+        new_pins.concat conversions.pins
+
+        # Avoid RBS::DuplicatedDeclarationError by loading in a different EnvironmentLoader
+        fill_loader = RBS::EnvironmentLoader.new(core_root: nil, repository: RBS::Repository.new(no_stdlib: false))
+        fill_loader.add(path: Pathname(FILLS_DIRECTORY))
+        out&.puts 'Caching RBS pins for Ruby core'
+        fill_conversions = Conversions.new(loader: fill_loader)
+        new_pins.concat fill_conversions.pins
+
+        new_pins.concat RbsMap::CoreFills::ALL
+
+        processed = ApiMap::Store.new(new_pins).pins.reject { |p| p.is_a?(Solargraph::Pin::Reference::Override) }
+        new_pins.replace processed
+
+        PinCache.serialize_core new_pins
+
+        new_pins
       end
 
       private
diff --git a/lib/solargraph/rbs_map/stdlib_map.rb b/lib/solargraph/rbs_map/stdlib_map.rb
index b6804157f..e7891bfe3 100644
--- a/lib/solargraph/rbs_map/stdlib_map.rb
+++ b/lib/solargraph/rbs_map/stdlib_map.rb
@@ -12,8 +12,13 @@ class StdlibMap < RbsMap
       # @type [Hash{String => RbsMap}]
       @stdlib_maps_hash = {}
 
+      def log_caching lib, out: $stderr
+        out&.puts("Caching RBS pins for standard library #{lib.name}")
+      end
+
       # @param library [String]
-      def initialize library
+      # @param out [IO, nil] where to log messages
+      def initialize library, out: $stderr
         cached_pins = PinCache.deserialize_stdlib_require library
         if cached_pins
           @pins = cached_pins
@@ -24,7 +29,7 @@ def initialize library
           super
           unless resolved?
             @pins = []
-            logger.info { "Could not resolve #{library.inspect}" }
+            logger.debug { "StdlibMap could not resolve #{library.inspect}" }
             return
           end
           generated_pins = pins
@@ -33,6 +38,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/shell.rb b/lib/solargraph/shell.rb
index a005f600b..735e6c290 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -3,6 +3,7 @@
 require 'benchmark'
 require 'thor'
 require 'yard'
+require 'yaml'
 
 module Solargraph
   class Shell < Thor
@@ -118,19 +119,21 @@ 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
+          PinCache.uncache_core(out: $stdout)
           next
         end
 
         if gem == 'stdlib'
-          PinCache.uncache_stdlib
+          PinCache.uncache_stdlib(out: $stdout)
           next
         end
 
         spec = Gem::Specification.find_by_name(gem)
-        PinCache.uncache_gem(spec, out: $stdout)
+        workspace.uncache_gem(spec, out: $stdout)
       end
     end
 
diff --git a/lib/solargraph/workspace.rb b/lib/solargraph/workspace.rb
index ffd653d96..92be0c8c3 100644
--- a/lib/solargraph/workspace.rb
+++ b/lib/solargraph/workspace.rb
@@ -2,6 +2,7 @@
 
 require 'open3'
 require 'json'
+require 'yaml'
 
 module Solargraph
   # A workspace consists of the files in a project's directory and the
@@ -9,7 +10,10 @@ module Solargraph
   # in an associated Library or ApiMap.
   #
   class Workspace
+    include Logging
+
     autoload :Config, 'solargraph/workspace/config'
+    autoload :RequirePaths, 'solargraph/workspace/require_paths'
 
     # @return [String]
     attr_reader :directory
@@ -19,14 +23,12 @@ class Workspace
     # @return [Array<String>]
     attr_reader :require_paths
 
-    # @return [Array<String>]
-    attr_reader :gemnames
-    alias source_gems gemnames
-
-    # @param directory [String]
+    # @param directory [String] TODO: Document and test '' and '*' semantics
     # @param config [Config, nil]
     # @param server [Hash]
     def initialize directory = '', config = nil, server = {}
+      raise ArgumentError, 'directory must be a String' unless directory.is_a?(String)
+
       @directory = directory
       @config = config
       @server = server
@@ -41,6 +43,56 @@ def config
       @config ||= Solargraph::Workspace::Config.new(directory)
     end
 
+    # @return [Solargraph::PinCache]
+    def pin_cache
+      @pin_cache ||= fresh_pincache
+    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
+
+    # @return [Environ]
+    def global_environ
+      # empty docmap, since the result needs to work in any possible
+      # context here
+      @global_environ ||= Convention.for_global(DocMap.new([], [], self))
+    end
+
+    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
+    # @param out [IO, nil] output stream for logging
+    # @param rebuild [Boolean] whether to rebuild the pins even if they are cached
+    #
+    # @return [void]
+    def cache_gem gemspec, out: nil, rebuild: false
+      pin_cache.cache_gem(gemspec: gemspec, out: out, rebuild: rebuild)
+    end
+
+    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
+    # @param out [IO, nil] output stream for logging
+    #
+    # @return [void]
+    def uncache_gem gemspec, out: nil
+      pin_cache.uncache_gem(gemspec, out: out)
+    end
+
+    # @return [Solargraph::PinCache]
+    def fresh_pincache
+      PinCache.new(rbs_collection_path: rbs_collection_path,
+                   rbs_collection_config_path: rbs_collection_config_path,
+                   yard_plugins: yard_plugins,
+                   directory: directory)
+    end
+
+    # @return [Array<String>]
+    def yard_plugins
+      @yard_plugins ||= global_environ.yard_plugins.sort.uniq
+    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.
@@ -135,12 +187,23 @@ def rbs_collection_path
 
     # @return [String, nil]
     def rbs_collection_config_path
-      @rbs_collection_config_path ||= begin
-        unless directory.empty? || directory == '*'
-          yaml_file = File.join(directory, 'rbs_collection.yaml')
-          yaml_file if File.file?(yaml_file)
+      @rbs_collection_config_path ||=
+        begin
+          unless directory.empty? || directory == '*'
+            yaml_file = File.join(directory, 'rbs_collection.yaml')
+            yaml_file if File.file?(yaml_file)
+          end
         end
-      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.
@@ -182,7 +245,10 @@ def load_sources
       source_hash.clear
       unless directory.empty? || directory == '*'
         size = config.calculated.length
-        raise WorkspaceTooLargeError, "The workspace is too large to index (#{size} files, #{config.max_files} max)" if config.max_files > 0 and size > config.max_files
+        if config.max_files > 0 and size > config.max_files
+          raise WorkspaceTooLargeError,
+                "The workspace is too large to index (#{size} files, #{config.max_files} max)"
+        end
         config.calculated.each do |filename|
           begin
             source_hash[filename] = Solargraph::Source.load(filename)
diff --git a/lib/solargraph/yardoc.rb b/lib/solargraph/yardoc.rb
index 625e41ce4..ffe7da4c3 100644
--- a/lib/solargraph/yardoc.rb
+++ b/lib/solargraph/yardoc.rb
@@ -8,45 +8,55 @@ module Solargraph
   module Yardoc
     module_function
 
-    # Build and cache a gem's yardoc and return the path. If the cache already
-    # exists, do nothing and return the path.
+    # Build and save a gem's yardoc into a given path.
     #
-    # @param yard_plugins [Array<String>] The names of YARD plugins to use.
+    # @param gem_yardoc_path [String] the path to the yardoc cache of a particular gem
+    # @param yard_plugins [Array<String>]
     # @param gemspec [Gem::Specification]
-    # @return [String] The path to the cached yardoc.
-    def cache(yard_plugins, gemspec)
-      path = PinCache.yardoc_path gemspec
-      return path if cached?(gemspec)
+    #
+    # @return [void]
+    def build_docs gem_yardoc_path, yard_plugins, gemspec
+      return if docs_built?(gem_yardoc_path)
 
-      Solargraph.logger.info "Caching yardoc for #{gemspec.name} #{gemspec.version}"
-      cmd = "yardoc --db #{path} --no-output --plugin solargraph"
+      Solargraph.logger.info "Saving yardoc for #{gemspec.name} #{gemspec.version} into #{gem_yardoc_path}"
+      cmd = "yardoc --db #{gem_yardoc_path} --no-output --plugin solargraph"
       yard_plugins.each { |plugin| cmd << " --plugin #{plugin}" }
       Solargraph.logger.debug { "Running: #{cmd}" }
       # @todo set these up to run in parallel
-      #
-      # @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)
-      unless status.success?
-        Solargraph.logger.warn { "YARD failed running #{cmd.inspect} in #{gemspec.gem_dir}" }
-        Solargraph.logger.info stdout_and_stderr_str
+      unless File.exist?(gemspec.gem_dir)
+        Solargraph.logger.info { "Bad info from gemspec - #{gemspec.gem_dir} does not exist" }
+        return
       end
-      path
+
+      # @sg-ignore
+      stdout_and_stderr_str, status = Open3.capture2e(current_bundle_env_tweaks, cmd, chdir: gemspec.gem_dir)
+      return if status.success?
+      Solargraph.logger.warn { "YARD failed running #{cmd.inspect} in #{gemspec.gem_dir}" }
+      Solargraph.logger.info stdout_and_stderr_str
+    end
+
+    # @param gem_yardoc_path [String] the path to the yardoc cache of a particular gem
+    # @param gemspec [Gem::Specification]
+    # @param out [IO, nil] where to log messages
+    # @return [Array<Pin::Base>]
+    def build_pins gem_yardoc_path, gemspec, out: $stderr
+      yardoc = load!(gem_yardoc_path)
+      YardMap::Mapper.new(yardoc, gemspec).map
     end
 
     # True if the gem yardoc is cached.
     #
-    # @param gemspec [Gem::Specification]
-    def cached?(gemspec)
-      yardoc = File.join(PinCache.yardoc_path(gemspec), 'complete')
+    # @param gem_yardoc_path [String]
+    def docs_built? gem_yardoc_path
+      yardoc = File.join(gem_yardoc_path, 'complete')
       File.exist?(yardoc)
     end
 
     # True if another process is currently building the yardoc cache.
     #
-    # @param gemspec [Gem::Specification]
-    def processing?(gemspec)
-      yardoc = File.join(PinCache.yardoc_path(gemspec), 'processing')
+    # @param gem_yardoc_path [String] the path to the yardoc cache of a particular gem
+    def processing? gem_yardoc_path
+      yardoc = File.join(gem_yardoc_path, 'processing')
       File.exist?(yardoc)
     end
 
@@ -54,11 +64,28 @@ def processing?(gemspec)
     #
     # @note This method modifies the global YARD registry.
     #
-    # @param gemspec [Gem::Specification]
+    # @param gem_yardoc_path [String] the path to the yardoc cache of a particular gem
     # @return [Array<YARD::CodeObjects::Base>]
-    def load!(gemspec)
-      YARD::Registry.load! PinCache.yardoc_path gemspec
+    def load! gem_yardoc_path
+      YARD::Registry.load! gem_yardoc_path
       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
diff --git a/spec/doc_map_spec.rb b/spec/doc_map_spec.rb
index b03e573f0..b87970d48 100644
--- a/spec/doc_map_spec.rb
+++ b/spec/doc_map_spec.rb
@@ -1,80 +1,129 @@
 # 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
 
-  it 'generates pins from gems' do
-    doc_map = Solargraph::DocMap.new(['ast'], [])
-    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)
+  let(:out) { StringIO.new }
+  let(:pre_cache) { true }
+  let(:requires) { [] }
+
+  let(:workspace) do
+    Solargraph::Workspace.new(Dir.pwd)
   end
 
-  it 'tracks unresolved requires' do
-    doc_map = Solargraph::DocMap.new(['not_a_gem'], [])
-    expect(doc_map.unresolved_requires).to include('not_a_gem')
+  let(:plain_doc_map) { described_class.new([], [], workspace, out: nil) }
+
+  before do
+    doc_map.cache_doc_map_gems!(nil) if pre_cache
   end
 
-  it 'tracks uncached_gemspecs' do
-    gemspec = Gem::Specification.new do |spec|
-      spec.name = 'not_a_gem'
-      spec.version = '1.0.0'
+  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
-    allow(Gem::Specification).to receive(:find_by_path).and_return(gemspec)
-    doc_map = Solargraph::DocMap.new(['not_a_gem'], [gemspec])
-    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)
+  context 'when deserialization takes a while' do
+    let(:pre_cache) { false }
+    let(:requires) { ['backport'] }
 
-    expect(doc_map_with_bundler_require.pins.length - plain_doc_map.pins.length).to be_positive
+    before do
+      # proxy this method to simulate a long-running deserialization
+      allow(Benchmark).to receive(:measure) do |&block|
+        block.call
+        5.0
+      end
+    end
+
+    it 'logs timing' do
+      # force lazy evaluation
+      _pins = doc_map.pins
+      expect(out.string).to include('Deserialized ').and include(' gem pins ').and include(' ms')
+    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.
-    expect(Solargraph.logger).not_to receive(:warn).with(/path set/)
-    Solargraph::DocMap.new(['set'], [])
+  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
+      pincache = instance_double(Solargraph::PinCache)
+      uncached_gemspec = Gem::Specification.new('uncached_gem', '1.0.0')
+      allow(workspace).to receive_messages(fresh_pincache: pincache)
+      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 'ignores nil requires' do
-    expect { Solargraph::DocMap.new([nil], []) }.not_to raise_error
+  context 'with require as bundle/require' do
+    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_doc_map_gems!(nil)
+      expect(doc_map_with_bundler_require.pins.length - plain_doc_map.pins.length).to be_positive
+    end
   end
 
-  it 'ignores empty requires' do
-    expect { Solargraph::DocMap.new([''], []) }.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 'collects dependencies' do
-    doc_map = Solargraph::DocMap.new(['rspec'], [])
-    expect(doc_map.dependencies.map(&:name)).to include('rspec-core')
+  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 '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 an empty require' do
+    let(:requires) { [''] }
+
+    it 'does not raise error' do
+      expect { doc_map }.not_to raise_error
     end
+  end
 
-    Solargraph::Convention.register dummy_convention
+  context 'with convention' do
+    let(:pre_cache) { false }
 
-    doc_map = Solargraph::DocMap.new(['original_gem'], [])
+    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
 
-    expect(doc_map.requires).to include('original_gem', 'convention_gem1', 'convention_gem2')
+      Solargraph::Convention.register dummy_convention
 
-    # Clean up the registered convention
-    Solargraph::Convention.deregister dummy_convention
+      doc_map = Solargraph::DocMap.new(['original_gem'], [], workspace)
+
+      expect(doc_map.requires).to include('original_gem', 'convention_gem1', 'convention_gem2')
+    ensure
+      # Clean up the registered convention
+      Solargraph::Convention.deregister dummy_convention
+    end
   end
 end
diff --git a/spec/gem_pins_spec.rb b/spec/gem_pins_spec.rb
index d630784cf..4d2bb4ff5 100644
--- a/spec/gem_pins_spec.rb
+++ b/spec/gem_pins_spec.rb
@@ -1,14 +1,49 @@
 # frozen_string_literal: true
 
 describe Solargraph::GemPins do
-  it 'can merge YARD and RBS' do
-    gemspec = Gem::Specification.find_by_name('rbs')
-    yard_pins = Solargraph::GemPins.build_yard_pins([], gemspec)
-    rbs_map = Solargraph::RbsMap.from_gemspec(gemspec, nil, nil)
-    pins = Solargraph::GemPins.combine yard_pins, rbs_map.pins
-
-    core_root = pins.find { |pin| pin.path == 'RBS::EnvironmentLoader#core_root' }
-    expect(core_root.return_type.to_s).to eq('Pathname, nil')
-    expect(core_root.location.filename).to end_with('environment_loader.rb')
+  let(:workspace) { Solargraph::Workspace.new(Dir.pwd) }
+  let(:doc_map) { Solargraph::DocMap.new(requires, [], workspace, out: nil) }
+  let(:pin) { doc_map.pins.find { |pin| pin.path == path } }
+
+  before do
+    doc_map.cache_doc_map_gems!(STDERR) # rubocop:disable Style/GlobalStdStream
+  end
+
+  context 'with a combined method pin' do
+    let(:path) { 'RBS::EnvironmentLoader#core_root' }
+    let(:requires) { ['rbs'] }
+
+    it 'can merge YARD and RBS' do
+      expect(pin.source).to eq(:combined)
+    end
+
+    it 'finds types from RBS' do
+      expect(pin.return_type.to_s).to eq('Pathname, nil')
+    end
+
+    it 'finds locations from YARD' do
+      expect(pin.location.filename).to end_with('environment_loader.rb')
+    end
+  end
+
+  context 'with a YARD-only pin' do
+    let(:requires) { ['rake'] }
+    let(:path) { 'Rake::Task#prerequisites' }
+
+    it 'found a pin' do
+      expect(pin.source).not_to be_nil
+    end
+
+    it 'can merge YARD and RBS' do
+      expect(pin.source).to eq(:yardoc)
+    end
+
+    it 'does not find types from YARD in this case' do
+      expect(pin.return_type.to_s).to eq('undefined')
+    end
+
+    it 'finds locations from YARD' do
+      expect(pin.location.filename).to end_with('task.rb')
+    end
   end
 end
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..f7c17cb6d 100644
--- a/spec/language_server/host/message_worker_spec.rb
+++ b/spec/language_server/host/message_worker_spec.rb
@@ -2,7 +2,7 @@
   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)
diff --git a/spec/library_spec.rb b/spec/library_spec.rb
index 34de9e1f0..f7daafdf4 100644
--- a/spec/library_spec.rb
+++ b/spec/library_spec.rb
@@ -26,6 +26,32 @@
     expect(completion.pins.map(&:name)).to include('x')
   end
 
+  context 'with a require from a not-yet-cached external gem' do
+    before do
+      Solargraph::Shell.new.uncache('backport')
+    end
+
+    it "returns a Completion", time_limit_seconds: 50 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 = nil
+      # give Solargraph time to cache the gem
+      while (completion = library.completions_at('file.rb', 5, 19)).pins.empty?
+        sleep 0.25
+      end
+      expect(completion).to be_a(Solargraph::SourceMap::Completion)
+      expect(completion.pins.map(&:name)).to include('remote')
+    end
+  end
+
   context 'with a require from an already-cached external gem' do
     before do
       Solargraph::Shell.new.gems('backport')
@@ -161,10 +187,47 @@ def bar
     expect(pins.map(&:path)).to include('Foo#bar')
   end
 
-  it "collects references to an instance method symbol" do
-    workspace = Solargraph::Workspace.new('*')
-    library = Solargraph::Library.new(workspace)
-    src1 = Solargraph::Source.load_string(%(
+  describe '#references_from' do
+    it "collects references to a new method on a constant from assignment of Class.new" do
+      workspace = Solargraph::Workspace.new('*')
+      library = Solargraph::Library.new(workspace)
+      src1 = Solargraph::Source.load_string(%(
+        Foo.new
+      ), 'file1.rb', 0)
+      library.merge src1
+      src2 = Solargraph::Source.load_string(%(
+        Foo = Class.new
+      ), 'file2.rb', 0)
+      library.merge src2
+      library.catalog
+      locs = library.references_from('file1.rb', 1, 12)
+      expect(locs.map { |l| [l.filename, l.range.start.line] })
+        .to eq([["file1.rb", 1]])
+    end
+
+    it "collects references to a new method to a constant from assignment" do
+      workspace = Solargraph::Workspace.new('*')
+      library = Solargraph::Library.new(workspace)
+      src1 = Solargraph::Source.load_string(%(
+        Foo.new
+      ), 'file1.rb', 0)
+      library.merge src1
+      src2 = Solargraph::Source.load_string(%(
+        class Foo
+        end
+        blah = Foo.new
+      ), 'file2.rb', 0)
+      library.merge src2
+      library.catalog
+      locs = library.references_from('file2.rb', 3, 21)
+      expect(locs.map { |l| [l.filename, l.range.start.line] })
+        .to eq([["file1.rb", 1], ["file2.rb", 3]])
+    end
+
+    it "collects references to an instance method symbol" do
+      workspace = Solargraph::Workspace.new('*')
+      library = Solargraph::Library.new(workspace)
+      src1 = Solargraph::Source.load_string(%(
       class Foo
         def bar
         end
@@ -172,8 +235,8 @@ def bar
 
       Foo.new.bar
     ), 'file1.rb', 0)
-    library.merge src1
-    src2 = Solargraph::Source.load_string(%(
+      library.merge src1
+      src2 = Solargraph::Source.load_string(%(
       foo = Foo.new
       foo.bar
       class Other
@@ -181,17 +244,17 @@ def bar; end
       end
       Other.new.bar
     ), 'file2.rb', 0)
-    library.merge src2
-    library.catalog
-    locs = library.references_from('file2.rb', 2, 11)
-    expect(locs.length).to eq(3)
-    expect(locs.select{|l| l.filename == 'file2.rb' && l.range.start.line == 6}).to be_empty
-  end
+      library.merge src2
+      library.catalog
+      locs = library.references_from('file2.rb', 2, 11)
+      expect(locs.length).to eq(3)
+      expect(locs.select{|l| l.filename == 'file2.rb' && l.range.start.line == 6}).to be_empty
+    end
 
-  it "collects references to a class method symbol" do
-    workspace = Solargraph::Workspace.new('*')
-    library = Solargraph::Library.new(workspace)
-    src1 = Solargraph::Source.load_string(%(
+    it "collects references to a class method symbol" do
+      workspace = Solargraph::Workspace.new('*')
+      library = Solargraph::Library.new(workspace)
+      src1 = Solargraph::Source.load_string(%(
       class Foo
         def self.bar
         end
@@ -203,8 +266,8 @@ def bar
       Foo.bar
       Foo.new.bar
     ), 'file1.rb', 0)
-    library.merge src1
-    src2 = Solargraph::Source.load_string(%(
+      library.merge src1
+      src2 = Solargraph::Source.load_string(%(
       Foo.bar
       Foo.new.bar
       class Other
@@ -214,48 +277,48 @@ def bar; end
       Other.bar
       Other.new.bar
     ), 'file2.rb', 0)
-    library.merge src2
-    library.catalog
-    locs = library.references_from('file2.rb', 1, 11)
-    expect(locs.length).to eq(3)
-    expect(locs.select{|l| l.filename == 'file1.rb' && l.range.start.line == 2}).not_to be_empty
-    expect(locs.select{|l| l.filename == 'file1.rb' && l.range.start.line == 9}).not_to be_empty
-    expect(locs.select{|l| l.filename == 'file2.rb' && l.range.start.line == 1}).not_to be_empty
-  end
+      library.merge src2
+      library.catalog
+      locs = library.references_from('file2.rb', 1, 11)
+      expect(locs.length).to eq(3)
+      expect(locs.select{|l| l.filename == 'file1.rb' && l.range.start.line == 2}).not_to be_empty
+      expect(locs.select{|l| l.filename == 'file1.rb' && l.range.start.line == 9}).not_to be_empty
+      expect(locs.select{|l| l.filename == 'file2.rb' && l.range.start.line == 1}).not_to be_empty
+    end
 
-  it "collects stripped references to constant symbols" do
-    workspace = Solargraph::Workspace.new('*')
-    library = Solargraph::Library.new(workspace)
-    src1 = Solargraph::Source.load_string(%(
+    it "collects stripped references to constant symbols" do
+      workspace = Solargraph::Workspace.new('*')
+      library = Solargraph::Library.new(workspace)
+      src1 = Solargraph::Source.load_string(%(
       class Foo
         def bar
         end
       end
       Foo.new.bar
     ), 'file1.rb', 0)
-    library.merge src1
-    src2 = Solargraph::Source.load_string(%(
+      library.merge src1
+      src2 = Solargraph::Source.load_string(%(
       class Other
         foo = Foo.new
         foo.bar
       end
     ), 'file2.rb', 0)
-    library.merge src2
-    library.catalog
-    locs = library.references_from('file1.rb', 1, 12, strip: true)
-    expect(locs.length).to eq(3)
-    locs.each do |l|
-      code = library.read_text(l.filename)
-      o1 = Solargraph::Position.to_offset(code, l.range.start)
-      o2 = Solargraph::Position.to_offset(code, l.range.ending)
-      expect(code[o1..o2-1]).to eq('Foo')
+      library.merge src2
+      library.catalog
+      locs = library.references_from('file1.rb', 1, 12, strip: true)
+      expect(locs.length).to eq(3)
+      locs.each do |l|
+        code = library.read_text(l.filename)
+        o1 = Solargraph::Position.to_offset(code, l.range.start)
+        o2 = Solargraph::Position.to_offset(code, l.range.ending)
+        expect(code[o1..o2-1]).to eq('Foo')
+      end
     end
-  end
 
-  it 'rejects new references from different classes' do
-    workspace = Solargraph::Workspace.new('*')
-    library = Solargraph::Library.new(workspace)
-    source = Solargraph::Source.load_string(%(
+    it 'rejects new references from different classes' do
+      workspace = Solargraph::Workspace.new('*')
+      library = Solargraph::Library.new(workspace)
+      source = Solargraph::Source.load_string(%(
       class Foo
         def bar
         end
@@ -263,106 +326,131 @@ def bar
       Foo.new
       Array.new
     ), 'test.rb')
-    library.merge source
-    library.catalog
-    foo_new_locs = library.references_from('test.rb', 5, 10)
-    expect(foo_new_locs).to eq([Solargraph::Location.new('test.rb', Solargraph::Range.from_to(5, 10, 5, 13))])
-    obj_new_locs = library.references_from('test.rb', 6, 12)
-    expect(obj_new_locs).to eq([Solargraph::Location.new('test.rb', Solargraph::Range.from_to(6, 12, 6, 15))])
-  end
+      library.merge source
+      library.catalog
+      foo_new_locs = library.references_from('test.rb', 5, 10)
+      expect(foo_new_locs).to eq([Solargraph::Location.new('test.rb', Solargraph::Range.from_to(5, 10, 5, 13))])
+      obj_new_locs = library.references_from('test.rb', 6, 12)
+      expect(obj_new_locs).to eq([Solargraph::Location.new('test.rb', Solargraph::Range.from_to(6, 12, 6, 15))])
+    end
 
-  it "searches the core for queries" do
-    library = Solargraph::Library.new
-    result = library.search('String')
-    expect(result).not_to be_empty
-  end
+    it "searches the core for queries" do
+      library = Solargraph::Library.new
+      result = library.search('String')
+      expect(result).not_to be_empty
+    end
 
-  it "returns YARD documentation from the core" do
-    library = Solargraph::Library.new
-    api_map, result = library.document('String')
-    expect(result).not_to be_empty
-    expect(result.first).to be_a(Solargraph::Pin::Base)
-  end
+    it "returns YARD documentation from the core" do
+      library = Solargraph::Library.new
+      api_map, result = library.document('String')
+      expect(result).not_to be_empty
+      expect(result.first).to be_a(Solargraph::Pin::Base)
+    end
 
-  it "returns YARD documentation from sources" do
-    library = Solargraph::Library.new
-    src = Solargraph::Source.load_string(%(
+    it "returns YARD documentation from sources" do
+      library = Solargraph::Library.new
+      src = Solargraph::Source.load_string(%(
       class Foo
         # My bar method
         def bar; end
       end
     ), 'test.rb', 0)
-    library.attach src
-    api_map, result = library.document('Foo#bar')
-    expect(result).not_to be_empty
-    expect(result.first).to be_a(Solargraph::Pin::Base)
-  end
+      library.attach src
+      api_map, result = library.document('Foo#bar')
+      expect(result).not_to be_empty
+      expect(result.first).to be_a(Solargraph::Pin::Base)
+    end
 
-  it "synchronizes sources from updaters" do
-    library = Solargraph::Library.new
-    src = Solargraph::Source.load_string(%(
+    it "synchronizes sources from updaters" do
+      library = Solargraph::Library.new
+      src = Solargraph::Source.load_string(%(
       class Foo
       end
     ), 'test.rb', 1)
-    library.attach src
-    repl = %(
+      library.attach src
+      repl = %(
       class Foo
         def bar; end
       end
     )
-    updater = Solargraph::Source::Updater.new(
-      'test.rb',
-      2,
-      [Solargraph::Source::Change.new(nil, repl)]
-    )
-    library.attach src.synchronize(updater)
-    expect(library.current.code).to eq(repl)
-  end
+      updater = Solargraph::Source::Updater.new(
+        'test.rb',
+        2,
+        [Solargraph::Source::Change.new(nil, repl)]
+      )
+      library.attach src.synchronize(updater)
+      expect(library.current.code).to eq(repl)
+    end
 
-  it "finds unique references" do
-    library = Solargraph::Library.new(Solargraph::Workspace.new('*'))
-    src1 = Solargraph::Source.load_string(%(
+    it "finds unique references" do
+      library = Solargraph::Library.new(Solargraph::Workspace.new('*'))
+      src1 = Solargraph::Source.load_string(%(
       class Foo
       end
     ), 'src1.rb', 1)
-    library.merge src1
-    src2 = Solargraph::Source.load_string(%(
+      library.merge src1
+      src2 = Solargraph::Source.load_string(%(
       foo = Foo.new
     ), 'src2.rb', 1)
-    library.merge src2
-    library.catalog
-    refs = library.references_from('src2.rb', 1, 12)
-    expect(refs.length).to eq(2)
-  end
+      library.merge src2
+      library.catalog
+      refs = library.references_from('src2.rb', 1, 12)
+      expect(refs.length).to eq(2)
+    end
 
-  it "includes method parameters in references" do
-    library = Solargraph::Library.new(Solargraph::Workspace.new('*'))
-    source = Solargraph::Source.load_string(%(
+    it "includes method parameters in references" do
+      library = Solargraph::Library.new(Solargraph::Workspace.new('*'))
+      source = Solargraph::Source.load_string(%(
       class Foo
         def bar(baz)
           baz.upcase
         end
       end
     ), 'test.rb', 1)
-    library.attach source
-    from_def = library.references_from('test.rb', 2, 16)
-    expect(from_def.length).to eq(2)
-    from_ref = library.references_from('test.rb', 3, 10)
-    expect(from_ref.length).to eq(2)
-  end
+      library.attach source
+      from_def = library.references_from('test.rb', 2, 16)
+      expect(from_def.length).to eq(2)
+      from_ref = library.references_from('test.rb', 3, 10)
+      expect(from_ref.length).to eq(2)
+    end
 
-  it "includes block parameters in references" do
-    library = Solargraph::Library.new(Solargraph::Workspace.new('*'))
-    source = Solargraph::Source.load_string(%(
+    it "lies about names when client can't handle the truth" do
+      library = Solargraph::Library.new(Solargraph::Workspace.new('*'))
+      source = Solargraph::Source.load_string(%(
+      class Foo
+        def 🤦🏻foo♀️; 123; end
+      end
+    ), 'test.rb', 1)
+      library.attach source
+      from_def = library.references_from('test.rb', 2, 16, strip: true)
+      expect(from_def.first.range.start.column).to eq(14)
+    end
+
+    it "tells the truth about names when client can handle the truth" do
+      library = Solargraph::Library.new(Solargraph::Workspace.new('*'))
+      source = Solargraph::Source.load_string(%(
+      class Foo
+        def 🤦🏻foo♀️; 123; end
+      end
+    ), 'test.rb', 1)
+      library.attach source
+      from_def = library.references_from('test.rb', 2, 16, strip: false)
+      expect(from_def.first.range.start.column).to eq(12)
+    end
+
+    it "includes block parameters in references" do
+      library = Solargraph::Library.new(Solargraph::Workspace.new('*'))
+      source = Solargraph::Source.load_string(%(
       100.times do |foo|
         puts foo
       end
     ), 'test.rb', 1)
-    library.attach source
-    from_def = library.references_from('test.rb', 1, 20)
-    expect(from_def.length).to eq(2)
-    from_ref = library.references_from('test.rb', 2, 13)
-    expect(from_ref.length).to eq(2)
+      library.attach source
+      from_def = library.references_from('test.rb', 1, 20)
+      expect(from_def.length).to eq(2)
+      from_ref = library.references_from('test.rb', 2, 13)
+      expect(from_ref.length).to eq(2)
+    end
   end
 
   it 'defines YARD tags' do
diff --git a/spec/pin_cache_spec.rb b/spec/pin_cache_spec.rb
new file mode 100644
index 000000000..0a11686f5
--- /dev/null
+++ b/spec/pin_cache_spec.rb
@@ -0,0 +1,197 @@
+# frozen_string_literal: true
+
+require 'bundler'
+require 'benchmark'
+
+describe Solargraph::PinCache do
+  subject(:pin_cache) do
+    described_class.new(rbs_collection_path: '.gem_rbs_collection',
+                        rbs_collection_config_path: 'rbs_collection.yaml',
+                        directory: Dir.pwd,
+                        yard_plugins: ['activesupport-concern'])
+  end
+
+  describe '#cached?' do
+    it 'returns true for a gem that is cached' do
+      allow(File).to receive(:file?).with(%r{.*stdlib/backport.ser$}).and_return(false)
+      allow(File).to receive(:file?).with(%r{.*combined/.*/backport-.*.ser$}).and_return(true)
+
+      gemspec = Gem::Specification.find_by_name('backport')
+      expect(pin_cache.cached?(gemspec)).to be true
+    end
+
+    it 'returns false for a gem that is not cached' do
+      gemspec = Gem::Specification.new.tap do |spec|
+        spec.name = 'nonexistent'
+        spec.version = '0.0.1'
+      end
+      expect(pin_cache.cached?(gemspec)).to be false
+    end
+  end
+
+  describe '.core?' do
+    it 'returns true when core pins exist' do
+      allow(File).to receive(:file?).with(%r{.*/core.ser$}).and_return(true)
+
+      expect(described_class.core?).to be true
+    end
+
+    it "returns true when core pins don't" do
+      allow(File).to receive(:file?).with(%r{.*/core.ser$}).and_return(false)
+
+      expect(described_class.core?).to be false
+    end
+  end
+
+  describe '#possible_stdlibs' do
+    it 'is tolerant of less usual Ruby installations' do
+      stub_const('Gem::RUBYGEMS_DIR', nil)
+
+      expect(pin_cache.possible_stdlibs).to eq([])
+    end
+  end
+
+  describe '#cache_all_stdlibs' do
+    it 'creates stdlibmaps' do
+      allow(Solargraph::RbsMap::StdlibMap).to receive(:new).and_return(instance_double(Solargraph::RbsMap::StdlibMap))
+
+      pin_cache.cache_all_stdlibs
+
+      expect(Solargraph::RbsMap::StdlibMap).to have_received(:new).at_least(:once)
+    end
+  end
+
+  describe '#cache_gem' do
+    context 'with an already in-memory gem' do
+      let(:backport_gemspec) { Gem::Specification.find_by_name('backport') }
+
+      before do
+        pin_cache.cache_gem(gemspec: backport_gemspec, out: nil)
+      end
+
+      it 'does not load the gem again' do
+        allow(Marshal).to receive(:load).and_call_original
+
+        pin_cache.cache_gem(gemspec: backport_gemspec, out: nil)
+
+        expect(Marshal).not_to have_received(:load).with(anything)
+      end
+    end
+
+    context 'with the parser gem' do
+      before do
+        Solargraph::Shell.new.uncache('parser')
+        allow(Solargraph::Yardoc).to receive(:build_docs)
+      end
+
+      it 'chooses not to use YARD' do
+        parser_gemspec = Gem::Specification.find_by_name('parser')
+        pin_cache.cache_gem(gemspec: parser_gemspec, out: nil)
+        # if this fails, you may not have run `bundle exec rbs collection update`
+        expect(Solargraph::Yardoc).not_to have_received(:build_docs).with(any_args)
+      end
+    end
+
+    context 'with an installed gem' do
+      before do
+        Solargraph::Shell.new.gems('kramdown')
+      end
+
+      it 'uncaches when asked' do
+        gemspec = Gem::Specification.find_by_name('kramdown')
+        expect do
+          pin_cache.uncache_gem(gemspec, out: nil)
+        end.not_to raise_error
+      end
+    end
+
+    context 'with the rebuild flag' do
+      before do
+        allow(Solargraph::Yardoc).to receive(:build_docs)
+      end
+
+      it 'chooses not to use YARD' do
+        parser_gemspec = Gem::Specification.find_by_name('parser')
+        pin_cache.cache_gem(gemspec: parser_gemspec, rebuild: true, out: nil)
+        # if this fails, you may not have run `bundle exec rbs collection update`
+        expect(Solargraph::Yardoc).not_to have_received(:build_docs).with(any_args)
+      end
+    end
+
+    context 'with a stdlib gem' do
+      let(:gem_name) { 'logger' }
+
+      before do
+        Solargraph::Shell.new.uncache(gem_name)
+      end
+
+      it 'caches' do
+        yaml_gemspec = Gem::Specification.find_by_name(gem_name)
+        allow(File).to receive(:write).and_call_original
+
+        pin_cache.cache_gem(gemspec: yaml_gemspec, out: nil)
+
+        # match arguments with regexp using rspec-matchers syntax
+        expect(File).to have_received(:write).with(%r{combined/.*/logger-.*-stdlib.ser$}, any_args).once
+      end
+    end
+
+    context 'with gem packaged with its own RBS gem' do
+      let(:gem_name) { 'base64' }
+
+      before do
+        Solargraph::Shell.new.uncache(gem_name)
+      end
+
+      it 'caches' do
+        yaml_gemspec = Gem::Specification.find_by_name(gem_name)
+        allow(File).to receive(:write).and_call_original
+
+        pin_cache.cache_gem(gemspec: yaml_gemspec, out: nil)
+
+        # match arguments with regexp using rspec-matchers syntax
+        expect(File).to have_received(:write).with(%r{combined/.*/base64-.*-export.ser$}, any_args, mode: 'wb').once
+      end
+    end
+  end
+
+  describe '#uncache_gem' do
+    subject(:call) { pin_cache.uncache_gem(gemspec, out: out) }
+
+    let(:out) { StringIO.new }
+
+    before do
+      allow(FileUtils).to receive(:rm_rf)
+    end
+
+    context 'with an already cached gem' do
+      let(:gemspec) { Gem::Specification.find_by_name('backport') }
+
+      it 'deletes files' do
+        call
+
+        expect(FileUtils).to have_received(:rm_rf).at_least(:once)
+      end
+    end
+
+    context 'with a non-existent gem' do
+      let(:gemspec) { instance_double(Gem::Specification, name: 'nonexistent', version: '0.0.1') }
+
+      it 'does not raise an error' do
+        expect { call }.not_to raise_error
+      end
+
+      it 'logs a message' do
+        call
+
+        expect(out.string).to include('does not exist')
+      end
+
+      it 'does not delete files' do
+        call
+
+        expect(FileUtils).not_to have_received(:rm_rf)
+      end
+    end
+  end
+end
diff --git a/spec/rbs_map_spec.rb b/spec/rbs_map_spec.rb
index b06c975d1..f3ca90a36 100644
--- a/spec/rbs_map_spec.rb
+++ b/spec/rbs_map_spec.rb
@@ -3,7 +3,18 @@
     spec = Gem::Specification.find_by_name('rbs')
     rbs_map = Solargraph::RbsMap.from_gemspec(spec, nil, nil)
     pin = rbs_map.path_pin('RBS::EnvironmentLoader#add_collection')
-    expect(pin).to be
+    expect(pin).not_to be_nil
+  end
+
+  it 'fails if it does not find data from gemspec' do
+    spec = Gem::Specification.find_by_name('backport')
+    rbs_map = Solargraph::RbsMap.from_gemspec(spec, nil, nil)
+    expect(rbs_map).not_to be_resolved
+  end
+
+  it 'fails if it does not find data from name' do
+    rbs_map = Solargraph::RbsMap.new('lskdflaksdfjl')
+    expect(rbs_map.pins).to be_empty
   end
 
   it 'converts constants and aliases to correct types' do
diff --git a/spec/shell_spec.rb b/spec/shell_spec.rb
index 91f84b4c7..6e2a83074 100644
--- a/spec/shell_spec.rb
+++ b/spec/shell_spec.rb
@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 require 'tmpdir'
 require 'open3'
 
 describe Solargraph::Shell do
+  let(:shell) { described_class.new }
   let(:temp_dir) { Dir.mktmpdir }
 
   before do
@@ -25,20 +28,122 @@ 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
+        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('https://github.com/castwide/solargraph/pull/1061')
+
+        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
+        output = capture_both do
+          shell.gems('solargraph123')
+        end
+
+        expect(output).to include("Gem 'solargraph123' not found")
+      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('https://github.com/castwide/solargraph/pull/1061')
+
+        # capture stderr output
+        expect { call }.to output(/not found/).to_stderr
+      end
+    end
   end
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 00cc6c8c3..0a0c1dde4 100755
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -26,7 +26,9 @@
   c.example_status_persistence_file_path = 'rspec-examples.txt'
 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
@@ -43,3 +45,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/type_checker/levels/normal_spec.rb b/spec/type_checker/levels/normal_spec.rb
index 3b38f55d8..0b3024f62 100644
--- a/spec/type_checker/levels/normal_spec.rb
+++ b/spec/type_checker/levels/normal_spec.rb
@@ -1,5 +1,5 @@
 describe Solargraph::TypeChecker do
-  context 'normal level' do
+  context 'when checking at normal level' do
     def type_checker(code)
       Solargraph::TypeChecker.load_string(code, 'test.rb', :normal)
     end
@@ -221,9 +221,9 @@ def bar; end
       # @todo This test uses kramdown-parser-gfm because it's a gem dependency known to
       #   lack typed methods. A better test wouldn't depend on the state of
       #   vendored code.
+      workspace = Solargraph::Workspace.new(Dir.pwd)
       gemspec = Gem::Specification.find_by_name('kramdown-parser-gfm')
-      yard_pins = Solargraph::GemPins.build_yard_pins([], gemspec)
-      Solargraph::PinCache.serialize_yard_gem(gemspec, yard_pins)
+      workspace.cache_gem(gemspec)
 
       checker = type_checker(%(
         require 'kramdown-parser-gfm'
diff --git a/spec/yard_map/mapper_spec.rb b/spec/yard_map/mapper_spec.rb
index 6b00e5c33..3afa3a4ca 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) # rubocop:disable RSpec/InstanceVariable
+    doc_map.cache_doc_map_gems!(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,10 +58,7 @@
 
   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)
@@ -76,10 +66,7 @@
 
   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)
diff --git a/spec/yardoc_spec.rb b/spec/yardoc_spec.rb
new file mode 100644
index 000000000..2e821498e
--- /dev/null
+++ b/spec/yardoc_spec.rb
@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+require 'tmpdir'
+require 'open3'
+
+describe Solargraph::Yardoc do
+  around do |testobj|
+    @tmpdir = Dir.mktmpdir
+
+    testobj.run
+  ensure
+    FileUtils.remove_entry(@tmpdir) # rubocop:disable RSpec/InstanceVariable
+  end
+
+  let(:gem_yardoc_path) do
+    File.join(@tmpdir, 'solargraph', 'yardoc', 'test_gem') # rubocop:disable RSpec/InstanceVariable
+  end
+
+  before do
+    FileUtils.mkdir_p(gem_yardoc_path)
+  end
+
+  describe '#processing?' do
+    it 'returns true if the yardoc is being processed' do
+      FileUtils.touch(File.join(gem_yardoc_path, 'processing'))
+      expect(described_class.processing?(gem_yardoc_path)).to be(true)
+    end
+
+    it 'returns false if the yardoc is not being processed' do
+      expect(described_class.processing?(gem_yardoc_path)).to be(false)
+    end
+  end
+
+  describe '#load!' do
+    it 'does not blow up when called on empty directory' do
+      expect { described_class.load!(gem_yardoc_path) }.not_to raise_error
+    end
+  end
+
+  describe '#build_docs' do
+    let(:workspace) { Solargraph::Workspace.new(Dir.pwd) }
+    let(:gemspec) { workspace.find_gem('rubocop') }
+    let(:output) { '' }
+
+    before do
+      allow(Solargraph.logger).to receive(:warn)
+      allow(Solargraph.logger).to receive(:info)
+      FileUtils.rm_rf(gem_yardoc_path)
+    end
+
+    it 'builds docs for a gem' do
+      described_class.build_docs(gem_yardoc_path, [], gemspec)
+      expect(File.exist?(File.join(gem_yardoc_path, 'complete'))).to be true
+    end
+
+    it 'bails quietly if directory given does not exist' do
+      allow(File).to receive(:exist?).and_return(false)
+
+      expect do
+        described_class.build_docs(gem_yardoc_path, [], gemspec)
+      end.not_to raise_error
+    end
+
+    it 'is idempotent' do
+      described_class.build_docs(gem_yardoc_path, [], gemspec)
+      described_class.build_docs(gem_yardoc_path, [], gemspec) # second time
+      expect(File.exist?(File.join(gem_yardoc_path, 'complete'))).to be true
+    end
+
+    context 'with an error from yard' do
+      before do
+        allow(Open3).to receive(:capture2e).and_return([output, result])
+      end
+
+      let(:result) { instance_double(Process::Status) }
+
+      it 'does not raise on error from yard' do
+        allow(result).to receive(:success?).and_return(false)
+
+        expect do
+          described_class.build_docs(gem_yardoc_path, [], gemspec)
+        end.not_to raise_error
+      end
+    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.build_docs(gem_yardoc_path, [], gemspec)
+
+        expect(called_with[0]['BUNDLE_GEMFILE']).to start_with('/')
+      end
+    end
+  end
+end

From c7b66cf1ae782dda517f6d262551772b4b19af76 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 3 Sep 2025 20:47:37 -0400
Subject: [PATCH 105/327] Exclude more scenarios that RBS does not support

---
 .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 7b2255b0e..4038be21a 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 dev 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 eb676b70da386a704f0b8cc7b09a5a26e67787d1 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 3 Sep 2025 20:49:09 -0400
Subject: [PATCH 106/327] 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 4038be21a..4846551ea 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 8ea210411fce0b2fcb8cf4d0b392a98454a2baad Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 3 Sep 2025 23:02:00 -0400
Subject: [PATCH 107/327] Adjust comment location

---
 .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 4846551ea..0c83e8434 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -23,8 +23,8 @@ 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'

From 2b3152e32da43a8fafe3b6435ba6e1035d5a06a8 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 3 Sep 2025 23:03:04 -0400
Subject: [PATCH 108/327] Ensure using latest RBS version in undercover

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

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index 0c83e8434..6fe05a9b9 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -74,7 +74,9 @@ jobs:
         ruby-version: '3.4'
         bundler-cache: false
     - name: Install gems
-      run: bundle install
+      run: |
+        bundle install
+        bundle update rbs # use latest available for this Ruby version
     - name: Install types
       run: bundle exec rbs collection update
     - name: Run tests

From b10cdd19a1936c13b504540cda4ce527b4faf0c4 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 4 Sep 2025 08:36:01 -0400
Subject: [PATCH 109/327] Drop broken 'namespaces' method

These unused methods call into ApiMap::Index#namespaces, which does
not exist.
---
 lib/solargraph/api_map.rb       | 7 -------
 lib/solargraph/api_map/store.rb | 5 -----
 2 files changed, 12 deletions(-)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index f58633a0c..c44ceea93 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -236,13 +236,6 @@ def keyword_pins
       store.pins_by_class(Pin::Keyword)
     end
 
-    # An array of namespace names defined in the ApiMap.
-    #
-    # @return [Set<String>]
-    def namespaces
-      store.namespaces
-    end
-
     # True if the namespace exists.
     #
     # @param name [String] The namespace to match
diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index f3e2ed278..a4148f867 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -142,11 +142,6 @@ def namespace_exists?(fqns)
         fqns_pins(fqns).any?
       end
 
-      # @return [Set<String>]
-      def namespaces
-        index.namespaces
-      end
-
       # @return [Enumerable<Solargraph::Pin::Namespace>]
       def namespace_pins
         pins_by_class(Solargraph::Pin::Namespace)

From 1b644b48452e7875233765bc0f2c40361cf84308 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 4 Sep 2025 09:09:19 -0400
Subject: [PATCH 110/327] Add regression specs

---
 spec/api_map/index_spec.rb | 64 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 spec/api_map/index_spec.rb

diff --git a/spec/api_map/index_spec.rb b/spec/api_map/index_spec.rb
new file mode 100644
index 000000000..8afb74759
--- /dev/null
+++ b/spec/api_map/index_spec.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+describe Solargraph::ApiMap::Index do
+  subject(:output_pins) { described_class.new(input_pins).pins }
+
+  describe '#map_overrides' do
+    let(:foo_class) do
+      Solargraph::Pin::Namespace.new(name: 'Foo')
+    end
+
+    let(:foo_initialize) do
+      init = Solargraph::Pin::Method.new(name: 'initialize',
+                                         scope: :instance,
+                                         parameters: [],
+                                         closure: foo_class)
+      # no return type specified
+      param = Solargraph::Pin::Parameter.new(name: 'bar',
+                                             closure: init)
+      init.parameters << param
+      init
+    end
+
+    let(:foo_new) do
+      init = Solargraph::Pin::Method.new(name: 'new',
+                                         scope: :class,
+                                         parameters: [],
+                                         closure: foo_class)
+      # no return type specified
+      param = Solargraph::Pin::Parameter.new(name: 'bar',
+                                             closure: init)
+      init.parameters << param
+      init
+    end
+
+    let(:foo_override) do
+      Solargraph::Pin::Reference::Override.from_comment('Foo#initialize',
+                                                        '@param [String] bar')
+    end
+
+    let(:input_pins) do
+      [
+        foo_initialize,
+        foo_new,
+        foo_override
+      ]
+    end
+
+    it 'has a docstring to process on override' do
+      expect(foo_override.docstring.tags).to be_empty
+    end
+
+    it 'overrides .new method' do
+      method_pin = output_pins.find { |pin| pin.path == 'Foo.new' }
+      first_parameter = method_pin.parameters.first
+      expect(first_parameter.return_type.tag).to eq('String')
+    end
+
+    it 'overrides #initialize method in signature' do
+      method_pin = output_pins.find { |pin| pin.path == 'Foo#initialize' }
+      first_parameter = method_pin.parameters.first
+      expect(first_parameter.return_type.tag).to eq('String')
+    end
+  end
+end

From aafaa5d867458d3bb2895387cfc80d067ccd50ad Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 4 Sep 2025 10:49:29 -0400
Subject: [PATCH 111/327] Ensure overrides are handled properly regardless of
 state of pin

---
 lib/solargraph/api_map/index.rb | 12 +++++++-----
 lib/solargraph/pin/callable.rb  |  5 +++++
 lib/solargraph/pin/parameter.rb |  5 +++++
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/lib/solargraph/api_map/index.rb b/lib/solargraph/api_map/index.rb
index a5870ff50..8234e4718 100644
--- a/lib/solargraph/api_map/index.rb
+++ b/lib/solargraph/api_map/index.rb
@@ -169,10 +169,13 @@ def map_overrides
             ovr.tags.each do |tag|
               pin.docstring.add_tag(tag)
               redefine_return_type pin, tag
-              if new_pin
-                new_pin.docstring.add_tag(tag)
-                redefine_return_type new_pin, tag
-              end
+              pin.reset_generated!
+
+              next unless new_pin
+
+              new_pin.docstring.add_tag(tag)
+              redefine_return_type new_pin, tag
+              new_pin.reset_generated!
             end
           end
         end
@@ -189,7 +192,6 @@ def redefine_return_type pin, tag
         pin.signatures.each do |sig|
           sig.instance_variable_set(:@return_type, ComplexType.try_parse(tag.type))
         end
-        pin.reset_generated!
       end
     end
   end
diff --git a/lib/solargraph/pin/callable.rb b/lib/solargraph/pin/callable.rb
index 504dd4862..7d9fd69be 100644
--- a/lib/solargraph/pin/callable.rb
+++ b/lib/solargraph/pin/callable.rb
@@ -205,6 +205,11 @@ def arity_matches? arguments, with_block
         true
       end
 
+      def reset_generated!
+        super
+        @parameters.each(&:reset_generated!)
+      end
+
       # @return [Integer]
       def mandatory_positional_param_count
         parameters.count(&:arg?)
diff --git a/lib/solargraph/pin/parameter.rb b/lib/solargraph/pin/parameter.rb
index 512ee0ead..9f58ec067 100644
--- a/lib/solargraph/pin/parameter.rb
+++ b/lib/solargraph/pin/parameter.rb
@@ -123,6 +123,11 @@ def full_name
         end
       end
 
+      def reset_generated!
+        super
+        @return_type = nil if @return_type&.undefined?
+      end
+
       # @return [String]
       def full
         full_name + case decl

From e2ba56923e5e4e26d997a89447cf8fdd8c6433e8 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 4 Sep 2025 11:03:01 -0400
Subject: [PATCH 112/327] Lint fixes

---
 spec/yard_map/mapper_spec.rb | 2 +-
 spec/yardoc_spec.rb          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/yard_map/mapper_spec.rb b/spec/yard_map/mapper_spec.rb
index 3afa3a4ca..770d9e9ef 100644
--- a/spec/yard_map/mapper_spec.rb
+++ b/spec/yard_map/mapper_spec.rb
@@ -4,7 +4,7 @@
   end
 
   def pins_with require
-    doc_map = Solargraph::DocMap.new([require], [], @api_map.workspace, out: nil) # rubocop:disable RSpec/InstanceVariable
+    doc_map = Solargraph::DocMap.new([require], [], @api_map.workspace, out: nil)
     doc_map.cache_doc_map_gems!(nil)
     doc_map.pins
   end
diff --git a/spec/yardoc_spec.rb b/spec/yardoc_spec.rb
index 2e821498e..6e7171afe 100644
--- a/spec/yardoc_spec.rb
+++ b/spec/yardoc_spec.rb
@@ -9,11 +9,11 @@
 
     testobj.run
   ensure
-    FileUtils.remove_entry(@tmpdir) # rubocop:disable RSpec/InstanceVariable
+    FileUtils.remove_entry(@tmpdir)
   end
 
   let(:gem_yardoc_path) do
-    File.join(@tmpdir, 'solargraph', 'yardoc', 'test_gem') # rubocop:disable RSpec/InstanceVariable
+    File.join(@tmpdir, 'solargraph', 'yardoc', 'test_gem')
   end
 
   before do

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 113/327] 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 114/327] 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 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 115/327] 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 116/327] 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 117/327] 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 118/327] 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 119/327] 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 120/327] 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 121/327] 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 122/327] 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 41f098b9245c194b5367d0e521fd595082118ee6 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 6 Sep 2025 14:41:54 -0400
Subject: [PATCH 123/327] Rebuild rubocop todo file

---
 .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 7edc8691344bec6ca09fe1b8a4cce69df3cb0113 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 6 Sep 2025 22:04:57 -0400
Subject: [PATCH 124/327] Reodo rubocop todo

---
 .rubocop_todo.yml | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index c55a29039..c2fe01517 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -223,11 +223,6 @@ Layout/SpaceAfterComma:
 Layout/SpaceAroundEqualsInParameterDefault:
   Enabled: false
 
-# This cop supports safe autocorrection (--autocorrect).
-Layout/SpaceAroundKeyword:
-  Exclude:
-    - 'spec/rbs_map/conversions_spec.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator, EnforcedStyleForRationalLiterals.
 # SupportedStylesForExponentOperator: space, no_space
@@ -643,7 +638,6 @@ RSpec/ExampleWording:
 # This cop supports safe autocorrection (--autocorrect).
 RSpec/ExcessiveDocstringSpacing:
   Exclude:
-    - 'spec/rbs_map/conversions_spec.rb'
     - 'spec/source/chain/call_spec.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
@@ -659,21 +653,10 @@ RSpec/ExpectActual:
 RSpec/HookArgument:
   Enabled: false
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: .
-# SupportedStyles: is_expected, should
-RSpec/ImplicitExpect:
-  EnforcedStyle: should
-
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Enabled: false
 
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/LeadingSubject:
-  Exclude:
-    - 'spec/rbs_map/conversions_spec.rb'
-
 RSpec/LeakyConstantDeclaration:
   Exclude:
     - 'spec/complex_type_spec.rb'
@@ -974,7 +957,6 @@ Style/MapIntoArray:
   Exclude:
     - 'lib/solargraph/diagnostics/update_errors.rb'
     - 'lib/solargraph/parser/parser_gem/node_chainer.rb'
-    - 'lib/solargraph/type_checker/param_def.rb'
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/MapToHash:
@@ -1048,7 +1030,6 @@ Style/Next:
     - 'lib/solargraph/parser/parser_gem/node_processors/send_node.rb'
     - 'lib/solargraph/pin/signature.rb'
     - 'lib/solargraph/source_map/clip.rb'
-    - 'lib/solargraph/type_checker/checks.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Strict, AllowedNumbers, AllowedPatterns.
@@ -1295,10 +1276,7 @@ YARD/MismatchName:
   Enabled: false
 
 YARD/TagTypeSyntax:
-  Exclude:
-    - 'lib/solargraph/language_server/host.rb'
-    - 'lib/solargraph/parser/comment_ripper.rb'
-    - 'lib/solargraph/type_checker.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.

From 86965f26b813efdd98f87a22cc90faef4871a968 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 6 Sep 2025 22:15:50 -0400
Subject: [PATCH 125/327] Fix merge

---
 lib/solargraph/api_map/store.rb  | 2 +-
 spec/rbs_map/conversions_spec.rb | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index e12431c94..e3972415c 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -297,7 +297,7 @@ def include_reference_pins
         index.include_reference_pins
       end
 
-      # @return [Hash{String => Array<Pin::Reference::Prepend>}]
+      # @return [Hash{String => Array<String>}]
       def prepend_references
         index.prepend_references
       end
diff --git a/spec/rbs_map/conversions_spec.rb b/spec/rbs_map/conversions_spec.rb
index ea7d3df02..30f784673 100644
--- a/spec/rbs_map/conversions_spec.rb
+++ b/spec/rbs_map/conversions_spec.rb
@@ -135,7 +135,6 @@ class C < ::B::C
           param.name == 'chdir'
         end
         expect(chdir_param).not_to be_nil, -> { "Found pin #{method_pin.to_rbs} from #{method_pin.type_location}" }
->>>>>>> origin/master
       end
     end
   end

From 557edd0574bc2a1dbc0f87937f64e7a019c4a4bc Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 6 Sep 2025 23:04:04 -0400
Subject: [PATCH 126/327] Fix merge

---
 spec/rbs_map/conversions_spec.rb | 51 ++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/spec/rbs_map/conversions_spec.rb b/spec/rbs_map/conversions_spec.rb
index 30f784673..7eac07209 100644
--- a/spec/rbs_map/conversions_spec.rb
+++ b/spec/rbs_map/conversions_spec.rb
@@ -25,6 +25,33 @@
 
     attr_reader :temp_dir
 
+
+    context 'with overlapping module hierarchies and inheritance' do
+      let(:rbs) do
+        <<~RBS
+          module B
+            class C
+              def foo: () -> String
+            end
+          end
+          module A
+            module B
+              class C < ::B::C
+              end
+            end
+          end
+        RBS
+      end
+
+      subject(:method_pin) { api_map.get_method_stack('A::B::C', 'foo').first }
+
+      before do
+        api_map.index conversions.pins
+      end
+
+      it { should be_a(Solargraph::Pin::Method) }
+    end
+
     context 'with untyped response' do
       let(:rbs) do
         <<~RBS
@@ -51,7 +78,7 @@ def bar: () -> untyped
       @api_map = Solargraph::ApiMap.load_with_cache('.')
     end
 
-    let(:api_map) { @api_map } # rubocop:disable RSpec/InstanceVariable
+    let(:api_map) { @api_map }
 
     context 'with superclass pin for Parser::AST::Node' do
       let(:superclass_pin) do
@@ -97,28 +124,6 @@ class Sub < Hash[Symbol, untyped]
                  .uniq).to eq(['Symbol'])
       end
     end
-
-    context 'with overlapping module hierarchies and inheritance' do
-      let(:rbs) do
-        <<~RBS
-          module B
-            class C
-              def foo: () -> String
-            end
-          end
-          module A
-            module B
-              class C < ::B::C
-              end
-            end
-          end
-        RBS
-      end
-
-      subject(:method_pin) { api_map.get_method_stack('A::B::C', 'foo').first }
-
-      it { should be_a(Solargraph::Pin::Method) }
-    end
   end
 
   if Gem::Version.new(RBS::VERSION) >= Gem::Version.new('3.9.1')

From 9628ef4be67f0ff5b3769760156bacd4673c83c7 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 6 Sep 2025 23:09:23 -0400
Subject: [PATCH 127/327] Clean up spec

---
 spec/rbs_map/conversions_spec.rb | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/spec/rbs_map/conversions_spec.rb b/spec/rbs_map/conversions_spec.rb
index 7eac07209..e964e69f2 100644
--- a/spec/rbs_map/conversions_spec.rb
+++ b/spec/rbs_map/conversions_spec.rb
@@ -25,8 +25,9 @@
 
     attr_reader :temp_dir
 
-
     context 'with overlapping module hierarchies and inheritance' do
+      subject(:method_pin) { api_map.get_method_stack('A::B::C', 'foo').first }
+
       let(:rbs) do
         <<~RBS
           module B
@@ -43,16 +44,16 @@ class C < ::B::C
         RBS
       end
 
-      subject(:method_pin) { api_map.get_method_stack('A::B::C', 'foo').first }
-
       before do
         api_map.index conversions.pins
       end
 
-      it { should be_a(Solargraph::Pin::Method) }
+      it { is_expected.to be_a(Solargraph::Pin::Method) }
     end
 
     context 'with untyped response' do
+      subject(:method_pin) { conversions.pins.find { |pin| pin.path == 'Foo#bar' } }
+
       let(:rbs) do
         <<~RBS
           class Foo
@@ -61,13 +62,11 @@ def bar: () -> untyped
         RBS
       end
 
-      subject(:method_pin) { conversions.pins.find { |pin| pin.path == 'Foo#bar' } }
-
-      it { should_not be_nil }
+      it { is_expected.not_to be_nil }
 
-      it { should be_a(Solargraph::Pin::Method) }
+      it { is_expected.to be_a(Solargraph::Pin::Method) }
 
-      it 'maps untyped in RBS to undefined in Solargraph 'do
+      it 'maps untyped in RBS to undefined in Solargraph' do
         expect(method_pin.return_type.tag).to eq('undefined')
       end
     end

From 4bfee71fce385524654c955d1a22988ffea25189 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 6 Sep 2025 23:15:18 -0400
Subject: [PATCH 128/327] Add @type annotation

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

diff --git a/lib/solargraph/type_checker.rb b/lib/solargraph/type_checker.rb
index 0b43c44fe..c315a407f 100644
--- a/lib/solargraph/type_checker.rb
+++ b/lib/solargraph/type_checker.rb
@@ -481,6 +481,7 @@ def kwarg_problems_for sig, argchain, api_map, block_pin, locals, location, pin,
           else
             ptype = data[:qualified]
             unless ptype.undefined?
+              # @type [ComplexType]
               argtype = argchain.infer(api_map, block_pin, locals)
               if argtype.defined? && ptype && !arg_conforms_to?(argtype, ptype)
                 result.push Problem.new(location, "Wrong argument type for #{pin.path}: #{par.name} expected #{ptype}, received #{argtype}")

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 129/327] 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 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 130/327] 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 131/327] 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 132/327] 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 133/327] 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 134/327] 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 135/327] 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 136/327] 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 137/327] 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 6433c25e15002a3ebc10f4aa7bda21c0fc87645d Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 18:32:29 -0400
Subject: [PATCH 138/327] Update rubocop todo

---
 .rubocop_todo.yml | 11 -----------
 1 file changed, 11 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:

From 32fc77e303b7cb4097d8a331957d1a79440a200a Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 18:33:02 -0400
Subject: [PATCH 139/327] linting fix

---
 spec/convention_spec.rb | 2 --
 1 file changed, 2 deletions(-)

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 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 140/327] 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 217fecdcf8bf20402c78348a86aa9f4c083c1a6d Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 18:40:51 -0400
Subject: [PATCH 141/327] 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 3965777d9..1b3783d86 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -279,7 +279,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.
@@ -337,11 +336,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
@@ -609,11 +603,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 2d2f0a77d8d17b9dabeee2a65f3ed636e528437b Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 17:14:22 -0400
Subject: [PATCH 142/327] 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 3db4b1f3b049338fea2f871724c2b6a7d5de7277 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 17:25:05 -0400
Subject: [PATCH 143/327] 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 faa64283a3e63ec203d94a8d76ff1de3b14bcd1f Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 17:44:39 -0400
Subject: [PATCH 144/327] 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 3f68a02944a1bd249a3ea6d2c5964dd0f467c798 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 17:45:56 -0400
Subject: [PATCH 145/327] 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 b8c16054ec9be28fb3143113bd58424af82acdd6 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 17:58:16 -0400
Subject: [PATCH 146/327] 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 d3a0c36a5ca735759a050e1ccc5114832e01ba36 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 18:09:04 -0400
Subject: [PATCH 147/327] 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 410372e83ac2c576b98e7ab24fe76401daeef402 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 4 Sep 2025 08:36:01 -0400
Subject: [PATCH 148/327] Drop broken 'namespaces' method

These unused methods call into ApiMap::Index#namespaces, which does
not exist.
---
 lib/solargraph/api_map.rb       | 7 -------
 lib/solargraph/api_map/store.rb | 5 -----
 2 files changed, 12 deletions(-)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index b85fa8a0b..1f3459d96 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -237,13 +237,6 @@ def keyword_pins
       store.pins_by_class(Pin::Keyword)
     end
 
-    # An array of namespace names defined in the ApiMap.
-    #
-    # @return [Set<String>]
-    def namespaces
-      store.namespaces
-    end
-
     # True if the namespace exists.
     #
     # @param name [String] The namespace to match
diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index eec3a50ac..d240752de 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -147,11 +147,6 @@ def namespace_exists?(fqns)
         fqns_pins(fqns).any?
       end
 
-      # @return [Set<String>]
-      def namespaces
-        index.namespaces
-      end
-
       # @return [Enumerable<Solargraph::Pin::Namespace>]
       def namespace_pins
         pins_by_class(Solargraph::Pin::Namespace)

From 29e019320bba5655eca7bb48703534e7fca00800 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 21:30:02 -0400
Subject: [PATCH 149/327] Merge branch 'rubocop_stability' into
 cache_uncache_gem

---
 lib/solargraph/api_map.rb       | 7 +++++++
 lib/solargraph/api_map/store.rb | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 1f3459d96..b85fa8a0b 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -237,6 +237,13 @@ def keyword_pins
       store.pins_by_class(Pin::Keyword)
     end
 
+    # An array of namespace names defined in the ApiMap.
+    #
+    # @return [Set<String>]
+    def namespaces
+      store.namespaces
+    end
+
     # True if the namespace exists.
     #
     # @param name [String] The namespace to match
diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index d240752de..eec3a50ac 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -147,6 +147,11 @@ def namespace_exists?(fqns)
         fqns_pins(fqns).any?
       end
 
+      # @return [Set<String>]
+      def namespaces
+        index.namespaces
+      end
+
       # @return [Enumerable<Solargraph::Pin::Namespace>]
       def namespace_pins
         pins_by_class(Solargraph::Pin::Namespace)

From 19daea07e175663fca84b3609158cd681421d4fa Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Wed, 3 Sep 2025 13:21:16 -0400
Subject: [PATCH 150/327] ApiMap::Constants

---
 lib/solargraph/api_map.rb           | 125 ++----------------
 lib/solargraph/api_map/constants.rb | 192 ++++++++++++++++++++++++++++
 lib/solargraph/api_map/store.rb     |   6 +
 spec/api_map_spec.rb                |   9 +-
 4 files changed, 213 insertions(+), 119 deletions(-)
 create mode 100644 lib/solargraph/api_map/constants.rb

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 02f8f68ea..eafde292d 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -13,6 +13,7 @@ class ApiMap
     autoload :SourceToYard,   'solargraph/api_map/source_to_yard'
     autoload :Store,          'solargraph/api_map/store'
     autoload :Index,          'solargraph/api_map/index'
+    autoload :Constants,      'solargraph/api_map/constants'
 
     # @return [Array<String>]
     attr_reader :unresolved_requires
@@ -261,19 +262,13 @@ def namespace_exists? name, context = ''
     # @return [Array<Solargraph::Pin::Base>]
     def get_constants namespace, *contexts
       namespace ||= ''
-      contexts.push '' if contexts.empty?
-      cached = cache.get_constants(namespace, contexts)
-      return cached.clone unless cached.nil?
-      skip = Set.new
-      result = []
-      contexts.each do |context|
-        fqns = qualify(namespace, context)
-        visibility = [:public]
-        visibility.push :private if fqns == context
-        result.concat inner_get_constants(fqns, visibility, skip)
-      end
-      cache.set_constants(namespace, contexts, result)
-      result
+      gates = contexts.clone
+      gates.push '' if contexts.empty? && namespace.empty?
+      gates.push namespace unless namespace.empty?
+      store.constants
+           .collect(gates)
+           .select { |pin| namespace.empty? || contexts.empty? || pin.namespace == namespace }
+           .select { |pin| pin.visibility == :public || pin.namespace == namespace }
     end
 
     # @param namespace [String]
@@ -299,44 +294,7 @@ def get_namespace_pins namespace, context
     #   Should not be prefixed with '::'.
     # @return [String, nil] fully qualified tag
     def qualify tag, context_tag = ''
-      return tag if ['Boolean', 'self', nil].include?(tag)
-
-      context_type = ComplexType.try_parse(context_tag).force_rooted
-      return unless context_type
-
-      type = ComplexType.try_parse(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
-
-      fqns + type.substring
-    end
-
-    # Determine fully qualified namespace for a given namespace used
-    # inside the definition of another tag ("context"). This method
-    # will start the search in the specified context until it finds a
-    # match for the namespace.
-    #
-    # @param namespace [String, nil] The namespace to
-    #   match
-    # @param context_namespace [String] The context namespace in which the
-    #   tag was referenced; start from here to resolve the name
-    # @return [String, nil] fully qualified namespace
-    def qualify_namespace(namespace, context_namespace = '')
-      cached = cache.get_qualified_namespace(namespace, context_namespace)
-      return cached.clone unless cached.nil?
-      result = if namespace.start_with?('::')
-                 inner_qualify(namespace[2..-1], '', Set.new)
-               else
-                 inner_qualify(namespace, context_namespace, Set.new)
-               end
-      cache.set_qualified_namespace(namespace, context_namespace, result)
-      result
+      store.constants.qualify(tag, context_tag)
     end
 
     # @param fqns [String]
@@ -828,30 +786,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>]
-    # @param skip [Set<String>]
-    # @return [Array<Pin::Base>]
-    def inner_get_constants fqns, visibility, skip
-      return [] if fqns.nil? || skip.include?(fqns)
-      skip.add fqns
-      result = []
-      store.get_prepends(fqns).each do |is|
-        result.concat inner_get_constants(qualify(is, fqns), [:public], skip)
-      end
-      result.concat store.get_constants(fqns, visibility)
-                    .sort { |a, b| a.name <=> b.name }
-      store.get_includes(fqns).each do |is|
-        result.concat inner_get_constants(qualify(is, fqns), [:public], skip)
-      end
-      fqsc = qualify_superclass(fqns)
-      unless %w[Object BasicObject].include?(fqsc)
-        result.concat inner_get_constants(fqsc, [:public], skip)
-      end
-      result
-    end
 
     # @return [Hash]
     def path_macros
@@ -880,47 +814,6 @@ def qualify_superclass fq_sub_tag
       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
-    # @return [String, nil] Fully qualified ("rooted") namespace
-    def inner_qualify name, root, skip
-      return name if name == ComplexType::GENERIC_TAG_NAME
-      return nil if name.nil?
-      return nil if skip.include?(root)
-      skip.add root
-      possibles = []
-      if name == ''
-        if root == ''
-          return ''
-        else
-          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('::'))
-          incs.each do |inc|
-            foundinc = inner_qualify(name, inc, skip)
-            possibles.push foundinc unless foundinc.nil?
-          end
-          roots.pop
-        end
-        if possibles.empty?
-          incs = store.get_includes('')
-          incs.each do |inc|
-            foundinc = inner_qualify(name, inc, skip)
-            possibles.push foundinc unless foundinc.nil?
-          end
-        end
-        return name if store.namespace_exists?(name)
-        return possibles.last
-      end
-    end
-
     # Get the namespace's type (Class or Module).
     #
     # @param fqns [String] A fully qualified namespace
diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
new file mode 100644
index 000000000..5656cb475
--- /dev/null
+++ b/lib/solargraph/api_map/constants.rb
@@ -0,0 +1,192 @@
+# frozen_string_literal: true
+
+module Solargraph
+  class ApiMap
+    # Methods for handling constants.
+    #
+    class Constants
+      # @param store [Store]
+      def initialize(store)
+        @store = store
+      end
+
+      # @param name [String]
+      # @param gates [Array<Array<String>, String>]
+      # @return [String]
+      def resolve(name, *gates)
+        flat = gates.flatten
+        flat.push '' if flat.empty?
+        cached_resolve[[name, flat]] || resolve_and_cache(name, flat)
+      end
+
+      # @param gates [Array<Array<String>, String>]
+      # @return [Array<Pin::Base>]
+      def collect(*gates)
+        flat = gates.flatten
+        cached_collect[flat] || collect_and_cache(flat)
+      end
+
+      # Determine fully qualified tag for a given tag used inside the
+      # definition of another tag ("context"). This method will start
+      # the search in the specified context until it finds a match for
+      # the tag.
+      #
+      # Does not recurse into qualifying the type parameters, but
+      # returns any which were passed in unchanged.
+      #
+      # @param tag [String, nil] The namespace to
+      #   match, complete with generic parameters set to appropriate
+      #   values if available
+      # @param context_tag [String] The fully qualified context in which
+      #   the tag was referenced; start from here to resolve the name.
+      #   Should not be prefixed with '::'.
+      # @return [String, nil] fully qualified tag
+      def qualify tag, context_tag = ''
+        return tag if ['Boolean', 'self', nil].include?(tag)
+
+        context_type = ComplexType.try_parse(context_tag).force_rooted
+        return unless context_type
+
+        type = ComplexType.try_parse(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
+
+        fqns + type.substring
+      end
+
+      private
+
+      # @return [Store]
+      attr_reader :store
+
+      # @param name [String]
+      # @param gates [Array<String>]
+      # @return [String]
+      def resolve_and_cache name, gates
+
+      end
+
+      # @param gates [Array<String>]
+      # @return [Array<Pin::Base>]
+      def collect_and_cache gates
+        skip = Set.new
+        cached_collect[gates] = gates.flat_map do |gate|
+          inner_get_constants(gate, [:public, :private], skip)
+        end
+      end
+
+      def cached_resolve
+        @cached_resolve ||= {}
+      end
+
+      def cached_collect
+        @cached_collect ||= {}
+      end
+
+      # Determine fully qualified namespace for a given namespace used
+      # inside the definition of another tag ("context"). This method
+      # will start the search in the specified context until it finds a
+      # match for the namespace.
+      #
+      # @param namespace [String, nil] The namespace to
+      #   match
+      # @param context_namespace [String] The context namespace in which the
+      #   tag was referenced; start from here to resolve the name
+      # @return [String, nil] fully qualified namespace
+      def qualify_namespace(namespace, context_namespace = '')
+        if namespace.start_with?('::')
+          inner_qualify(namespace[2..-1], '', Set.new)
+        else
+          inner_qualify(namespace, context_namespace, Set.new)
+        end
+      end
+
+      # @param name [String] Namespace to fully qualify
+      # @param root [String] The context to search
+      # @param skip [Set<String>] Contexts already searched
+      # @return [String, nil] Fully qualified ("rooted") namespace
+      def inner_qualify name, root, skip
+        return name if name == ComplexType::GENERIC_TAG_NAME
+        return nil if name.nil?
+        return nil if skip.include?(root)
+        skip.add root
+        possibles = []
+        if name == ''
+          if root == ''
+            return ''
+          else
+            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('::'))
+            incs.each do |inc|
+              foundinc = inner_qualify(name, inc, skip)
+              possibles.push foundinc unless foundinc.nil?
+            end
+            roots.pop
+          end
+          if possibles.empty?
+            incs = store.get_includes('')
+            incs.each do |inc|
+              foundinc = inner_qualify(name, inc, skip)
+              possibles.push foundinc unless foundinc.nil?
+            end
+          end
+          return name if store.namespace_exists?(name)
+          return possibles.last
+        end
+      end
+
+      # @param fqns [String]
+      # @param visibility [Array<Symbol>]
+      # @param skip [Set<String>]
+      # @return [Array<Pin::Base>]
+      def inner_get_constants fqns, visibility, skip
+        return [] if fqns.nil? || skip.include?(fqns)
+        skip.add fqns
+        return cached_collect[[fqns]] if cached_collect.key?([fqns])
+        result = []
+
+        store.get_prepends(fqns).each do |is|
+          result.concat inner_get_constants(qualify(is, fqns), [:public], skip)
+        end
+        result.concat store.get_constants(fqns, visibility)
+                      .sort { |a, b| a.name <=> b.name }
+        store.get_includes(fqns).each do |is|
+          result.concat inner_get_constants(qualify(is, fqns), [:public], skip)
+        end
+        fqsc = qualify_superclass(fqns)
+        unless %w[Object BasicObject].include?(fqsc)
+          result.concat inner_get_constants(fqsc, [:public], skip)
+        end
+        cached_collect[[fqns]] = result
+      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
+    end
+  end
+end
diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index eec3a50ac..bf48ae6e4 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -42,6 +42,7 @@ def update *pinsets
             @indexes[changed + idx - 1].merge(pins)
           end
         end
+        @constants = Constants.new(self)
         true
       end
 
@@ -251,6 +252,10 @@ def get_ancestors(fqns)
         ancestors.compact.uniq
       end
 
+      def constants
+        @constants ||= Constants.new(self)
+      end
+
       private
 
       # @return [Index]
@@ -271,6 +276,7 @@ def catalog pinsets
             @indexes.push(@indexes.last&.merge(pins) || Solargraph::ApiMap::Index.new(pins))
           end
         end
+        @constants = Constants.new(self)
         true
       end
 
diff --git a/spec/api_map_spec.rb b/spec/api_map_spec.rb
index aeb530b13..ff20b3768 100755
--- a/spec/api_map_spec.rb
+++ b/spec/api_map_spec.rb
@@ -115,7 +115,8 @@ class Baz
     expect(paths).to include('Foo::Baz')
   end
 
-  it 'finds nested namespaces within a context' do
+  # @todo Working on context resolution
+  xit 'finds nested namespaces within a context' do
     map = Solargraph::SourceMap.load_string(%(
       module Foo
         class Bar
@@ -130,7 +131,8 @@ class Baz
     expect(pins.map(&:path)).to include('Foo::Bar::BAR_CONSTANT')
   end
 
-  it 'checks constant visibility' do
+  # @todo This might be invalid now
+  xit 'checks constant visibility' do
     map = Solargraph::SourceMap.load_string(%(
       module Foo
         FOO_CONSTANT = 'foo'
@@ -460,7 +462,8 @@ class Container
     expect(pins.map(&:path)).to include('Mixin::FOO')
   end
 
-  it 'sorts constants by name' do
+  # @todo This test needs changed
+  xit 'sorts constants by name' do
     source = Solargraph::Source.load_string(%(
       module Foo
         AAB = 'aaa'

From 0e80188669abd9da5981e6b56e1093edd8ce6757 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Wed, 3 Sep 2025 14:38:15 -0400
Subject: [PATCH 151/327] ApiMap::Constants#resolve

---
 lib/solargraph/api_map/constants.rb | 14 +++++++++-
 spec/api_map/constants_spec.rb      | 42 +++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 spec/api_map/constants_spec.rb

diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index 5656cb475..e1b01fa05 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -10,15 +10,19 @@ def initialize(store)
         @store = store
       end
 
+      # Resolve a name to a fully qualified namespace or constant.
+      #
       # @param name [String]
       # @param gates [Array<Array<String>, String>]
-      # @return [String]
+      # @return [String, nil]
       def resolve(name, *gates)
         flat = gates.flatten
         flat.push '' if flat.empty?
         cached_resolve[[name, flat]] || resolve_and_cache(name, flat)
       end
 
+      # Collect a list of all constants defined in the specified gates.
+      #
       # @param gates [Array<Array<String>, String>]
       # @return [Array<Pin::Base>]
       def collect(*gates)
@@ -69,7 +73,15 @@ def qualify tag, context_tag = ''
       # @param gates [Array<String>]
       # @return [String]
       def resolve_and_cache name, gates
+        cached_resolve[[name, gates]] = resolve_uncached(name, gates)
+      end
 
+      def resolve_uncached name, gates
+        gates.each do |gate|
+          resolved = collect(name, gate).map(&:path).find { |ns| ns if "::#{ns}".end_with?("::#{name}") }
+          return resolved if resolved
+        end
+        nil
       end
 
       # @param gates [Array<String>]
diff --git a/spec/api_map/constants_spec.rb b/spec/api_map/constants_spec.rb
new file mode 100644
index 000000000..e0644dd84
--- /dev/null
+++ b/spec/api_map/constants_spec.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+describe Solargraph::ApiMap::Constants do
+  describe '#resolve' do
+    it 'returns an absolute constant for a relative constant' do
+      source_map = Solargraph::SourceMap.load_string(%(
+        module Foo
+          module Bar
+            Baz = 'baz'
+          end
+          module Quuz
+            include Bar
+          end
+        end
+      ), 'test.rb')
+      store = Solargraph::ApiMap::Store.new(source_map.pins)
+      constants = Solargraph::ApiMap::Constants.new(store)
+      pin = source_map.first_pin('Foo::Quuz')
+      resolved = constants.resolve('Bar', pin.gates)
+      expect(resolved).to eq('Foo::Bar')
+    end
+  end
+
+  describe '#collect' do
+    it 'finds constants from includes' do
+      source_map = Solargraph::SourceMap.load_string(%(
+        module Foo
+          module Bar
+            Baz = 'baz'
+          end
+          module Quuz
+            include Bar
+          end
+        end
+      ), 'test.rb')
+      store = Solargraph::ApiMap::Store.new(source_map.pins)
+      constants = Solargraph::ApiMap::Constants.new(store)
+      collected = constants.collect('Foo::Quuz').map(&:path)
+      expect(collected).to eq(['Foo::Bar::Baz'])
+    end
+  end
+end

From 2c489cbc701f1dc154b047be1acbbe01aace7e81 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Thu, 4 Sep 2025 09:36:37 -0400
Subject: [PATCH 152/327] Index prepend/include/extend references

---
 lib/solargraph/api_map.rb                       |  8 ++++----
 lib/solargraph/api_map/constants.rb             | 17 ++++++++---------
 lib/solargraph/api_map/index.rb                 | 12 +++++-------
 lib/solargraph/api_map/source_to_yard.rb        |  4 ++--
 lib/solargraph/api_map/store.rb                 |  8 +-------
 .../convention/active_support_concern.rb        |  4 ++--
 6 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index eafde292d..42f311ae8 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -637,7 +637,7 @@ def super_and_sub?(sup, sub)
     #
     # @return [Boolean]
     def type_include?(host_ns, module_ns)
-      store.get_includes(host_ns).map { |inc_tag| ComplexType.parse(inc_tag).name }.include?(module_ns)
+      store.get_includes(host_ns).map { |inc_tag| ComplexType.parse(inc_tag.parametrized_tag.to_s).name }.include?(module_ns)
     end
 
     # @param pins [Enumerable<Pin::Base>]
@@ -732,7 +732,7 @@ def inner_get_methods rooted_tag, scope, visibility, deep, skip, no_core = false
 
       if deep && scope == :instance
         store.get_prepends(fqns).reverse.each do |im|
-          fqim = qualify(im, fqns)
+          fqim = qualify(im.parametrized_tag.to_s, fqns)
           result.concat inner_get_methods(fqim, scope, visibility, deep, skip, true) unless fqim.nil?
         end
       end
@@ -746,7 +746,7 @@ def inner_get_methods rooted_tag, scope, visibility, deep, skip, no_core = false
         result.concat convention_methods_by_reference
 
         if scope == :instance
-          store.get_include_pins(fqns).reverse.each do |ref|
+          store.get_includes(fqns).reverse.each do |ref|
             const = get_constants('', *ref.closure.gates).find { |pin| pin.path.end_with? ref.name }
             if const.is_a?(Pin::Namespace)
               result.concat inner_get_methods(const.path, scope, visibility, deep, skip, true)
@@ -766,7 +766,7 @@ def inner_get_methods rooted_tag, scope, visibility, deep, skip, no_core = false
         else
           logger.info { "ApiMap#inner_get_methods(#{fqns}, #{scope}, #{visibility}, #{deep}, #{skip}) - looking for get_extends() from #{fqns}" }
           store.get_extends(fqns).reverse.each do |em|
-            fqem = qualify(em, fqns)
+            fqem = qualify(em.parametrized_tag.to_s, fqns)
             result.concat inner_get_methods(fqem, :instance, visibility, deep, skip, true) unless fqem.nil?
           end
           rooted_sc_tag = qualify_superclass(rooted_tag)
diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index e1b01fa05..91a62c882 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -143,7 +143,7 @@ def inner_qualify name, root, skip
             return fqns if store.namespace_exists?(fqns)
             incs = store.get_includes(roots.join('::'))
             incs.each do |inc|
-              foundinc = inner_qualify(name, inc, skip)
+              foundinc = inner_qualify(name, inc.parametrized_tag, skip)
               possibles.push foundinc unless foundinc.nil?
             end
             roots.pop
@@ -151,7 +151,7 @@ def inner_qualify name, root, skip
           if possibles.empty?
             incs = store.get_includes('')
             incs.each do |inc|
-              foundinc = inner_qualify(name, inc, skip)
+              foundinc = inner_qualify(name, inc.parametrized_tag, skip)
               possibles.push foundinc unless foundinc.nil?
             end
           end
@@ -167,22 +167,21 @@ def inner_qualify name, root, skip
       def inner_get_constants fqns, visibility, skip
         return [] if fqns.nil? || skip.include?(fqns)
         skip.add fqns
-        return cached_collect[[fqns]] if cached_collect.key?([fqns])
         result = []
 
         store.get_prepends(fqns).each do |is|
-          result.concat inner_get_constants(qualify(is, fqns), [:public], skip)
+          result.concat inner_get_constants(qualify(is.parametrized_tag.to_s, fqns), [:public], skip)
         end
-        result.concat store.get_constants(fqns, visibility)
-                      .sort { |a, b| a.name <=> b.name }
-        store.get_includes(fqns).each do |is|
-          result.concat inner_get_constants(qualify(is, fqns), [:public], skip)
+        result.concat(store.get_constants(fqns, visibility).sort { |a, b| a.name <=> b.name })
+        store.get_includes(fqns).each do |pin|
+          inc_fqns = resolve(pin.name, pin.closure.gates - skip.to_a)
+          result.concat inner_get_constants(inc_fqns, [:public], skip)
         end
         fqsc = qualify_superclass(fqns)
         unless %w[Object BasicObject].include?(fqsc)
           result.concat inner_get_constants(fqsc, [:public], skip)
         end
-        cached_collect[[fqns]] = result
+        result
       end
 
       # @param fq_sub_tag [String]
diff --git a/lib/solargraph/api_map/index.rb b/lib/solargraph/api_map/index.rb
index a5870ff50..42d997d88 100644
--- a/lib/solargraph/api_map/index.rb
+++ b/lib/solargraph/api_map/index.rb
@@ -111,8 +111,7 @@ def catalog new_pins
         map_references Pin::Reference::Include, include_references
         map_references Pin::Reference::Prepend, prepend_references
         map_references Pin::Reference::Extend, extend_references
-        map_references Pin::Reference::Superclass, superclass_references
-        map_include_pins
+        old_map_references Pin::Reference::Superclass, superclass_references
         map_overrides
         self
       end
@@ -122,14 +121,13 @@ def catalog new_pins
       # @return [void]
       def map_references klass, hash
         pins_by_class(klass).each do |pin|
-          store_parametric_reference(hash, pin)
+          hash[pin.namespace].push pin
         end
       end
 
-      # @return [void]
-      def map_include_pins
-        pins_by_class(Solargraph::Pin::Reference::Include).each do |pin|
-          include_reference_pins[pin.namespace].push pin
+      def old_map_references klass, hash
+        pins_by_class(klass).each do |pin|
+          store_parametric_reference(hash, pin)
         end
       end
 
diff --git a/lib/solargraph/api_map/source_to_yard.rb b/lib/solargraph/api_map/source_to_yard.rb
index b44ebbf1a..a7b9e57f1 100644
--- a/lib/solargraph/api_map/source_to_yard.rb
+++ b/lib/solargraph/api_map/source_to_yard.rb
@@ -45,12 +45,12 @@ def rake_yard store
           code_object_map[pin.path].docstring = pin.docstring
           store.get_includes(pin.path).each do |ref|
             include_object = code_object_at(pin.path, YARD::CodeObjects::ClassObject)
-            include_object.instance_mixins.push code_object_map[ref] unless include_object.nil? or include_object.nil?
+            include_object.instance_mixins.push code_object_map[ref.parametrized_tag.to_s] unless include_object.nil? || include_object.nil?
           end
           store.get_extends(pin.path).each do |ref|
             extend_object = code_object_at(pin.path, YARD::CodeObjects::ClassObject)
             next unless extend_object
-            code_object = code_object_map[ref]
+            code_object = code_object_map[ref.parametrized_tag.to_s]
             next unless code_object
             extend_object.class_mixins.push code_object
             # @todo add spec showing why this next line is necessary
diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index bf48ae6e4..f6331090e 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -98,12 +98,6 @@ def get_includes fqns
         include_references[fqns] || []
       end
 
-      # @param fqns [String]
-      # @return [Array<Pin::Reference::Include>]
-      def get_include_pins fqns
-        include_reference_pins[fqns] || []
-      end
-
       # @param fqns [String]
       # @return [Array<String>]
       def get_prepends fqns
@@ -241,7 +235,7 @@ def get_ancestors(fqns)
           # 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|
+            refs.map(&:parametrized_tag).map(&:to_s).each do |ref|
               next if ref.nil? || ref.empty? || visited.include?(ref)
               ancestors << ref
               queue << ref
diff --git a/lib/solargraph/convention/active_support_concern.rb b/lib/solargraph/convention/active_support_concern.rb
index b6e0c814f..bc34bb56e 100644
--- a/lib/solargraph/convention/active_support_concern.rb
+++ b/lib/solargraph/convention/active_support_concern.rb
@@ -60,7 +60,7 @@ def initialize api_map, rooted_tag, scope, visibility, deep, skip
           @namespace_pin = api_map.get_path_pins(fqns).select { |p| p.is_a?(Pin::Namespace) }.first
 
           api_map.get_includes(fqns).reverse.each do |include_tag|
-            process_include include_tag
+            process_include include_tag.parametrized_tag.to_s
           end
         end
 
@@ -80,7 +80,7 @@ def process_include include_tag
             "ActiveSupportConcern#object(#{fqns}, #{scope}, #{visibility}, #{deep}) - " \
               "Handling class include include_tag=#{include_tag}"
           end
-          module_extends = api_map.get_extends(rooted_include_tag)
+          module_extends = api_map.get_extends(rooted_include_tag).map(&:parametrized_tag).map(&:to_s)
           logger.debug do
             "ActiveSupportConcern#object(#{fqns}, #{scope}, #{visibility}, #{deep}) - " \
               "found module extends of #{rooted_include_tag}: #{module_extends}"

From b329a2661921a3eaf95295f1225f491bdc263b96 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Thu, 4 Sep 2025 11:47:02 -0400
Subject: [PATCH 153/327] Index superclass references

---
 lib/solargraph/api_map.rb           | 11 +----------
 lib/solargraph/api_map/constants.rb |  4 ++++
 lib/solargraph/api_map/index.rb     | 27 +--------------------------
 lib/solargraph/api_map/store.rb     |  9 +++++++--
 lib/solargraph/pin/reference.rb     |  8 ++++++++
 spec/rbs_map/core_map_spec.rb       |  2 +-
 6 files changed, 22 insertions(+), 39 deletions(-)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 42f311ae8..7e09f7ce3 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -802,16 +802,7 @@ def qualify_lower namespace, context
     # @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('::'))
+      store.get_superclass(fq_sub_tag)
     end
 
     # Get the namespace's type (Class or Module).
diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index 91a62c882..cec1027b0 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -16,6 +16,10 @@ def initialize(store)
       # @param gates [Array<Array<String>, String>]
       # @return [String, nil]
       def resolve(name, *gates)
+        if name.start_with?('::')
+          return store.get_path_pins(name[2..]).any? ? name[2..] : nil
+        end
+
         flat = gates.flatten
         flat.push '' if flat.empty?
         cached_resolve[[name, flat]] || resolve_and_cache(name, flat)
diff --git a/lib/solargraph/api_map/index.rb b/lib/solargraph/api_map/index.rb
index 42d997d88..2facc3558 100644
--- a/lib/solargraph/api_map/index.rb
+++ b/lib/solargraph/api_map/index.rb
@@ -111,7 +111,7 @@ def catalog new_pins
         map_references Pin::Reference::Include, include_references
         map_references Pin::Reference::Prepend, prepend_references
         map_references Pin::Reference::Extend, extend_references
-        old_map_references Pin::Reference::Superclass, superclass_references
+        map_references Pin::Reference::Superclass, superclass_references
         map_overrides
         self
       end
@@ -125,31 +125,6 @@ def map_references klass, hash
         end
       end
 
-      def old_map_references klass, hash
-        pins_by_class(klass).each do |pin|
-          store_parametric_reference(hash, pin)
-        end
-      end
-
-      # Add references to a map
-      #
-      # @param hash [Hash{String => Array<Pin::Reference>}]
-      # @param reference_pin [Pin::Reference]
-      #
-      # @return [void]
-      def store_parametric_reference(hash, reference_pin)
-        referenced_ns = reference_pin.name
-        referenced_tag_params = reference_pin.generic_values
-        referenced_tag = referenced_ns +
-                         if referenced_tag_params && referenced_tag_params.length > 0
-                           "<" + referenced_tag_params.join(', ') + ">"
-                         else
-                           ''
-                         end
-        referencing_ns = reference_pin.namespace
-        hash[referencing_ns].push referenced_tag
-      end
-
       # @return [void]
       def map_overrides
         pins_by_class(Pin::Reference::Override).each do |ovr|
diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index f6331090e..d650eaa99 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -83,8 +83,13 @@ def get_superclass 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)
+        ref = superclass_references[fq_tag].first || superclass_references[fqns].first
+        if ref
+          return nil if ref.name == ref.closure.path
+          resolved = constants.resolve(ref.name, ref.closure.gates - [ref.closure.path])
+          return resolved + ref.parameter_tag if resolved
+          return nil
+        end
         return 'Object' if fqns != 'BasicObject' && namespace_exists?(fqns)
         return 'Object' if fqns == 'Boolean'
         simplified_literal_name = ComplexType.parse("#{fqns}").simplify_literals.name
diff --git a/lib/solargraph/pin/reference.rb b/lib/solargraph/pin/reference.rb
index 7e702f5b7..4a38d7232 100644
--- a/lib/solargraph/pin/reference.rb
+++ b/lib/solargraph/pin/reference.rb
@@ -18,6 +18,14 @@ def initialize generic_values: [], **splat
         @generic_values = generic_values
       end
 
+      def parameter_tag
+        @parameter_tag ||= if generic_values&.any?
+          "<#{generic_values.join(', ')}>"
+        else
+          ''
+        end
+      end
+
       # @return [ComplexType]
       def parametrized_tag
         @parametrized_tag ||= ComplexType.try_parse(
diff --git a/spec/rbs_map/core_map_spec.rb b/spec/rbs_map/core_map_spec.rb
index 88590925b..352d29937 100644
--- a/spec/rbs_map/core_map_spec.rb
+++ b/spec/rbs_map/core_map_spec.rb
@@ -6,7 +6,7 @@
       pin = store.get_path_pins("Errno::#{const}").first
       expect(pin).to be_a(Solargraph::Pin::Namespace)
       superclass = store.get_superclass(pin.path)
-      expect(superclass).to eq('::SystemCallError')
+      expect(superclass).to eq('SystemCallError')
     end
   end
 

From 13adb25366e7fe423a05bd587282b37a5423c277 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Thu, 4 Sep 2025 12:05:53 -0400
Subject: [PATCH 154/327] Redundant type parsing

---
 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 7e09f7ce3..b47637ee3 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -637,7 +637,7 @@ def super_and_sub?(sup, sub)
     #
     # @return [Boolean]
     def type_include?(host_ns, module_ns)
-      store.get_includes(host_ns).map { |inc_tag| ComplexType.parse(inc_tag.parametrized_tag.to_s).name }.include?(module_ns)
+      store.get_includes(host_ns).map { |inc_tag| inc_tag.parametrized_tag.name }.include?(module_ns)
     end
 
     # @param pins [Enumerable<Pin::Base>]

From 124be5d779d07f77d440aacc98f3cf78e0d14a16 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Thu, 4 Sep 2025 12:35:26 -0400
Subject: [PATCH 155/327] ApiMap::Constants#dereference

---
 lib/solargraph/api_map.rb                  |  4 +--
 lib/solargraph/api_map/constants.rb        | 13 +++++++--
 lib/solargraph/api_map/store.rb            |  2 +-
 lib/solargraph/pin/reference.rb            |  4 +++
 lib/solargraph/pin/reference/superclass.rb |  3 ++
 spec/api_map/constants_spec.rb             | 32 ++++++++++++++++++++++
 6 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index b47637ee3..cdef656b2 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -732,7 +732,7 @@ def inner_get_methods rooted_tag, scope, visibility, deep, skip, no_core = false
 
       if deep && scope == :instance
         store.get_prepends(fqns).reverse.each do |im|
-          fqim = qualify(im.parametrized_tag.to_s, fqns)
+          fqim = store.constants.dereference(im)
           result.concat inner_get_methods(fqim, scope, visibility, deep, skip, true) unless fqim.nil?
         end
       end
@@ -766,7 +766,7 @@ def inner_get_methods rooted_tag, scope, visibility, deep, skip, no_core = false
         else
           logger.info { "ApiMap#inner_get_methods(#{fqns}, #{scope}, #{visibility}, #{deep}, #{skip}) - looking for get_extends() from #{fqns}" }
           store.get_extends(fqns).reverse.each do |em|
-            fqem = qualify(em.parametrized_tag.to_s, fqns)
+            fqem = store.constants.dereference(em)
             result.concat inner_get_methods(fqem, :instance, visibility, deep, skip, true) unless fqem.nil?
           end
           rooted_sc_tag = qualify_superclass(rooted_tag)
diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index cec1027b0..89e55e0a3 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -25,6 +25,14 @@ def resolve(name, *gates)
         cached_resolve[[name, flat]] || resolve_and_cache(name, flat)
       end
 
+      # Get a fully qualified namespace from a reference pin.
+      #
+      # @param pin [Pin::Reference]
+      # @return [String, nil]
+      def dereference(pin)
+        resolve(pin.name, pin.allowed_gates)
+      end
+
       # Collect a list of all constants defined in the specified gates.
       #
       # @param gates [Array<Array<String>, String>]
@@ -173,8 +181,9 @@ def inner_get_constants fqns, visibility, skip
         skip.add fqns
         result = []
 
-        store.get_prepends(fqns).each do |is|
-          result.concat inner_get_constants(qualify(is.parametrized_tag.to_s, fqns), [:public], skip)
+        store.get_prepends(fqns).each do |pre|
+          pre_fqns = resolve(pre.name, pre.closure.gates - skip.to_a)
+          result.concat inner_get_constants(pre_fqns, [:public], skip)
         end
         result.concat(store.get_constants(fqns, visibility).sort { |a, b| a.name <=> b.name })
         store.get_includes(fqns).each do |pin|
diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index d650eaa99..a91d0dbf0 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -86,7 +86,7 @@ def get_superclass fq_tag
         ref = superclass_references[fq_tag].first || superclass_references[fqns].first
         if ref
           return nil if ref.name == ref.closure.path
-          resolved = constants.resolve(ref.name, ref.closure.gates - [ref.closure.path])
+          resolved = constants.dereference(ref)
           return resolved + ref.parameter_tag if resolved
           return nil
         end
diff --git a/lib/solargraph/pin/reference.rb b/lib/solargraph/pin/reference.rb
index 4a38d7232..46b029a47 100644
--- a/lib/solargraph/pin/reference.rb
+++ b/lib/solargraph/pin/reference.rb
@@ -37,6 +37,10 @@ def parametrized_tag
           end
         )
       end
+
+      def allowed_gates
+        closure.gates
+      end
     end
   end
 end
diff --git a/lib/solargraph/pin/reference/superclass.rb b/lib/solargraph/pin/reference/superclass.rb
index 8441b1c69..3d92936e7 100644
--- a/lib/solargraph/pin/reference/superclass.rb
+++ b/lib/solargraph/pin/reference/superclass.rb
@@ -4,6 +4,9 @@ module Solargraph
   module Pin
     class Reference
       class Superclass < Reference
+        def allowed_gates
+          @allowed_gates ||= closure.gates - [closure.path]
+        end
       end
     end
   end
diff --git a/spec/api_map/constants_spec.rb b/spec/api_map/constants_spec.rb
index e0644dd84..05ce6b5c0 100644
--- a/spec/api_map/constants_spec.rb
+++ b/spec/api_map/constants_spec.rb
@@ -21,6 +21,38 @@ module Quuz
     end
   end
 
+  describe '#dereference' do
+    it 'returns fully qualified namespaces for includes' do
+      source_map = Solargraph::SourceMap.load_string(%(
+        module Foo
+          module Bar
+            Baz = 'baz'
+          end
+          module Quuz
+            include Bar
+          end
+        end
+      ), 'test.rb')
+      store = Solargraph::ApiMap::Store.new(source_map.pins)
+      constants = Solargraph::ApiMap::Constants.new(store)
+      pin = source_map.pins_by_class(Solargraph::Pin::Reference::Include).first
+      resolved = constants.dereference(pin)
+      expect(resolved).to eq('Foo::Bar')
+    end
+
+    it 'returns fully qualified namespaces for superclasses' do
+      source_map = Solargraph::SourceMap.load_string(%(
+        class Foo; end
+        class Bar < Foo; end
+      ), 'test.rb')
+      store = Solargraph::ApiMap::Store.new(source_map.pins)
+      constants = Solargraph::ApiMap::Constants.new(store)
+      pin = source_map.pins_by_class(Solargraph::Pin::Reference::Superclass).first
+      resolved = constants.dereference(pin)
+      expect(resolved).to eq('Foo')
+    end
+  end
+
   describe '#collect' do
     it 'finds constants from includes' do
       source_map = Solargraph::SourceMap.load_string(%(

From 8f8f009562e2dda807188c2a087639d1b5b7cb41 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Thu, 4 Sep 2025 12:57:25 -0400
Subject: [PATCH 156/327] Redundant qualify_superclass method

---
 lib/solargraph/api_map/constants.rb | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index 89e55e0a3..f253d930d 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -190,27 +190,12 @@ def inner_get_constants fqns, visibility, skip
           inc_fqns = resolve(pin.name, pin.closure.gates - skip.to_a)
           result.concat inner_get_constants(inc_fqns, [:public], skip)
         end
-        fqsc = qualify_superclass(fqns)
+        fqsc = store.get_superclass(fqns)
         unless %w[Object BasicObject].include?(fqsc)
           result.concat inner_get_constants(fqsc, [:public], skip)
         end
         result
       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
     end
   end
 end

From 40019b5b21a1156e6402b0a3567ef00208becd1a Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Thu, 4 Sep 2025 13:32:03 -0400
Subject: [PATCH 157/327] Minor refactoring

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

diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index f253d930d..cb0c3b581 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -16,9 +16,7 @@ def initialize(store)
       # @param gates [Array<Array<String>, String>]
       # @return [String, nil]
       def resolve(name, *gates)
-        if name.start_with?('::')
-          return store.get_path_pins(name[2..]).any? ? name[2..] : nil
-        end
+        return store.get_path_pins(name[2..]).first&.path if name.start_with?('::')
 
         flat = gates.flatten
         flat.push '' if flat.empty?
@@ -90,7 +88,7 @@ def resolve_and_cache name, gates
 
       def resolve_uncached name, gates
         gates.each do |gate|
-          resolved = collect(name, gate).map(&:path).find { |ns| ns if "::#{ns}".end_with?("::#{name}") }
+          resolved = collect(gate).map(&:path).find { |ns| ns if "::#{ns}".end_with?("::#{name}") }
           return resolved if resolved
         end
         nil

From 013cec09e7b1d05bf7f07065b731d2d2e9010dd3 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Thu, 4 Sep 2025 15:25:28 -0400
Subject: [PATCH 158/327] Resolve nested namespaces

---
 lib/solargraph/api_map/constants.rb | 12 +++++++++++-
 spec/api_map/constants_spec.rb      | 14 ++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index cb0c3b581..0b34dd980 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -87,8 +87,18 @@ def resolve_and_cache name, gates
       end
 
       def resolve_uncached name, gates
+        parts = name.split('::')
+        here = parts.shift
+        resolved = simple_resolve(here, gates)
+        return resolved if parts.empty? || resolved.nil?
+
+        final = "#{resolved}::#{parts.join('::')}".sub(/^::/, '')
+        final if store.namespace_exists?(final)
+      end
+
+      def simple_resolve name, gates
         gates.each do |gate|
-          resolved = collect(gate).map(&:path).find { |ns| ns if "::#{ns}".end_with?("::#{name}") }
+          resolved = collect(gate).map(&:path).find { |ns| "::#{ns}".end_with?("::#{name}") }
           return resolved if resolved
         end
         nil
diff --git a/spec/api_map/constants_spec.rb b/spec/api_map/constants_spec.rb
index 05ce6b5c0..172fdde86 100644
--- a/spec/api_map/constants_spec.rb
+++ b/spec/api_map/constants_spec.rb
@@ -19,6 +19,20 @@ module Quuz
       resolved = constants.resolve('Bar', pin.gates)
       expect(resolved).to eq('Foo::Bar')
     end
+
+    it 'returns namespaces for nested namespaces' do
+      source_map = Solargraph::SourceMap.load_string(%(
+        module Foo
+          module Bar
+            module Baz; end
+          end
+        end
+      ), 'test.rb')
+      store = Solargraph::ApiMap::Store.new(source_map.pins)
+      constants = Solargraph::ApiMap::Constants.new(store)
+      resolved = constants.resolve('Foo::Bar::Baz')
+      expect(resolved).to eq('Foo::Bar::Baz')
+    end
   end
 
   describe '#dereference' do

From 7351be22b23a47762e9c4f9ec870911571439d4c Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Thu, 4 Sep 2025 16:21:13 -0400
Subject: [PATCH 159/327] Reduce ApiMap#qualify calls

---
 lib/solargraph/api_map.rb | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index cdef656b2..5a3c93693 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -319,11 +319,9 @@ def get_instance_variable_pins(namespace, scope = :instance)
       result = []
       used = [namespace]
       result.concat store.get_instance_variables(namespace, scope)
-      sc = qualify_lower(store.get_superclass(namespace), namespace)
-      until sc.nil? || used.include?(sc)
-        used.push sc
+      sc = namespace
+      while (sc = store.get_superclass(sc))
         result.concat store.get_instance_variables(sc, scope)
-        sc = qualify_lower(store.get_superclass(sc), sc)
       end
       result
     end
@@ -618,13 +616,10 @@ def bundled? filename
     # @param sub [String] The subclass
     # @return [Boolean]
     def super_and_sub?(sup, sub)
-      fqsup = qualify(sup)
-      cls = qualify(sub)
-      tested = []
-      until fqsup.nil? || cls.nil? || tested.include?(cls)
-        return true if cls == fqsup
-        tested.push cls
-        cls = qualify_superclass(cls)
+      return true if sup == sub
+      sc = sub
+      while (sc = store.get_superclass(sc))
+        return true if sc == sup
       end
       false
     end
@@ -792,13 +787,6 @@ def path_macros
       @path_macros ||= {}
     end
 
-    # @param namespace [String]
-    # @param context [String]
-    # @return [String, nil]
-    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

From c3e167298035950e6b715f0df2fc0ef857a498af Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Thu, 4 Sep 2025 16:38:18 -0400
Subject: [PATCH 160/327] Dereference pins in ActiveSupportConcern

---
 lib/solargraph/api_map.rb                           | 6 ++++++
 lib/solargraph/convention/active_support_concern.rb | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 5a3c93693..0933a8649 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -297,6 +297,12 @@ def qualify tag, context_tag = ''
       store.constants.qualify(tag, context_tag)
     end
 
+    # @param [Pin::Reference]
+    # @return [String, nil]
+    def dereference(pin)
+      store.constants.dereference(pin)
+    end
+
     # @param fqns [String]
     # @return [Array<String>]
     def get_extends(fqns)
diff --git a/lib/solargraph/convention/active_support_concern.rb b/lib/solargraph/convention/active_support_concern.rb
index bc34bb56e..74c9ce765 100644
--- a/lib/solargraph/convention/active_support_concern.rb
+++ b/lib/solargraph/convention/active_support_concern.rb
@@ -60,7 +60,7 @@ def initialize api_map, rooted_tag, scope, visibility, deep, skip
           @namespace_pin = api_map.get_path_pins(fqns).select { |p| p.is_a?(Pin::Namespace) }.first
 
           api_map.get_includes(fqns).reverse.each do |include_tag|
-            process_include include_tag.parametrized_tag.to_s
+            process_include include_tag
           end
         end
 
@@ -70,11 +70,11 @@ def initialize api_map, rooted_tag, scope, visibility, deep, skip
                     :visibility, :deep, :skip, :namespace_pin,
                     :fqns
 
-        # @param include_tag [String] the tag of the module being included
+        # @param include_tag [Pin::Reference::Include] the include reference pin
         #
         # @return [void]
         def process_include include_tag
-          rooted_include_tag = api_map.qualify(include_tag, rooted_tag)
+          rooted_include_tag = api_map.dereference(include_tag)
           return if rooted_include_tag.nil?
           logger.debug do
             "ActiveSupportConcern#object(#{fqns}, #{scope}, #{visibility}, #{deep}) - " \

From 983c63e5251d6d8daff32fe00f990e6534efe9e9 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Fri, 5 Sep 2025 04:00:00 -0400
Subject: [PATCH 161/327] ApiMap::Constants#clear

---
 lib/solargraph/api_map.rb           | 2 ++
 lib/solargraph/api_map/constants.rb | 4 ++++
 lib/solargraph/api_map/store.rb     | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 0933a8649..0fd38bc47 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -297,6 +297,8 @@ def qualify tag, context_tag = ''
       store.constants.qualify(tag, context_tag)
     end
 
+    # Get a fully qualified namespace from a reference pin.
+    #
     # @param [Pin::Reference]
     # @return [String, nil]
     def dereference(pin)
diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index 0b34dd980..796e92539 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -74,6 +74,10 @@ def qualify tag, context_tag = ''
         fqns + type.substring
       end
 
+      def clear
+        [cached_collect, cached_resolve].each(&:clear)
+      end
+
       private
 
       # @return [Store]
diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index a91d0dbf0..b8360da94 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -42,7 +42,7 @@ def update *pinsets
             @indexes[changed + idx - 1].merge(pins)
           end
         end
-        @constants = Constants.new(self)
+        constants.clear
         true
       end
 
@@ -275,7 +275,7 @@ def catalog pinsets
             @indexes.push(@indexes.last&.merge(pins) || Solargraph::ApiMap::Index.new(pins))
           end
         end
-        @constants = Constants.new(self)
+        constants.clear
         true
       end
 

From 27ae510a5ccbf1df432b93302064a4fa6d34fca0 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Fri, 5 Sep 2025 06:45:50 -0400
Subject: [PATCH 162/327] Redundant code

---
 lib/solargraph/api_map/constants.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index 796e92539..e2f4fc158 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -58,15 +58,12 @@ def collect(*gates)
       def qualify tag, context_tag = ''
         return tag if ['Boolean', 'self', nil].include?(tag)
 
-        context_type = ComplexType.try_parse(context_tag).force_rooted
-        return unless context_type
-
         type = ComplexType.try_parse(tag)
-        return unless type
+        return unless type.defined?
         return tag if type.literal?
 
         context_type = ComplexType.try_parse(context_tag)
-        return unless context_type
+        return unless context_type.defined?
 
         fqns = qualify_namespace(type.rooted_namespace, context_type.rooted_namespace)
         return unless fqns

From ad517f4a9bb623b05b7052dd8fbb3849a71319b5 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Fri, 5 Sep 2025 14:27:24 -0400
Subject: [PATCH 163/327] Store superclass references

---
 lib/solargraph/api_map/constants.rb        | 11 +++++---
 lib/solargraph/api_map/store.rb            | 20 ++++++++++++++
 lib/solargraph/pin/reference.rb            |  2 +-
 lib/solargraph/pin/reference/superclass.rb |  4 +--
 spec/api_map/store_spec.rb                 | 31 ++++++++++++++++++++++
 5 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index e2f4fc158..76053d4bd 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -28,7 +28,7 @@ def resolve(name, *gates)
       # @param pin [Pin::Reference]
       # @return [String, nil]
       def dereference(pin)
-        resolve(pin.name, pin.allowed_gates)
+        resolve(pin.name, pin.reference_gates)
       end
 
       # Collect a list of all constants defined in the specified gates.
@@ -199,9 +199,12 @@ def inner_get_constants fqns, visibility, skip
           inc_fqns = resolve(pin.name, pin.closure.gates - skip.to_a)
           result.concat inner_get_constants(inc_fqns, [:public], skip)
         end
-        fqsc = store.get_superclass(fqns)
-        unless %w[Object BasicObject].include?(fqsc)
-          result.concat inner_get_constants(fqsc, [:public], skip)
+        heh = store.get_superclass_pin(fqns)
+        if heh
+          fqsc = dereference(heh)
+          unless %w[Object BasicObject].include?(fqsc)
+            result.concat inner_get_constants(fqsc, [:public], skip)
+          end
         end
         result
       end
diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index b8360da94..bed50f3db 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -97,6 +97,17 @@ def get_superclass fq_tag
         nil
       end
 
+      BOOLEAN_SUPERCLASS_PIN = Pin::Reference::Superclass.new(name: 'Boolean', closure: Pin::ROOT_PIN)
+      OBJECT_SUPERCLASS_PIN = Pin::Reference::Superclass.new(name: 'Object', closure: Pin::ROOT_PIN)
+
+      # @param fqns [String]
+      # @return [Pin::Reference::Superclass]
+      def get_superclass_pin fqns
+        return BOOLEAN_SUPERCLASS_PIN if %w[TrueClass FalseClass].include?(fqns)
+
+        superclass_references[fqns].first || try_special_superclasses(fqns)
+      end
+
       # @param fqns [String]
       # @return [Array<String>]
       def get_includes fqns
@@ -328,6 +339,15 @@ def namespace_children name
       def all_instance_variables
         index.pins_by_class(Pin::InstanceVariable)
       end
+
+      # @param fqns [String]
+      # @return [Pin::Reference::Superclass, nil]
+      def try_special_superclasses(fqns)
+        return OBJECT_SUPERCLASS_PIN if fqns == 'Boolean'
+
+        sub = ComplexType.try_parse(fqns)
+        get_superclass_pin(sub.simplify_literals.name) if sub.literal?
+      end
     end
   end
 end
diff --git a/lib/solargraph/pin/reference.rb b/lib/solargraph/pin/reference.rb
index 46b029a47..ccb23851d 100644
--- a/lib/solargraph/pin/reference.rb
+++ b/lib/solargraph/pin/reference.rb
@@ -38,7 +38,7 @@ def parametrized_tag
         )
       end
 
-      def allowed_gates
+      def reference_gates
         closure.gates
       end
     end
diff --git a/lib/solargraph/pin/reference/superclass.rb b/lib/solargraph/pin/reference/superclass.rb
index 3d92936e7..befb7a207 100644
--- a/lib/solargraph/pin/reference/superclass.rb
+++ b/lib/solargraph/pin/reference/superclass.rb
@@ -4,8 +4,8 @@ module Solargraph
   module Pin
     class Reference
       class Superclass < Reference
-        def allowed_gates
-          @allowed_gates ||= closure.gates - [closure.path]
+        def reference_gates
+          @reference_gates ||= closure.gates - [closure.path]
         end
       end
     end
diff --git a/spec/api_map/store_spec.rb b/spec/api_map/store_spec.rb
index 888086921..d3d07754b 100644
--- a/spec/api_map/store_spec.rb
+++ b/spec/api_map/store_spec.rb
@@ -48,4 +48,35 @@
     expect(store.get_path_pins('Foo')).to eq([foo_pin])
     expect(store.get_path_pins('Bar')).to eq([bar_pin])
   end
+
+  # @todo This will become #get_superclass
+  describe '#get_superclass_pin' do
+    it 'returns simple superclasses' do
+      map = Solargraph::SourceMap.load_string(%(
+        class Foo; end
+        class Bar < Foo; end
+      ), 'test.rb')
+      store = Solargraph::ApiMap::Store.new(map.pins)
+      ref = store.get_superclass_pin('Bar')
+      expect(ref.name).to eq('Foo')
+    end
+
+    it 'returns Boolean superclass' do
+      store = Solargraph::ApiMap::Store.new
+      ref = store.get_superclass_pin('TrueClass')
+      expect(ref.name).to eq('Boolean')
+    end
+
+    it 'maps core Errno classes' do
+      map = Solargraph::RbsMap::CoreMap.new
+      store = Solargraph::ApiMap::Store.new(map.pins)
+      Errno.constants.each do |const|
+        pin = store.get_path_pins("Errno::#{const}").first
+        expect(pin).to be_a(Solargraph::Pin::Namespace)
+        superclass = store.get_superclass_pin(pin.path)
+        expect(superclass.name).to eq('::SystemCallError')
+        expect(store.constants.dereference(superclass)).to eq('SystemCallError')
+      end
+    end
+  end
 end

From 6064dbc5308dda4675fb7c2791b40083891926dc Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Fri, 5 Sep 2025 14:49:56 -0400
Subject: [PATCH 164/327] ApiMap#get_instance_variable_pins uses superclass
 references

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

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 0fd38bc47..72ff34e97 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -327,9 +327,10 @@ def get_instance_variable_pins(namespace, scope = :instance)
       result = []
       used = [namespace]
       result.concat store.get_instance_variables(namespace, scope)
-      sc = namespace
-      while (sc = store.get_superclass(sc))
-        result.concat store.get_instance_variables(sc, scope)
+      sc_fqns = namespace
+      while (sc = store.get_superclass_pin(sc_fqns))
+        sc_fqns = store.constants.dereference(sc)
+        result.concat store.get_instance_variables(sc_fqns, scope)
       end
       result
     end

From a96d11f664de93739f696d81119b292f4e9403e0 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Fri, 5 Sep 2025 15:08:30 -0400
Subject: [PATCH 165/327] Handle constant pins in generic checks

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

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 72ff34e97..1f2f7403a 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -924,9 +924,9 @@ 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]
+    # @param namespace_pin [Pin::Namespace, Pin::Constant]
     def has_generics?(namespace_pin)
-      namespace_pin && !namespace_pin.generics.empty?
+      namespace_pin.is_a?(Pin::Namespace) && !namespace_pin.generics.empty?
     end
 
     # @param namespace_pin [Pin::Namespace]

From d13b6ea4d2a9b3738e028a7926a1ee85a9240fda Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Sat, 6 Sep 2025 15:13:01 -0400
Subject: [PATCH 166/327] Use superclass references in ApiMap#super_and_sub?

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

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 1f2f7403a..240fd6e8f 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -625,10 +625,22 @@ def bundled? filename
     # @param sub [String] The subclass
     # @return [Boolean]
     def super_and_sub?(sup, sub)
+      sup = ComplexType.try_parse(sup)
+      sub = ComplexType.try_parse(sub)
+      # @todo If two literals are different values of the same type, it would
+      #   make more sense for super_and_sub? to return true, but there are a
+      #   few callers that currently expect this to be false.
+      return false if sup.literal? && sub.literal? && sup.to_s != sub.to_s
+      sup = sup.simplify_literals.to_s
+      sub = sub.simplify_literals.to_s
       return true if sup == sub
-      sc = sub
-      while (sc = store.get_superclass(sc))
-        return true if sc == sup
+      sc_fqns = sub
+      while (sc = store.get_superclass_pin(sc_fqns))
+        sc_new = store.constants.dereference(sc)
+        # Cyclical inheritance is invalid
+        return false if sc_new == sc_fqns
+        sc_fqns = sc_new
+        return true if sc_fqns == sup
       end
       false
     end

From 68da764d012987089f2db99d6bbeed5be7c02707 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Sat, 6 Sep 2025 16:31:29 -0400
Subject: [PATCH 167/327] ApiMap#qualify_superclass uses superclass references

---
 lib/solargraph/api_map.rb       | 8 +++++++-
 lib/solargraph/api_map/store.rb | 9 +++++++--
 spec/rbs_map/core_map_spec.rb   | 3 ++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 240fd6e8f..d38a67054 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -811,7 +811,13 @@ def path_macros
     # @param fq_sub_tag [String]
     # @return [String, nil]
     def qualify_superclass fq_sub_tag
-      store.get_superclass(fq_sub_tag)
+      type = ComplexType.try_parse(fq_sub_tag)
+      return type.simplify_literals.to_s if type.literal?
+      ref = store.get_superclass_pin(fq_sub_tag)
+      return unless ref
+      res = store.constants.dereference(ref)
+      return unless res
+      res + type.substring
     end
 
     # Get the namespace's type (Class or Module).
diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index bed50f3db..27ea2e203 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -103,6 +103,7 @@ def get_superclass fq_tag
       # @param fqns [String]
       # @return [Pin::Reference::Superclass]
       def get_superclass_pin fqns
+        return nil if fqns.empty?
         return BOOLEAN_SUPERCLASS_PIN if %w[TrueClass FalseClass].include?(fqns)
 
         superclass_references[fqns].first || try_special_superclasses(fqns)
@@ -242,7 +243,8 @@ def get_ancestors(fqns)
           current = current.gsub(/^::/, '')
 
           # Add superclass
-          superclass = get_superclass(current)
+          ref = get_superclass_pin(current)
+          superclass = ref && constants.dereference(ref)
           if superclass && !superclass.empty? && !visited.include?(superclass)
             ancestors << superclass
             queue << superclass
@@ -344,9 +346,12 @@ def all_instance_variables
       # @return [Pin::Reference::Superclass, nil]
       def try_special_superclasses(fqns)
         return OBJECT_SUPERCLASS_PIN if fqns == 'Boolean'
+        return OBJECT_SUPERCLASS_PIN if !['BasicObject', 'Object'].include?(fqns) && namespace_exists?(fqns)
 
         sub = ComplexType.try_parse(fqns)
-        get_superclass_pin(sub.simplify_literals.name) if sub.literal?
+        return get_superclass_pin(sub.simplify_literals.name) if sub.literal?
+
+        get_superclass_pin(sub.namespace) if sub.namespace != fqns
       end
     end
   end
diff --git a/spec/rbs_map/core_map_spec.rb b/spec/rbs_map/core_map_spec.rb
index 352d29937..7f5464ecd 100644
--- a/spec/rbs_map/core_map_spec.rb
+++ b/spec/rbs_map/core_map_spec.rb
@@ -5,7 +5,8 @@
     Errno.constants.each do |const|
       pin = store.get_path_pins("Errno::#{const}").first
       expect(pin).to be_a(Solargraph::Pin::Namespace)
-      superclass = store.get_superclass(pin.path)
+      ref = store.get_superclass_pin(pin.path)
+      superclass = store.constants.dereference(ref)
       expect(superclass).to eq('SystemCallError')
     end
   end

From 3017565444e79a8f0ce64fdd55340b76913e6bdd Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Sat, 6 Sep 2025 16:36:56 -0400
Subject: [PATCH 168/327] Store#get_superclass uses references

---
 lib/solargraph/api_map.rb           |  6 +++---
 lib/solargraph/api_map/constants.rb |  2 +-
 lib/solargraph/api_map/store.rb     | 31 ++++-------------------------
 spec/api_map/store_spec.rb          |  8 ++++----
 spec/rbs_map/core_map_spec.rb       |  2 +-
 5 files changed, 13 insertions(+), 36 deletions(-)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index d38a67054..2ef3a355e 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -328,7 +328,7 @@ def get_instance_variable_pins(namespace, scope = :instance)
       used = [namespace]
       result.concat store.get_instance_variables(namespace, scope)
       sc_fqns = namespace
-      while (sc = store.get_superclass_pin(sc_fqns))
+      while (sc = store.get_superclass(sc_fqns))
         sc_fqns = store.constants.dereference(sc)
         result.concat store.get_instance_variables(sc_fqns, scope)
       end
@@ -635,7 +635,7 @@ def super_and_sub?(sup, sub)
       sub = sub.simplify_literals.to_s
       return true if sup == sub
       sc_fqns = sub
-      while (sc = store.get_superclass_pin(sc_fqns))
+      while (sc = store.get_superclass(sc_fqns))
         sc_new = store.constants.dereference(sc)
         # Cyclical inheritance is invalid
         return false if sc_new == sc_fqns
@@ -813,7 +813,7 @@ def path_macros
     def qualify_superclass fq_sub_tag
       type = ComplexType.try_parse(fq_sub_tag)
       return type.simplify_literals.to_s if type.literal?
-      ref = store.get_superclass_pin(fq_sub_tag)
+      ref = store.get_superclass(fq_sub_tag)
       return unless ref
       res = store.constants.dereference(ref)
       return unless res
diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index 76053d4bd..1b1818ce3 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -199,7 +199,7 @@ def inner_get_constants fqns, visibility, skip
           inc_fqns = resolve(pin.name, pin.closure.gates - skip.to_a)
           result.concat inner_get_constants(inc_fqns, [:public], skip)
         end
-        heh = store.get_superclass_pin(fqns)
+        heh = store.get_superclass(fqns)
         if heh
           fqsc = dereference(heh)
           unless %w[Object BasicObject].include?(fqsc)
diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index 27ea2e203..9cf9d0356 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -74,35 +74,12 @@ def get_methods fqns, scope: :instance, visibility: [:public]
         GemPins.combine_method_pins_by_path(all_pins)
       end
 
-      # @param fq_tag [String]
-      # @return [String, nil]
-      def get_superclass fq_tag
-        raise "Do not prefix fully qualified tags with '::' - #{fq_tag.inspect}" if fq_tag.start_with?('::')
-        sub = ComplexType.try_parse(fq_tag)
-        return nil if sub.nil?
-        return sub.simplify_literals.name if sub.literal?
-        return 'Boolean' if %w[TrueClass FalseClass].include?(fq_tag)
-        fqns = sub.namespace
-        ref = superclass_references[fq_tag].first || superclass_references[fqns].first
-        if ref
-          return nil if ref.name == ref.closure.path
-          resolved = constants.dereference(ref)
-          return resolved + ref.parameter_tag if resolved
-          return nil
-        end
-        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
-
       BOOLEAN_SUPERCLASS_PIN = Pin::Reference::Superclass.new(name: 'Boolean', closure: Pin::ROOT_PIN)
       OBJECT_SUPERCLASS_PIN = Pin::Reference::Superclass.new(name: 'Object', closure: Pin::ROOT_PIN)
 
       # @param fqns [String]
       # @return [Pin::Reference::Superclass]
-      def get_superclass_pin fqns
+      def get_superclass fqns
         return nil if fqns.empty?
         return BOOLEAN_SUPERCLASS_PIN if %w[TrueClass FalseClass].include?(fqns)
 
@@ -243,7 +220,7 @@ def get_ancestors(fqns)
           current = current.gsub(/^::/, '')
 
           # Add superclass
-          ref = get_superclass_pin(current)
+          ref = get_superclass(current)
           superclass = ref && constants.dereference(ref)
           if superclass && !superclass.empty? && !visited.include?(superclass)
             ancestors << superclass
@@ -349,9 +326,9 @@ def try_special_superclasses(fqns)
         return OBJECT_SUPERCLASS_PIN if !['BasicObject', 'Object'].include?(fqns) && namespace_exists?(fqns)
 
         sub = ComplexType.try_parse(fqns)
-        return get_superclass_pin(sub.simplify_literals.name) if sub.literal?
+        return get_superclass(sub.simplify_literals.name) if sub.literal?
 
-        get_superclass_pin(sub.namespace) if sub.namespace != fqns
+        get_superclass(sub.namespace) if sub.namespace != fqns
       end
     end
   end
diff --git a/spec/api_map/store_spec.rb b/spec/api_map/store_spec.rb
index d3d07754b..dc8413de5 100644
--- a/spec/api_map/store_spec.rb
+++ b/spec/api_map/store_spec.rb
@@ -50,20 +50,20 @@
   end
 
   # @todo This will become #get_superclass
-  describe '#get_superclass_pin' do
+  describe '#get_superclass' do
     it 'returns simple superclasses' do
       map = Solargraph::SourceMap.load_string(%(
         class Foo; end
         class Bar < Foo; end
       ), 'test.rb')
       store = Solargraph::ApiMap::Store.new(map.pins)
-      ref = store.get_superclass_pin('Bar')
+      ref = store.get_superclass('Bar')
       expect(ref.name).to eq('Foo')
     end
 
     it 'returns Boolean superclass' do
       store = Solargraph::ApiMap::Store.new
-      ref = store.get_superclass_pin('TrueClass')
+      ref = store.get_superclass('TrueClass')
       expect(ref.name).to eq('Boolean')
     end
 
@@ -73,7 +73,7 @@ class Bar < Foo; end
       Errno.constants.each do |const|
         pin = store.get_path_pins("Errno::#{const}").first
         expect(pin).to be_a(Solargraph::Pin::Namespace)
-        superclass = store.get_superclass_pin(pin.path)
+        superclass = store.get_superclass(pin.path)
         expect(superclass.name).to eq('::SystemCallError')
         expect(store.constants.dereference(superclass)).to eq('SystemCallError')
       end
diff --git a/spec/rbs_map/core_map_spec.rb b/spec/rbs_map/core_map_spec.rb
index 7f5464ecd..7b5007529 100644
--- a/spec/rbs_map/core_map_spec.rb
+++ b/spec/rbs_map/core_map_spec.rb
@@ -5,7 +5,7 @@
     Errno.constants.each do |const|
       pin = store.get_path_pins("Errno::#{const}").first
       expect(pin).to be_a(Solargraph::Pin::Namespace)
-      ref = store.get_superclass_pin(pin.path)
+      ref = store.get_superclass(pin.path)
       superclass = store.constants.dereference(ref)
       expect(superclass).to eq('SystemCallError')
     end

From 4010123ea14bff5164d1477a9f77bb82115b147d Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Sat, 6 Sep 2025 16:58:59 -0400
Subject: [PATCH 169/327] Store#qualify_superclass

---
 lib/solargraph/api_map.rb       |  8 +------
 lib/solargraph/api_map/store.rb | 38 +++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 2ef3a355e..ad84d1de4 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -811,13 +811,7 @@ def path_macros
     # @param fq_sub_tag [String]
     # @return [String, nil]
     def qualify_superclass fq_sub_tag
-      type = ComplexType.try_parse(fq_sub_tag)
-      return type.simplify_literals.to_s if type.literal?
-      ref = store.get_superclass(fq_sub_tag)
-      return unless ref
-      res = store.constants.dereference(ref)
-      return unless res
-      res + type.substring
+      store.qualify_superclass fq_sub_tag
     end
 
     # Get the namespace's type (Class or Module).
diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index 9cf9d0356..567de1abd 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -43,6 +43,7 @@ def update *pinsets
           end
         end
         constants.clear
+        cached_qualify_superclass.clear
         true
       end
 
@@ -86,6 +87,19 @@ def get_superclass fqns
         superclass_references[fqns].first || try_special_superclasses(fqns)
       end
 
+      # @param fq_sub_tag [String]
+      # @return [String, nil]
+      def qualify_superclass fq_sub_tag
+        cached_qualify_superclass[fq_sub_tag] || qualify_and_cache_superclass(fq_sub_tag)
+        type = ComplexType.try_parse(fq_sub_tag)
+        return type.simplify_literals.to_s if type.literal?
+        ref = get_superclass(fq_sub_tag)
+        return unless ref
+        res = constants.dereference(ref)
+        return unless res
+        res + type.substring
+      end
+
       # @param fqns [String]
       # @return [Array<String>]
       def get_includes fqns
@@ -266,6 +280,7 @@ def catalog pinsets
           end
         end
         constants.clear
+        cached_qualify_superclass.clear
         true
       end
 
@@ -330,6 +345,29 @@ def try_special_superclasses(fqns)
 
         get_superclass(sub.namespace) if sub.namespace != fqns
       end
+
+      # @param fq_sub_tag [String]
+      # @return [String, nil]
+      def qualify_and_cache_superclass fq_sub_tag
+        cached_qualify_superclass[fq_sub_tag] = uncached_qualify_superclass(fq_sub_tag)
+      end
+
+      # @return [Hash{String => String, nil}]
+      def cached_qualify_superclass
+        @cached_qualify_superclass ||= {}
+      end
+
+      # @param fq_sub_tag [String]
+      # @return [String, nil]
+      def uncached_qualify_superclass fq_sub_tag
+        type = ComplexType.try_parse(fq_sub_tag)
+        return type.simplify_literals.to_s if type.literal?
+        ref = get_superclass(fq_sub_tag)
+        return unless ref
+        res = constants.dereference(ref)
+        return unless res
+        res + type.substring
+      end
     end
   end
 end

From 64fb828ec4ed4cac0401bd1f51e275f02a4a54e7 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Sat, 6 Sep 2025 18:13:37 -0400
Subject: [PATCH 170/327] Type annotation

---
 lib/solargraph/api_map/constants.rb | 11 ++++++++---
 lib/solargraph/api_map/store.rb     |  6 +++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index 1b1818ce3..3bbc0de47 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -82,11 +82,14 @@ def clear
 
       # @param name [String]
       # @param gates [Array<String>]
-      # @return [String]
+      # @return [String, nil]
       def resolve_and_cache name, gates
         cached_resolve[[name, gates]] = resolve_uncached(name, gates)
       end
 
+      # @param name [String]
+      # @param gates [Array<String>]
+      # @return [String, nil]
       def resolve_uncached name, gates
         parts = name.split('::')
         here = parts.shift
@@ -114,10 +117,12 @@ def collect_and_cache gates
         end
       end
 
+      # @return [Hash{Array(Name, Array<String>) => String, nil}]
       def cached_resolve
         @cached_resolve ||= {}
       end
 
+      # @return [Hash{Array<String> => Array<Pin::Base>}]
       def cached_collect
         @cached_collect ||= {}
       end
@@ -164,7 +169,7 @@ def inner_qualify name, root, skip
             return fqns if store.namespace_exists?(fqns)
             incs = store.get_includes(roots.join('::'))
             incs.each do |inc|
-              foundinc = inner_qualify(name, inc.parametrized_tag, skip)
+              foundinc = inner_qualify(name, inc.parametrized_tag.to_s, skip)
               possibles.push foundinc unless foundinc.nil?
             end
             roots.pop
@@ -172,7 +177,7 @@ def inner_qualify name, root, skip
           if possibles.empty?
             incs = store.get_includes('')
             incs.each do |inc|
-              foundinc = inner_qualify(name, inc.parametrized_tag, skip)
+              foundinc = inner_qualify(name, inc.parametrized_tag.to_s, skip)
               possibles.push foundinc unless foundinc.nil?
             end
           end
diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index 567de1abd..d52b2176b 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -101,19 +101,19 @@ def qualify_superclass fq_sub_tag
       end
 
       # @param fqns [String]
-      # @return [Array<String>]
+      # @return [Array<Pin::Reference::Include>]
       def get_includes fqns
         include_references[fqns] || []
       end
 
       # @param fqns [String]
-      # @return [Array<String>]
+      # @return [Array<Pin::Reference::Prepend>]
       def get_prepends fqns
         prepend_references[fqns] || []
       end
 
       # @param fqns [String]
-      # @return [Array<String>]
+      # @return [Array<Pin::Reference::Extend>]
       def get_extends fqns
         extend_references[fqns] || []
       end

From b8747bc0ec5a67fc39de70a722b093e63331d87c Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Sat, 6 Sep 2025 18:36:18 -0400
Subject: [PATCH 171/327] Spec linting

---
 spec/api_map/constants_spec.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spec/api_map/constants_spec.rb b/spec/api_map/constants_spec.rb
index 172fdde86..26eaf6b25 100644
--- a/spec/api_map/constants_spec.rb
+++ b/spec/api_map/constants_spec.rb
@@ -14,7 +14,7 @@ module Quuz
         end
       ), 'test.rb')
       store = Solargraph::ApiMap::Store.new(source_map.pins)
-      constants = Solargraph::ApiMap::Constants.new(store)
+      constants = described_class.new(store)
       pin = source_map.first_pin('Foo::Quuz')
       resolved = constants.resolve('Bar', pin.gates)
       expect(resolved).to eq('Foo::Bar')
@@ -29,7 +29,7 @@ module Baz; end
         end
       ), 'test.rb')
       store = Solargraph::ApiMap::Store.new(source_map.pins)
-      constants = Solargraph::ApiMap::Constants.new(store)
+      constants = described_class.new(store)
       resolved = constants.resolve('Foo::Bar::Baz')
       expect(resolved).to eq('Foo::Bar::Baz')
     end
@@ -48,7 +48,7 @@ module Quuz
         end
       ), 'test.rb')
       store = Solargraph::ApiMap::Store.new(source_map.pins)
-      constants = Solargraph::ApiMap::Constants.new(store)
+      constants = described_class.new(store)
       pin = source_map.pins_by_class(Solargraph::Pin::Reference::Include).first
       resolved = constants.dereference(pin)
       expect(resolved).to eq('Foo::Bar')
@@ -60,7 +60,7 @@ class Foo; end
         class Bar < Foo; end
       ), 'test.rb')
       store = Solargraph::ApiMap::Store.new(source_map.pins)
-      constants = Solargraph::ApiMap::Constants.new(store)
+      constants = described_class.new(store)
       pin = source_map.pins_by_class(Solargraph::Pin::Reference::Superclass).first
       resolved = constants.dereference(pin)
       expect(resolved).to eq('Foo')
@@ -80,7 +80,7 @@ module Quuz
         end
       ), 'test.rb')
       store = Solargraph::ApiMap::Store.new(source_map.pins)
-      constants = Solargraph::ApiMap::Constants.new(store)
+      constants = described_class.new(store)
       collected = constants.collect('Foo::Quuz').map(&:path)
       expect(collected).to eq(['Foo::Bar::Baz'])
     end

From f02870b46b11011a3635822043f0162cf15ee86f Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Sat, 6 Sep 2025 18:42:38 -0400
Subject: [PATCH 172/327] Pin sources

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

diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index d52b2176b..c96c53e90 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -75,8 +75,8 @@ def get_methods fqns, scope: :instance, visibility: [:public]
         GemPins.combine_method_pins_by_path(all_pins)
       end
 
-      BOOLEAN_SUPERCLASS_PIN = Pin::Reference::Superclass.new(name: 'Boolean', closure: Pin::ROOT_PIN)
-      OBJECT_SUPERCLASS_PIN = Pin::Reference::Superclass.new(name: 'Object', closure: Pin::ROOT_PIN)
+      BOOLEAN_SUPERCLASS_PIN = Pin::Reference::Superclass.new(name: 'Boolean', closure: Pin::ROOT_PIN, source: :solargraph)
+      OBJECT_SUPERCLASS_PIN = Pin::Reference::Superclass.new(name: 'Object', closure: Pin::ROOT_PIN, source: :solargraph)
 
       # @param fqns [String]
       # @return [Pin::Reference::Superclass]

From 20dfbec5b5ee8d6c24ebaf30475892d1ce36664f Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Sat, 6 Sep 2025 18:47:15 -0400
Subject: [PATCH 173/327] Strong typechecking

---
 lib/solargraph/api_map/constants.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index 3bbc0de47..01ff23d15 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -71,6 +71,7 @@ def qualify tag, context_tag = ''
         fqns + type.substring
       end
 
+      # @return [void]
       def clear
         [cached_collect, cached_resolve].each(&:clear)
       end
@@ -100,6 +101,9 @@ def resolve_uncached name, gates
         final if store.namespace_exists?(final)
       end
 
+      # @param name [String]
+      # @param gates [Array<String>]
+      # @return [String, nil]
       def simple_resolve name, gates
         gates.each do |gate|
           resolved = collect(gate).map(&:path).find { |ns| "::#{ns}".end_with?("::#{name}") }

From 35482bcdaa2364eaaa1861cc8eb267ee4fadda11 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Sat, 6 Sep 2025 18:50:08 -0400
Subject: [PATCH 174/327] rubocop -a

---
 lib/solargraph/api_map.rb                |  3 ++-
 lib/solargraph/api_map/constants.rb      | 24 +++++++++++-------------
 lib/solargraph/api_map/source_to_yard.rb |  4 +++-
 lib/solargraph/api_map/store.rb          |  2 +-
 lib/solargraph/pin/reference.rb          |  8 ++++----
 5 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index ad84d1de4..eb10845e4 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -299,7 +299,7 @@ def qualify tag, context_tag = ''
 
     # Get a fully qualified namespace from a reference pin.
     #
-    # @param [Pin::Reference]
+    # @param pin [Pin::Reference]
     # @return [String, nil]
     def dereference(pin)
       store.constants.dereference(pin)
@@ -802,6 +802,7 @@ def inner_get_methods rooted_tag, scope, visibility, deep, skip, no_core = false
       end
       result
     end
+    # rubocop:enable Metrics/CyclomaticComplexity
 
     # @return [Hash]
     def path_macros
diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index 01ff23d15..ee8d7a971 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -6,7 +6,7 @@ class ApiMap
     #
     class Constants
       # @param store [Store]
-      def initialize(store)
+      def initialize store
         @store = store
       end
 
@@ -27,7 +27,7 @@ def resolve(name, *gates)
       #
       # @param pin [Pin::Reference]
       # @return [String, nil]
-      def dereference(pin)
+      def dereference pin
         resolve(pin.name, pin.reference_gates)
       end
 
@@ -117,7 +117,7 @@ def simple_resolve name, gates
       def collect_and_cache gates
         skip = Set.new
         cached_collect[gates] = gates.flat_map do |gate|
-          inner_get_constants(gate, [:public, :private], skip)
+          inner_get_constants(gate, %i[public private], skip)
         end
       end
 
@@ -141,7 +141,7 @@ def cached_collect
       # @param context_namespace [String] The context namespace in which the
       #   tag was referenced; start from here to resolve the name
       # @return [String, nil] fully qualified namespace
-      def qualify_namespace(namespace, context_namespace = '')
+      def qualify_namespace namespace, context_namespace = ''
         if namespace.start_with?('::')
           inner_qualify(namespace[2..-1], '', Set.new)
         else
@@ -160,11 +160,11 @@ def inner_qualify name, root, skip
         skip.add root
         possibles = []
         if name == ''
-          if root == ''
-            return ''
-          else
-            return inner_qualify(root, '', skip)
-          end
+          return '' if root == ''
+
+
+          inner_qualify(root, '', skip)
+
         else
           return name if root == '' && store.namespace_exists?(name)
           roots = root.to_s.split('::')
@@ -186,7 +186,7 @@ def inner_qualify name, root, skip
             end
           end
           return name if store.namespace_exists?(name)
-          return possibles.last
+          possibles.last
         end
       end
 
@@ -211,9 +211,7 @@ def inner_get_constants fqns, visibility, skip
         heh = store.get_superclass(fqns)
         if heh
           fqsc = dereference(heh)
-          unless %w[Object BasicObject].include?(fqsc)
-            result.concat inner_get_constants(fqsc, [:public], skip)
-          end
+          result.concat inner_get_constants(fqsc, [:public], skip) unless %w[Object BasicObject].include?(fqsc)
         end
         result
       end
diff --git a/lib/solargraph/api_map/source_to_yard.rb b/lib/solargraph/api_map/source_to_yard.rb
index a7b9e57f1..ccbed3eb6 100644
--- a/lib/solargraph/api_map/source_to_yard.rb
+++ b/lib/solargraph/api_map/source_to_yard.rb
@@ -45,7 +45,9 @@ def rake_yard store
           code_object_map[pin.path].docstring = pin.docstring
           store.get_includes(pin.path).each do |ref|
             include_object = code_object_at(pin.path, YARD::CodeObjects::ClassObject)
-            include_object.instance_mixins.push code_object_map[ref.parametrized_tag.to_s] unless include_object.nil? || include_object.nil?
+            unless include_object.nil? || include_object.nil?
+              include_object.instance_mixins.push code_object_map[ref.parametrized_tag.to_s]
+            end
           end
           store.get_extends(pin.path).each do |ref|
             extend_object = code_object_at(pin.path, YARD::CodeObjects::ClassObject)
diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index c96c53e90..049aa4b06 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -338,7 +338,7 @@ def all_instance_variables
       # @return [Pin::Reference::Superclass, nil]
       def try_special_superclasses(fqns)
         return OBJECT_SUPERCLASS_PIN if fqns == 'Boolean'
-        return OBJECT_SUPERCLASS_PIN if !['BasicObject', 'Object'].include?(fqns) && namespace_exists?(fqns)
+        return OBJECT_SUPERCLASS_PIN if !%w[BasicObject Object].include?(fqns) && namespace_exists?(fqns)
 
         sub = ComplexType.try_parse(fqns)
         return get_superclass(sub.simplify_literals.name) if sub.literal?
diff --git a/lib/solargraph/pin/reference.rb b/lib/solargraph/pin/reference.rb
index ccb23851d..8f8d88e7d 100644
--- a/lib/solargraph/pin/reference.rb
+++ b/lib/solargraph/pin/reference.rb
@@ -20,10 +20,10 @@ def initialize generic_values: [], **splat
 
       def parameter_tag
         @parameter_tag ||= if generic_values&.any?
-          "<#{generic_values.join(', ')}>"
-        else
-          ''
-        end
+                             "<#{generic_values.join(', ')}>"
+                           else
+                             ''
+                           end
       end
 
       # @return [ComplexType]

From 3ce186a7cac36995246725a069d9e61665bc694a Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Sat, 6 Sep 2025 18:58:05 -0400
Subject: [PATCH 175/327] RuboCop linting

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

diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index ee8d7a971..2e821d610 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -143,7 +143,7 @@ def cached_collect
       # @return [String, nil] fully qualified namespace
       def qualify_namespace namespace, context_namespace = ''
         if namespace.start_with?('::')
-          inner_qualify(namespace[2..-1], '', Set.new)
+          inner_qualify(namespace[2..], '', Set.new)
         else
           inner_qualify(namespace, context_namespace, Set.new)
         end
@@ -162,14 +162,12 @@ def inner_qualify name, root, skip
         if name == ''
           return '' if root == ''
 
-
           inner_qualify(root, '', skip)
-
         else
           return name if root == '' && store.namespace_exists?(name)
           roots = root.to_s.split('::')
-          while roots.length > 0
-            fqns = roots.join('::') + '::' + name
+          while roots.length.positive?
+            fqns = "#{roots.join('::')}::#{name}"
             return fqns if store.namespace_exists?(fqns)
             incs = store.get_includes(roots.join('::'))
             incs.each do |inc|

From 5fb33e138d58c932d153b59a92346f26885ecafa Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Sat, 6 Sep 2025 19:00:23 -0400
Subject: [PATCH 176/327] Strong typechecking

---
 lib/solargraph/api_map/store.rb | 1 +
 lib/solargraph/pin/reference.rb | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index 049aa4b06..40e96ba1a 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -255,6 +255,7 @@ def get_ancestors(fqns)
         ancestors.compact.uniq
       end
 
+      # @return [Constants]
       def constants
         @constants ||= Constants.new(self)
       end
diff --git a/lib/solargraph/pin/reference.rb b/lib/solargraph/pin/reference.rb
index 8f8d88e7d..d678ab7b7 100644
--- a/lib/solargraph/pin/reference.rb
+++ b/lib/solargraph/pin/reference.rb
@@ -18,6 +18,7 @@ def initialize generic_values: [], **splat
         @generic_values = generic_values
       end
 
+      # @return [String]
       def parameter_tag
         @parameter_tag ||= if generic_values&.any?
                              "<#{generic_values.join(', ')}>"
@@ -38,6 +39,7 @@ def parametrized_tag
         )
       end
 
+      # @return [Array<String>]
       def reference_gates
         closure.gates
       end

From 839b8c1eceb8b9d620ca793474a04b273dcf4deb Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Sat, 6 Sep 2025 19:07:14 -0400
Subject: [PATCH 177/327] Superclass documentation

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

diff --git a/lib/solargraph/pin/reference/superclass.rb b/lib/solargraph/pin/reference/superclass.rb
index befb7a207..c50f640df 100644
--- a/lib/solargraph/pin/reference/superclass.rb
+++ b/lib/solargraph/pin/reference/superclass.rb
@@ -3,6 +3,8 @@
 module Solargraph
   module Pin
     class Reference
+      # A Superclass reference pin.
+      #
       class Superclass < Reference
         def reference_gates
           @reference_gates ||= closure.gates - [closure.path]

From 05da6031a99c2899942077a484d281f46bc098b6 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Mon, 8 Sep 2025 13:20:02 -0400
Subject: [PATCH 178/327] Handle nil fqns in get_superclass

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

diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index 40e96ba1a..ffa1df0e2 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -81,7 +81,7 @@ def get_methods fqns, scope: :instance, visibility: [:public]
       # @param fqns [String]
       # @return [Pin::Reference::Superclass]
       def get_superclass fqns
-        return nil if fqns.empty?
+        return nil if fqns.nil? || fqns.empty?
         return BOOLEAN_SUPERCLASS_PIN if %w[TrueClass FalseClass].include?(fqns)
 
         superclass_references[fqns].first || try_special_superclasses(fqns)

From ef3fc9d700c117e0e466a16bbcc469e6ca066481 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 8 Sep 2025 15:21:31 -0400
Subject: [PATCH 179/327] Add empty-directory-related regression spec

---
 .../message/text_document/definition_spec.rb  | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/spec/language_server/message/text_document/definition_spec.rb b/spec/language_server/message/text_document/definition_spec.rb
index 72ff77f1e..b6c98b99b 100644
--- a/spec/language_server/message/text_document/definition_spec.rb
+++ b/spec/language_server/message/text_document/definition_spec.rb
@@ -1,4 +1,33 @@
 describe Solargraph::LanguageServer::Message::TextDocument::Definition do
+  it 'prepares empty directory' do
+    Dir.mktmpdir do |dir|
+      host = Solargraph::LanguageServer::Host.new
+      test_rb_path = File.join(dir, 'test.rb')
+      thing_rb_path = File.join(dir, 'thing.rb')
+      FileUtils.cp('spec/fixtures/workspace/lib/other.rb', test_rb_path)
+      FileUtils.cp('spec/fixtures/workspace/lib/thing.rb', thing_rb_path)
+      host.prepare(dir)
+      sleep 0.1 until host.libraries.all?(&:mapped?)
+      host.catalog
+      file_uri = Solargraph::LanguageServer::UriHelpers.file_to_uri(test_rb_path)
+      other_uri = Solargraph::LanguageServer::UriHelpers.file_to_uri(thing_rb_path)
+      message = Solargraph::LanguageServer::Message::TextDocument::Definition
+                .new(host, {
+                       'params' => {
+                         'textDocument' => {
+                           'uri' => file_uri
+                         },
+                         'position' => {
+                           'line' => 4,
+                           'character' => 10
+                         }
+                       }
+                     })
+      message.process
+      expect(message.result.first[:uri]).to eq(other_uri)
+    end
+  end
+
   it 'finds definitions of methods' do
     host = Solargraph::LanguageServer::Host.new
     host.prepare('spec/fixtures/workspace')
@@ -21,7 +50,7 @@
     expect(message.result.first[:uri]).to eq(other_uri)
   end
 
-  it 'finds definitions of require paths' do
+  it 'finds definitions of require paths', time_limit_seconds: 120 do
     path = File.absolute_path('spec/fixtures/workspace')
     host = Solargraph::LanguageServer::Host.new
     host.prepare(path)

From 5b4fac32224f1967743f6d836c63dc74e20dbe4c Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 9 Sep 2025 08:59:37 -0400
Subject: [PATCH 180/327] Add ActiveRecord example from RBS

---
 spec/convention/activesupport_concern_spec.rb | 87 +++++++++++++++++++
 1 file changed, 87 insertions(+)

diff --git a/spec/convention/activesupport_concern_spec.rb b/spec/convention/activesupport_concern_spec.rb
index e75e8749c..ac061aa63 100644
--- a/spec/convention/activesupport_concern_spec.rb
+++ b/spec/convention/activesupport_concern_spec.rb
@@ -96,4 +96,91 @@ def self.my_method; end
       expect(pins.first.typify(api_map).map(&:tag)).to include('Numeric')
     end
   end
+
+  context 'with RBS to digest' do
+    # create a temporary directory with the scope of the spec
+    around do |example|
+      require 'tmpdir'
+      Dir.mktmpdir("rspec-solargraph-") do |dir|
+        @temp_dir = dir
+        example.run
+      end
+    end
+
+    let(:conversions) do
+      loader = RBS::EnvironmentLoader.new(core_root: nil, repository: RBS::Repository.new(no_stdlib: false))
+      loader.add(path: Pathname(temp_dir))
+      Solargraph::RbsMap::Conversions.new(loader: loader)
+    end
+
+    let(:api_map) { Solargraph::ApiMap.new }
+
+    before do
+      rbs_file = File.join(temp_dir, 'foo.rbs')
+      File.write(rbs_file, rbs)
+      api_map.index conversions.pins
+    end
+
+    attr_reader :temp_dir
+
+    context 'with Inheritance module in ActiveRecord' do
+      let(:rbs) do
+        <<~RBS
+          module MyActiveRecord
+            module Inheritance
+              extend ActiveSupport::Concern
+
+              module ClassMethods
+                attr_accessor abstract_class: untyped
+              end
+            end
+          end
+
+          module MyActiveRecord
+            class Base
+              include Inheritance
+            end
+          end
+        RBS
+      end
+
+      subject(:method_pins) { api_map.get_method_stack('MyActiveRecord', 'abstract_class', scope: :class) }
+
+      it { should_not be_empty }
+
+      it { should be_a(Solargraph::Pin::Method) }
+    end
+
+    # https://github.com/castwide/solargraph/issues/1042
+    context 'with Hash superclass with untyped value and alias' do
+      let(:rbs) do
+        <<~RBS
+          class Sub < Hash[Symbol, untyped]
+            alias meth_alias []
+          end
+        RBS
+      end
+
+      let(:sup_method_stack) { api_map.get_method_stack('Hash{Symbol => undefined}', '[]', scope: :instance) }
+
+      let(:sub_alias_stack) { api_map.get_method_stack('Sub', 'meth_alias', scope: :instance) }
+
+      it 'does not crash looking at superclass method' do
+        expect { sup_method_stack }.not_to raise_error
+      end
+
+      it 'does not crash looking at alias' do
+        expect { sub_alias_stack }.not_to raise_error
+      end
+
+      it 'finds superclass method pin return type' do
+        expect(sup_method_stack.map(&:return_type).map(&:rooted_tags).uniq).to eq(['undefined'])
+      end
+
+      it 'finds superclass method pin parameter type' do
+        expect(sup_method_stack.flat_map(&:signatures).flat_map(&:parameters).map(&:return_type).map(&:rooted_tags)
+                 .uniq).to eq(['Symbol'])
+      end
+    end
+  end
 end

From 7e3a9aa64bfddd396a6499aa638e375c6a6e39e5 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 9 Sep 2025 09:03:10 -0400
Subject: [PATCH 181/327] Add ActiveRecord example from RBS

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

diff --git a/spec/convention/activesupport_concern_spec.rb b/spec/convention/activesupport_concern_spec.rb
index ac061aa63..395e28e20 100644
--- a/spec/convention/activesupport_concern_spec.rb
+++ b/spec/convention/activesupport_concern_spec.rb
@@ -124,6 +124,9 @@ def self.my_method; end
     attr_reader :temp_dir
 
     context 'with Inheritance module in ActiveRecord' do
+      # See
+      # https://github.com/ruby/gem_rbs_collection/blob/main/gems/activerecord/6.0/activerecord-generated.rbs
+      # for full RBS
       let(:rbs) do
         <<~RBS
           module MyActiveRecord

From f2dd55aa0b139c568e182c39fc808dfb1cfd6a63 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Tue, 9 Sep 2025 10:16:15 -0400
Subject: [PATCH 182/327] Even simpler Constants#simple_resolve

---
 lib/solargraph/api_map/constants.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index 2e821d610..adbe1350c 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -106,8 +106,8 @@ def resolve_uncached name, gates
       # @return [String, nil]
       def simple_resolve name, gates
         gates.each do |gate|
-          resolved = collect(gate).map(&:path).find { |ns| "::#{ns}".end_with?("::#{name}") }
-          return resolved if resolved
+          here = "#{gate}::#{name}".sub(/^::/, '').sub(/::$/, '')
+          return here if store.namespace_exists?(here)
         end
         nil
       end
@@ -206,9 +206,9 @@ def inner_get_constants fqns, visibility, skip
           inc_fqns = resolve(pin.name, pin.closure.gates - skip.to_a)
           result.concat inner_get_constants(inc_fqns, [:public], skip)
         end
-        heh = store.get_superclass(fqns)
-        if heh
-          fqsc = dereference(heh)
+        sc_ref = store.get_superclass(fqns)
+        if sc_ref
+          fqsc = dereference(sc_ref)
           result.concat inner_get_constants(fqsc, [:public], skip) unless %w[Object BasicObject].include?(fqsc)
         end
         result

From 9b713b27c4f3ced6377b4b352fd249e2bda0ab59 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 9 Sep 2025 11:20:02 -0400
Subject: [PATCH 183/327] Fix combined gem cache implementation

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

diff --git a/lib/solargraph/pin_cache.rb b/lib/solargraph/pin_cache.rb
index 8c47cfef4..d48873c53 100644
--- a/lib/solargraph/pin_cache.rb
+++ b/lib/solargraph/pin_cache.rb
@@ -119,7 +119,8 @@ def uncache_gem gemspec, out: nil
       PinCache.uncache(yard_gem_path(gemspec), out: out)
       uncache_by_prefix(rbs_collection_pins_path_prefix(gemspec), out: out)
       uncache_by_prefix(combined_path_prefix(gemspec), out: out)
-      combined_pins_in_memory.delete([gemspec.name, gemspec.version])
+      rbs_version_cache_key = lookup_rbs_version_cache_key(gemspec)
+      combined_pins_in_memory.delete([gemspec.name, gemspec.version, rbs_version_cache_key])
     end
 
     # @param gemspec [Gem::Specification, Bundler::LazySpecification]
@@ -380,7 +381,11 @@ def combined_gem? gemspec, hash
     # @param hash [String, nil]
     # @return [Array<Pin::Base>, nil]
     def load_combined_gem gemspec, hash
-      PinCache.load(combined_path(gemspec, hash))
+      cached = combined_pins_in_memory[[gemspec.name, gemspec.version, hash]]
+      return cached if cached
+      loaded = PinCache.load(combined_path(gemspec, hash))
+      combined_pins_in_memory[[gemspec.name, gemspec.version, hash]] = loaded if loaded
+      loaded
     end
 
     # @param gemspec [Gem::Specification]

From 4e02576942b48d8320123c9921324db1c203ab26 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 9 Sep 2025 16:36:23 -0400
Subject: [PATCH 184/327] Improve doc_map_spec.rb

---
 spec/doc_map_spec.rb | 177 +++++++++++++++++++++++++++++++++----------
 1 file changed, 135 insertions(+), 42 deletions(-)

diff --git a/spec/doc_map_spec.rb b/spec/doc_map_spec.rb
index 1315f6c90..2624e472d 100644
--- a/spec/doc_map_spec.rb
+++ b/spec/doc_map_spec.rb
@@ -1,80 +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)
   end
 
-  it 'generates pins from gems' do
-    doc_map = Solargraph::DocMap.new(['ast'], [])
-    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)
+  let(:out) { StringIO.new }
+  let(:pre_cache) { true }
+  let(:requires) { [] }
+
+  let(:workspace) do
+    Solargraph::Workspace.new(Dir.pwd)
   end
 
-  it 'tracks unresolved requires' do
-    doc_map = Solargraph::DocMap.new(['not_a_gem'], [])
-    expect(doc_map.unresolved_requires).to include('not_a_gem')
+  let(:plain_doc_map) { described_class.new([], [], workspace) }
+
+  before do
+    doc_map.cache_all!(nil) if pre_cache
   end
 
-  it 'tracks uncached_gemspecs' do
-    gemspec = Gem::Specification.new do |spec|
-      spec.name = 'not_a_gem'
-      spec.version = '1.0.0'
+  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
-    allow(Gem::Specification).to receive(:find_by_path).and_return(gemspec)
-    doc_map = Solargraph::DocMap.new(['not_a_gem'], [gemspec])
-    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)
+  context 'with an invalid require' do
+    let(:requires) do
+      ['not_a_gem']
+    end
 
-    expect(doc_map_with_bundler_require.pins.length - plain_doc_map.pins.length).to be_positive
+    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 = [
+        '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
 
   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
+
+  context 'when deserialization takes a while' do
+    let(:pre_cache) { false }
+    let(:requires) { ['backport'] }
+
+    before do
+      # proxy this method to simulate a long-running deserialization
+      allow(Benchmark).to receive(:measure) do |&block|
+        block.call
+        5.0
+      end
+    end
+
+    it 'logs timing' do
+      pending('logging being implemented')
+      # force lazy evaluation
+      _pins = doc_map.pins
+      expect(out.string).to include('Deserialized ').and include(' gem pins ').and include(' ms')
+    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/)
   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
 
-  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 require as bundle/require' do
+    it 'imports all gems when bundler/require used' do
+      doc_map_with_bundler_require = described_class.new(['bundler/require'], [], workspace)
+      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
+
+  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
+
+  context 'with a nil require' do
+    let(:requires) { [nil] }
+
+    it 'does not raise error' do
+      expect { doc_map }.not_to raise_error
+    end
+  end
+
+  context 'with an empty require' do
+    let(:requires) { [''] }
 
-    Solargraph::Convention.register dummy_convention
+    it 'does not raise error' do
+      expect { doc_map }.not_to raise_error
+    end
+  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
+
+  context 'with convention' do
+    let(:pre_cache) { false }
 
-    doc_map = Solargraph::DocMap.new(['original_gem'], [])
+    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
 
-    expect(doc_map.requires).to include('original_gem', 'convention_gem1', 'convention_gem2')
+      Solargraph::Convention.register dummy_convention
 
-    # Clean up the registered convention
-    Solargraph::Convention.unregister dummy_convention
+      doc_map = Solargraph::DocMap.new(['original_gem'], [], workspace)
+
+      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 2d0479977a08c6d358c588c559351dc684fbc7a5 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 9 Sep 2025 16:46:41 -0400
Subject: [PATCH 185/327] Fix merge errors

---
 spec/doc_map_spec.rb | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/spec/doc_map_spec.rb b/spec/doc_map_spec.rb
index 2624e472d..54b423f99 100644
--- a/spec/doc_map_spec.rb
+++ b/spec/doc_map_spec.rb
@@ -55,14 +55,6 @@
     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).and_call_original
-    Solargraph::DocMap.new(['set'], [])
-    expect(Solargraph.logger).not_to have_received(:warn).with(/path set/)
-  end
-
   context 'when deserialization takes a while' do
     let(:pre_cache) { false }
     let(:requires) { ['backport'] }
@@ -83,27 +75,6 @@
     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/)
-  end
-
-  it 'ignores nil requires' do
-    expect { Solargraph::DocMap.new([nil], [], workspace) }.not_to raise_error
-  end
-
-  it 'ignores empty requires' do
-    expect { Solargraph::DocMap.new([''], [], workspace) }.not_to raise_error
-  end
-
-  it 'collects dependencies' do
-    doc_map = Solargraph::DocMap.new(['rspec'], [], workspace)
-    expect(doc_map.dependencies.map(&:name)).to include('rspec-core')
-  end
-
   context 'with require as bundle/require' do
     it 'imports all gems when bundler/require used' do
       doc_map_with_bundler_require = described_class.new(['bundler/require'], [], workspace)

From be3f5e54853eebbf835964ac139e3ace4ae81318 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 9 Sep 2025 16:55:10 -0400
Subject: [PATCH 186/327] Add fix-ups

---
 spec/api_map_spec.rb | 2 +-
 spec/shell_spec.rb   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/spec/api_map_spec.rb b/spec/api_map_spec.rb
index 01f78846c..805ce49cb 100755
--- a/spec/api_map_spec.rb
+++ b/spec/api_map_spec.rb
@@ -766,7 +766,7 @@ def bar; end
 
   it 'knows that false is a "subtype" of Boolean' do
     api_map = Solargraph::ApiMap.new
-    expect(api_map.super_and_sub?('Boolean', 'true')).to be(true)
+    expect(api_map.super_and_sub?('Boolean', 'false')).to be(true)
   end
 
   it 'resolves aliases for YARD methods' do
diff --git a/spec/shell_spec.rb b/spec/shell_spec.rb
index 91f84b4c7..e24220ea9 100644
--- a/spec/shell_spec.rb
+++ b/spec/shell_spec.rb
@@ -7,12 +7,14 @@
   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)

From 82c94a675f989db005e0e29dba45dafe507c6157 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 10 Sep 2025 12:16:23 -0400
Subject: [PATCH 187/327] Move Pin::Base#infer deprecation to assert system

---
 lib/solargraph/api_map.rb  | 3 ++-
 lib/solargraph/pin/base.rb | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 02f8f68ea..f41ae0038 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -793,7 +793,8 @@ def inner_get_methods rooted_tag, scope, visibility, deep, skip, no_core = false
             if const.is_a?(Pin::Namespace)
               result.concat inner_get_methods(const.path, scope, visibility, deep, skip, true)
             elsif const.is_a?(Pin::Constant)
-              type = const.infer(self)
+              type = const.typify(self)
+              type = const.probe(self) unless type.defined?
               result.concat inner_get_methods(type.namespace, scope, visibility, deep, skip, true) if type.defined?
             else
               referenced_tag = ref.parametrized_tag
diff --git a/lib/solargraph/pin/base.rb b/lib/solargraph/pin/base.rb
index e6a630562..42b90b77c 100644
--- a/lib/solargraph/pin/base.rb
+++ b/lib/solargraph/pin/base.rb
@@ -528,7 +528,7 @@ def probe api_map
       # @param api_map [ApiMap]
       # @return [ComplexType]
       def infer api_map
-        Solargraph::Logging.logger.warn "WARNING: Pin #infer methods are deprecated. Use #typify or #probe instead."
+        Solargraph.assert_or_log(:pin_infer, 'WARNING: Pin #infer methods are deprecated. Use #typify or #probe instead.')
         type = typify(api_map)
         return type unless type.undefined?
         probe api_map

From 6372fdf19b10d4ffa7408c250517d43e7327b17a Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 10 Sep 2025 12:25:04 -0400
Subject: [PATCH 188/327] Let extra line slide pending new constants PR

---
 .rubocop_todo.yml | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 89fd47c5d..65e9d3feb 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.2.
+# 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.
 # Note that changes in the inspected code, or installation of new
@@ -433,7 +433,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.
@@ -512,11 +511,6 @@ Lint/DuplicateMethods:
     - 'lib/solargraph/rbs_map/core_map.rb'
     - 'lib/solargraph/source/chain/link.rb'
 
-# Configuration parameters: AllowComments, AllowEmptyLambdas.
-Lint/EmptyBlock:
-  Exclude:
-    - 'spec/convention_spec.rb'
-
 # Configuration parameters: AllowComments.
 Lint/EmptyClass:
   Exclude:
@@ -530,6 +524,7 @@ Lint/EmptyClass:
 # Configuration parameters: AllowComments.
 Lint/EmptyFile:
   Exclude:
+    - 'lib/solargraph/foo.rb'
     - 'spec/fixtures/vendored/vendor/do_not_use.gemspec'
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -782,6 +777,7 @@ Metrics/ParameterLists:
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/PerceivedComplexity:
   Exclude:
+    - 'lib/solargraph/api_map.rb'
     - 'lib/solargraph/complex_type.rb'
     - 'lib/solargraph/parser/parser_gem/node_chainer.rb'
     - 'lib/solargraph/source/chain/call.rb'
@@ -998,11 +994,6 @@ RSpec/DescribedClass:
     - 'spec/yard_map/mapper/to_method_spec.rb'
     - 'spec/yard_map/mapper_spec.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-RSpec/EmptyExampleGroup:
-  Exclude:
-    - 'spec/convention_spec.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 RSpec/EmptyLineAfterFinalLet:
   Exclude:
@@ -2143,7 +2134,6 @@ 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'
 
@@ -2299,7 +2289,6 @@ Style/StringLiterals:
     - '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'
@@ -2614,7 +2603,6 @@ Layout/LineLength:
     - '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'

From 930d3c6c6cbd7987f6ba3754b504eb242088b45a Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 10 Sep 2025 20:13:23 -0400
Subject: [PATCH 189/327] Keep workspace directories as absolute paths

---
 lib/solargraph/workspace.rb | 10 ++++++++--
 spec/workspace_spec.rb      |  3 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/solargraph/workspace.rb b/lib/solargraph/workspace.rb
index a8325ea89..de4b11084 100644
--- a/lib/solargraph/workspace.rb
+++ b/lib/solargraph/workspace.rb
@@ -19,11 +19,17 @@ class Workspace
     attr_reader :gemnames
     alias source_gems gemnames
 
-    # @param directory [String]
+    # @param directory [String] TODO: Remove '' and '*' special cases
     # @param config [Config, nil]
     # @param server [Hash]
     def initialize directory = '', config = nil, server = {}
-      @directory = directory
+      raise ArgumentError, 'directory must be a String' unless directory.is_a?(String)
+
+      @directory = if ['*', ''].include?(directory)
+                     directory
+                   else
+                     File.absolute_path(directory)
+                   end
       @config = config
       @server = server
       load_sources
diff --git a/spec/workspace_spec.rb b/spec/workspace_spec.rb
index 572c3e131..d9c7ca415 100644
--- a/spec/workspace_spec.rb
+++ b/spec/workspace_spec.rb
@@ -124,7 +124,8 @@
 
   it "uses configured require paths" do
     workspace = Solargraph::Workspace.new('spec/fixtures/workspace')
-    expect(workspace.require_paths).to eq(['spec/fixtures/workspace/lib', 'spec/fixtures/workspace/ext'])
+    expect(workspace.require_paths).to eq([File.absolute_path('spec/fixtures/workspace/lib'),
+                                           File.absolute_path('spec/fixtures/workspace/ext')])
   end
 
   it 'ignores gemspecs in excluded directories' do

From 82bfce70146f35a112e46386b574334beea01bfc Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 10 Sep 2025 22:05:12 -0400
Subject: [PATCH 190/327] Add rebuild option

---
 lib/solargraph/shell.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/solargraph/shell.rb b/lib/solargraph/shell.rb
index 4f114c5fe..c66dd9c32 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -125,23 +125,27 @@ def cache gem, version = nil
         The 'core' argument can be used to cache the type
         documentation for the core Ruby libraries.
 
+        If the library is already cached, it will be rebuilt if the
+        --rebuild option is set.
+
         Cached documentation is stored in #{PinCache.base_dir}, which
         can be stored between CI runs.
     )
+    option :rebuild, type: :boolean, desc: 'Rebuild existing documentation', default: false
     # @param names [Array<String>]
     # @return [void]
     def gems *names
-      $stderr.puts("Caching these gems: #{names}")
       # print time with ms
       workspace = Solargraph::Workspace.new('.')
 
       api_map = Solargraph::ApiMap.load(Dir.pwd)
       if names.empty?
-        api_map.cache_all!($stdout)
+        api_map.cache_all!($stdout, rebuild: options[:rebuild]])
       else
+        $stderr.puts("Caching these gems: #{names}")
         names.each do |name|
           if name == 'core'
-            PinCache.cache_core(out: $stdout)
+            PinCache.cache_core(out: $stdout) if !PinCache.core? || options[:rebuild]
             next
           end
 

From 0fa1ad149dcb4799f37850bbd2670d1b5644eddb Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 10 Sep 2025 22:09:27 -0400
Subject: [PATCH 191/327] Fix syntax

---
 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 c66dd9c32..68e7bf661 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -140,7 +140,7 @@ def gems *names
 
       api_map = Solargraph::ApiMap.load(Dir.pwd)
       if names.empty?
-        api_map.cache_all!($stdout, rebuild: options[:rebuild]])
+        api_map.cache_all!($stdout, rebuild: options[:rebuild])
       else
         $stderr.puts("Caching these gems: #{names}")
         names.each do |name|

From 5a5b865963c7a35539ff0df315707232d2f913ae Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 10 Sep 2025 22:18:50 -0400
Subject: [PATCH 192/327] Pass through rebuild flag

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

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index b85fa8a0b..532ea62a2 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -190,9 +190,10 @@ def self.load directory
     end
 
     # @param out [IO, nil]
+    # @param rebuild [Boolean] whether to rebuild the pins even if they are cached
     # @return [void]
-    def cache_all!(out)
-      @doc_map.cache_all!(out)
+    def cache_all!(out, rebuild: false)
+      @doc_map.cache_all!(out, rebuild: rebuild)
     end
 
     # @param gemspec [Gem::Specification]

From 3a7b7e7bc980cfc22371348362d98b0d99e78408 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 10 Sep 2025 22:51:56 -0400
Subject: [PATCH 193/327] Document 'solargraph init' command in README

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 7f344c712..febc972ee 100755
--- a/README.md
+++ b/README.md
@@ -51,6 +51,8 @@ Plug-ins and extensions are available for the following editors:
 
 Solargraph's behavior can be controlled via optional [configuration](https://solargraph.org/guides/configuration) files. The highest priority file is a `.solargraph.yml` file at the root of the project. If not present, any global configuration at `~/.config/solargraph/config.yml` will apply. The path to the global configuration can be overridden with the `SOLARGRAPH_GLOBAL_CONFIG` environment variable.
 
+Use `bundle exec solargraph init` to create a configuration file.
+
 ### Plugins
 
 Solargraph supports [plugins](https://solargraph.org/guides/plugins) that implement their own Solargraph features, such as diagnostics reporters and conventions to provide LSP features and type-checking, e.g. for frameworks which use metaprogramming and/or DSLs.

From 2ea9620b7e1b96c41d1381d674b0dd4c9d5dc4a5 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 11 Sep 2025 08:03:08 -0400
Subject: [PATCH 194/327] Add future spec for issue that blocks existing one

---
 spec/doc_map_spec.rb | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/spec/doc_map_spec.rb b/spec/doc_map_spec.rb
index 54b423f99..51acdbb93 100644
--- a/spec/doc_map_spec.rb
+++ b/spec/doc_map_spec.rb
@@ -33,12 +33,30 @@
     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']
     end
 
-    it 'tracks unresolved requires' do
+    # 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 = [

From 0dbf35846dec2b3a80d31699258598cf253379a9 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 11 Sep 2025 08:17:41 -0400
Subject: [PATCH 195/327] Disable new spec

---
 spec/doc_map_spec.rb | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/spec/doc_map_spec.rb b/spec/doc_map_spec.rb
index 51acdbb93..b0efb7d44 100644
--- a/spec/doc_map_spec.rb
+++ b/spec/doc_map_spec.rb
@@ -94,7 +94,19 @@
   end
 
   context 'with require as bundle/require' do
-    it 'imports all gems when bundler/require used' 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)
       doc_map_with_bundler_require.cache_all!(nil)
       expect(doc_map_with_bundler_require.pins.length - plain_doc_map.pins.length).to be_positive

From daf863331cc3959036f607cc774de4ad06a7a002 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 11 Sep 2025 08:41:43 -0400
Subject: [PATCH 196/327] Mark spec with xit

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

diff --git a/spec/doc_map_spec.rb b/spec/doc_map_spec.rb
index b0efb7d44..0d8817116 100644
--- a/spec/doc_map_spec.rb
+++ b/spec/doc_map_spec.rb
@@ -38,7 +38,9 @@
       ['rspec-mocks']
     end
 
-    it 'generates pins from gems' do
+    # This is a gem name vs require name issue - works under
+    # solargraph-rspec, but not without
+    xit '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' }

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 197/327] 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 198/327] 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 199/327] 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 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 200/327] 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 201/327] 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 9b58947b4beada2bc5cf4faff9915a59bdcbedf8 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 11 Sep 2025 15:24:35 -0400
Subject: [PATCH 202/327] xit -> pending so we reenable specs once fixed

---
 spec/api_map_spec.rb                    |  5 ++--
 spec/complex_type_spec.rb               | 15 ++++++++----
 spec/parser/node_chainer_spec.rb        |  4 +++-
 spec/parser/node_methods_spec.rb        |  4 +++-
 spec/rbs_map/core_map_spec.rb           |  4 +++-
 spec/source/chain/call_spec.rb          | 12 +++++++---
 spec/source/chain_spec.rb               |  4 +++-
 spec/source_map/clip_spec.rb            | 32 ++++++++++++++++++-------
 spec/type_checker/levels/strict_spec.rb | 16 +++++++++----
 spec/yard_map/mapper/to_method_spec.rb  |  4 +++-
 10 files changed, 74 insertions(+), 26 deletions(-)

diff --git a/spec/api_map_spec.rb b/spec/api_map_spec.rb
index 805ce49cb..bb76679f1 100755
--- a/spec/api_map_spec.rb
+++ b/spec/api_map_spec.rb
@@ -430,8 +430,9 @@ class Sup
     expect(pins.map(&:path)).to include('Mixin#bar')
   end
 
-  # pending https://github.com/apiology/solargraph/pull/4
-  xit 'understands tuples inherit from regular arrays' do
+  it 'understands tuples inherit from regular arrays' do
+    pending('Fix to remove trailing generic<> after resolution')
+
     method_pins = @api_map.get_method_stack("Array(1, 2, 'a')", 'include?')
     method_pin = method_pins.first
     expect(method_pin).to_not be_nil
diff --git a/spec/complex_type_spec.rb b/spec/complex_type_spec.rb
index f876d642f..b97338a6c 100644
--- a/spec/complex_type_spec.rb
+++ b/spec/complex_type_spec.rb
@@ -13,7 +13,8 @@
       expect(types.length).to eq(0)
     end
 
-    xit 'parses zero types as a string' do
+    it 'parses zero types as a string' do
+      pending('special case being added')
       types = Solargraph::ComplexType.parse ''
       expect(types.length).to eq(0)
     end
@@ -265,14 +266,18 @@
     # See literal details at
     # https://github.com/ruby/rbs/blob/master/docs/syntax.md and
     # https://yardoc.org/types.html
-    xit 'understands literal strings with double quotes' do
+    it 'understands literal strings with double quotes' do
+      pending('string escaping support being added')
+
       type = Solargraph::ComplexType.parse('"foo"')
       expect(type.tag).to eq('"foo"')
       expect(type.to_rbs).to eq('"foo"')
       expect(type.to_s).to eq('String')
     end
 
-    xit 'understands literal strings with single quotes' do
+    it 'understands literal strings with single quotes' do
+      pending('string escaping support being added')
+
       type = Solargraph::ComplexType.parse("'foo'")
       expect(type.tag).to eq("'foo'")
       expect(type.to_rbs).to eq("'foo'")
@@ -725,7 +730,9 @@ def make_bar
       expect(result.to_rbs).to eq('::Array[::String]')
     end
 
-    xit 'stops parsing when the first character indicates a string literal' do
+    it 'stops parsing when the first character indicates a string literal' do
+      pending('string escaping support being added')
+
       api_map = Solargraph::ApiMap.new
       type = Solargraph::ComplexType.parse('"Array(Symbol, String, Array(Integer, Integer)"')
       type = type.qualify(api_map)
diff --git a/spec/parser/node_chainer_spec.rb b/spec/parser/node_chainer_spec.rb
index e92431aae..85fa140d8 100644
--- a/spec/parser/node_chainer_spec.rb
+++ b/spec/parser/node_chainer_spec.rb
@@ -141,7 +141,9 @@ class Foo
     expect(chain.links.first).to be_with_block
   end
 
-  xit 'tracks complex multiple assignment' do
+  it 'tracks complex multiple assignment' do
+    pending('complex multiple assignment support')
+
     source = Solargraph::Source.load_string(%(
       foo.baz, bar = [1, 2]
     ))
diff --git a/spec/parser/node_methods_spec.rb b/spec/parser/node_methods_spec.rb
index f9504b584..536bc61d6 100644
--- a/spec/parser/node_methods_spec.rb
+++ b/spec/parser/node_methods_spec.rb
@@ -289,7 +289,9 @@
     expect(rets.length).to eq(1)
   end
 
-  xit "short-circuits return node finding after a raise statement in a begin expressiona" do
+  it "short-circuits return node finding after a raise statement in a begin expression" do
+    pending('case being handled')
+
     node = Solargraph::Parser.parse(%(
       raise "Error"
       y
diff --git a/spec/rbs_map/core_map_spec.rb b/spec/rbs_map/core_map_spec.rb
index 88590925b..3f9cc6e03 100644
--- a/spec/rbs_map/core_map_spec.rb
+++ b/spec/rbs_map/core_map_spec.rb
@@ -58,7 +58,9 @@
     expect(signature.block.parameters.map(&:return_type).map(&:to_s)).to eq(['String'])
   end
 
-  xit 'understands defaulted type parameters' do
+  it 'understands defaulted type parameters' do
+    pending('defaulted type parameter support')
+
     # @todo Enumerable#each's' return type not yet supported as _Each<>
     #   takes two type parameters, the second has a default value,
     #   Enumerable specifies it, but Solargraph doesn't support type
diff --git a/spec/source/chain/call_spec.rb b/spec/source/chain/call_spec.rb
index 8b67a3c66..e27203fd4 100644
--- a/spec/source/chain/call_spec.rb
+++ b/spec/source/chain/call_spec.rb
@@ -250,7 +250,9 @@ def baz
     expect(type.simple_tags).to eq('Integer')
   end
 
-  xit 'infers method return types based on method generic' do
+  it 'infers method return types based on method generic' do
+    pending('deeper inference support')
+
     source = Solargraph::Source.load_string(%(
       class Foo
         # @Generic A
@@ -315,7 +317,9 @@ def baz
     expect(type.tag).to eq('String')
   end
 
-  xit 'infers generic return types from block from yield being a return node' do
+  it 'infers generic return types from block from yield being a return node' do
+    pending('deeper inference support')
+
     source = Solargraph::Source.load_string(%(
       def yielder(&blk)
         yield
@@ -595,7 +599,9 @@ def k
     expect(clip.infer.rooted_tags).to eq('::Array<::A::D::E>')
   end
 
-  xit 'correctly looks up civars' do
+  it 'correctly looks up civars' do
+    pending('better civar support')
+
     source = Solargraph::Source.load_string(%(
       class Foo
         BAZ = /aaa/
diff --git a/spec/source/chain_spec.rb b/spec/source/chain_spec.rb
index abc8c2b05..ec96e800f 100644
--- a/spec/source/chain_spec.rb
+++ b/spec/source/chain_spec.rb
@@ -362,7 +362,9 @@ class Bar; end
     expect(chain.links[1]).to be_with_block
   end
 
-  xit 'infers instance variables from multiple assignments' do
+  it 'infers instance variables from sequential assignments' do
+    pending('sequential assignment support')
+
     source = Solargraph::Source.load_string(%(
       def foo
         @foo = nil
diff --git a/spec/source_map/clip_spec.rb b/spec/source_map/clip_spec.rb
index 0f83331ec..fe6a14723 100644
--- a/spec/source_map/clip_spec.rb
+++ b/spec/source_map/clip_spec.rb
@@ -320,7 +320,9 @@ def foo
     expect(type.simple_tags).to eq('String, Integer')
   end
 
-  xit 'uses flow-sensitive typing to infer non-nil method return type' do
+  it 'uses flow-sensitive typing to infer non-nil method return type' do
+    pending('if x.nil? support in flow sensitive typing')
+
     source = Solargraph::Source.load_string(%(
     # @return [Gem::Specification,nil]
     def find_by_name; end
@@ -2626,7 +2628,9 @@ def bar; end
     expect(clip.infer.to_s).to eq('Foo')
   end
 
-  xit 'replaces nil with reassignments' do
+  it 'replaces nil with reassignments' do
+    pending 'sequential assignment support'
+
     source = Solargraph::Source.load_string(%(
       bar = nil
       bar
@@ -2641,7 +2645,9 @@ def bar; end
     expect(clip.infer.to_s).to eq('Integer')
   end
 
-  xit 'replaces type with reassignments' do
+  it 'replaces type with reassignments' do
+    pending 'sequential assignment support'
+
     source = Solargraph::Source.load_string(%(
       bar = 'a'
       bar
@@ -2669,7 +2675,9 @@ def bar; end
     expect(clip.infer.to_s).to eq('String, nil')
   end
 
-  xit 'replaces nil with alternate reassignments' do
+  it 'replaces nil with alternate reassignments' do
+    pending 'conditional assignment support'
+
     source = Solargraph::Source.load_string(%(
       bar = nil
       if baz
@@ -2684,7 +2692,9 @@ def bar; end
     expect(clip.infer.to_s).to eq('Symbol, Integer')
   end
 
-  xit 'replaces type with alternate reassignments' do
+  it 'replaces type with alternate reassignments' do
+    pending 'conditional assignment support'
+
     source = Solargraph::Source.load_string(%(
       bar = 'a'
       if baz
@@ -2949,7 +2959,9 @@ def foo
     expect(clip.infer.to_s).to eq('Array, Hash, Integer, nil')
   end
 
-  xit 'infers that type of argument has been overridden' do
+  it 'infers that type of argument has been overridden' do
+    pending 'sequential assignment support'
+
     source = Solargraph::Source.load_string(%(
       def foo a
         a = 'foo'
@@ -2962,7 +2974,9 @@ def foo a
     expect(clip.infer.to_s).to eq('String')
   end
 
-  xit 'preserves hash value when it is a union with brackets' do
+  it 'preserves hash value when it is a union with brackets' do
+    pending 'union in bracket support'
+
     source = Solargraph::Source.load_string(%(
       # @type [Hash{String => [Array, Hash, Integer, nil]}]
       raw_data = {}
@@ -2988,7 +3002,9 @@ def foo a
     expect(clip.infer.to_s).to eq('Array<String>')
   end
 
-  xit 'preserves hash value when it is a union with brackets' do
+  it 'preserves hash value when it is a union with brackets' do
+    pending 'union in bracket support'
+
     source = Solargraph::Source.load_string(%(
       # @type [Hash{String => [Array, Hash, Integer, nil]}]
       raw_data = {}
diff --git a/spec/type_checker/levels/strict_spec.rb b/spec/type_checker/levels/strict_spec.rb
index 7e57cb7cf..a408544f5 100644
--- a/spec/type_checker/levels/strict_spec.rb
+++ b/spec/type_checker/levels/strict_spec.rb
@@ -539,7 +539,9 @@ def bar(baz:, bing:)
       expect(checker.problems).to be_empty
     end
 
-    xit 'requires strict return tags' do
+    it 'requires strict return tags' do
+      pending 'nil? support in flow sensitive typing'
+
       checker = type_checker(%(
         class Foo
           # The tag is [String] but the inference is [String, nil]
@@ -554,7 +556,9 @@ def bar
       expect(checker.problems.first.message).to include('does not match inferred type')
     end
 
-    xit 'requires strict return tags' do
+    it 'requires strict return tags' do
+      pending 'nil? support in flow sensitive typing'
+
       checker = type_checker(%(
         class Foo
           # The tag is [String] but the inference is [String, nil]
@@ -755,7 +759,9 @@ def meth(param1)
       expect(checker.problems).to be_one
     end
 
-    xit 'uses nil? to refine type' do
+    it 'uses nil? to refine type' do
+      pending 'nil? support in flow sensitive typing'
+
       checker = type_checker(%(
         # @sg-ignore
         # @type [String, nil]
@@ -859,7 +865,9 @@ def foo *path, baz; end
       expect(checker.problems.map(&:message)).to be_empty
     end
 
-    xit "Uses flow scope to specialize understanding of cvar types" do
+    it "Uses flow scope to specialize understanding of cvar types" do
+      pending 'better cvar support'
+
       checker = type_checker(%(
         class Bar
           # @return [String]
diff --git a/spec/yard_map/mapper/to_method_spec.rb b/spec/yard_map/mapper/to_method_spec.rb
index 9c5caa705..c90fe75ed 100644
--- a/spec/yard_map/mapper/to_method_spec.rb
+++ b/spec/yard_map/mapper/to_method_spec.rb
@@ -67,7 +67,9 @@
     expect(param.full).to eq("&bar")
   end
 
-  xit 'parses undefined but typed blockargs' do
+  it 'parses undeclared but typed blockargs' do
+    pending('block args coming from YARD alone')
+
     code_object.parameters = []
     code_object.docstring = <<EOF
 @yieldparam foo [Integer]

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 203/327] 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 805276e023d95d8601f9f93b333935c0c2623b80 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 13 Sep 2025 16:34:41 -0400
Subject: [PATCH 204/327] Fix typechecking issues

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

diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index b82e5612c..d89d1a489 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -101,7 +101,7 @@ def qualify_superclass fq_sub_tag
       end
 
       # @param fqns [String]
-      # @return [Array<Pin::Reference::Include>]
+      # @return [Array<String>]
       def get_includes fqns
         include_references[fqns] || []
       end
@@ -113,7 +113,7 @@ def get_prepends fqns
       end
 
       # @param fqns [String]
-      # @return [Array<Pin::Reference::Extend>]
+      # @return [Array<String>]
       def get_extends fqns
         extend_references[fqns] || []
       end

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 205/327] 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 ca4f03922843102de8ac2ada050a264e095bab9f Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 13 Sep 2025 19:35:01 -0400
Subject: [PATCH 206/327] Rebuild rubocop todo

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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index f7e83b95f..ecc699d97 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -584,7 +584,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'
 
@@ -675,7 +674,6 @@ RSpec/LetBeforeExamples:
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
   Exclude:
-    - 'spec/doc_map_spec.rb'
     - 'spec/language_server/host/diagnoser_spec.rb'
     - 'spec/language_server/host/message_worker_spec.rb'
 
@@ -704,7 +702,11 @@ RSpec/NotToNot:
     - 'spec/rbs_map/core_map_spec.rb'
 
 RSpec/PendingWithoutReason:
-  Enabled: false
+  Exclude:
+    - 'spec/api_map_spec.rb'
+    - 'spec/doc_map_spec.rb'
+    - 'spec/pin/local_variable_spec.rb'
+    - 'spec/type_checker/levels/strict_spec.rb'
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Strict, EnforcedStyle, AllowedExplicitMatchers.

From 88c219c3df40e6146c69436d687d780f787f8126 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Mon, 8 Sep 2025 13:20:02 -0400
Subject: [PATCH 207/327] Handle nil fqns in get_superclass

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

diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index 40e96ba1a..ffa1df0e2 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -81,7 +81,7 @@ def get_methods fqns, scope: :instance, visibility: [:public]
       # @param fqns [String]
       # @return [Pin::Reference::Superclass]
       def get_superclass fqns
-        return nil if fqns.empty?
+        return nil if fqns.nil? || fqns.empty?
         return BOOLEAN_SUPERCLASS_PIN if %w[TrueClass FalseClass].include?(fqns)
 
         superclass_references[fqns].first || try_special_superclasses(fqns)

From 3f6cfa3930d71116505c0e1fe66363348ab4d1b1 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Tue, 9 Sep 2025 10:16:15 -0400
Subject: [PATCH 208/327] Even simpler Constants#simple_resolve

---
 lib/solargraph/api_map/constants.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index 2e821d610..adbe1350c 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -106,8 +106,8 @@ def resolve_uncached name, gates
       # @return [String, nil]
       def simple_resolve name, gates
         gates.each do |gate|
-          resolved = collect(gate).map(&:path).find { |ns| "::#{ns}".end_with?("::#{name}") }
-          return resolved if resolved
+          here = "#{gate}::#{name}".sub(/^::/, '').sub(/::$/, '')
+          return here if store.namespace_exists?(here)
         end
         nil
       end
@@ -206,9 +206,9 @@ def inner_get_constants fqns, visibility, skip
           inc_fqns = resolve(pin.name, pin.closure.gates - skip.to_a)
           result.concat inner_get_constants(inc_fqns, [:public], skip)
         end
-        heh = store.get_superclass(fqns)
-        if heh
-          fqsc = dereference(heh)
+        sc_ref = store.get_superclass(fqns)
+        if sc_ref
+          fqsc = dereference(sc_ref)
           result.concat inner_get_constants(fqsc, [:public], skip) unless %w[Object BasicObject].include?(fqsc)
         end
         result

From 4e6ede997402fcd2afa669c397383ef230102ad2 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 13 Sep 2025 19:51:25 -0400
Subject: [PATCH 209/327] 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 -
 solargraph.gemspec            | 13 ++++++++++---
 3 files changed, 14 insertions(+), 6 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 c17a56410..0e0a529ee 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -37,7 +37,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/solargraph.gemspec b/solargraph.gemspec
index 42d80dae2..13ae124de 100755
--- a/solargraph.gemspec
+++ b/solargraph.gemspec
@@ -51,9 +51,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 58dd848e4d675fbfc767f972871e72cb6f2cb3af Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 13 Sep 2025 19:51:46 -0400
Subject: [PATCH 210/327] Fix merge issue

---
 .github/workflows/linting.yml |    2 +-
 .rubocop_todo.yml             | 1503 ++-------------------------------
 lib/solargraph/api_map.rb     |    2 -
 spec/api_map_spec.rb          |    3 -
 4 files changed, 94 insertions(+), 1416 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 89fd47c5d..0ed335f34 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.2.
+# `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.
 # Note that changes in the inspected code, or installation of new
@@ -64,6 +64,7 @@ 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.
@@ -75,23 +76,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.
@@ -103,18 +88,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.
@@ -134,23 +108,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
@@ -194,22 +152,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.
@@ -224,32 +167,13 @@ 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).
 # 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.
@@ -279,14 +203,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.
@@ -306,13 +223,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:
@@ -324,55 +235,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/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:
@@ -384,28 +254,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.
@@ -444,13 +293,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:
@@ -461,15 +304,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.
@@ -503,14 +338,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:
@@ -519,13 +347,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:
@@ -624,31 +446,7 @@ Lint/UnusedBlockArgument:
 # Configuration parameters: 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: ContextCreatingMethods, MethodCreatingMethods.
@@ -658,30 +456,7 @@ Lint/UselessAccessModifier:
 
 # This cop supports safe autocorrection (--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:
@@ -694,43 +469,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:
@@ -742,33 +490,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:
@@ -781,13 +511,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:
@@ -810,41 +534,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_
@@ -899,16 +600,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:
@@ -926,80 +618,10 @@ 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).
-RSpec/EmptyExampleGroup:
+  Enabled: false
+
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/EmptyExampleGroup:
   Exclude:
     - 'spec/convention_spec.rb'
 
@@ -1010,33 +632,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.
@@ -1063,15 +659,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: .
@@ -1081,12 +669,7 @@ RSpec/ImplicitExpect:
 
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
-  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/protocol_spec.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 RSpec/LeadingSubject:
@@ -1102,101 +685,26 @@ RSpec/LetBeforeExamples:
   Exclude:
     - 'spec/complex_type_spec.rb'
 
-# Configuration parameters: EnforcedStyle.
+# Configuration parameters: .
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
-  Exclude:
-    - 'spec/doc_map_spec.rb'
-    - 'spec/language_server/host/diagnoser_spec.rb'
-    - 'spec/language_server/host/message_worker_spec.rb'
+  EnforcedStyle: receive
 
 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.
@@ -1207,18 +715,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.
@@ -1238,16 +735,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:
@@ -1262,26 +750,17 @@ 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'
 
 # 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:
@@ -1291,20 +770,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.
@@ -1320,21 +786,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.
@@ -1353,44 +805,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.
@@ -1398,18 +818,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.
@@ -1445,150 +854,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:
@@ -1639,136 +911,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:
@@ -1781,19 +924,11 @@ 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'
-
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowSplatArgument.
-Style/HashConversion:
+  Enabled: false
+
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowSplatArgument.
+Style/HashConversion:
   Exclude:
     - 'lib/solargraph/doc_map.rb'
 
@@ -1824,52 +959,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.
@@ -1900,68 +994,7 @@ Style/MapToSet:
 # 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'
+  Enabled: false
 
 Style/MultilineBlockChain:
   Exclude:
@@ -1980,29 +1013,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.
@@ -2037,34 +1054,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:
@@ -2073,14 +1071,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.
@@ -2137,15 +1128,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/pin/search.rb'
-    - 'lib/solargraph/source.rb'
-    - 'lib/solargraph/type_checker.rb'
+  Enabled: false
 
 # This cop supports safe autocorrection (--autocorrect).
 Style/RedundantRegexpArgument:
@@ -2158,13 +1141,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.
@@ -2178,15 +1155,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.
@@ -2207,19 +1176,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:
@@ -2228,36 +1185,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:
@@ -2268,114 +1201,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:
@@ -2389,35 +1221,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.
@@ -2430,19 +1240,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.
@@ -2456,13 +1254,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.
@@ -2481,20 +1273,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:
@@ -2503,13 +1282,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.
@@ -2522,32 +1295,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/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:
@@ -2556,72 +1304,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/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index eb10845e4..2ad831b50 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -728,7 +728,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
@@ -802,7 +801,6 @@ def inner_get_methods rooted_tag, scope, visibility, deep, skip, no_core = false
       end
       result
     end
-    # rubocop:enable Metrics/CyclomaticComplexity
 
     # @return [Hash]
     def path_macros
diff --git a/spec/api_map_spec.rb b/spec/api_map_spec.rb
index ff20b3768..5d366c4a6 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
@@ -878,6 +877,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 b6c474a518a71f383a441b7298ce6f9786eefaa0 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 6 Sep 2025 14:18:16 -0400
Subject: [PATCH 211/327] 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 75abb080bcb4793f01852898326d73350b44b44a Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 18:40:51 -0400
Subject: [PATCH 212/327] 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 b77d374de10bfc59da3e5566936b5b485af2a40f Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 16:57:05 -0400
Subject: [PATCH 213/327] 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 0b9c8074964d324caac09f3b84813248f8c51f92 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 17:10:41 -0400
Subject: [PATCH 214/327] 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 3ea35f08789378c3302342d55f22661a823bb4d9 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 17:14:22 -0400
Subject: [PATCH 215/327] 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 b5984f3cb..4d550a35d 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -163,7 +163,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 39877f9629f4e6f358838f8d90545eeffb4e4ec3 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 17:25:05 -0400
Subject: [PATCH 216/327] 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 4d550a35d..cd5fadfdc 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:
@@ -163,7 +164,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 41322c109dbd6a2dba8ba4c044df4dbf15b40f68 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 17:44:39 -0400
Subject: [PATCH 217/327] 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 cd5fadfdc..58998e125 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -157,8 +157,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 f8993a7e9d9664a553348c26101c6ce19409b97c Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 17:45:56 -0400
Subject: [PATCH 218/327] 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 58998e125..4dedbd93f 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -157,6 +157,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 6d7b80b1da80f37a5cc92cd5116595bc29d38e01 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 7 Sep 2025 18:09:04 -0400
Subject: [PATCH 219/327] 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 584f78b309055498b187e22f8935f339260effbb Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 13 Sep 2025 16:30:39 -0400
Subject: [PATCH 220/327] 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 41cee2c2043bb7561a2da8e6ce49bbcf4ebe1a9c Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 13 Sep 2025 19:50:55 -0400
Subject: [PATCH 221/327] Update rubocop todo

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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index f7e83b95f..f5a19f3bb 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -660,6 +660,7 @@ RSpec/InstanceVariable:
 # This cop supports safe autocorrection (--autocorrect).
 RSpec/LeadingSubject:
   Exclude:
+    - 'spec/convention/activesupport_concern_spec.rb'
     - 'spec/rbs_map/conversions_spec.rb'
 
 RSpec/LeakyConstantDeclaration:

From df2573539463c71815ed97ee4ed1d3347a03cf64 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 14 Sep 2025 20:45:04 -0400
Subject: [PATCH 222/327] Fix types

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

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index eb86aa4b1..5ea0166f0 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -306,13 +306,13 @@ def dereference(pin)
     end
 
     # @param fqns [String]
-    # @return [Array<String>]
+    # @return [Array<Pin::Reference::Extend>]
     def get_extends(fqns)
       store.get_extends(fqns)
     end
 
     # @param fqns [String]
-    # @return [Array<String>]
+    # @return [Array<Pin::Reference::Include>]
     def get_includes(fqns)
       store.get_includes(fqns)
     end
@@ -762,6 +762,9 @@ def inner_get_methods rooted_tag, scope, visibility, deep, skip, no_core = false
 
         if scope == :instance
           store.get_includes(fqns).reverse.each do |ref|
+            # @sg-ignore Declared type Solargraph::Pin::Constant does
+            #   not match inferred type Solargraph::Pin::Constant,
+            #   Solargraph::Pin::Namespace, nil for variable const
             const = get_constants('', *ref.closure.gates).find { |pin| pin.path.end_with? ref.name }
             if const.is_a?(Pin::Namespace)
               result.concat inner_get_methods(const.path, scope, visibility, deep, skip, true)

From f74f255442ede1a9ae76dcc80d77012367186b68 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 14 Sep 2025 20:45:23 -0400
Subject: [PATCH 223/327] Fix types

---
 lib/solargraph/api_map/index.rb |  8 ++++----
 lib/solargraph/api_map/store.rb | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/solargraph/api_map/index.rb b/lib/solargraph/api_map/index.rb
index b06366f97..c311a9782 100644
--- a/lib/solargraph/api_map/index.rb
+++ b/lib/solargraph/api_map/index.rb
@@ -43,7 +43,7 @@ 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<String>}]
+      # @return [Hash{String => Array<Pin::Reference::Include>}]
       def include_references
         @include_references ||= Hash.new { |h, k| h[k] = [] }
       end
@@ -53,17 +53,17 @@ def include_reference_pins
         @include_reference_pins ||= Hash.new { |h, k| h[k] = [] }
       end
 
-      # @return [Hash{String => Array<String>}]
+      # @return [Hash{String => Array<Pin::Reference::Extend>}]
       def extend_references
         @extend_references ||= Hash.new { |h, k| h[k] = [] }
       end
 
-      # @return [Hash{String => Array<String>}]
+      # @return [Hash{String => Array<Pin::Reference::Prepend>}]
       def prepend_references
         @prepend_references ||= Hash.new { |h, k| h[k] = [] }
       end
 
-      # @return [Hash{String => Array<String>}]
+      # @return [Hash{String => Array<Pin::Reference::Superclass>}]
       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 d89d1a489..545d99540 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -79,7 +79,7 @@ def get_methods fqns, scope: :instance, visibility: [:public]
       OBJECT_SUPERCLASS_PIN = Pin::Reference::Superclass.new(name: 'Object', closure: Pin::ROOT_PIN, source: :solargraph)
 
       # @param fqns [String]
-      # @return [Pin::Reference::Superclass]
+      # @return [Pin::Reference::Superclass, nil]
       def get_superclass fqns
         return nil if fqns.nil? || fqns.empty?
         return BOOLEAN_SUPERCLASS_PIN if %w[TrueClass FalseClass].include?(fqns)
@@ -298,12 +298,12 @@ def symbols
         index.pins_by_class(Pin::Symbol)
       end
 
-      # @return [Hash{String => Array<String>}]
+      # @return [Hash{String => Array<Pin::Reference::Superclass>}]
       def superclass_references
         index.superclass_references
       end
 
-      # @return [Hash{String => Array<String>}]
+      # @return [Hash{String => Array<Pin::Reference::Include>}]
       def include_references
         index.include_references
       end
@@ -313,12 +313,12 @@ def include_reference_pins
         index.include_reference_pins
       end
 
-      # @return [Hash{String => Array<String>}]
+      # @return [Hash{String => Array<Pin::Reference::Prepend>}]
       def prepend_references
         index.prepend_references
       end
 
-      # @return [Hash{String => Array<String>}]
+      # @return [Hash{String => Array<Pin::Reference::Extend>}]
       def extend_references
         index.extend_references
       end

From 135e50db2a27741618e9d76c39b4ec565d6df800 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 14 Sep 2025 21:18:22 -0400
Subject: [PATCH 224/327] Fix types

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

diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index 545d99540..a286b851b 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -101,7 +101,7 @@ def qualify_superclass fq_sub_tag
       end
 
       # @param fqns [String]
-      # @return [Array<String>]
+      # @return [Array<Pin::Reference::Include>]
       def get_includes fqns
         include_references[fqns] || []
       end
@@ -113,7 +113,7 @@ def get_prepends fqns
       end
 
       # @param fqns [String]
-      # @return [Array<String>]
+      # @return [Array<Pin::Reference::Extend>]
       def get_extends fqns
         extend_references[fqns] || []
       end

From 27bde68aaf7e3cc0380d04b4a446f9fc387cdb92 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Thu, 18 Sep 2025 05:43:49 -0400
Subject: [PATCH 225/327] Unused argument

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

diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index b9e7865d2..2080e1b4f 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -92,7 +92,7 @@ def resolve_uncached name, gates
       # @return [String, nil]
       def complex_resolve name, gates, internal
         resolved = nil
-        gates.each.with_index do |gate, idx|
+        gates.each do |gate|
           resolved = simple_resolve(name, gate, internal)
           return resolved if resolved
           store.get_ancestor_references(gate).each do |ref|

From fe67c88823547655f30e931d369fc9b01bbaee0a Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Thu, 18 Sep 2025 05:56:08 -0400
Subject: [PATCH 226/327] Revert method and parameter pin changes

---
 lib/solargraph/pin/method.rb    | 2 +-
 lib/solargraph/pin/parameter.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/solargraph/pin/method.rb b/lib/solargraph/pin/method.rb
index fe6e16e54..295b72fbf 100644
--- a/lib/solargraph/pin/method.rb
+++ b/lib/solargraph/pin/method.rb
@@ -556,7 +556,7 @@ def resolve_reference ref, api_map
         if parts.first.empty? || parts.one?
           path = "#{namespace}#{ref}"
         else
-          fqns = api_map.resolve(parts.first, *gates)
+          fqns = api_map.qualify(parts.first, *gates)
           return ComplexType::UNDEFINED if fqns.nil?
           path = fqns + ref[parts.first.length] + parts.last
         end
diff --git a/lib/solargraph/pin/parameter.rb b/lib/solargraph/pin/parameter.rb
index 3b4458183..947513689 100644
--- a/lib/solargraph/pin/parameter.rb
+++ b/lib/solargraph/pin/parameter.rb
@@ -251,7 +251,7 @@ def resolve_reference ref, api_map, skip
         if parts.first.empty?
           path = "#{namespace}#{ref}"
         else
-          fqns = api_map.resolve(parts.first, namespace)
+          fqns = api_map.qualify(parts.first, namespace)
           return nil if fqns.nil?
           path = fqns + ref[parts.first.length] + parts.last
         end

From 3c5d3c97fd64cf6c0db32201b90e991385d3a1d0 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Thu, 18 Sep 2025 07:34:45 -0400
Subject: [PATCH 227/327] Constants resumes open gates for deep name collisions

---
 lib/solargraph/api_map/constants.rb | 37 ++++++++++++++++++++---------
 lib/solargraph/type_checker.rb      |  2 +-
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index 2080e1b4f..a4c991f60 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -51,7 +51,16 @@ def qualify name, *gates
         return name if ['Boolean', 'self', nil].include?(name)
 
         gates.push '' unless gates.include?('')
-        resolve(name, gates)
+        fqns = resolve(name, gates)
+        return unless fqns
+        pin = store.get_path_pins(fqns).first
+        if pin.is_a?(Pin::Constant)
+          const = Solargraph::Parser::NodeMethods.unpack_name(pin.assignment)
+          return unless const
+          resolve(const, pin.gates)
+        else
+          fqns
+        end
       end
 
       # @return [void]
@@ -78,10 +87,15 @@ def resolve_uncached name, gates
         resolved = nil
         base = gates
         parts = name.split('::')
+        first = nil
         parts.each.with_index do |nam, idx|
-          resolved = complex_resolve(nam, base, idx != parts.length - 1)
-          break unless resolved
-          base = [resolved]
+          resolved, remainder = complex_resolve(nam, base, idx != parts.length - 1)
+          first ||= remainder
+          if resolved
+            base = [resolved]
+          else
+            return resolve(name, first) unless first.empty?
+          end
         end
         resolved
       end
@@ -89,25 +103,26 @@ def resolve_uncached name, gates
       # @param name [String]
       # @param gates [Array<String>]
       # @param internal [Boolean] True if the name is not the last in the namespace
-      # @return [String, nil]
+      # @return [Array]
       def complex_resolve name, gates, internal
         resolved = nil
-        gates.each do |gate|
+        gates.each.with_index do |gate, idx|
           resolved = simple_resolve(name, gate, internal)
-          return resolved if resolved
-          store.get_ancestor_references(gate).each do |ref|
+          return [resolved, gates[idx + 1..]] if resolved
+          (store.get_ancestor_references(gate)).each do |ref|
             mixin = resolve(ref.name, ref.reference_gates - [gate])
+            next unless mixin
             resolved = simple_resolve(name, mixin, internal)
-            return resolved if resolved
+            return [resolved, gates[idx + 1..]] if resolved
           end
         end
-        nil
+        [nil, []]
       end
 
       # @param name [String]
       # @param gate [String]
       # @param internal [Boolean] True if the name is not the last in the namespace
-      # @return [Pin::Constant, Pin::Namespace, nil]
+      # @return [String, nil]
       def simple_resolve name, gate, internal
         here = "#{gate}::#{name}".sub(/^::/, '').sub(/::$/, '')
         pin = store.get_path_pins(here).first
diff --git a/lib/solargraph/type_checker.rb b/lib/solargraph/type_checker.rb
index b8bb6e82a..88190409a 100644
--- a/lib/solargraph/type_checker.rb
+++ b/lib/solargraph/type_checker.rb
@@ -96,7 +96,7 @@ def method_tag_problems
     def method_return_type_problems_for pin
       return [] if pin.is_a?(Pin::MethodAlias)
       result = []
-      declared = pin.typify(api_map).self_to_type(pin.full_context).qualify(api_map, *pin.closure.gates)
+      declared = pin.typify(api_map).self_to_type(pin.full_context).qualify(api_map, *pin.gates)
       if declared.undefined?
         if pin.return_type.undefined? && rules.require_type_tags?
           if pin.attribute?

From 67f651719a7a6051b1823c738650d484e87639fd Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Thu, 18 Sep 2025 07:35:07 -0400
Subject: [PATCH 228/327] Typechecker specs

---
 spec/type_checker/levels/normal_spec.rb | 21 +++++++++++++++++++++
 spec/type_checker/levels/typed_spec.rb  |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/spec/type_checker/levels/normal_spec.rb b/spec/type_checker/levels/normal_spec.rb
index 3b38f55d8..9af91efe1 100644
--- a/spec/type_checker/levels/normal_spec.rb
+++ b/spec/type_checker/levels/normal_spec.rb
@@ -909,5 +909,26 @@ def get_a_mutex; end
       ))
       expect(checker.problems).to be_empty
     end
+
+    it 'resolves namespace gate conflicts' do
+      checker = type_checker(%(
+        class Base
+          class Target
+          end
+        end
+
+        module Other
+          class Base
+          end
+
+          class Deep
+            # @return [Base::Target]
+            def foo
+            end
+          end
+        end
+      ))
+      expect(checker.problems).to be_empty
+    end
   end
 end
diff --git a/spec/type_checker/levels/typed_spec.rb b/spec/type_checker/levels/typed_spec.rb
index b10bbd42c..b2071465e 100644
--- a/spec/type_checker/levels/typed_spec.rb
+++ b/spec/type_checker/levels/typed_spec.rb
@@ -388,7 +388,7 @@ def nil_assignment?
          'foo'.nil? # infers as 'false'
         end
       ))
-      expect(checker.problems.map(&:message)).to be_empty
+      expect(checker.problems).to be_empty
     end
   end
 end

From af51344e07825c8e363f9c53a5732e83f1f7b5a0 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Thu, 18 Sep 2025 07:42:02 -0400
Subject: [PATCH 229/327] Linting

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

diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index a4c991f60..0c83d967d 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -109,7 +109,7 @@ def complex_resolve name, gates, internal
         gates.each.with_index do |gate, idx|
           resolved = simple_resolve(name, gate, internal)
           return [resolved, gates[idx + 1..]] if resolved
-          (store.get_ancestor_references(gate)).each do |ref|
+          store.get_ancestor_references(gate).each do |ref|
             mixin = resolve(ref.name, ref.reference_gates - [gate])
             next unless mixin
             resolved = simple_resolve(name, mixin, internal)

From 9009a2ca34c39cf42b7aa433e1cfbfff226dbfe0 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Thu, 18 Sep 2025 07:58:48 -0400
Subject: [PATCH 230/327] Documentation

---
 lib/solargraph/api_map.rb           | 2 ++
 lib/solargraph/api_map/constants.rb | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index f233ecb74..44ca19035 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -297,6 +297,8 @@ def qualify tag, *gates
       store.constants.qualify(tag, *gates)
     end
 
+    # @see Store::Constants#resolve
+    #
     # @param name [String]
     # @param gates [Array<String, Array<String>>]
     # @return [String, nil]
diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index 0c83d967d..2e38b9ad6 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -12,6 +12,11 @@ def initialize store
 
       # Resolve a name to a fully qualified namespace or constant.
       #
+      # `Constants#resolve` is similar to `Constants#qualify`` in that its
+      # purpose is to find fully qualified (absolute) namespaces, except
+      # `#resolve`` is only concerned with real namespaces. It disregards
+      # parametrized types and special types like literals, self, and Boolean.
+      #
       # @param name [String]
       # @param gates [Array<Array<String>, String>]
       # @return [String, nil]
@@ -108,12 +113,12 @@ def complex_resolve name, gates, internal
         resolved = nil
         gates.each.with_index do |gate, idx|
           resolved = simple_resolve(name, gate, internal)
-          return [resolved, gates[idx + 1..]] if resolved
+          return [resolved, gates[(idx + 1)..]] if resolved
           store.get_ancestor_references(gate).each do |ref|
             mixin = resolve(ref.name, ref.reference_gates - [gate])
             next unless mixin
             resolved = simple_resolve(name, mixin, internal)
-            return [resolved, gates[idx + 1..]] if resolved
+            return [resolved, gates[(idx + 1)..]] if resolved
           end
         end
         [nil, []]

From 8e171845184a82d51fb8085c32ae3f2d1bd9a5d1 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Thu, 18 Sep 2025 08:05:51 -0400
Subject: [PATCH 231/327] Typechecking

---
 lib/solargraph/api_map/constants.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index 2e38b9ad6..333b5f8fb 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -105,10 +105,14 @@ def resolve_uncached name, gates
         resolved
       end
 
+      # @todo I'm not sure of a better way to express the return value in YARD.
+      #   It's a tuple where the first element is a nullable string. Something
+      #   like `Array(String|nil, Array<String>)` would be more accurate.
+      #
       # @param name [String]
       # @param gates [Array<String>]
       # @param internal [Boolean] True if the name is not the last in the namespace
-      # @return [Array]
+      # @return [Array(Object, Array<String>)]
       def complex_resolve name, gates, internal
         resolved = nil
         gates.each.with_index do |gate, idx|

From ed3809f4695a3555892a84a48f36d11328de9003 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Thu, 18 Sep 2025 09:43:27 -0400
Subject: [PATCH 232/327] Fix ancestral recursion

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

diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index 333b5f8fb..552a6b04e 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -119,7 +119,8 @@ def complex_resolve name, gates, internal
           resolved = simple_resolve(name, gate, internal)
           return [resolved, gates[(idx + 1)..]] if resolved
           store.get_ancestor_references(gate).each do |ref|
-            mixin = resolve(ref.name, ref.reference_gates - [gate])
+            return ref.name if ref.name.end_with?("::#{name}")
+            mixin = resolve(ref.name, ref.reference_gates - gates)
             next unless mixin
             resolved = simple_resolve(name, mixin, internal)
             return [resolved, gates[(idx + 1)..]] if resolved

From 1864b67a3818113bdb8d108c8978ac4b5c48e783 Mon Sep 17 00:00:00 2001
From: Fred Snyder <fsnyder@castwide.com>
Date: Thu, 18 Sep 2025 10:22:20 -0400
Subject: [PATCH 233/327] Constants strips leading namespace separators

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

diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index 552a6b04e..430303ae1 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -119,7 +119,7 @@ def complex_resolve name, gates, internal
           resolved = simple_resolve(name, gate, internal)
           return [resolved, gates[(idx + 1)..]] if resolved
           store.get_ancestor_references(gate).each do |ref|
-            return ref.name if ref.name.end_with?("::#{name}")
+            return ref.name.sub(/^::/, '') if ref.name.end_with?("::#{name}")
             mixin = resolve(ref.name, ref.reference_gates - gates)
             next unless mixin
             resolved = simple_resolve(name, mixin, internal)

From e5d88a51307a948de85880fcbbde4a8ec790d199 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 19 Sep 2025 18:15:17 -0400
Subject: [PATCH 234/327] Show all evaluated types in typechecker

---
 lib/solargraph/type_checker.rb | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/lib/solargraph/type_checker.rb b/lib/solargraph/type_checker.rb
index c315a407f..9b98d3d74 100644
--- a/lib/solargraph/type_checker.rb
+++ b/lib/solargraph/type_checker.rb
@@ -295,15 +295,20 @@ def call_problems
         if type.undefined? && !rules.ignore_all_undefined?
           base = chain
           missing = chain
+          # @type [Solargraph::Pin::Base, nil]
           found = nil
+          # @type [Array<Solargraph::Pin::Base>]
+          all_found = []
           closest = ComplexType::UNDEFINED
           until base.links.first.undefined?
-            found = base.define(api_map, block_pin, locals).first
+            all_found = base.define(api_map, block_pin, locals)
+            found = all_found.first
             break if found
             missing = base
             base = base.base
           end
-          closest = found.typify(api_map) if found
+          all_closest = all_found.map { |pin| pin.typify(api_map) }
+          closest = ComplexType.new(all_closest.flat_map(&:items).uniq)
           # @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)
@@ -603,15 +608,20 @@ def declared_externally? pin
       if type.undefined? && !rules.ignore_all_undefined?
         base = chain
         missing = chain
+        # @type [Solargraph::Pin::Base, nil]
         found = nil
+        # @type [Array<Solargraph::Pin::Base>]
+        all_found = []
         closest = ComplexType::UNDEFINED
         until base.links.first.undefined?
-          found = base.define(api_map, block_pin, locals).first
+          all_found = base.define(api_map, block_pin, locals)
+          found = all_found.first
           break if found
           missing = base
           base = base.base
         end
-        closest = found.typify(api_map) if found
+        all_closest = all_found.map { |pin| pin.typify(api_map) }
+        closest = ComplexType.new(all_closest.flat_map(&:items).uniq)
         if !found || closest.defined? || internal?(found)
           return false
         end

From 62a1c97ee5b495ad0dba89d2841679d36d4e3580 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 21 Sep 2025 12:32:53 -0400
Subject: [PATCH 235/327] Less-rigorous assertions merging assignment attribute
 of parameters

Default values don't exist in RBS; it just tells you if the arg is
optinal or not - this was a problem in solargraph-rails specs while
assertions were on.
---
 lib/solargraph/pin/local_variable.rb | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/solargraph/pin/local_variable.rb b/lib/solargraph/pin/local_variable.rb
index 78e0b287d..512231a8a 100644
--- a/lib/solargraph/pin/local_variable.rb
+++ b/lib/solargraph/pin/local_variable.rb
@@ -23,14 +23,22 @@ def initialize assignment: nil, presence: nil, presence_certain: false, **splat
 
       def combine_with(other, attrs={})
         new_attrs = {
-          assignment: assert_same(other, :assignment),
+          # default values don't exist in RBS; it just tells you if
+          # the arg is optinal or not; prefer a provided value if we
+          # have one here, but don't be too picky otherwise, as it's
+          # ultimately just documentation, not something we use for
+          # inference or typechecking
+          #
+          # @sg-ignore https://github.com/castwide/solargraph/pull/1050
+          assignment: choose(other, :assignment),
+
+          # @sg-ignore https://github.com/castwide/solargraph/pull/1050
           presence_certain: assert_same(other, :presence_certain?),
         }.merge(attrs)
-        # @sg-ignore Wrong argument type for
-        #   Solargraph::Pin::Base#assert_same: other expected
-        #   Solargraph::Pin::Base, received self
+        # @sg-ignore https://github.com/castwide/solargraph/pull/1050
         new_attrs[:presence] = assert_same(other, :presence) unless attrs.key?(:presence)
 
+        # @sg-ignore https://github.com/castwide/solargraph/pull/1050
         super(other, new_attrs)
       end
 

From 85be17da9c63cb69f88320959aa0793bfd9cab05 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 22 Sep 2025 10:05:02 -0400
Subject: [PATCH 236/327] Fix bad sexpr generation in op_asgn

I'm not sure I could come up with a case where this matters in
practice, but this was spotted in the solargraph-rails specs when I
turned on assertions.  It was trying to parse:

```
Rails.application.config.filter_parameters += [
  :passw, :email, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn, :cvv, :cvc
]
```

from Rails' filter_parameter_logging.rb

https://github.com/iftheshoefritz/solargraph-rails/actions/runs/17915995139/job/50938306870?pr=173

```
       Expected method name to be a Symbol, got Parser::AST::Node for node s(:send,
         s(:send,
           s(:send,
             s(:const, nil, :Rails), :application), :config),
         s(:send,
           s(:send,
             s(:send,
               s(:send,
                 s(:const, nil, :Rails), :application), :config), :filter_parameters), :+,
           s(:array,
             s(:sym, :passw),
             s(:sym, :email),
             s(:sym, :secret),
             s(:sym, :token),
             s(:sym, :_key),
             s(:sym, :crypt),
             s(:sym, :salt),
             s(:sym, :certificate),
             s(:sym, :otp),
             s(:sym, :ssn),
             s(:sym, :cvv),
             s(:sym, :cvc))))
```

Blocks https://github.com/iftheshoefritz/solargraph-rails/pull/173
---
 .../parser_gem/node_processors/opasgn_node.rb | 75 +++++++++++++++++--
 spec/source_map_spec.rb                       | 51 +++++++++++++
 2 files changed, 118 insertions(+), 8 deletions(-)

diff --git a/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb b/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb
index 151f79928..d9a54508b 100644
--- a/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb
+++ b/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb
@@ -9,14 +9,71 @@ module NodeProcessors
         class OpasgnNode < Parser::NodeProcessor::Base
           # @return [void]
           def process
-            # Parser::CurrentRuby.parse("a += 2")
-            # => s(:op_asgn,
-            #      s(:lvasgn, :a), :+,
-            #      s(:int, 2))
-            asgn = node.children[0]
-            variable_name = asgn.children[0]
+            target = node.children[0]
             operator = node.children[1]
             argument = node.children[2]
+            if target.type == :send
+              process_send_target(target, operator, argument)
+            elsif target.type.to_s.end_with?('vasgn')
+              process_vasgn_target(target, operator, argument)
+            else
+              Solargraph.assert_or_log(:opasgn_unknown_target,
+                                       "Unexpected op_asgn target type: #{target.type}")
+            end
+          end
+
+          # @param call [Parser::AST::Node] the target of the assignment
+          # @param operator [Symbol] the operator, e.g. :+
+          # @param argument [Parser::AST::Node] the argument of the operation
+          #
+          # @return [void]
+          def process_send_target(call, operator, argument)
+            # if target is a call:
+            # [10] pry(main)> Parser::CurrentRuby.parse("Foo.bar += baz")
+            # => s(:op_asgn,
+            #      s(:send, # call
+            #        s(:const, nil, :Foo), # calee
+            #        :bar), # call_method
+            #      :+, # operator
+            #      s(:send, nil, :baz)) # argument
+            # [11] pry(main)>
+            callee = call.children[0]
+            call_method = call.children[1]
+            asgn_method = "#{call_method}=".to_sym
+
+            # [8] pry(main)> Parser::CurrentRuby.parse("Foo.bar = Foo.bar + baz")
+            # => s(:send,
+            #       s(:const, nil, :Foo), # callee
+            #       :bar=, # asgn_method
+            #        s(:send,
+            #          s(:send,
+            #             s(:const, nil, :Foo), # callee
+            #             :bar), # call_method
+            #          :+, # operator
+            #          s(:send, nil, :baz))) # argument
+            new_send = node.updated(:send,
+                                    [callee,
+                                     asgn_method,
+                                     node.updated(:send, [call, operator, argument])])
+            NodeProcessor.process(new_send, region, pins, locals)
+          end
+
+          # @param asgn [Parser::AST::Node] the target of the assignment
+          # @param operator [Symbol] the operator, e.g. :+
+          # @param argument [Parser::AST::Node] the argument of the operation
+          #
+          # @return [void]
+          def process_vasgn_target(asgn, operator, argument)
+            # => s(:op_asgn,
+            #      s(:lvasgn, :a), # asgn
+            #      :+, # operator
+            #      s(:int, 2)) # argument
+
+            # @sg-ignore https://github.com/castwide/solargraph/pull/1005
+            # @type [Parser::AST::Node]
+            variable_name = asgn.children[0]
+            # @sg-ignore https://github.com/castwide/solargraph/pull/1005
+            STDERR.puts("variable_name is #{variable_name.inspect}")
             # for lvasgn, gvasgn, cvasgn, convert to lvar, gvar, cvar
             # [6] pry(main)> Parser::CurrentRuby.parse("a = a + 1")
             # => s(:lvasgn, :a,
@@ -25,14 +82,16 @@ def process
             #     s(:int, 1)))
             # [7] pry(main)>
             variable_reference_type = asgn.type.to_s.sub(/vasgn$/, 'var').to_sym
-            variable_reference = node.updated(variable_reference_type, asgn.children)
+            target_reference = node.updated(variable_reference_type, asgn.children)
             send_children = [
-              variable_reference,
+              target_reference,
               operator,
               argument
             ]
+            STDERR.puts("send_children is #{send_children.inspect}")
             send_node = node.updated(:send, send_children)
             new_asgn = node.updated(asgn.type, [variable_name,  send_node])
+            STDERR.puts("new_asgn: #{new_asgn}")
             NodeProcessor.process(new_asgn, region, pins, locals)
           end
         end
diff --git a/spec/source_map_spec.rb b/spec/source_map_spec.rb
index ef6eddebd..5cc9ea737 100644
--- a/spec/source_map_spec.rb
+++ b/spec/source_map_spec.rb
@@ -88,6 +88,57 @@ def foo
     expect(locals).to be_empty
   end
 
+  it 'handles op_asgn case with assertions on' do
+    # set SOLARGRAPH_ASSERTS=onto test this
+    old_asserts = ENV.fetch('SOLARGRAPH_ASSERTS', nil)
+    ENV['SOLARGRAPH_ASSERTS'] = 'on'
+
+    expect do
+      map = Solargraph::SourceMap.load_string(%(
+            Foo.bar += baz
+       ), 'test.rb')
+      loc = Solargraph::Location.new('test.rb', Solargraph::Range.from_to(3, 9, 3, 9))
+      locals = map.locals_at(loc)
+      expect(locals).to be_empty
+    end.not_to raise_error
+  ensure
+    ENV['SOLARGRAPH_ASSERTS'] = old_asserts
+  end
+
+  it 'handles or_asgn case with assertions on' do
+    # set SOLARGRAPH_ASSERTS=onto test this
+    old_asserts = ENV.fetch('SOLARGRAPH_ASSERTS', nil)
+    ENV['SOLARGRAPH_ASSERTS'] = 'on'
+
+    expect do
+      map = Solargraph::SourceMap.load_string(%(
+            Foo.bar ||= baz
+       ), 'test.rb')
+      loc = Solargraph::Location.new('test.rb', Solargraph::Range.from_to(3, 9, 3, 9))
+      locals = map.locals_at(loc)
+      expect(locals).to be_empty
+    end.not_to raise_error
+  ensure
+    ENV['SOLARGRAPH_ASSERTS'] = old_asserts
+  end
+
+  it 'handles lvasgn case with assertions on' do
+    # set SOLARGRAPH_ASSERTS=onto test this
+    old_asserts = ENV.fetch('SOLARGRAPH_ASSERTS', nil)
+    ENV['SOLARGRAPH_ASSERTS'] = 'on'
+
+    expect do
+      map = Solargraph::SourceMap.load_string(%(
+            Foo.bar = baz
+       ), 'test.rb')
+      loc = Solargraph::Location.new('test.rb', Solargraph::Range.from_to(3, 9, 3, 9))
+      locals = map.locals_at(loc)
+      expect(locals).to be_empty
+    end.not_to raise_error
+  ensure
+    ENV['SOLARGRAPH_ASSERTS'] = old_asserts
+  end
+
   it 'scopes local variables correctly in class_eval blocks' do
     map = Solargraph::SourceMap.load_string(%(
       class Foo; end

From d2a0ca94c8e9d9fbe0d9f42ad78aaa8826491159 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 22 Sep 2025 10:10:36 -0400
Subject: [PATCH 237/327] Drop logging

---
 lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb b/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb
index d9a54508b..11ed93e51 100644
--- a/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb
+++ b/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb
@@ -88,10 +88,8 @@ def process_vasgn_target(asgn, operator, argument)
               operator,
               argument
             ]
-            STDERR.puts("send_children is #{send_children.inspect}")
             send_node = node.updated(:send, send_children)
             new_asgn = node.updated(asgn.type, [variable_name,  send_node])
-            STDERR.puts("new_asgn: #{new_asgn}")
             NodeProcessor.process(new_asgn, region, pins, locals)
           end
         end

From 42fa59fe7486411d9b14a4dbf9223f8b7625c454 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 22 Sep 2025 10:28:23 -0400
Subject: [PATCH 238/327] Drop logging

---
 lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb b/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb
index 11ed93e51..9020532e5 100644
--- a/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb
+++ b/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb
@@ -72,8 +72,6 @@ def process_vasgn_target(asgn, operator, argument)
             # @sg-ignore https://github.com/castwide/solargraph/pull/1005
             # @type [Parser::AST::Node]
             variable_name = asgn.children[0]
-            # @sg-ignore https://github.com/castwide/solargraph/pull/1005
-            STDERR.puts("variable_name is #{variable_name.inspect}")
             # for lvasgn, gvasgn, cvasgn, convert to lvar, gvar, cvar
             # [6] pry(main)> Parser::CurrentRuby.parse("a = a + 1")
             # => s(:lvasgn, :a,

From 82adf3e664dab9ef6118b2e8ee1b5ad0061080d6 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 22 Sep 2025 10:32:26 -0400
Subject: [PATCH 239/327] rubocop fixes

---
 .../parser/parser_gem/node_processors/opasgn_node.rb        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb b/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb
index 9020532e5..1500a4f72 100644
--- a/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb
+++ b/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb
@@ -27,7 +27,7 @@ def process
           # @param argument [Parser::AST::Node] the argument of the operation
           #
           # @return [void]
-          def process_send_target(call, operator, argument)
+          def process_send_target call, operator, argument
             # if target is a call:
             # [10] pry(main)> Parser::CurrentRuby.parse("Foo.bar += baz")
             # => s(:op_asgn,
@@ -39,7 +39,7 @@ def process_send_target(call, operator, argument)
             # [11] pry(main)>
             callee = call.children[0]
             call_method = call.children[1]
-            asgn_method = "#{call_method}=".to_sym
+            asgn_method = :"#{call_method}="
 
             # [8] pry(main)> Parser::CurrentRuby.parse("Foo.bar = Foo.bar + baz")
             # => s(:send,
@@ -63,7 +63,7 @@ def process_send_target(call, operator, argument)
           # @param argument [Parser::AST::Node] the argument of the operation
           #
           # @return [void]
-          def process_vasgn_target(asgn, operator, argument)
+          def process_vasgn_target asgn, operator, argument
             # => s(:op_asgn,
             #      s(:lvasgn, :a), # asgn
             #      :+, # operator

From 225c2dd8203575a743216c2277a9dcc0d624b0a6 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 22 Sep 2025 10:42:52 -0400
Subject: [PATCH 240/327] Drop @sg-ignore

---
 lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb b/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb
index 1500a4f72..0e4d7b26a 100644
--- a/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb
+++ b/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb
@@ -69,7 +69,6 @@ def process_vasgn_target asgn, operator, argument
             #      :+, # operator
             #      s(:int, 2)) # argument
 
-            # @sg-ignore https://github.com/castwide/solargraph/pull/1005
             # @type [Parser::AST::Node]
             variable_name = asgn.children[0]
             # for lvasgn, gvasgn, cvasgn, convert to lvar, gvar, cvar

From 982ad1a74096ec5f5cf817d9b715ffeda7837faf Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 22 Sep 2025 11:07:47 -0400
Subject: [PATCH 241/327] Remove duplicate assignment handling

---
 lib/solargraph/pin/base_variable.rb  |  8 +++++++-
 lib/solargraph/pin/local_variable.rb | 13 +------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/lib/solargraph/pin/base_variable.rb b/lib/solargraph/pin/base_variable.rb
index 764c1fb39..93845b585 100644
--- a/lib/solargraph/pin/base_variable.rb
+++ b/lib/solargraph/pin/base_variable.rb
@@ -23,7 +23,13 @@ def initialize assignment: nil, return_type: nil, **splat
 
       def combine_with(other, attrs={})
         attrs.merge({
-          assignment: assert_same(other, :assignment),
+          # default values don't exist in RBS parameters; it just
+          # tells you if the arg is optional or not.  Prefer a
+          # provided value if we have one here since we can't rely on
+          # it from RBS so we can infer from it and typecheck on it.
+          #
+          # @sg-ignore https://github.com/castwide/solargraph/pull/1050
+          assignment: choose(other, :assignment),
           mass_assignment: assert_same(other, :mass_assignment),
           return_type: combine_return_type(other),
         })
diff --git a/lib/solargraph/pin/local_variable.rb b/lib/solargraph/pin/local_variable.rb
index 512231a8a..db6dcfe6a 100644
--- a/lib/solargraph/pin/local_variable.rb
+++ b/lib/solargraph/pin/local_variable.rb
@@ -10,28 +10,17 @@ def presence_certain?
         @presence_certain
       end
 
-      # @param assignment [AST::Node, nil]
       # @param presence [Range, nil]
       # @param presence_certain [Boolean]
       # @param splat [Hash]
-      def initialize assignment: nil, presence: nil, presence_certain: false, **splat
+      def initialize presence: nil, presence_certain: false, **splat
         super(**splat)
-        @assignment = assignment
         @presence = presence
         @presence_certain = presence_certain
       end
 
       def combine_with(other, attrs={})
         new_attrs = {
-          # default values don't exist in RBS; it just tells you if
-          # the arg is optinal or not; prefer a provided value if we
-          # have one here, but don't be too picky otherwise, as it's
-          # ultimately just documentation, not something we use for
-          # inference or typechecking
-          #
-          # @sg-ignore https://github.com/castwide/solargraph/pull/1050
-          assignment: choose(other, :assignment),
-
           # @sg-ignore https://github.com/castwide/solargraph/pull/1050
           presence_certain: assert_same(other, :presence_certain?),
         }.merge(attrs)

From 3399448f739d09b0a1297e878fac5499ff9bb816 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 23 Sep 2025 20:59:58 -0400
Subject: [PATCH 242/327] Add @sg-ignore

---
 lib/solargraph/api_map/store.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index 5978e322d..91db664b5 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -297,6 +297,10 @@ def fqns_pins_map
         end
       end
 
+      # @sg-ignore Rooted type issue here - "Declared return type
+      #   ::Enumerable<::Solargraph::Pin::Symbol> does not match
+      #   inferred type ::Set<::Symbol> for
+      #   Solargraph::ApiMap::Store#symbols"
       # @return [Enumerable<Solargraph::Pin::Symbol>]
       def symbols
         index.pins_by_class(Pin::Symbol)

From 4eda431ce26211bf4d6955cbae997b0e79ffe4d4 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 24 Sep 2025 14:56:12 -0400
Subject: [PATCH 243/327] Handle RBS static method aliases

Should fix solargraph-rails spec failures
---
 lib/solargraph/api_map.rb        |  2 +-
 spec/rbs_map/conversions_spec.rb | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 44ca19035..e176a10cd 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -860,7 +860,7 @@ def prefer_non_nil_variables pins
     # @param alias_pin [Pin::MethodAlias]
     # @return [Pin::Method, nil]
     def resolve_method_alias(alias_pin)
-      ancestors = store.get_ancestors(alias_pin.full_context.tag)
+      ancestors = store.get_ancestors(alias_pin.full_context.reduce_class_type.tag)
       original = nil
 
       # Search each ancestor for the original method
diff --git a/spec/rbs_map/conversions_spec.rb b/spec/rbs_map/conversions_spec.rb
index 1df43af26..8afdeca2d 100644
--- a/spec/rbs_map/conversions_spec.rb
+++ b/spec/rbs_map/conversions_spec.rb
@@ -25,6 +25,29 @@
 
     attr_reader :temp_dir
 
+    context 'with self alias to self method' do
+      let(:rbs) do
+        <<~RBS
+          class Foo
+            def self.bar: () -> String
+            alias self.bar? self.bar
+          end
+        RBS
+      end
+
+      subject(:alias_pin) { api_map.get_method_stack('Foo', 'bar?', scope: :class).first }
+
+      let(:method_pin) { api_map.get_method_stack('Foo', 'bar', scope: :class).first }
+
+      it { should_not be_nil }
+
+      it { should be_instance_of(Solargraph::Pin::Method) }
+
+      it 'finds the type' do
+        expect(alias_pin.return_type.tag).to eq('String')
+      end
+    end
+
     context 'with untyped response' do
       let(:rbs) do
         <<~RBS

From 037307ed9fc9945810c64ce867c9e09a4003cd7c Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 24 Sep 2025 15:17:37 -0400
Subject: [PATCH 244/327] Fix #reduce_class_type

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

diff --git a/lib/solargraph/complex_type.rb b/lib/solargraph/complex_type.rb
index 8798ecb88..669a66900 100644
--- a/lib/solargraph/complex_type.rb
+++ b/lib/solargraph/complex_type.rb
@@ -246,6 +246,7 @@ def all_params
     def reduce_class_type
       new_items = items.flat_map do |type|
         next type unless ['Module', 'Class'].include?(type.name)
+        next type if type.all_params.empty?
 
         type.all_params
       end

From 25b0770551d5b5c9a702dfbfc90dcd7f01685c1a Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 24 Sep 2025 15:20:10 -0400
Subject: [PATCH 245/327] linting

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

diff --git a/spec/rbs_map/conversions_spec.rb b/spec/rbs_map/conversions_spec.rb
index 8afdeca2d..d1d3e564d 100644
--- a/spec/rbs_map/conversions_spec.rb
+++ b/spec/rbs_map/conversions_spec.rb
@@ -35,10 +35,10 @@ def self.bar: () -> String
         RBS
       end
 
-      subject(:alias_pin) { api_map.get_method_stack('Foo', 'bar?', scope: :class).first }
-
       let(:method_pin) { api_map.get_method_stack('Foo', 'bar', scope: :class).first }
 
+      subject(:alias_pin) { api_map.get_method_stack('Foo', 'bar?', scope: :class).first }
+
       it { should_not be_nil }
 
       it { should be_instance_of(Solargraph::Pin::Method) }

From 6a7a37feedad44e0be8bf0fba8c5f9d4e9b83964 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 24 Sep 2025 16:49:01 -0400
Subject: [PATCH 246/327] Fix RuboCop issues

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

diff --git a/spec/rbs_map/conversions_spec.rb b/spec/rbs_map/conversions_spec.rb
index 4ed3f511d..31c354023 100644
--- a/spec/rbs_map/conversions_spec.rb
+++ b/spec/rbs_map/conversions_spec.rb
@@ -52,6 +52,8 @@ class C < ::B::C
     end
 
     context 'with self alias to self method' do
+      subject(:alias_pin) { api_map.get_method_stack('Foo', 'bar?', scope: :class).first }
+
       let(:rbs) do
         <<~RBS
           class Foo
@@ -63,11 +65,9 @@ def self.bar: () -> String
 
       let(:method_pin) { api_map.get_method_stack('Foo', 'bar', scope: :class).first }
 
-      subject(:alias_pin) { api_map.get_method_stack('Foo', 'bar?', scope: :class).first }
-
-      it { should_not be_nil }
+      it { is_expected.not_to be_nil }
 
-      it { should be_instance_of(Solargraph::Pin::Method) }
+      it { is_expected.to be_instance_of(Solargraph::Pin::Method) }
 
       it 'finds the type' do
         expect(alias_pin.return_type.tag).to eq('String')

From f4399eba824fdd5aa8d605b2143ddef20c5617d8 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 25 Sep 2025 11:15:45 -0400
Subject: [PATCH 247/327] [regression] Fix issue resolving mixins under same
 namespace

---
 lib/solargraph/api_map/constants.rb     |  7 ++++-
 spec/api_map/constants_spec.rb          | 36 +++++++++++++++++++++++++
 spec/type_checker/levels/strong_spec.rb | 20 ++++++++++++++
 3 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index 430303ae1..51d0a207c 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -120,8 +120,13 @@ def complex_resolve name, gates, internal
           return [resolved, gates[(idx + 1)..]] if resolved
           store.get_ancestor_references(gate).each do |ref|
             return ref.name.sub(/^::/, '') if ref.name.end_with?("::#{name}")
-            mixin = resolve(ref.name, ref.reference_gates - gates)
+
+            # avoid infinite loops resolving mixin pin
+            next if ref.name == name && gates.to_set == ref.reference_gates.to_set
+
+            mixin = resolve(ref.name, ref.reference_gates)
             next unless mixin
+
             resolved = simple_resolve(name, mixin, internal)
             return [resolved, gates[(idx + 1)..]] if resolved
           end
diff --git a/spec/api_map/constants_spec.rb b/spec/api_map/constants_spec.rb
index 26eaf6b25..c0460e79a 100644
--- a/spec/api_map/constants_spec.rb
+++ b/spec/api_map/constants_spec.rb
@@ -20,6 +20,42 @@ module Quuz
       expect(resolved).to eq('Foo::Bar')
     end
 
+    it 'resolves straightforward mixins' do
+      source_map = Solargraph::SourceMap.load_string(%(
+        module Bar
+          Baz = 'baz'
+        end
+
+        class Foo
+          include Bar
+        end
+      ), 'test.rb')
+
+      store = Solargraph::ApiMap::Store.new(source_map.pins)
+      constants = described_class.new(store)
+      pin = source_map.first_pin('Foo')
+      resolved = constants.resolve('Baz', pin.gates)
+      expect(resolved).to eq('Bar::Baz')
+    end
+
+    it 'resolves mixin living under same namespace' do
+      source_map = Solargraph::SourceMap.load_string(%(
+        class Foo
+          module Bar
+            Baz = 'baz'
+          end
+
+          include Bar
+        end
+      ), 'test.rb')
+
+      store = Solargraph::ApiMap::Store.new(source_map.pins)
+      constants = described_class.new(store)
+      pin = source_map.first_pin('Foo')
+      resolved = constants.resolve('Baz', pin.gates)
+      expect(resolved).to eq('Foo::Bar::Baz')
+    end
+
     it 'returns namespaces for nested namespaces' do
       source_map = Solargraph::SourceMap.load_string(%(
         module Foo
diff --git a/spec/type_checker/levels/strong_spec.rb b/spec/type_checker/levels/strong_spec.rb
index a03e6eb5d..4bf3b7163 100644
--- a/spec/type_checker/levels/strong_spec.rb
+++ b/spec/type_checker/levels/strong_spec.rb
@@ -272,5 +272,25 @@ def meth arg
       ))
       expect(checker.problems).to be_empty
     end
+
+    it 'resolves constants inside modules inside classes' do
+      checker = type_checker(%(
+        class Bar
+          module Foo
+            CONSTANT = 'hi'
+          end
+        end
+
+        class Bar
+          include Foo
+
+          # @return [String]
+          def baz
+            CONSTANT
+          end
+        end
+      ))
+      expect(checker.problems.map(&:message)).to be_empty
+    end
   end
 end

From 3324b4c7fb392405c39252701a9494d70d63dcf0 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 25 Sep 2025 12:11:22 -0400
Subject: [PATCH 248/327] Prevent recursion via caching mechanism

---
 lib/solargraph/api_map/constants.rb | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index 51d0a207c..bc508b330 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -24,8 +24,16 @@ def resolve(name, *gates)
         return store.get_path_pins(name[2..]).first&.path if name.start_with?('::')
 
         flat = gates.flatten
-        flat.push '' if flat.empty?
-        cached_resolve[[name, flat]] || resolve_and_cache(name, flat)
+        if flat.empty?
+          flat.push ''
+        end
+        if cached_resolve.include? [name, flat]
+          cached_result = cached_resolve[[name, flat]]
+          # don't recurse
+          return nil if cached_result == :in_process
+          return cached_result
+        end
+        resolve_and_cache(name, flat)
       end
 
       # Get a fully qualified namespace from a reference pin.
@@ -82,6 +90,7 @@ def clear
       # @param gates [Array<String>]
       # @return [String, nil]
       def resolve_and_cache name, gates
+        cached_resolve[[name, gates]] = :in_process
         cached_resolve[[name, gates]] = resolve_uncached(name, gates)
       end
 
@@ -121,9 +130,6 @@ def complex_resolve name, gates, internal
           store.get_ancestor_references(gate).each do |ref|
             return ref.name.sub(/^::/, '') if ref.name.end_with?("::#{name}")
 
-            # avoid infinite loops resolving mixin pin
-            next if ref.name == name && gates.to_set == ref.reference_gates.to_set
-
             mixin = resolve(ref.name, ref.reference_gates)
             next unless mixin
 
@@ -159,7 +165,7 @@ def collect_and_cache gates
         end
       end
 
-      # @return [Hash{Array(Name, Array<String>) => String, nil}]
+      # @return [Hash{Array(String, Array<String>) => String, :in_process, nil}]
       def cached_resolve
         @cached_resolve ||= {}
       end

From 174bf4e430edf7198c9ae3d23d701e359a74146c Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 25 Sep 2025 12:15:46 -0400
Subject: [PATCH 249/327] Linting fix, ignore rubocop-yard issue pending yard
 PR merge

---
 .rubocop_todo.yml                   | 33 ++---------------------------
 lib/solargraph/api_map/constants.rb |  4 +---
 2 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 89fd47c5d..f17d08a94 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.2.
+# 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.
 # Note that changes in the inspected code, or installation of new
@@ -280,7 +280,6 @@ Layout/MultilineMethodCallBraceLayout:
 # 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'
@@ -356,7 +355,6 @@ Layout/SpaceBeforeBlockBraces:
     - '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'
@@ -433,13 +431,11 @@ 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.
 Lint/AmbiguousBlockAssociation:
   Exclude:
-    - 'lib/solargraph/api_map.rb'
     - 'lib/solargraph/language_server/host.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
@@ -512,11 +508,6 @@ Lint/DuplicateMethods:
     - 'lib/solargraph/rbs_map/core_map.rb'
     - 'lib/solargraph/source/chain/link.rb'
 
-# Configuration parameters: AllowComments, AllowEmptyLambdas.
-Lint/EmptyBlock:
-  Exclude:
-    - 'spec/convention_spec.rb'
-
 # Configuration parameters: AllowComments.
 Lint/EmptyClass:
   Exclude:
@@ -998,11 +989,6 @@ RSpec/DescribedClass:
     - 'spec/yard_map/mapper/to_method_spec.rb'
     - 'spec/yard_map/mapper_spec.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-RSpec/EmptyExampleGroup:
-  Exclude:
-    - 'spec/convention_spec.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 RSpec/EmptyLineAfterFinalLet:
   Exclude:
@@ -1321,7 +1307,6 @@ Style/AccessorGrouping:
 # 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'
@@ -1782,7 +1767,6 @@ Style/GlobalStdStream:
 # 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'
@@ -1835,7 +1819,6 @@ Style/IfInsideElse:
 # 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'
@@ -1903,7 +1886,6 @@ 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'
@@ -1947,7 +1929,6 @@ Style/MethodDefParentheses:
     - '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'
@@ -2049,8 +2030,6 @@ Style/NumericLiterals:
 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'
@@ -2131,7 +2110,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'
 
@@ -2143,7 +2121,6 @@ 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'
 
@@ -2170,7 +2147,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'
@@ -2269,8 +2245,6 @@ Style/StderrPuts:
 # 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'
@@ -2286,7 +2260,6 @@ 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'
@@ -2504,8 +2477,6 @@ 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'
@@ -2551,6 +2522,7 @@ YARD/MismatchName:
 
 YARD/TagTypeSyntax:
   Exclude:
+    - 'lib/solargraph/api_map/constants.rb'
     - 'lib/solargraph/language_server/host.rb'
     - 'lib/solargraph/parser/comment_ripper.rb'
     - 'lib/solargraph/type_checker.rb'
@@ -2614,7 +2586,6 @@ Layout/LineLength:
     - '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'
diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index bc508b330..0df8d83ce 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -24,9 +24,7 @@ def resolve(name, *gates)
         return store.get_path_pins(name[2..]).first&.path if name.start_with?('::')
 
         flat = gates.flatten
-        if flat.empty?
-          flat.push ''
-        end
+        flat.push '' if flat.empty?
         if cached_resolve.include? [name, flat]
           cached_result = cached_resolve[[name, flat]]
           # don't recurse

From 4898313a80331277b733ce827962ff5eaadf5a16 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 25 Sep 2025 16:03:39 -0400
Subject: [PATCH 250/327] [regression] Fix resolution in deep YARD namespace
 hierarchies

YARD-parsed namespaces weren't correctly setting their gates, leading
to unresolved types from methods.
---
 lib/solargraph/yard_map/mapper/to_namespace.rb | 1 +
 spec/yard_map/mapper_spec.rb                   | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/lib/solargraph/yard_map/mapper/to_namespace.rb b/lib/solargraph/yard_map/mapper/to_namespace.rb
index 054ba3306..f7063e3d6 100644
--- a/lib/solargraph/yard_map/mapper/to_namespace.rb
+++ b/lib/solargraph/yard_map/mapper/to_namespace.rb
@@ -21,6 +21,7 @@ def self.make code_object, spec, closure = nil
             type: code_object.is_a?(YARD::CodeObjects::ClassObject) ? :class : :module,
             visibility: code_object.visibility,
             closure: closure,
+            gates: closure.gates,
             source: :yardoc,
           )
         end
diff --git a/spec/yard_map/mapper_spec.rb b/spec/yard_map/mapper_spec.rb
index 6b00e5c33..63efc3835 100644
--- a/spec/yard_map/mapper_spec.rb
+++ b/spec/yard_map/mapper_spec.rb
@@ -74,6 +74,14 @@
     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
+    pin = pins_with('ast').find do |pin|
+      pin.is_a?(Solargraph::Pin::Namespace) && pin.name == 'Mixin' && pin.closure.path == 'AST::Processor'
+    end
+    expect(pin.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')

From cb47db054f16e625bba1331738376068e9899dbb Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 25 Sep 2025 17:31:01 -0400
Subject: [PATCH 251/327] [regression] Fix resolution of ambiguous argument
 types

This is a case where incorrect gates result in the wrong type being
used - found by strong typechecking on a branch ::Solargraph::Pin::Symbol
was resolved as ::Symbol in a generics scenario.
---
 lib/solargraph/pin/proxy_type.rb        |  3 +-
 lib/solargraph/source/chain/call.rb     |  5 +++-
 spec/source/chain/call_spec.rb          | 37 +++++++++++++++++++++++++
 spec/type_checker/levels/strong_spec.rb | 32 +++++++++++++++++++++
 4 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/lib/solargraph/pin/proxy_type.rb b/lib/solargraph/pin/proxy_type.rb
index 2323489a7..6babeb353 100644
--- a/lib/solargraph/pin/proxy_type.rb
+++ b/lib/solargraph/pin/proxy_type.rb
@@ -5,8 +5,9 @@ module Pin
     class ProxyType < Base
       # @param return_type [ComplexType]
       # @param binder [ComplexType, ComplexType::UniqueType, nil]
-      def initialize return_type: ComplexType::UNDEFINED, binder: nil, **splat
+      def initialize return_type: ComplexType::UNDEFINED, binder: nil, gates: [''], **splat
         super(**splat)
+        @gates = gates
         @return_type = return_type
         @binder = binder if binder
       end
diff --git a/lib/solargraph/source/chain/call.rb b/lib/solargraph/source/chain/call.rb
index 24d10656d..5dca071de 100644
--- a/lib/solargraph/source/chain/call.rb
+++ b/lib/solargraph/source/chain/call.rb
@@ -98,7 +98,10 @@ def inferred_pins pins, api_map, name_pin, locals
                   match = ol.parameters.any?(&:restarg?)
                   break
                 end
-                atype = atypes[idx] ||= arg.infer(api_map, Pin::ProxyType.anonymous(name_pin.context, source: :chain), locals)
+                name_pin = Pin::ProxyType.anonymous(name_pin.context,
+                                                    gates: name_pin.gates,
+                                                    source: :chain)
+                atype = atypes[idx] ||= arg.infer(api_map, name_pin, locals)
                 unless param.compatible_arg?(atype, api_map) || param.restarg?
                   match = false
                   break
diff --git a/spec/source/chain/call_spec.rb b/spec/source/chain/call_spec.rb
index 8b67a3c66..3725686a7 100644
--- a/spec/source/chain/call_spec.rb
+++ b/spec/source/chain/call_spec.rb
@@ -627,4 +627,41 @@ def bl
     clip = api_map.clip_at('test.rb', [3, 8])
     expect(clip.infer.rooted_tags).to eq('::String')
   end
+
+  it 'sends proper gates in ProxyType' do
+    source = Solargraph::Source.load_string(%(
+      module Foo
+        module Bar
+          class Symbol
+          end
+        end
+      end
+
+      module Foo
+        module Baz
+          class Quux
+            # @return [void]
+            def foo
+              s = objects_by_class(Bar::Symbol)
+              s
+            end
+
+            # @generic T
+            # @param klass [Class<generic<T>>]
+            # @return [Set<generic<T>>]
+            def objects_by_class klass
+              # @type [Set<generic<T>>]
+              s = Set.new
+              s
+            end
+          end
+        end
+      end
+    ), 'test.rb')
+    api_map = Solargraph::ApiMap.new
+    api_map.map source
+
+    clip = api_map.clip_at('test.rb', [14, 14])
+    expect(clip.infer.rooted_tags).to eq('::Set<::Foo::Bar::Symbol>')
+  end
 end
diff --git a/spec/type_checker/levels/strong_spec.rb b/spec/type_checker/levels/strong_spec.rb
index a03e6eb5d..f9ff1ebb5 100644
--- a/spec/type_checker/levels/strong_spec.rb
+++ b/spec/type_checker/levels/strong_spec.rb
@@ -272,5 +272,37 @@ def meth arg
       ))
       expect(checker.problems).to be_empty
     end
+
+    it 'resolves class name correctly in generic resolution' do
+      checker = type_checker(%(
+        module Foo
+          module Bar
+            class Symbol
+            end
+          end
+        end
+
+        module Foo
+          module Baz
+            class Quux
+              # @return [void]
+              def foo
+                objects_by_class(Bar::Symbol)
+              end
+
+              # @generic T
+              # @param klass [Class<generic<T>>]
+              # @return [Set<generic<T>>]
+              def objects_by_class klass
+                # @type [Set<generic<T>>]
+                s = Set.new
+                s
+              end
+            end
+          end
+        end
+      ))
+      expect(checker.problems.map(&:message)).to be_empty
+    end
   end
 end

From 97e5519600f9b1d4bdf39c400f20f2cd104bf079 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 25 Sep 2025 17:43:19 -0400
Subject: [PATCH 252/327] Fix gates default value to match existing behavior

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

diff --git a/lib/solargraph/pin/proxy_type.rb b/lib/solargraph/pin/proxy_type.rb
index 6babeb353..ecaa94fdd 100644
--- a/lib/solargraph/pin/proxy_type.rb
+++ b/lib/solargraph/pin/proxy_type.rb
@@ -5,7 +5,7 @@ module Pin
     class ProxyType < Base
       # @param return_type [ComplexType]
       # @param binder [ComplexType, ComplexType::UniqueType, nil]
-      def initialize return_type: ComplexType::UNDEFINED, binder: nil, gates: [''], **splat
+      def initialize return_type: ComplexType::UNDEFINED, binder: nil, gates: nil, **splat
         super(**splat)
         @gates = gates
         @return_type = return_type

From 7840f9e91cbf0bad3d849f9e3fc565b1af25101e Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 25 Sep 2025 17:47:37 -0400
Subject: [PATCH 253/327] Linting

---
 spec/type_checker/levels/strong_spec.rb | 53 ++++++++++++++-----------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/spec/type_checker/levels/strong_spec.rb b/spec/type_checker/levels/strong_spec.rb
index f9ff1ebb5..0991ad9ad 100644
--- a/spec/type_checker/levels/strong_spec.rb
+++ b/spec/type_checker/levels/strong_spec.rb
@@ -273,36 +273,41 @@ def meth arg
       expect(checker.problems).to be_empty
     end
 
-    it 'resolves class name correctly in generic resolution' do
-      checker = type_checker(%(
-        module Foo
-          module Bar
-            class Symbol
+    context 'with class name available in more than one gate' do
+      let(:checker) do
+        type_checker(%(
+          module Foo
+            module Bar
+              class Symbol
+              end
             end
           end
-        end
-
-        module Foo
-          module Baz
-            class Quux
-              # @return [void]
-              def foo
-                objects_by_class(Bar::Symbol)
-              end
 
-              # @generic T
-              # @param klass [Class<generic<T>>]
-              # @return [Set<generic<T>>]
-              def objects_by_class klass
-                # @type [Set<generic<T>>]
-                s = Set.new
-                s
+          module Foo
+            module Baz
+              class Quux
+                # @return [void]
+                def foo
+                  objects_by_class(Bar::Symbol)
+                end
+
+                # @generic T
+                # @param klass [Class<generic<T>>]
+                # @return [Set<generic<T>>]
+                def objects_by_class klass
+                  # @type [Set<generic<T>>]
+                  s = Set.new
+                  s
+                end
               end
             end
           end
-        end
-      ))
-      expect(checker.problems.map(&:message)).to be_empty
+        ))
+      end
+
+      it 'resolves class name correctly in generic resolution' do
+        expect(checker.problems.map(&:message)).to be_empty
+      end
     end
   end
 end

From 99cf71d31770203c7a48685f87f1e79eb5511234 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Thu, 25 Sep 2025 18:18:47 -0400
Subject: [PATCH 254/327] Linting

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

diff --git a/lib/solargraph/pin/proxy_type.rb b/lib/solargraph/pin/proxy_type.rb
index ecaa94fdd..1fed841a3 100644
--- a/lib/solargraph/pin/proxy_type.rb
+++ b/lib/solargraph/pin/proxy_type.rb
@@ -5,6 +5,7 @@ module Pin
     class ProxyType < Base
       # @param return_type [ComplexType]
       # @param binder [ComplexType, ComplexType::UniqueType, nil]
+      # @param gates [Array<String>, nil]
       def initialize return_type: ComplexType::UNDEFINED, binder: nil, gates: nil, **splat
         super(**splat)
         @gates = gates

From dfdb952a5ac56a38adfd34f913073dfb8cee1cc2 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 26 Sep 2025 08:58:35 -0400
Subject: [PATCH 255/327] Fix re-used variable name issue

---
 lib/solargraph/pin/proxy_type.rb    | 1 +
 lib/solargraph/source/chain/call.rb | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/solargraph/pin/proxy_type.rb b/lib/solargraph/pin/proxy_type.rb
index 1fed841a3..452536834 100644
--- a/lib/solargraph/pin/proxy_type.rb
+++ b/lib/solargraph/pin/proxy_type.rb
@@ -4,6 +4,7 @@ module Solargraph
   module Pin
     class ProxyType < Base
       # @param return_type [ComplexType]
+      # @param gates [Array<String>, nil] Namespaces to try while resolving non-rooted types
       # @param binder [ComplexType, ComplexType::UniqueType, nil]
       # @param gates [Array<String>, nil]
       def initialize return_type: ComplexType::UNDEFINED, binder: nil, gates: nil, **splat
diff --git a/lib/solargraph/source/chain/call.rb b/lib/solargraph/source/chain/call.rb
index 5dca071de..74afff4e0 100644
--- a/lib/solargraph/source/chain/call.rb
+++ b/lib/solargraph/source/chain/call.rb
@@ -98,10 +98,10 @@ def inferred_pins pins, api_map, name_pin, locals
                   match = ol.parameters.any?(&:restarg?)
                   break
                 end
-                name_pin = Pin::ProxyType.anonymous(name_pin.context,
-                                                    gates: name_pin.gates,
-                                                    source: :chain)
-                atype = atypes[idx] ||= arg.infer(api_map, name_pin, locals)
+                arg_name_pin = Pin::ProxyType.anonymous(name_pin.context,
+                                                        gates: name_pin.gates,
+                                                        source: :chain)
+                atype = atypes[idx] ||= arg.infer(api_map, arg_name_pin, locals)
                 unless param.compatible_arg?(atype, api_map) || param.restarg?
                   match = false
                   break

From f8f7ca27b1dc40864a4ac49e3c26caa1fcb33b84 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 26 Sep 2025 09:02:13 -0400
Subject: [PATCH 256/327] Linting

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

diff --git a/spec/yard_map/mapper_spec.rb b/spec/yard_map/mapper_spec.rb
index 63efc3835..6fa778f2c 100644
--- a/spec/yard_map/mapper_spec.rb
+++ b/spec/yard_map/mapper_spec.rb
@@ -79,7 +79,7 @@
     pin = pins_with('ast').find do |pin|
       pin.is_a?(Solargraph::Pin::Namespace) && pin.name == 'Mixin' && pin.closure.path == 'AST::Processor'
     end
-    expect(pin.gates).to eq(["AST::Processor::Mixin", "AST::Processor", "AST", ""])
+    expect(pin.gates).to eq(['AST::Processor::Mixin', 'AST::Processor', 'AST', ''])
   end
 
   it 'adds extend references' do

From 8ce4bb91e5f2f7a57c8125150427e67b8e465ee7 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 26 Sep 2025 09:26:26 -0400
Subject: [PATCH 257/327] Fix merge

---
 spec/yard_map/mapper_spec.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/spec/yard_map/mapper_spec.rb b/spec/yard_map/mapper_spec.rb
index 6fa778f2c..d45af985b 100644
--- a/spec/yard_map/mapper_spec.rb
+++ b/spec/yard_map/mapper_spec.rb
@@ -76,7 +76,10 @@
 
   it 'adds corect gates' do
     # Asssuming the ast gem exists because it's a known dependency
-    pin = pins_with('ast').find do |pin|
+    gemspec = Gem::Specification.find_by_name('ast')
+    Solargraph::Yardoc.cache([], gemspec)
+    pins = Solargraph::YardMap::Mapper.new(Solargraph::Yardoc.load!(gemspec)).map
+    pin = pins.find do |pin|
       pin.is_a?(Solargraph::Pin::Namespace) && pin.name == 'Mixin' && pin.closure.path == 'AST::Processor'
     end
     expect(pin.gates).to eq(['AST::Processor::Mixin', 'AST::Processor', 'AST', ''])

From a398b84bd2f09c4e9148aee79c8ee0a643c651a1 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 26 Sep 2025 12:45:46 -0400
Subject: [PATCH 258/327] Resolve constants in references

Also replaces 'include' logic with call to ApiMap::Constants

Fixes #1099
---
 lib/solargraph/api_map.rb             | 13 +---
 lib/solargraph/api_map/constants.rb   | 23 ++++---
 lib/solargraph/parser/node_methods.rb | 97 ---------------------------
 spec/api_map/constants_spec.rb        | 27 ++++++++
 4 files changed, 44 insertions(+), 116 deletions(-)
 delete mode 100644 lib/solargraph/parser/node_methods.rb

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 44ca19035..7f53e7596 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -772,17 +772,8 @@ def inner_get_methods rooted_tag, scope, visibility, deep, skip, no_core = false
 
         if scope == :instance
           store.get_includes(fqns).reverse.each do |ref|
-            const = get_constants('', *ref.closure.gates).find { |pin| pin.path.end_with? ref.name }
-            if const.is_a?(Pin::Namespace)
-              result.concat inner_get_methods(const.path, scope, visibility, deep, skip, true)
-            elsif const.is_a?(Pin::Constant)
-              type = const.infer(self)
-              result.concat inner_get_methods(type.namespace, scope, visibility, deep, skip, true) if type.defined?
-            else
-              referenced_tag = ref.parametrized_tag
-              next unless referenced_tag.defined?
-              result.concat inner_get_methods_from_reference(referenced_tag.to_s, namespace_pin, rooted_type, scope, visibility, deep, skip, true)
-            end
+            fqin = dereference(ref)
+            result.concat inner_get_methods(fqin, scope, visibility, deep, skip, true)
           end
           rooted_sc_tag = qualify_superclass(rooted_tag)
           unless rooted_sc_tag.nil?
diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index 430303ae1..5dbcd4b67 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -12,14 +12,21 @@ def initialize store
 
       # Resolve a name to a fully qualified namespace or constant.
       #
-      # `Constants#resolve` is similar to `Constants#qualify`` in that its
-      # purpose is to find fully qualified (absolute) namespaces, except
-      # `#resolve`` is only concerned with real namespaces. It disregards
-      # parametrized types and special types like literals, self, and Boolean.
+      # `Constants#resolve` finds fully qualified (absolute)
+      # namespaces based on relative names and the open gates
+      # (namespaces) provided.  Names must be runtime-visible (erased)
+      # non-literal types - e.g., TrueClass, NilClass, Integer and
+      # Hash instead of true, nil, 96, or Hash{String => Symbol}
       #
-      # @param name [String]
-      # @param gates [Array<Array<String>, String>]
-      # @return [String, nil]
+      # Note: You may want to be using #qualify.  Notably, #resolve:
+      # - will not gracefully handle nil, self and Boolean
+      # - will return a constant name instead of following its assignment
+      #
+      # @param name [String] Namespace which may relative and not be rooted.
+      # @param gates [Array<Array<String>, String>] Namespaces to search while resolving the name
+      #
+      # @return [String, nil] fully qualified namespace (i.e., is
+      #   absolute, but will not start with ::)
       def resolve(name, *gates)
         return store.get_path_pins(name[2..]).first&.path if name.start_with?('::')
 
@@ -33,7 +40,7 @@ def resolve(name, *gates)
       # @param pin [Pin::Reference]
       # @return [String, nil]
       def dereference pin
-        resolve(pin.name, pin.reference_gates)
+        qualify(pin.name, pin.reference_gates)
       end
 
       # Collect a list of all constants defined in the specified gates.
diff --git a/lib/solargraph/parser/node_methods.rb b/lib/solargraph/parser/node_methods.rb
deleted file mode 100644
index f33a924c1..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{Symbol => 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/spec/api_map/constants_spec.rb b/spec/api_map/constants_spec.rb
index 26eaf6b25..e09c12c29 100644
--- a/spec/api_map/constants_spec.rb
+++ b/spec/api_map/constants_spec.rb
@@ -20,6 +20,33 @@ module Quuz
       expect(resolved).to eq('Foo::Bar')
     end
 
+    it 'resolves constants in includes' do
+      code = %(
+        module A
+          module Parser
+            module C
+              module_function
+
+              # @return [String]
+              def baz; "abc"; end
+            end
+
+            B = C
+          end
+
+          class Foo
+            include Parser::B
+
+            # @return [String]
+            def bar
+              baz
+            end
+          end
+        end)
+      checker = Solargraph::TypeChecker.load_string(code, 'test.rb', :strong)
+      expect(checker.problems.map(&:message)).to be_empty
+    end
+
     it 'returns namespaces for nested namespaces' do
       source_map = Solargraph::SourceMap.load_string(%(
         module Foo

From dd06a479b9f12e797b12caef53bdff482f686426 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 26 Sep 2025 12:51:45 -0400
Subject: [PATCH 259/327] Linting

---
 spec/api_map/constants_spec.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spec/api_map/constants_spec.rb b/spec/api_map/constants_spec.rb
index e09c12c29..ef07c00b7 100644
--- a/spec/api_map/constants_spec.rb
+++ b/spec/api_map/constants_spec.rb
@@ -25,8 +25,6 @@ module Quuz
         module A
           module Parser
             module C
-              module_function
-
               # @return [String]
               def baz; "abc"; end
             end

From cc86aec403ca74694a408e85e6ccd1f5f5e32343 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 26 Sep 2025 13:00:55 -0400
Subject: [PATCH 260/327] Ratchet RuboCop

---
 .rubocop_todo.yml         | 35 +----------------------------------
 lib/solargraph/api_map.rb |  2 --
 2 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 89fd47c5d..0de27608a 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.2.
+# 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.
 # Note that changes in the inspected code, or installation of new
@@ -280,7 +280,6 @@ Layout/MultilineMethodCallBraceLayout:
 # 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'
@@ -356,7 +355,6 @@ Layout/SpaceBeforeBlockBraces:
     - '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'
@@ -433,13 +431,11 @@ 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.
 Lint/AmbiguousBlockAssociation:
   Exclude:
-    - 'lib/solargraph/api_map.rb'
     - 'lib/solargraph/language_server/host.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
@@ -512,11 +508,6 @@ Lint/DuplicateMethods:
     - 'lib/solargraph/rbs_map/core_map.rb'
     - 'lib/solargraph/source/chain/link.rb'
 
-# Configuration parameters: AllowComments, AllowEmptyLambdas.
-Lint/EmptyBlock:
-  Exclude:
-    - 'spec/convention_spec.rb'
-
 # Configuration parameters: AllowComments.
 Lint/EmptyClass:
   Exclude:
@@ -998,11 +989,6 @@ RSpec/DescribedClass:
     - 'spec/yard_map/mapper/to_method_spec.rb'
     - 'spec/yard_map/mapper_spec.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-RSpec/EmptyExampleGroup:
-  Exclude:
-    - 'spec/convention_spec.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 RSpec/EmptyLineAfterFinalLet:
   Exclude:
@@ -1321,7 +1307,6 @@ Style/AccessorGrouping:
 # 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'
@@ -1510,7 +1495,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'
@@ -1651,7 +1635,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'
@@ -1782,7 +1765,6 @@ Style/GlobalStdStream:
 # 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'
@@ -1835,7 +1817,6 @@ Style/IfInsideElse:
 # 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'
@@ -1903,7 +1884,6 @@ 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'
@@ -1925,7 +1905,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'
@@ -1947,7 +1926,6 @@ Style/MethodDefParentheses:
     - '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'
@@ -2049,8 +2027,6 @@ Style/NumericLiterals:
 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'
@@ -2131,7 +2107,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'
 
@@ -2143,7 +2118,6 @@ 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'
 
@@ -2170,7 +2144,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'
@@ -2269,8 +2242,6 @@ Style/StderrPuts:
 # 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'
@@ -2286,7 +2257,6 @@ 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'
@@ -2504,8 +2474,6 @@ 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'
@@ -2614,7 +2582,6 @@ Layout/LineLength:
     - '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'
diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 7f53e7596..7bac1395c 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -737,7 +737,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
@@ -802,7 +801,6 @@ def inner_get_methods rooted_tag, scope, visibility, deep, skip, no_core = false
       end
       result
     end
-    # rubocop:enable Metrics/CyclomaticComplexity
 
     # @return [Hash]
     def path_macros

From 343cd23307e00ae0c0d4952514f326eac209de5b Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 26 Sep 2025 14:36:29 -0400
Subject: [PATCH 261/327] Fix lack of parameters in include types

---
 lib/solargraph/api_map.rb                   |  6 ++--
 lib/solargraph/api_map/constants.rb         | 37 +++++++++++++--------
 lib/solargraph/api_map/store.rb             |  2 +-
 lib/solargraph/complex_type/type_methods.rb |  4 +++
 lib/solargraph/pin/reference.rb             | 13 ++------
 5 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 7bac1395c..14d33b1d7 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -771,8 +771,8 @@ def inner_get_methods rooted_tag, scope, visibility, deep, skip, no_core = false
 
         if scope == :instance
           store.get_includes(fqns).reverse.each do |ref|
-            fqin = dereference(ref)
-            result.concat inner_get_methods(fqin, scope, visibility, deep, skip, true)
+            in_tag = dereference(ref)
+            result.concat inner_get_methods_from_reference(in_tag, namespace_pin, rooted_type, scope, visibility, deep, skip, true)
           end
           rooted_sc_tag = qualify_superclass(rooted_tag)
           unless rooted_sc_tag.nil?
@@ -781,7 +781,7 @@ def inner_get_methods rooted_tag, scope, visibility, deep, skip, no_core = false
         else
           logger.info { "ApiMap#inner_get_methods(#{fqns}, #{scope}, #{visibility}, #{deep}, #{skip}) - looking for get_extends() from #{fqns}" }
           store.get_extends(fqns).reverse.each do |em|
-            fqem = store.constants.dereference(em)
+            fqem = dereference(em)
             result.concat inner_get_methods(fqem, :instance, visibility, deep, skip, true) unless fqem.nil?
           end
           rooted_sc_tag = qualify_superclass(rooted_tag)
diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index 5dbcd4b67..0b6070507 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -15,10 +15,12 @@ def initialize store
       # `Constants#resolve` finds fully qualified (absolute)
       # namespaces based on relative names and the open gates
       # (namespaces) provided.  Names must be runtime-visible (erased)
-      # non-literal types - e.g., TrueClass, NilClass, Integer and
-      # Hash instead of true, nil, 96, or Hash{String => Symbol}
+      # non-literal types, non-duck, non-signature types - e.g.,
+      # TrueClass, NilClass, Integer and Hash instead of true, nil,
+      # 96, or Hash{String => Symbol}
       #
       # Note: You may want to be using #qualify.  Notably, #resolve:
+      # - does not handle anything with type parameters
       # - will not gracefully handle nil, self and Boolean
       # - will return a constant name instead of following its assignment
       #
@@ -40,7 +42,7 @@ def resolve(name, *gates)
       # @param pin [Pin::Reference]
       # @return [String, nil]
       def dereference pin
-        qualify(pin.name, pin.reference_gates)
+        qualify_type(pin.type, pin.reference_gates)&.tag
       end
 
       # Collect a list of all constants defined in the specified gates.
@@ -52,27 +54,36 @@ def collect(*gates)
         cached_collect[flat] || collect_and_cache(flat)
       end
 
-      # Determine a fully qualified namespace for a given name referenced
-      # from the specified open gates. This method will search in each gate
-      # until it finds a match for the name.
+      # Determine a fully qualified namespace for a given tag
+      # referenced from the specified open gates. This method will
+      # search in each gate until it finds a match for the name.
       #
-      # @param name [String, nil] The namespace to match
+      # @param tag [String, nil] The type to match
       # @param gates [Array<String>]
       # @return [String, nil] fully qualified tag
-      def qualify name, *gates
-        return name if ['Boolean', 'self', nil].include?(name)
+      def qualify tag, *gates
+        type = ComplexType.try_parse(tag)
+        qualify_type(type)&.tag
+      end
+
+      # @param type [ComplexType, nil] The type to match
+      # @param gates [Array<String>]
+      #
+      # @return [ComplexType, nil] A new rooted ComplexType
+      def qualify_type type, *gates
+        return nil if type.nil?
+        return type if type.selfy? || type.literal? || type.tag == 'nil' || type.interface?
 
         gates.push '' unless gates.include?('')
-        fqns = resolve(name, gates)
+        fqns = resolve(type.namespace, type.namespace)
         return unless fqns
         pin = store.get_path_pins(fqns).first
         if pin.is_a?(Pin::Constant)
           const = Solargraph::Parser::NodeMethods.unpack_name(pin.assignment)
           return unless const
-          resolve(const, pin.gates)
-        else
-          fqns
+          fqns = resolve(const, pin.gates)
         end
+        type.recreate(new_name: fqns, rooted: true)
       end
 
       # @return [void]
diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index b3953cfec..a0b2ae856 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -244,7 +244,7 @@ def get_ancestors(fqns)
           # Add includes, prepends, and extends
           [get_includes(current), get_prepends(current), get_extends(current)].each do |refs|
             next if refs.nil?
-            refs.map(&:parametrized_tag).map(&:to_s).each do |ref|
+            refs.map(&:type).map(&:to_s).each do |ref|
               next if ref.nil? || ref.empty? || visited.include?(ref)
               ancestors << ref
               queue << ref
diff --git a/lib/solargraph/complex_type/type_methods.rb b/lib/solargraph/complex_type/type_methods.rb
index d8d4fc7d7..1145bd034 100644
--- a/lib/solargraph/complex_type/type_methods.rb
+++ b/lib/solargraph/complex_type/type_methods.rb
@@ -43,6 +43,10 @@ def rooted_tag
         @rooted_tag ||= rooted_name + rooted_substring
       end
 
+      def interface?
+        name.start_with?('_')
+      end
+
       # @return [Boolean]
       def duck_type?
         @duck_type ||= name.start_with?('#')
diff --git a/lib/solargraph/pin/reference.rb b/lib/solargraph/pin/reference.rb
index d678ab7b7..d456fbbf8 100644
--- a/lib/solargraph/pin/reference.rb
+++ b/lib/solargraph/pin/reference.rb
@@ -18,18 +18,9 @@ def initialize generic_values: [], **splat
         @generic_values = generic_values
       end
 
-      # @return [String]
-      def parameter_tag
-        @parameter_tag ||= if generic_values&.any?
-                             "<#{generic_values.join(', ')}>"
-                           else
-                             ''
-                           end
-      end
-
       # @return [ComplexType]
-      def parametrized_tag
-        @parametrized_tag ||= ComplexType.try_parse(
+      def type
+        @type ||= ComplexType.try_parse(
           name +
           if generic_values&.length&.> 0
             "<#{generic_values.join(', ')}>"

From d787886b956aa9b5d748fe4003f0ceb1b4dcd4ca Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 26 Sep 2025 15:16:22 -0400
Subject: [PATCH 262/327] Bug fixes

---
 lib/solargraph/api_map.rb                         |  2 +-
 lib/solargraph/api_map/constants.rb               | 13 +++++++------
 lib/solargraph/api_map/source_to_yard.rb          |  4 ++--
 lib/solargraph/api_map/store.rb                   |  2 +-
 lib/solargraph/complex_type.rb                    | 15 +++++++++++++++
 .../convention/active_support_concern.rb          |  2 +-
 6 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 14d33b1d7..286761db2 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -662,7 +662,7 @@ def super_and_sub?(sup, sub)
     #
     # @return [Boolean]
     def type_include?(host_ns, module_ns)
-      store.get_includes(host_ns).map { |inc_tag| inc_tag.parametrized_tag.name }.include?(module_ns)
+      store.get_includes(host_ns).map { |inc_tag| inc_tag.type.name }.include?(module_ns)
     end
 
     # @param pins [Enumerable<Pin::Base>]
diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index 0b6070507..9463e2037 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -42,7 +42,7 @@ def resolve(name, *gates)
       # @param pin [Pin::Reference]
       # @return [String, nil]
       def dereference pin
-        qualify_type(pin.type, pin.reference_gates)&.tag
+        qualify_type(pin.type, *pin.reference_gates)&.tag
       end
 
       # Collect a list of all constants defined in the specified gates.
@@ -63,7 +63,7 @@ def collect(*gates)
       # @return [String, nil] fully qualified tag
       def qualify tag, *gates
         type = ComplexType.try_parse(tag)
-        qualify_type(type)&.tag
+        qualify_type(type, *gates)&.tag
       end
 
       # @param type [ComplexType, nil] The type to match
@@ -72,18 +72,19 @@ def qualify tag, *gates
       # @return [ComplexType, nil] A new rooted ComplexType
       def qualify_type type, *gates
         return nil if type.nil?
-        return type if type.selfy? || type.literal? || type.tag == 'nil' || type.interface?
+        return type if type.selfy? || type.literal? || type.tag == 'nil' || type.interface? ||
+                       type.tag == 'Boolean'
 
         gates.push '' unless gates.include?('')
-        fqns = resolve(type.namespace, type.namespace)
+        fqns = resolve(type.rooted_namespace, *gates)
         return unless fqns
         pin = store.get_path_pins(fqns).first
         if pin.is_a?(Pin::Constant)
           const = Solargraph::Parser::NodeMethods.unpack_name(pin.assignment)
           return unless const
-          fqns = resolve(const, pin.gates)
+          fqns = resolve(const, *pin.gates)
         end
-        type.recreate(new_name: fqns, rooted: true)
+        type.recreate(new_name: fqns, make_rooted: true)
       end
 
       # @return [void]
diff --git a/lib/solargraph/api_map/source_to_yard.rb b/lib/solargraph/api_map/source_to_yard.rb
index ccbed3eb6..39d86a85c 100644
--- a/lib/solargraph/api_map/source_to_yard.rb
+++ b/lib/solargraph/api_map/source_to_yard.rb
@@ -46,13 +46,13 @@ def rake_yard store
           store.get_includes(pin.path).each do |ref|
             include_object = code_object_at(pin.path, YARD::CodeObjects::ClassObject)
             unless include_object.nil? || include_object.nil?
-              include_object.instance_mixins.push code_object_map[ref.parametrized_tag.to_s]
+              include_object.instance_mixins.push code_object_map[ref.type.to_s]
             end
           end
           store.get_extends(pin.path).each do |ref|
             extend_object = code_object_at(pin.path, YARD::CodeObjects::ClassObject)
             next unless extend_object
-            code_object = code_object_map[ref.parametrized_tag.to_s]
+            code_object = code_object_map[ref.type.to_s]
             next unless code_object
             extend_object.class_mixins.push code_object
             # @todo add spec showing why this next line is necessary
diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index a0b2ae856..d97d1d342 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -97,7 +97,7 @@ def qualify_superclass fq_sub_tag
         return unless ref
         res = constants.dereference(ref)
         return unless res
-        res + type.substring
+        res
       end
 
       # @param fqns [String]
diff --git a/lib/solargraph/complex_type.rb b/lib/solargraph/complex_type.rb
index 8798ecb88..db378743f 100644
--- a/lib/solargraph/complex_type.rb
+++ b/lib/solargraph/complex_type.rb
@@ -105,6 +105,21 @@ def can_assign?(api_map, atype)
       any? { |ut| ut.can_assign?(api_map, atype) }
     end
 
+    # @param new_name [String, nil]
+    # @param make_rooted [Boolean, nil]
+    # @param new_key_types [Array<ComplexType>, nil]
+    # @param rooted [Boolean, nil]
+    # @param new_subtypes [Array<ComplexType>, nil]
+    # @return [self]
+    def recreate(new_name: nil, make_rooted: nil, new_key_types: nil, new_subtypes: nil)
+      ComplexType.new(map do |ut|
+                        ut.recreate(new_name: new_name,
+                                    make_rooted: make_rooted,
+                                    new_key_types: new_key_types,
+                                    new_subtypes: new_subtypes)
+                      end)
+    end
+
     # @return [Integer]
     def length
       @items.length
diff --git a/lib/solargraph/convention/active_support_concern.rb b/lib/solargraph/convention/active_support_concern.rb
index 74c9ce765..ed1fba175 100644
--- a/lib/solargraph/convention/active_support_concern.rb
+++ b/lib/solargraph/convention/active_support_concern.rb
@@ -80,7 +80,7 @@ def process_include include_tag
             "ActiveSupportConcern#object(#{fqns}, #{scope}, #{visibility}, #{deep}) - " \
               "Handling class include include_tag=#{include_tag}"
           end
-          module_extends = api_map.get_extends(rooted_include_tag).map(&:parametrized_tag).map(&:to_s)
+          module_extends = api_map.get_extends(rooted_include_tag).map(&:type).map(&:to_s)
           logger.debug do
             "ActiveSupportConcern#object(#{fqns}, #{scope}, #{visibility}, #{deep}) - " \
               "found module extends of #{rooted_include_tag}: #{module_extends}"

From 63a53dbed3be0c68d0eac7a7a61dd031b6c8466d Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 26 Sep 2025 15:35:50 -0400
Subject: [PATCH 263/327] Add actual type for Mutexes

---
 lib/solargraph/language_server/progress.rb | 2 +-
 lib/solargraph/library.rb                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/solargraph/language_server/progress.rb b/lib/solargraph/language_server/progress.rb
index 10900a37e..98b155714 100644
--- a/lib/solargraph/language_server/progress.rb
+++ b/lib/solargraph/language_server/progress.rb
@@ -134,7 +134,7 @@ def keep_alive host
         end
       end
 
-      # @return [Mutex]
+      # @return [Thread::Mutex]
       def mutex
         @mutex ||= Mutex.new
       end
diff --git a/lib/solargraph/library.rb b/lib/solargraph/library.rb
index 9d5162431..bdbd1354f 100644
--- a/lib/solargraph/library.rb
+++ b/lib/solargraph/library.rb
@@ -522,7 +522,7 @@ def find_external_requires source_map
       @external_requires = nil
     end
 
-    # @return [Mutex]
+    # @return [Thread::Mutex]
     def mutex
       @mutex ||= Mutex.new
     end

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 264/327] 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 265/327] 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 266/327] 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 7546f7355534c70d3ae9ddbb863304d5be557d16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lek=C3=AB=20Mula?= <l.mula@finlink.de>
Date: Sun, 21 Sep 2025 17:41:33 +0200
Subject: [PATCH 267/327] Enable solargraph-rspec tests

---
 .github/workflows/plugins.yml | 55 ++++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index b5984f3cb..ded3be5a0 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -105,30 +105,37 @@ jobs:
     - name: Ensure specs still run
       run: bundle exec rake spec
 
-  # run_solargraph_rspec_specs:
-  #   # check out solargraph-rspec as well as this project, and point the former to use the latter as a local gem
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #   - uses: actions/checkout@v3
-  #   - name: clone https://github.com/lekemula/solargraph-rspec/
-  #     run: |
-  #      cd ..
-  #      git clone https://github.com/lekemula/solargraph-rspec.git
-  #      cd solargraph-rspec
-  #   - name: Set up Ruby
-  #     uses: ruby/setup-ruby@v1
-  #     with:
-  #       ruby-version: '3.0'
-  #       bundler-cache: false
-  #   - name: Install gems
-  #     run: |
-  #      cd ../solargraph-rspec
-  #      echo "gem 'solargraph', path: '../solargraph'" >> Gemfile
-  #      bundle install
-  #   - name: Run specs
-  #     run: |
-  #       cd ../solargraph-rspec
-  #       bundle exec rake spec
+  run_solargraph_rspec_specs:
+    # check out solargraph-rspec as well as this project, and point the former to use the latter as a local gem
+    runs-on: ubuntu-latest
+    env:
+      SOLARGRAPH_CACHE: ${{ github.workspace }}/solargraph-rspec/vendor/solargraph/cache
+    steps:
+    - uses: actions/checkout@v3
+    - name: clone https://github.com/lekemula/solargraph-rspec/
+      run: |
+       cd ..
+       git clone https://github.com/lekemula/solargraph-rspec.git
+       cd solargraph-rspec
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 3.4
+        bundler-cache: true
+    - name: Install gems
+      run: |
+       cd ../solargraph-rspec
+       echo "gem 'solargraph', path: '../solargraph'" >> Gemfile
+       bundle install
+    - name: Solargraph generate RSpec gems YARD and RBS pins
+      run: |
+        cd ../solargraph-rspec
+        rspec_gems=$(bundle exec ruby -r './lib/solargraph-rspec' -e 'puts Solargraph::Rspec::Gems.gem_names.join(" ")' 2>/dev/null | tail -n1)
+        bundle exec solargraph gems $rspec_gems
+    - name: Run specs
+      run: |
+        cd ../solargraph-rspec
+        bundle exec rspec
 
   run_solargraph_rails_specs:
     # check out solargraph-rails as well as this project, and point the former to use the latter as a local gem

From 9c79e5b3a01ac3fd8d84b35b94e4cb4110f91b2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lek=C3=AB=20Mula?= <l.mula@finlink.de>
Date: Sun, 21 Sep 2025 19:40:15 +0200
Subject: [PATCH 268/327] Fix rspec gems specs

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

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index ded3be5a0..1c633fda0 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -109,7 +109,8 @@ jobs:
     # check out solargraph-rspec as well as this project, and point the former to use the latter as a local gem
     runs-on: ubuntu-latest
     env:
-      SOLARGRAPH_CACHE: ${{ github.workspace }}/solargraph-rspec/vendor/solargraph/cache
+      SOLARGRAPH_CACHE: ${{ github.workspace }}/../solargraph-rspec/vendor/solargraph/cache
+      BUNDLE_PATH: ${{ github.workspace }}/../solargraph-rspec/vendor/bundle
     steps:
     - uses: actions/checkout@v3
     - name: clone https://github.com/lekemula/solargraph-rspec/
@@ -121,12 +122,17 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: 3.4
-        bundler-cache: true
+        bundler-cache: false
     - name: Install gems
       run: |
        cd ../solargraph-rspec
        echo "gem 'solargraph', path: '../solargraph'" >> Gemfile
-       bundle install
+       bundle config path ${{ env.BUNDLE_PATH }}
+       bundle install --jobs 4 --retry 3
+    - name: Configure .solargraph.yml
+      run: |
+        cd ../solargraph-rspec
+        cp .solargraph.yml.example .solargraph.yml
     - name: Solargraph generate RSpec gems YARD and RBS pins
       run: |
         cd ../solargraph-rspec
@@ -135,7 +141,7 @@ jobs:
     - name: Run specs
       run: |
         cd ../solargraph-rspec
-        bundle exec rspec
+        bundle exec rspec --format progress
 
   run_solargraph_rails_specs:
     # check out solargraph-rails as well as this project, and point the former to use the latter as a local gem

From b4c8b9975d168824b7eec72d7865de4ac78070d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lek=C3=AB=20Mula?= <l.mula@finlink.de>
Date: Thu, 4 Sep 2025 23:18:11 +0200
Subject: [PATCH 269/327] Add solargraph profile command

---
 lib/solargraph/shell.rb | 94 +++++++++++++++++++++++++++++++++++++++++
 solargraph.gemspec      |  1 +
 2 files changed, 95 insertions(+)

diff --git a/lib/solargraph/shell.rb b/lib/solargraph/shell.rb
index a005f600b..a8a8337f9 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -241,6 +241,100 @@ def list
       puts "#{workspace.filenames.length} files total."
     end
 
+    desc 'profile [FILE]', 'Profile go-to-definition performance using vernier'
+    option :directory, type: :string, aliases: :d, desc: 'The workspace directory', default: '.'
+    option :output_dir, type: :string, aliases: :o, desc: 'The output directory for profiles', default: './tmp/profiles'
+    option :line, type: :numeric, aliases: :l, desc: 'Line number (0-based)', default: 4
+    option :column, type: :numeric, aliases: :c, desc: 'Column number', default: 10
+    # @param file [String, nil]
+    # @return [void]
+    def profile(file = nil) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      begin
+        require 'vernier'
+      rescue LoadError
+        STDERR.puts "vernier gem not found. Install with: gem install vernier"
+        return
+      end
+
+      directory = File.realpath(options[:directory])
+      FileUtils.mkdir_p(options[:output_dir])
+
+      host = Solargraph::LanguageServer::Host.new
+      host.client_capabilities.merge!({ 'window' => { 'workDoneProgress' => true } })
+      def host.send_notification method, params
+        puts "Notification: #{method} - #{params}"
+      end
+
+      puts "Parsing and mapping source files..."
+      prepare_start = Time.now
+      Vernier.profile(out: "#{options[:output_dir]}/parse_benchmark.json.gz") do
+        puts "Mapping libraries"
+        host.prepare(directory)
+        sleep 0.2 until host.libraries.all?(&:mapped?)
+      end
+      prepare_time = Time.now - prepare_start
+
+      puts "Building the catalog..."
+      catalog_start = Time.now
+      Vernier.profile(out: "#{options[:output_dir]}/catalog_benchmark.json.gz") do
+        host.catalog
+      end
+      catalog_time = Time.now - catalog_start
+
+      # Determine test file
+      if file
+        test_file = File.join(directory, file)
+      else
+        test_file = File.join(directory, 'lib', 'other.rb')
+        unless File.exist?(test_file)
+          # Fallback to any Ruby file in the workspace
+          workspace = Solargraph::Workspace.new(directory)
+          test_file = workspace.filenames.find { |f| f.end_with?('.rb') }
+          unless test_file
+            STDERR.puts "No Ruby files found in workspace"
+            return
+          end
+        end
+      end
+
+      file_uri = Solargraph::LanguageServer::UriHelpers.file_to_uri(File.absolute_path(test_file))
+
+      puts "Profiling go-to-definition for #{test_file}"
+      puts "Position: line #{options[:line]}, column #{options[:column]}"
+
+      definition_start = Time.now
+      Vernier.profile(out: "#{options[:output_dir]}/definition_benchmark.json.gz") do
+        message = Solargraph::LanguageServer::Message::TextDocument::Definition.new(
+          host, {
+            'params' => {
+              'textDocument' => { 'uri' => file_uri },
+              'position' => { 'line' => options[:line], 'character' => options[:column] }
+            }
+          }
+        )
+        puts "Processing go-to-definition request..."
+        result = message.process
+
+        puts "Result: #{result.inspect}"
+      end
+      definition_time = Time.now - definition_start
+
+      puts "\n=== Timing Results ==="
+      puts "Parsing & mapping: #{(prepare_time * 1000).round(2)}ms"
+      puts "Catalog building: #{(catalog_time * 1000).round(2)}ms"
+      puts "Go-to-definition: #{(definition_time * 1000).round(2)}ms"
+      total_time = prepare_time + catalog_time + definition_time
+      puts "Total time: #{(total_time * 1000).round(2)}ms"
+
+      puts "\nProfiles saved to:"
+      puts "  - #{File.expand_path('parse_benchmark.json.gz', options[:output_dir])}"
+      puts "  - #{File.expand_path('catalog_benchmark.json.gz', options[:output_dir])}"
+      puts "  - #{File.expand_path('definition_benchmark.json.gz', options[:output_dir])}"
+
+      puts "\nUpload the JSON files to https://vernier.prof/ to view the profiles."
+      puts "Or use https://rubygems.org/gems/profile-viewer to view them locally."
+    end
+
     private
 
     # @param pin [Solargraph::Pin::Base]
diff --git a/solargraph.gemspec b/solargraph.gemspec
index 42d80dae2..1c694034b 100755
--- a/solargraph.gemspec
+++ b/solargraph.gemspec
@@ -59,6 +59,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'undercover', '~> 0.7'
   s.add_development_dependency 'overcommit', '~> 0.68.0'
   s.add_development_dependency 'webmock', '~> 3.6'
+  s.add_development_dependency 'vernier'
   # work around missing yard dependency needed as of Ruby 3.5
   s.add_development_dependency 'irb', '~> 1.15'
 end

From d67d580d84bc73728245afb3d319b0d7c57e98bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lek=C3=AB=20Mula?= <l.mula@finlink.de>
Date: Fri, 5 Sep 2025 11:09:23 +0200
Subject: [PATCH 270/327] Add memory usage counter

---
 lib/solargraph/shell.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/solargraph/shell.rb b/lib/solargraph/shell.rb
index a8a8337f9..2c07a94e0 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -246,6 +246,7 @@ def list
     option :output_dir, type: :string, aliases: :o, desc: 'The output directory for profiles', default: './tmp/profiles'
     option :line, type: :numeric, aliases: :l, desc: 'Line number (0-based)', default: 4
     option :column, type: :numeric, aliases: :c, desc: 'Column number', default: 10
+    option :memory, type: :boolean, aliases: :m, desc: 'Include memory usage counter', default: true
     # @param file [String, nil]
     # @return [void]
     def profile(file = nil) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
@@ -256,6 +257,9 @@ def profile(file = nil) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         return
       end
 
+      hooks = []
+      hooks << :memory_usage if options[:memory]
+
       directory = File.realpath(options[:directory])
       FileUtils.mkdir_p(options[:output_dir])
 
@@ -267,7 +271,7 @@ def host.send_notification method, params
 
       puts "Parsing and mapping source files..."
       prepare_start = Time.now
-      Vernier.profile(out: "#{options[:output_dir]}/parse_benchmark.json.gz") do
+      Vernier.profile(out: "#{options[:output_dir]}/parse_benchmark.json.gz", hooks: hooks) do
         puts "Mapping libraries"
         host.prepare(directory)
         sleep 0.2 until host.libraries.all?(&:mapped?)
@@ -276,7 +280,7 @@ def host.send_notification method, params
 
       puts "Building the catalog..."
       catalog_start = Time.now
-      Vernier.profile(out: "#{options[:output_dir]}/catalog_benchmark.json.gz") do
+      Vernier.profile(out: "#{options[:output_dir]}/catalog_benchmark.json.gz", hooks: hooks) do
         host.catalog
       end
       catalog_time = Time.now - catalog_start
@@ -303,7 +307,7 @@ def host.send_notification method, params
       puts "Position: line #{options[:line]}, column #{options[:column]}"
 
       definition_start = Time.now
-      Vernier.profile(out: "#{options[:output_dir]}/definition_benchmark.json.gz") do
+      Vernier.profile(out: "#{options[:output_dir]}/definition_benchmark.json.gz", hooks: hooks) do
         message = Solargraph::LanguageServer::Message::TextDocument::Definition.new(
           host, {
             'params' => {

From c0455fae9be835a4eb288eb626f92b058be75cc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lek=C3=AB=20Mula?= <l.mula@finlink.de>
Date: Thu, 11 Sep 2025 23:16:10 +0200
Subject: [PATCH 271/327] Fix CI (typechecking) and pin the gem version

Co-authored-by: Vince Broz <vince@broz.cc>
---
 lib/solargraph/parser/parser_gem/node_processors/defs_node.rb | 3 ++-
 solargraph.gemspec                                            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/solargraph/parser/parser_gem/node_processors/defs_node.rb b/lib/solargraph/parser/parser_gem/node_processors/defs_node.rb
index 5f40457e9..ce807cd47 100644
--- a/lib/solargraph/parser/parser_gem/node_processors/defs_node.rb
+++ b/lib/solargraph/parser/parser_gem/node_processors/defs_node.rb
@@ -15,7 +15,8 @@ def process
               closure = region.closure
             else
               closure = Solargraph::Pin::Namespace.new(
-                name: unpack_name(node.children[0])
+                name: unpack_name(node.children[0]),
+                source: :parser,
               )
             end
             pins.push Solargraph::Pin::Method.new(
diff --git a/solargraph.gemspec b/solargraph.gemspec
index 1c694034b..091daa093 100755
--- a/solargraph.gemspec
+++ b/solargraph.gemspec
@@ -59,7 +59,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'undercover', '~> 0.7'
   s.add_development_dependency 'overcommit', '~> 0.68.0'
   s.add_development_dependency 'webmock', '~> 3.6'
-  s.add_development_dependency 'vernier'
+  s.add_development_dependency 'vernier', '< 2'
   # work around missing yard dependency needed as of Ruby 3.5
   s.add_development_dependency 'irb', '~> 1.15'
 end

From 431dd3263b2e9449b7fa1a0a133fe2e8b38cd2b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lek=C3=AB=20Mula?= <l.mula@finlink.de>
Date: Fri, 12 Sep 2025 00:02:18 +0200
Subject: [PATCH 272/327] Make overcommit happy?

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

diff --git a/lib/solargraph/shell.rb b/lib/solargraph/shell.rb
index 2c07a94e0..6a335bc9a 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -265,6 +265,9 @@ def profile(file = nil) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
 
       host = Solargraph::LanguageServer::Host.new
       host.client_capabilities.merge!({ 'window' => { 'workDoneProgress' => true } })
+      # @param method [String] The message method
+      # @param params [Hash] The method parameters
+      # @return [void]
       def host.send_notification method, params
         puts "Notification: #{method} - #{params}"
       end

From 55cf9c32da1375e9213d656e83d865b320131c69 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 27 Sep 2025 10:12:21 -0400
Subject: [PATCH 273/327] Fix pin combination consistency issue

I was hitting a strange 'works on my machine' issue and figured it out
that I wasn't seeing it because of a difference in where files lived
in CI vs my machine.  This resulted in different pin info being
selected during combination, as we were using the file location when
we had no better way to prefer one over the other.

This should make the result more consistent, making user and CI
pin-combination-triggered issues easier to reproduce.
---
 lib/solargraph/pin/base.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/solargraph/pin/base.rb b/lib/solargraph/pin/base.rb
index c0eecabb2..d11c9455e 100644
--- a/lib/solargraph/pin/base.rb
+++ b/lib/solargraph/pin/base.rb
@@ -354,7 +354,7 @@ def choose_pin_attr(other, attr)
         end
         # arbitrary way of choosing a pin
         # @sg-ignore Need _1 support
-        [val1, val2].compact.min_by { _1.best_location.to_s }
+        [val1, val2].compact.max_by { File.basename(_1.best_location.to_s) }
       end
 
       # @return [void]

From 5d4bbc3b37c01eadfac7c60b17035e7412346e77 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 27 Sep 2025 22:09:31 -0400
Subject: [PATCH 274/327] Closure merging fixes

1) Prefer closures with more gates, to maximize compatibility
2) Look at basename of location, to make choice consistent
---
 lib/solargraph/pin/base.rb | 11 +++++++++--
 spec/pin/base_spec.rb      | 14 ++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/lib/solargraph/pin/base.rb b/lib/solargraph/pin/base.rb
index c0eecabb2..bb6608d0f 100644
--- a/lib/solargraph/pin/base.rb
+++ b/lib/solargraph/pin/base.rb
@@ -353,8 +353,15 @@ def choose_pin_attr(other, attr)
           # :nocov:
         end
         # arbitrary way of choosing a pin
-        # @sg-ignore Need _1 support
-        [val1, val2].compact.min_by { _1.best_location.to_s }
+        [val1, val2].compact.max_by do |closure|
+          [
+            # maximize number of gates, as types in other combined pins may
+            # depend on those gates
+            closure.gates.length,
+            # use basename so that results don't vary system to system
+            File.basename(closure.best_location.to_s)
+          ]
+        end
       end
 
       # @return [void]
diff --git a/spec/pin/base_spec.rb b/spec/pin/base_spec.rb
index 6bcce6cef..d1d2f0cf4 100644
--- a/spec/pin/base_spec.rb
+++ b/spec/pin/base_spec.rb
@@ -48,4 +48,18 @@
     pin = Solargraph::Pin::Base.new(name: 'Foo', comments: '@return [undefined]')
     expect(pin.link_documentation).to eq('Foo')
   end
+
+  it 'deals well with known closure combination issue' do
+    Solargraph::Shell.new.uncache('yard')
+    api_map = Solargraph::ApiMap.load_with_cache('.', $stderr)
+    pins = api_map.get_method_stack('YARD::Docstring', 'parser', scope: :class)
+    expect(pins.length).to eq(1)
+    parser_method_pin = pins.first
+    expect(parser_method_pin.source).to eq(:combined)
+    return_type = parser_method_pin.typify(api_map)
+    expect(parser_method_pin.closure.name).to eq("Docstring")
+    expect(parser_method_pin.closure.gates).to eq(["YARD::Docstring", "YARD", ''])
+    expect(return_type).to be_defined
+    expect(parser_method_pin.typify(api_map).rooted_tags).to eq('::YARD::DocstringParser')
+  end
 end

From b5898e2a97b81a0219ee145769c978d1fabcb6c3 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sat, 27 Sep 2025 22:21:02 -0400
Subject: [PATCH 275/327] Drop incidental requirement

---
 spec/pin/base_spec.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/pin/base_spec.rb b/spec/pin/base_spec.rb
index d1d2f0cf4..1a6cfd1e8 100644
--- a/spec/pin/base_spec.rb
+++ b/spec/pin/base_spec.rb
@@ -55,7 +55,6 @@
     pins = api_map.get_method_stack('YARD::Docstring', 'parser', scope: :class)
     expect(pins.length).to eq(1)
     parser_method_pin = pins.first
-    expect(parser_method_pin.source).to eq(:combined)
     return_type = parser_method_pin.typify(api_map)
     expect(parser_method_pin.closure.name).to eq("Docstring")
     expect(parser_method_pin.closure.gates).to eq(["YARD::Docstring", "YARD", ''])

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 276/327] 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 277/327] 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 12e45630867530a19b8c839c162c2ada88d03511 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 28 Sep 2025 14:19:54 -0400
Subject: [PATCH 278/327] [regression] Fix resolution of a nested type case

Found in the Solargraph::Pin::DelegatedMethod class in strong
typechecking in https://github.com/apiology/solargraph/pull/12
---
 lib/solargraph/api_map/constants.rb |  3 ++-
 spec/pin/parameter_spec.rb          | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index 430303ae1..3e846e0b1 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -119,7 +119,8 @@ def complex_resolve name, gates, internal
           resolved = simple_resolve(name, gate, internal)
           return [resolved, gates[(idx + 1)..]] if resolved
           store.get_ancestor_references(gate).each do |ref|
-            return ref.name.sub(/^::/, '') if ref.name.end_with?("::#{name}")
+            return ref.name.sub(/^::/, '') if ref.name.end_with?("::#{name}") && ref.name.start_with?('::')
+
             mixin = resolve(ref.name, ref.reference_gates - gates)
             next unless mixin
             resolved = simple_resolve(name, mixin, internal)
diff --git a/spec/pin/parameter_spec.rb b/spec/pin/parameter_spec.rb
index 082ec54c6..81d40e5db 100644
--- a/spec/pin/parameter_spec.rb
+++ b/spec/pin/parameter_spec.rb
@@ -473,5 +473,33 @@ def self.foo bar: 'bar'
       type = pin.probe(api_map)
       expect(type.simple_tags).to eq('String')
     end
+
+    it 'infers types from kwoptarg values' do
+      source = Solargraph::Source.load_string(%(
+        module A
+          module B
+            class Method
+            end
+          end
+        end
+
+        module A
+          module B
+            class C < B::Method
+              # @param alt [Method]
+              # @return [B::Method, nil]
+              def resolve_method alt
+                alt
+              end
+            end
+          end
+        end
+      ), 'test.rb')
+      api_map = Solargraph::ApiMap.new
+      api_map.map(source)
+
+      clip = api_map.clip_at('test.rb', [14, 16])
+      expect(clip.infer.rooted_tags).to eq('::A::B::Method')
+    end
   end
 end

From b8174ddb186418dc0ef2feec67c514da1e977d31 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 28 Sep 2025 14:36:41 -0400
Subject: [PATCH 279/327] Fix example name

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

diff --git a/spec/pin/parameter_spec.rb b/spec/pin/parameter_spec.rb
index 81d40e5db..14c39f3fe 100644
--- a/spec/pin/parameter_spec.rb
+++ b/spec/pin/parameter_spec.rb
@@ -474,7 +474,7 @@ def self.foo bar: 'bar'
       expect(type.simple_tags).to eq('String')
     end
 
-    it 'infers types from kwoptarg values' do
+    it 'handles a relative type name case' do
       source = Solargraph::Source.load_string(%(
         module A
           module B

From 07398d43f2baf1e5090d1715500b3303bbbc3665 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 30 Sep 2025 07:27:13 -0400
Subject: [PATCH 280/327] Exempt a file hit by the unmerged YARD fix

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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index ecc699d97..321f8ae52 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -89,13 +89,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
@@ -1290,6 +1283,7 @@ YARD/TagTypeSyntax:
   Exclude:
     - 'lib/solargraph/language_server/host.rb'
     - 'lib/solargraph/parser/comment_ripper.rb'
+    - 'lib/solargraph/pin/method.rb'
     - 'lib/solargraph/type_checker.rb'
 
 # This cop supports safe autocorrection (--autocorrect).

From faa57aa5b71898b899033ac1e49263fcecdb920b Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 30 Sep 2025 08:32:26 -0400
Subject: [PATCH 281/327] Add another unmerged-Yard-PR issue

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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 4745544d0..83339e756 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -89,13 +89,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
@@ -1286,6 +1279,7 @@ YARD/MismatchName:
 
 YARD/TagTypeSyntax:
   Exclude:
+    - 'lib/solargraph/api_map/constants.rb'
     - 'lib/solargraph/language_server/host.rb'
     - 'lib/solargraph/parser/comment_ripper.rb'
     - 'lib/solargraph/pin/method.rb'

From b9f29005c3e270a009688e72b68ae8005e99ba33 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 30 Sep 2025 09:37:05 -0400
Subject: [PATCH 282/327] Fix merge issue

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

diff --git a/lib/solargraph/type_checker.rb b/lib/solargraph/type_checker.rb
index dfabbec1a..d8bdb4424 100644
--- a/lib/solargraph/type_checker.rb
+++ b/lib/solargraph/type_checker.rb
@@ -462,7 +462,7 @@ def kwarg_problems_for sig, argchain, api_map, closure_pin, locals, location, pi
             ptype = data[:qualified]
             ptype = ptype.self_to_type(pin.context)
             unless ptype.undefined?
-              argtype = argchain.infer(api_map, closure_pin, locals).self_to_type(block_pin.context)
+              argtype = argchain.infer(api_map, closure_pin, locals).self_to_type(closure_pin.context)
               if argtype.defined? && ptype && !any_types_match?(api_map, ptype, argtype)
                 result.push Problem.new(location, "Wrong argument type for #{pin.path}: #{par.name} expected #{ptype}, received #{argtype}")
               end

From 6ed1150933f25ba8ba6e129dd5a187e7df5abbf9 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 30 Sep 2025 10:36:12 -0400
Subject: [PATCH 283/327] Fix merge

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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index c31316fdd..3377e2f51 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'
 
@@ -1269,6 +1268,7 @@ YARD/TagTypeSyntax:
   Exclude:
     - 'lib/solargraph/language_server/host.rb'
     - 'lib/solargraph/parser/comment_ripper.rb'
+    - 'lib/solargraph/pin/method.rb'
     - 'lib/solargraph/type_checker.rb'
 
 # This cop supports safe autocorrection (--autocorrect).

From eabe151b3dc4fce0600d0e5c62850907b74101c2 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 30 Sep 2025 10:41:55 -0400
Subject: [PATCH 284/327] Update rubocop todo

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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 4ab62a41f..7d2e33136 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'
 
@@ -89,13 +88,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
@@ -1266,6 +1258,7 @@ YARD/TagTypeSyntax:
   Exclude:
     - 'lib/solargraph/language_server/host.rb'
     - 'lib/solargraph/parser/comment_ripper.rb'
+    - 'lib/solargraph/pin/method.rb'
     - 'lib/solargraph/type_checker.rb'
 
 # This cop supports safe autocorrection (--autocorrect).

From ce3ce8c3ed11ec0031d53ad01163b43bc029d9eb Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 30 Sep 2025 10:51:49 -0400
Subject: [PATCH 285/327] Fix merge issue

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

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index a7462fb50..695de0230 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -109,7 +109,6 @@ def catalog bench
 
       if recreate_docmap
         @doc_map = DocMap.new(unresolved_requires, [], bench.workspace, out: nil) # @todo Implement gem preferences
-        @gemspecs = @doc_map.workspace.gemspecs
         @unresolved_requires = @doc_map.unresolved_requires
       end
       @cache.clear if store.update(@@core_map.pins, @doc_map.pins, conventions_environ.pins, iced_pins, live_pins)

From a6bdfd6336f0e12833fc7a52d87bc47eab39b14b Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 30 Sep 2025 10:57:41 -0400
Subject: [PATCH 286/327] Drop no-longer-needed @sg-ignores

---
 lib/solargraph/library.rb | 1 -
 lib/solargraph/yardoc.rb  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/lib/solargraph/library.rb b/lib/solargraph/library.rb
index 1faa6a9ba..a14dc40ee 100644
--- a/lib/solargraph/library.rb
+++ b/lib/solargraph/library.rb
@@ -609,7 +609,6 @@ def cache_next_gemspec
           report_cache_progress spec.name, pending
           kwargs = {}
           kwargs[:chdir] = workspace.directory.to_s if workspace.directory && !workspace.directory.empty?
-          # @sg-ignore Unresolved call to capture3 on Module<Open3>
           _o, e, s = Open3.capture3(workspace.command_path, 'cache', spec.name, spec.version.to_s,
                                     **kwargs)
           if s.success?
diff --git a/lib/solargraph/yardoc.rb b/lib/solargraph/yardoc.rb
index ffe7da4c3..50f212f13 100644
--- a/lib/solargraph/yardoc.rb
+++ b/lib/solargraph/yardoc.rb
@@ -28,7 +28,6 @@ def build_docs gem_yardoc_path, yard_plugins, gemspec
         return
       end
 
-      # @sg-ignore
       stdout_and_stderr_str, status = Open3.capture2e(current_bundle_env_tweaks, cmd, chdir: gemspec.gem_dir)
       return if status.success?
       Solargraph.logger.warn { "YARD failed running #{cmd.inspect} in #{gemspec.gem_dir}" }

From 3df4406de77a159e1997c10a4b7d3d7532745ab2 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 30 Sep 2025 11:13:47 -0400
Subject: [PATCH 287/327] Ratchet RuboCop

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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 4745544d0..3d48a2371 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -89,13 +89,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 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 288/327] 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 289/327] 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 2e6aa3f9344c299c22223265bb6d3fd7de4ba123 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 30 Sep 2025 12:25:15 -0400
Subject: [PATCH 290/327] Drop unneeded @sg-ignores

---
 lib/solargraph/parser/parser_gem/node_processors/send_node.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/solargraph/parser/parser_gem/node_processors/send_node.rb b/lib/solargraph/parser/parser_gem/node_processors/send_node.rb
index 645baf00f..3b7ec74b1 100644
--- a/lib/solargraph/parser/parser_gem/node_processors/send_node.rb
+++ b/lib/solargraph/parser/parser_gem/node_processors/send_node.rb
@@ -36,15 +36,12 @@ def process
                 process_autoload
               elsif method_name == :private_constant
                 process_private_constant
-              # @sg-ignore
               elsif method_name == :alias_method && node.children[2] && node.children[2] && node.children[2].type == :sym && node.children[3] && node.children[3].type == :sym
                 process_alias_method
-              # @sg-ignore
               elsif method_name == :private_class_method && node.children[2].is_a?(AST::Node)
                 # Processing a private class can potentially handle children on its own
                 return if process_private_class_method
               end
-            # @sg-ignore
             elsif method_name == :require && node.children[0].to_s == '(const nil :Bundler)'
               pins.push Pin::Reference::Require.new(Solargraph::Location.new(region.filename, Solargraph::Range.from_to(0, 0, 0, 0)), 'bundler/require', source: :parser)
             end

From 66abe83bd0d6d3759aa5e9bac70eff86009f098c Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 30 Sep 2025 12:26:53 -0400
Subject: [PATCH 291/327] Drop unneeded @sg-ignore

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

diff --git a/lib/solargraph/workspace/require_paths.rb b/lib/solargraph/workspace/require_paths.rb
index 67adae9e6..c8eea161b 100644
--- a/lib/solargraph/workspace/require_paths.rb
+++ b/lib/solargraph/workspace/require_paths.rb
@@ -76,7 +76,6 @@ def require_path_from_gemspec_file gemspec_file_path
                "spec = eval(File.read('#{gemspec_file_path}'), TOPLEVEL_BINDING, '#{gemspec_file_path}'); " \
                'return unless Gem::Specification === spec; ' \
                'puts({name: spec.name, paths: spec.require_paths}.to_json)']
-        # @sg-ignore Unresolved call to capture3 on Module<Open3>
         o, e, s = Open3.capture3(*cmd)
         if s.success?
           begin

From c35d6a7e74831f7c3562600b111a5c861658725d Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 30 Sep 2025 12:32:45 -0400
Subject: [PATCH 292/327] Drop another @sg-ignore

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

diff --git a/lib/solargraph/pin/delegated_method.rb b/lib/solargraph/pin/delegated_method.rb
index 9483fb058..bcf5b5912 100644
--- a/lib/solargraph/pin/delegated_method.rb
+++ b/lib/solargraph/pin/delegated_method.rb
@@ -51,7 +51,6 @@ def type_location
       %i[typify realize infer probe].each do |method|
         # @param api_map [ApiMap]
         define_method(method) do |api_map|
-          # @sg-ignore Unresolved call to resolve_method
           resolve_method(api_map)
           # @sg-ignore Need to set context correctly in define_method blocks
           @resolved_method ? @resolved_method.send(method, api_map) : super(api_map)

From 71f0b18f03f3224aabdf9e0e2be7f206519781df Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 30 Sep 2025 12:41:27 -0400
Subject: [PATCH 293/327] Ratchet RuboCop

---
 .rubocop_todo.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 83339e756..05c2cae63 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'
 

From 7cba7ca66ac466b71f0fb939b7fa8b1ac6d23a70 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 30 Sep 2025 13:46:53 -0400
Subject: [PATCH 294/327] Bump for call.rb complexity

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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 83339e756..35deed756 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'
 
@@ -458,7 +457,7 @@ Metrics/AbcSize:
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 54
+  Max: 56
 
 # Configuration parameters: CountBlocks, CountModifierForms.
 Metrics/BlockNesting:

From 470c26e1c755eb5c0ebca75c2ead76c8651342e9 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 30 Sep 2025 14:20:32 -0400
Subject: [PATCH 295/327] Mark spec as now working

---
 spec/pin/combine_with_spec.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/pin/combine_with_spec.rb b/spec/pin/combine_with_spec.rb
index 38d45a3e1..cc80d76d5 100644
--- a/spec/pin/combine_with_spec.rb
+++ b/spec/pin/combine_with_spec.rb
@@ -9,7 +9,6 @@
   end
 
   it 'combines return types with another method without type parameters' do
-    pending('logic being added to handle this case')
     pin1 = Solargraph::Pin::Method.new(name: 'foo', parameters: [], comments: '@return [Array<String>]')
     pin2 = Solargraph::Pin::Method.new(name: 'foo', parameters: [], comments: '@return [Array]')
     combined = pin1.combine_with(pin2)

From e933775e60244bb0f8094c7db365ee54a9e9b935 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 30 Sep 2025 16:06:38 -0400
Subject: [PATCH 296/327] Fix merge issue

---
 lib/solargraph/api_map/constants.rb | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/solargraph/api_map/constants.rb b/lib/solargraph/api_map/constants.rb
index 62bd3a1a9..0df8d83ce 100644
--- a/lib/solargraph/api_map/constants.rb
+++ b/lib/solargraph/api_map/constants.rb
@@ -142,10 +142,15 @@ def complex_resolve name, gates, internal
       # @param gate [String]
       # @param internal [Boolean] True if the name is not the last in the namespace
       # @return [String, nil]
-      def simple_resolve name, gates
-        gates.each do |gate|
-          here = "#{gate}::#{name}".sub(/^::/, '').sub(/::$/, '')
-          return here if store.namespace_exists?(here)
+      def simple_resolve name, gate, internal
+        here = "#{gate}::#{name}".sub(/^::/, '').sub(/::$/, '')
+        pin = store.get_path_pins(here).first
+        if pin.is_a?(Pin::Constant) && internal
+          const = Solargraph::Parser::NodeMethods.unpack_name(pin.assignment)
+          return unless const
+          resolve(const, pin.gates)
+        else
+          pin&.path
         end
       end
 

From c28b5ef6d0e88b60394abc2b338ae51d78d7d4b1 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 30 Sep 2025 16:07:14 -0400
Subject: [PATCH 297/327] Fix RuboCop issue

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

diff --git a/spec/convention/activesupport_concern_spec.rb b/spec/convention/activesupport_concern_spec.rb
index 395e28e20..4ed0f70f6 100644
--- a/spec/convention/activesupport_concern_spec.rb
+++ b/spec/convention/activesupport_concern_spec.rb
@@ -127,6 +127,8 @@ def self.my_method; end
       # See
       # https://github.com/ruby/gem_rbs_collection/blob/main/gems/activerecord/6.0/activerecord-generated.rbs
       # for full RBS
+      subject(:method_pins) { api_map.get_method_stack('MyActiveRecord', 'abstract_class', scope: :class) }
+
       let(:rbs) do
         <<~RBS
           module MyActiveRecord
@@ -147,8 +149,6 @@ class Base
         RBS
       end
 
-      subject(:method_pins) { api_map.get_method_stack('MyActiveRecord', 'abstract_class', scope: :class) }
-
       it { should_not be_empty }
 
       it { should be_a(Solargraph::Pin::Method) }

From 622bdd3e7bb68d1ecbd5bed4d23302ffe7d73b02 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Tue, 30 Sep 2025 17:16:02 -0400
Subject: [PATCH 298/327] Fix expectations

---
 spec/convention/activesupport_concern_spec.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/spec/convention/activesupport_concern_spec.rb b/spec/convention/activesupport_concern_spec.rb
index 4ed0f70f6..b58cd6584 100644
--- a/spec/convention/activesupport_concern_spec.rb
+++ b/spec/convention/activesupport_concern_spec.rb
@@ -127,7 +127,7 @@ def self.my_method; end
       # See
       # https://github.com/ruby/gem_rbs_collection/blob/main/gems/activerecord/6.0/activerecord-generated.rbs
       # for full RBS
-      subject(:method_pins) { api_map.get_method_stack('MyActiveRecord', 'abstract_class', scope: :class) }
+      subject(:method_pins) { api_map.get_method_stack('MyActiveRecord::Base', 'abstract_class', scope: :class) }
 
       let(:rbs) do
         <<~RBS
@@ -151,7 +151,13 @@ class Base
 
       it { should_not be_empty }
 
-      it { should be_a(Solargraph::Pin::Method) }
+      it "has one item" do
+        expect(method_pins.size).to eq(1)
+      end
+
+      it "is a Pin::Method" do
+        expect(method_pins.first).to be_a(Solargraph::Pin::Method)
+      end
     end
 
     # https://github.com/castwide/solargraph/issues/1042

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 299/327] 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 300/327] 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 1773a94edd9ffab4c569a2daed53a15b533eb8c4 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 1 Oct 2025 16:03:51 -0400
Subject: [PATCH 301/327] 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 2e96500479990ea5a1726aef5a12d0d8fa49a192 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 1 Oct 2025 16:48:54 -0400
Subject: [PATCH 302/327] Adjust @sg-ignores

---
 lib/solargraph/pin/base_variable.rb | 6 ------
 lib/solargraph/type_checker.rb      | 1 +
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/solargraph/pin/base_variable.rb b/lib/solargraph/pin/base_variable.rb
index 93845b585..e2efde0a7 100644
--- a/lib/solargraph/pin/base_variable.rb
+++ b/lib/solargraph/pin/base_variable.rb
@@ -23,12 +23,6 @@ def initialize assignment: nil, return_type: nil, **splat
 
       def combine_with(other, attrs={})
         attrs.merge({
-          # default values don't exist in RBS parameters; it just
-          # tells you if the arg is optional or not.  Prefer a
-          # provided value if we have one here since we can't rely on
-          # it from RBS so we can infer from it and typecheck on it.
-          #
-          # @sg-ignore https://github.com/castwide/solargraph/pull/1050
           assignment: choose(other, :assignment),
           mass_assignment: assert_same(other, :mass_assignment),
           return_type: combine_return_type(other),
diff --git a/lib/solargraph/type_checker.rb b/lib/solargraph/type_checker.rb
index 9dde9c6cf..cb33e5cf5 100644
--- a/lib/solargraph/type_checker.rb
+++ b/lib/solargraph/type_checker.rb
@@ -497,6 +497,7 @@ def kwarg_problems_for sig, argchain, api_map, closure_pin, locals, location, pi
             ptype = data[:qualified]
             ptype = ptype.self_to_type(pin.context)
             unless ptype.undefined?
+              # @sg-ignore Variable type could not be inferred for argtype
               # @type [ComplexType]
               argtype = argchain.infer(api_map, closure_pin, locals).self_to_type(closure_pin.context)
               if argtype.defined? && ptype && !arg_conforms_to?(argtype, ptype)

From c97f529679eab0fb48ff75c53e23e7fae8c581c2 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 1 Oct 2025 19:58:52 -0400
Subject: [PATCH 303/327] Mark spec as working

---
 spec/source/chain/call_spec.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spec/source/chain/call_spec.rb b/spec/source/chain/call_spec.rb
index e27203fd4..4ed843901 100644
--- a/spec/source/chain/call_spec.rb
+++ b/spec/source/chain/call_spec.rb
@@ -600,8 +600,6 @@ def k
   end
 
   it 'correctly looks up civars' do
-    pending('better civar support')
-
     source = Solargraph::Source.load_string(%(
       class Foo
         BAZ = /aaa/

From f547a5031f84d0088c08fd94520613028c60f102 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Wed, 1 Oct 2025 20:15:37 -0400
Subject: [PATCH 304/327] rubocop update

---
 .rubocop_todo.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index fc84519f5..f986cf142 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -631,6 +631,13 @@ RSpec/ExpectActual:
 RSpec/HookArgument:
   Enabled: false
 
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: is_expected, should
+RSpec/ImplicitExpect:
+  Exclude:
+    - 'spec/convention/activesupport_concern_spec.rb'
+
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Enabled: false

From b0756f60d6c515086df40854062f329f3d07e65c Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 5 Oct 2025 16:35:46 -0400
Subject: [PATCH 305/327] Use an integration fix branch for now

---
 .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 1c633fda0..b34c682c7 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -116,7 +116,7 @@ jobs:
     - name: clone https://github.com/lekemula/solargraph-rspec/
       run: |
        cd ..
-       git clone https://github.com/lekemula/solargraph-rspec.git
+       git clone --branch less_limited_requires https://github.com/apiology/solargraph-rspec.git
        cd solargraph-rspec
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1

From cd76c38f15104add4af54da7be57039a4afb29be Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 5 Oct 2025 16:39:23 -0400
Subject: [PATCH 306/327] Use appraisal gem while running solargraph-rspec
 specs

This change matches the change in
https://github.com/lekemula/solargraph-rspec/pull/27 that now requires
use of the appraisal gem to run soalrgraph-rspec's specs
---
 .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 b34c682c7..31a13595a 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -129,6 +129,7 @@ jobs:
        echo "gem 'solargraph', path: '../solargraph'" >> Gemfile
        bundle config path ${{ env.BUNDLE_PATH }}
        bundle install --jobs 4 --retry 3
+       bundle exec appraisal install
     - name: Configure .solargraph.yml
       run: |
         cd ../solargraph-rspec
@@ -137,11 +138,11 @@ jobs:
       run: |
         cd ../solargraph-rspec
         rspec_gems=$(bundle exec ruby -r './lib/solargraph-rspec' -e 'puts Solargraph::Rspec::Gems.gem_names.join(" ")' 2>/dev/null | tail -n1)
-        bundle exec solargraph gems $rspec_gems
+        bundle exec appraisal solargraph gems $rspec_gems
     - name: Run specs
       run: |
         cd ../solargraph-rspec
-        bundle exec rspec --format progress
+        bundle exec appraisal rspec --format progress
 
   run_solargraph_rails_specs:
     # check out solargraph-rails as well as this project, and point the former to use the latter as a local gem

From 152dbdfe446088f8c997c55d663321e264bf5ed2 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 5 Oct 2025 17:43:51 -0400
Subject: [PATCH 307/327] Annotation fixes for strong typechecking

---
 lib/solargraph/api_map/index.rb                             | 6 ++++--
 lib/solargraph/doc_map.rb                                   | 3 +--
 .../parser/parser_gem/node_processors/opasgn_node.rb        | 2 ++
 lib/solargraph/pin/local_variable.rb                        | 3 ---
 lib/solargraph/position.rb                                  | 1 -
 lib/solargraph/source_map.rb                                | 4 +++-
 lib/solargraph/source_map/mapper.rb                         | 2 --
 lib/solargraph/workspace/config.rb                          | 6 ++++++
 8 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/lib/solargraph/api_map/index.rb b/lib/solargraph/api_map/index.rb
index 35d86446a..cb61a28eb 100644
--- a/lib/solargraph/api_map/index.rb
+++ b/lib/solargraph/api_map/index.rb
@@ -114,8 +114,10 @@ def catalog new_pins
         self
       end
 
-      # @param klass [Class<Pin::Reference>]
-      # @param hash [Hash{String => Array<Pin::Reference>}]
+      # @generic T
+      # @param klass [Class<T>]
+      # @param hash [Hash{String => T}]
+      #
       # @return [void]
       def map_references klass, hash
         pins_by_class(klass).each do |pin|
diff --git a/lib/solargraph/doc_map.rb b/lib/solargraph/doc_map.rb
index 5966717f4..05f2f1647 100644
--- a/lib/solargraph/doc_map.rb
+++ b/lib/solargraph/doc_map.rb
@@ -128,7 +128,7 @@ def unresolved_requires
       @unresolved_requires ||= required_gems_map.select { |_, gemspecs| gemspecs.nil? }.keys
     end
 
-    # @return [Hash{Array(String, String) => Array<Gem::Specification>}] Indexed by gemspec name and version
+    # @return [Hash{Array(String, String) => Array<Pin::Base>}] Indexed by gemspec name and version
     def self.all_yard_gems_in_memory
       @yard_gems_in_memory ||= {}
     end
@@ -180,7 +180,6 @@ def load_serialized_gem_pins
       # @sg-ignore Need support for RBS duck interfaces like _ToHash
       # @type [Array<String>]
       paths = Hash[without_gemspecs].keys
-      # @sg-ignore Need support for RBS duck interfaces like _ToHash
       # @type [Array<Gem::Specification>]
       gemspecs = Hash[with_gemspecs].values.flatten.compact + dependencies.to_a
 
diff --git a/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb b/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb
index 0e4d7b26a..a4359af9d 100644
--- a/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb
+++ b/lib/solargraph/parser/parser_gem/node_processors/opasgn_node.rb
@@ -13,8 +13,10 @@ def process
             operator = node.children[1]
             argument = node.children[2]
             if target.type == :send
+              # @sg-ignore Need a downcast here
               process_send_target(target, operator, argument)
             elsif target.type.to_s.end_with?('vasgn')
+              # @sg-ignore Need a downcast here
               process_vasgn_target(target, operator, argument)
             else
               Solargraph.assert_or_log(:opasgn_unknown_target,
diff --git a/lib/solargraph/pin/local_variable.rb b/lib/solargraph/pin/local_variable.rb
index 9eae6cc6f..cb2dda140 100644
--- a/lib/solargraph/pin/local_variable.rb
+++ b/lib/solargraph/pin/local_variable.rb
@@ -26,9 +26,6 @@ def combine_with(other, attrs={})
           assignment: assert_same(other, :assignment),
           presence_certain: assert_same(other, :presence_certain?),
         }.merge(attrs)
-        # @sg-ignore Wrong argument type for
-        #   Solargraph::Pin::Base#assert_same: other expected
-        #   Solargraph::Pin::Base, received self
         new_attrs[:presence] = assert_same(other, :presence) unless attrs.key?(:presence)
 
         super(other, new_attrs)
diff --git a/lib/solargraph/position.rb b/lib/solargraph/position.rb
index 2faa0a99b..1197038ef 100644
--- a/lib/solargraph/position.rb
+++ b/lib/solargraph/position.rb
@@ -58,7 +58,6 @@ def inspect
     # @return [Integer]
     def self.to_offset text, position
       return 0 if text.empty?
-      # @sg-ignore Unresolved call to + on Integer
       text.lines[0...position.line].sum(&:length) + position.character
     end
 
diff --git a/lib/solargraph/source_map.rb b/lib/solargraph/source_map.rb
index d7b6fb4fc..15b747760 100644
--- a/lib/solargraph/source_map.rb
+++ b/lib/solargraph/source_map.rb
@@ -41,11 +41,13 @@ def initialize source
       # solargraph-rails is known to use this method to get the document symbols. It should probably be removed.
       @document_symbols = nil
       self.convention_pins = conventions_environ.pins
+      # @type [Hash{Class<Pin::Base> => Array<Pin::Base>}]
       @pin_select_cache = {}
     end
 
     # @generic T
     # @param klass [Class<generic<T>>]
+    #
     # @return [Array<generic<T>>]
     def pins_by_class klass
       @pin_select_cache[klass] ||= pin_class_hash.select { |key, _| key <= klass }.values.flatten
@@ -171,10 +173,10 @@ def map source
 
     private
 
-    # @return [Hash{Class => Array<Pin::Base>}]
     # @return [Array<Pin::Base>]
     attr_writer :convention_pins
 
+    # @return [Hash{Class<Pin::Base> => Array<Pin::Base>}]
     def pin_class_hash
       @pin_class_hash ||= pins.to_set.classify(&:class).transform_values(&:to_a)
     end
diff --git a/lib/solargraph/source_map/mapper.rb b/lib/solargraph/source_map/mapper.rb
index 18fdf1f88..5fdcb9fe6 100644
--- a/lib/solargraph/source_map/mapper.rb
+++ b/lib/solargraph/source_map/mapper.rb
@@ -70,7 +70,6 @@ def closure_at(position)
       # @param comment [String]
       # @return [void]
       def process_comment source_position, comment_position, comment
-        # @sg-ignore Wrong argument type for String#=~: object expected String::_MatchAgainst<String, undefined>, received Regexp
         return unless comment.encode('UTF-8', invalid: :replace, replace: '?') =~ DIRECTIVE_REGEXP
         cmnt = remove_inline_comment_hashes(comment)
         parse = Solargraph::Source.parse_docstring(cmnt)
@@ -245,7 +244,6 @@ def remove_inline_comment_hashes comment
 
       # @return [void]
       def process_comment_directives
-        # @sg-ignore Wrong argument type for String#=~: object expected String::_MatchAgainst<String, undefined>, received Regexp
         return unless @code.encode('UTF-8', invalid: :replace, replace: '?') =~ DIRECTIVE_REGEXP
         code_lines = @code.lines
         @source.associated_comments.each do |line, comments|
diff --git a/lib/solargraph/workspace/config.rb b/lib/solargraph/workspace/config.rb
index d1e6c27b5..3e30e5d74 100644
--- a/lib/solargraph/workspace/config.rb
+++ b/lib/solargraph/workspace/config.rb
@@ -63,6 +63,7 @@ def calculated
       # namespace. It's typically used to identify available DSLs.
       #
       # @return [Array<String>]
+      # @sg-ignore Need to validate config
       def domains
         raw_data['domains']
       end
@@ -70,6 +71,7 @@ def domains
       # An array of required paths to add to the workspace.
       #
       # @return [Array<String>]
+      # @sg-ignore Need to validate config
       def required
         raw_data['require']
       end
@@ -83,6 +85,7 @@ def require_paths
 
       # An array of reporters to use for diagnostics.
       #
+      # @sg-ignore Need to validate config
       # @return [Array<String>]
       def reporters
         raw_data['reporters']
@@ -90,6 +93,7 @@ def reporters
 
       # A hash of options supported by the formatter
       #
+      # @sg-ignore Need to validate config
       # @return [Hash]
       def formatter
         raw_data['formatter']
@@ -97,6 +101,7 @@ def formatter
 
       # An array of plugins to require.
       #
+      # @sg-ignore Need to validate config
       # @return [Array<String>]
       def plugins
         raw_data['plugins']
@@ -104,6 +109,7 @@ def plugins
 
       # The maximum number of files to parse from the workspace.
       #
+      # @sg-ignore Need to validate config
       # @return [Integer]
       def max_files
         raw_data['max_files']

From 2deded7c8f233e57b8fdee688574cb47af99e7df Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 5 Oct 2025 17:56:05 -0400
Subject: [PATCH 308/327] Drop now-unneeded @sg-ignore

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

diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
index ccd5e64d5..d52bbf71a 100644
--- a/lib/solargraph/api_map/store.rb
+++ b/lib/solargraph/api_map/store.rb
@@ -297,10 +297,6 @@ def fqns_pins_map
         end
       end
 
-      # @sg-ignore Rooted type issue here - "Declared return type
-      #   ::Enumerable<::Solargraph::Pin::Symbol> does not match
-      #   inferred type ::Set<::Symbol> for
-      #   Solargraph::ApiMap::Store#symbols"
       # @return [Enumerable<Solargraph::Pin::Symbol>]
       def symbols
         index.pins_by_class(Pin::Symbol)

From 94e650bf298482a79e6139eedd50a21916fd0c14 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 5 Oct 2025 18:01:26 -0400
Subject: [PATCH 309/327] Annotation fixes

---
 lib/solargraph/doc_map.rb  | 4 ++--
 lib/solargraph/pin/base.rb | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/solargraph/doc_map.rb b/lib/solargraph/doc_map.rb
index 322ab8970..5dcf28552 100644
--- a/lib/solargraph/doc_map.rb
+++ b/lib/solargraph/doc_map.rb
@@ -128,7 +128,7 @@ def unresolved_requires
       @unresolved_requires ||= required_gems_map.select { |_, gemspecs| gemspecs.nil? }.keys
     end
 
-    # @return [Hash{Array(String, String) => Array<Gem::Specification>}] Indexed by gemspec name and version
+    # @return [Hash{Array(String, String) => Array<Pin::Base>}] Indexed by gemspec name and version
     def self.all_yard_gems_in_memory
       @yard_gems_in_memory ||= {}
     end
@@ -138,7 +138,7 @@ def self.all_rbs_collection_gems_in_memory
       @rbs_collection_gems_in_memory ||= {}
     end
 
-    # @return [Hash{Array(String, String) => Array<Gem::Specification>}] Indexed by gemspec name and version
+    # @return [Hash{Array(String, String) => Array<Pin::Base>}] Indexed by gemspec name and version
     def yard_pins_in_memory
       self.class.all_yard_gems_in_memory
     end
diff --git a/lib/solargraph/pin/base.rb b/lib/solargraph/pin/base.rb
index d55ba79d8..f71d93be3 100644
--- a/lib/solargraph/pin/base.rb
+++ b/lib/solargraph/pin/base.rb
@@ -309,6 +309,7 @@ def assert_same_count(other, attr)
       # @param other [self]
       # @param attr [::Symbol]
       #
+      # @sg-ignore
       # @return [undefined]
       def assert_same(other, attr)
         if other.nil?

From 4e8b5d1abfae837009becc7bb572a594ee17ed01 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 5 Oct 2025 18:05:39 -0400
Subject: [PATCH 310/327] Fix merge issue

---
 lib/solargraph/pin/local_variable.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/solargraph/pin/local_variable.rb b/lib/solargraph/pin/local_variable.rb
index d78329521..9673d425d 100644
--- a/lib/solargraph/pin/local_variable.rb
+++ b/lib/solargraph/pin/local_variable.rb
@@ -21,12 +21,10 @@ def initialize presence: nil, presence_certain: false, **splat
 
       def combine_with(other, attrs={})
         new_attrs = {
-          # @sg-ignore https://github.com/castwide/solargraph/pull/1050
           presence_certain: assert_same(other, :presence_certain?),
         }.merge(attrs)
         new_attrs[:presence] = assert_same(other, :presence) unless attrs.key?(:presence)
 
-        # @sg-ignore https://github.com/castwide/solargraph/pull/1050
         super(other, new_attrs)
       end
 

From 95c6245fbc6a9d4222049cfbd7db97ff34a81b7b Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 5 Oct 2025 18:46:25 -0400
Subject: [PATCH 311/327] Fix merge

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

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index b903cf216..70dff5b37 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -37,6 +37,14 @@ 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: 'head'
+            rbs-version: '4.0.0.dev.4'
+          - ruby-version: 'head'
+            rbs-version: '3.9.4'
+          - ruby-version: 'head'
+            rbs-version: '3.6.1'
         include:
           - ruby-version: '3.1'
             rbs-version: '3.6.1'

From f153e38df96191c67bc575688a9a136c4cc314d8 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 5 Oct 2025 20:23:46 -0400
Subject: [PATCH 312/327] Fix merge

---
 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 c3a9cbd4ab196cfe673ec1a9cdfcd9af47e910c0 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 5 Oct 2025 21:27:42 -0400
Subject: [PATCH 313/327] Fix override issues with docstring

---
 lib/solargraph/api_map/index.rb | 13 ++++++++-----
 lib/solargraph/pin/method.rb    |  2 ++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/solargraph/api_map/index.rb b/lib/solargraph/api_map/index.rb
index b589279b1..fbaa651f5 100644
--- a/lib/solargraph/api_map/index.rb
+++ b/lib/solargraph/api_map/index.rb
@@ -142,10 +142,14 @@ def map_overrides
             ovr.tags.each do |tag|
               pin.docstring.add_tag(tag)
               redefine_return_type pin, tag
-              if new_pin
-                new_pin.docstring.add_tag(tag)
-                redefine_return_type new_pin, tag
-              end
+              pin.reset_generated!
+
+              next unless new_pin
+
+              new_pin.docstring.add_tag(tag)
+              redefine_return_type new_pin, tag
+              new_pin.comments = new_pin.docstring.to_raw + "\n"
+              new_pin.reset_generated!
             end
           end
         end
@@ -162,7 +166,6 @@ def redefine_return_type pin, tag
         pin.signatures.each do |sig|
           sig.instance_variable_set(:@return_type, ComplexType.try_parse(tag.type))
         end
-        pin.reset_generated!
       end
     end
   end
diff --git a/lib/solargraph/pin/method.rb b/lib/solargraph/pin/method.rb
index 47027864c..ad15256e2 100644
--- a/lib/solargraph/pin/method.rb
+++ b/lib/solargraph/pin/method.rb
@@ -12,6 +12,8 @@ class Method < Callable
 
       attr_writer :signatures
 
+      attr_writer :comments
+
       # @return [Parser::AST::Node]
       attr_reader :node
 

From d6f0b7c70cffbffff099f27cee099965b1cf2b95 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 5 Oct 2025 21:29:44 -0400
Subject: [PATCH 314/327] Drop xit

---
 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 4ffcd0bd1..cc1de59a5 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' }
 
-      xit 'returns gems' do
+      it 'returns gems' do
         pending('improved logic for require lookups')
 
         expect(specs&.map(&:name)).to include('bundler')

From c5dff9e438d35bae3fe1715f9a214a60cb4dd1f9 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 5 Oct 2025 21:31:13 -0400
Subject: [PATCH 315/327] Update Rubocop todo file

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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index a0c4a2bd7..f646f9764 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -461,6 +461,7 @@ Metrics/ClassLength:
   Exclude:
     - 'lib/solargraph/api_map.rb'
     - 'lib/solargraph/language_server/host.rb'
+    - 'lib/solargraph/pin/method.rb'
     - 'lib/solargraph/rbs_map/conversions.rb'
     - 'lib/solargraph/type_checker.rb'
 

From 88e1f7391e2a330185fe626de6ee6212e5076d48 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 5 Oct 2025 21:36:50 -0400
Subject: [PATCH 316/327] Fix merge

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

diff --git a/spec/yard_map/mapper_spec.rb b/spec/yard_map/mapper_spec.rb
index 84d2db90c..14451b97f 100644
--- a/spec/yard_map/mapper_spec.rb
+++ b/spec/yard_map/mapper_spec.rb
@@ -64,12 +64,9 @@ def pins_with require
     expect(inc).to be_a(Solargraph::Pin::Reference::Include)
   end
 
-  it 'adds corect gates' do
+  it 'adds correct gates' 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
-    pin = pins.find do |pin|
+    pin = pins_with('ast').find do |pin|
       pin.is_a?(Solargraph::Pin::Namespace) && pin.name == 'Mixin' && pin.closure.path == 'AST::Processor'
     end
     expect(pin.gates).to eq(['AST::Processor::Mixin', 'AST::Processor', 'AST', ''])

From 6fc3454cee47abd4d0e0664da69cdb1d830a8ac3 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 5 Oct 2025 21:40:05 -0400
Subject: [PATCH 317/327] Add @type annotation

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

diff --git a/lib/solargraph/api_map/index.rb b/lib/solargraph/api_map/index.rb
index fbaa651f5..daf0de083 100644
--- a/lib/solargraph/api_map/index.rb
+++ b/lib/solargraph/api_map/index.rb
@@ -132,6 +132,7 @@ def map_overrides
           pins = path_pin_hash[ovr.name]
           logger.debug { "ApiMap::Index#map_overrides: pins for path=#{ovr.name}: #{pins}" }
           pins.each do |pin|
+            # @type [Pin::Method]
             new_pin = if pin.path.end_with?('#initialize')
                         path_pin_hash[pin.path.sub(/#initialize/, '.new')].first
                       end

From 96bdd942dd8ca0e6ae096b54f9c29b213a2a95f3 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 5 Oct 2025 22:38:44 -0400
Subject: [PATCH 318/327] Add missing reset_generated! methods

---
 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..626b75457 100644
--- a/lib/solargraph/pin/callable.rb
+++ b/lib/solargraph/pin/callable.rb
@@ -208,6 +208,11 @@ def arity_matches? arguments, with_block
         true
       end
 
+      def reset_generated!
+        super
+        @parameters.each(&:reset_generated!)
+      end
+
       # @return [Integer]
       def mandatory_positional_param_count
         parameters.count(&:arg?)
diff --git a/lib/solargraph/pin/parameter.rb b/lib/solargraph/pin/parameter.rb
index 860397c3d..1cfa073f0 100644
--- a/lib/solargraph/pin/parameter.rb
+++ b/lib/solargraph/pin/parameter.rb
@@ -123,6 +123,11 @@ def full_name
         end
       end
 
+      def reset_generated!
+        super
+        @return_type = nil if @return_type&.undefined?
+      end
+
       # @return [String]
       def full
         full_name + case decl

From 83e6a2b41f0ba62cf6ddd7380088fd9ce580a718 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 5 Oct 2025 22:45:25 -0400
Subject: [PATCH 319/327] 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 a5d7ea55a0794036d50feb2dc5224f2b511a88cc Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 5 Oct 2025 22:50:04 -0400
Subject: [PATCH 320/327] Restore xit

---
 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 cc1de59a5..4ffcd0bd1 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 d5be6b20c0b3e5826fb50a929dfdad847ea8e3c9 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Sun, 5 Oct 2025 22:52:14 -0400
Subject: [PATCH 321/327] Fix Rubocop TODO file

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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index f646f9764..8a32435ab 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -681,6 +681,7 @@ RSpec/PendingWithoutReason:
     - 'spec/doc_map_spec.rb'
     - 'spec/pin/local_variable_spec.rb'
     - 'spec/type_checker/levels/strict_spec.rb'
+    - 'spec/workspace/gemspecs_resolve_require_spec.rb'
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Strict, EnforcedStyle, AllowedExplicitMatchers.

From 901e61fa5e82251a5d6322c46fb8dcf5d8ac9003 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 6 Oct 2025 07:51:55 -0400
Subject: [PATCH 322/327] Mark spec with xit

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

diff --git a/spec/doc_map_spec.rb b/spec/doc_map_spec.rb
index 2f1e8971f..84acb568d 100644
--- a/spec/doc_map_spec.rb
+++ b/spec/doc_map_spec.rb
@@ -37,7 +37,7 @@
 
     # This is a gem name vs require name issue - works under
     # solargraph-rspec, but not without
-    it 'generates pins from gems' do
+    xit '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' }

From 5a366431e06b5d8fe9ba1ed16389f19c000ad42e Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 6 Oct 2025 08:40:56 -0400
Subject: [PATCH 323/327] Fix RuboCop issue

---
 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 a178ac9bb..6a7cc400c 100755
--- a/lib/solargraph/shell.rb
+++ b/lib/solargraph/shell.rb
@@ -339,7 +339,7 @@ def pin path
     option :memory, type: :boolean, aliases: :m, desc: 'Include memory usage counter', default: true
     # @param file [String, nil]
     # @return [void]
-    def profile(file = nil) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    def profile(file = nil)
       begin
         require 'vernier'
       rescue LoadError

From 261c6fddfb346e8e64aa576f3c03270b2ec1545f Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 6 Oct 2025 09:19:20 -0400
Subject: [PATCH 324/327] Avoid deprecated method

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

diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index 8770f58f0..ecfeb3772 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -514,7 +514,8 @@ def get_method_stack rooted_tag, name, scope: :instance, visibility: [:private,
       fqns = rooted_type.namespace
       namespace_pin = store.get_path_pins(fqns).first
       methods = if namespace_pin.is_a?(Pin::Constant)
-                  type = namespace_pin.infer(self)
+                  type = namespace_pin.typify(self)
+                  type = namespace_pin.probe(api_map) unless type.defined?
                   if type.defined?
                     namespace_pin = store.get_path_pins(type.namespace).first
                     get_methods(type.namespace, scope: scope, visibility: visibility).select { |p| p.name == name }

From 934015bd603e1de698b0c1d24f6464c922324a33 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 6 Oct 2025 09:25:38 -0400
Subject: [PATCH 325/327] Avoid deprecated method

---
 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 ecfeb3772..906915a2c 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -515,7 +515,7 @@ def get_method_stack rooted_tag, name, scope: :instance, visibility: [:private,
       namespace_pin = store.get_path_pins(fqns).first
       methods = if namespace_pin.is_a?(Pin::Constant)
                   type = namespace_pin.typify(self)
-                  type = namespace_pin.probe(api_map) unless type.defined?
+                  type = namespace_pin.probe(self) unless type.defined?
                   if type.defined?
                     namespace_pin = store.get_path_pins(type.namespace).first
                     get_methods(type.namespace, scope: scope, visibility: visibility).select { |p| p.name == name }

From fafe298b8386f9e16ebb53d9d1554cd8dea8e672 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 6 Oct 2025 09:54:44 -0400
Subject: [PATCH 326/327] Fix merge

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

diff --git a/spec/workspace_spec.rb b/spec/workspace_spec.rb
index a81a3382e..71cac8558 100644
--- a/spec/workspace_spec.rb
+++ b/spec/workspace_spec.rb
@@ -76,7 +76,9 @@
   end
 
   it "generates default require path" do
-    expect(workspace.require_paths).to eq([File.join(dir_path, 'lib')])
+    relative = File.join(dir_path, 'lib')
+    absolute = File.absolute_path(relative)
+    expect(workspace.require_paths).to eq([absolute])
   end
 
   it "generates require paths from gemspecs" do

From e3623bbffe7f03676b255232e48e7dcf4f4ef851 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Mon, 6 Oct 2025 11:05:57 -0400
Subject: [PATCH 327/327] Fix spec

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

diff --git a/spec/workspace_spec.rb b/spec/workspace_spec.rb
index 71cac8558..b1fdf87c7 100644
--- a/spec/workspace_spec.rb
+++ b/spec/workspace_spec.rb
@@ -132,8 +132,10 @@
 
   it 'ignores gemspecs in excluded directories' do
     # vendor/**/* is excluded by default
-    workspace = Solargraph::Workspace.new('spec/fixtures/vendored')
-    expect(workspace.require_paths).to eq(['spec/fixtures/vendored/lib'])
+    relative = 'spec/fixtures/vendored'
+    absolute = File.absolute_path(relative)
+    workspace = Solargraph::Workspace.new(relative)
+    expect(workspace.require_paths).to eq([absolute + '/lib'])
   end
 
   it 'rescues errors loading files into sources' do