Enable strong type checking in CI

.github/workflows/plugins.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.0'
+        ruby-version: 3.4
         bundler-cache: true
     - uses: awalsh128/cache-apt-pkgs-action@latest
       with:
@@ -54,7 +54,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.0'
+        ruby-version: 3.4
         bundler-cache: false
     - uses: awalsh128/cache-apt-pkgs-action@latest
       with:
@@ -83,7 +83,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.0'
+        ruby-version: 3.4
         bundler-cache: false
     - uses: awalsh128/cache-apt-pkgs-action@latest
       with:
@@ -105,30 +105,64 @@ 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
+      BUNDLE_PATH: ${{ github.workspace }}/../solargraph-rspec/vendor/bundle
+    steps:
+    - uses: actions/checkout@v3
+    - name: clone https://github.com/lekemula/solargraph-rspec/
+      run: |
+       cd ..
+       # git clone https://github.com/lekemula/solargraph-rspec.git
+
+       # pending https://github.com/lekemula/solargraph-rspec/pull/30
+       git clone https://github.com/apiology/solargraph-rspec.git
+       cd solargraph-rspec
+       git checkout reset_closures
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.1'
+        rubygems: latest
+        bundler-cache: false
+    - name: Install gems
+      run: |
+       set -x
+
+       cd ../solargraph-rspec
+       echo "gem 'solargraph', path: '../solargraph'" >> Gemfile
+       bundle config path ${{ env.BUNDLE_PATH }}
+       bundle install --jobs 4 --retry 3
+       bundle exec appraisal install
+       # @todo some kind of appraisal/bundle conflict?
+       #   https://github.com/castwide/solargraph/actions/runs/19038710934/job/54369767122?pr=1116
+       #   /home/runner/work/solargraph/solargraph-rspec/vendor/bundle/ruby/3.1.0/gems/bundler-2.6.9/lib/bundler/runtime.rb:317:in
+       #   `check_for_activated_spec!': You have already activated date
+       #   3.5.0, but your Gemfile requires date 3.4.1. Prepending
+       #   `bundle exec` to your command may solve
+       #   this. (Gem::LoadError)
+       bundle exec appraisal update date
+       # For some reason on ruby 3.1 it defaults to an old version: 1.3.2
+       # https://github.com/lekemula/solargraph-rspec/actions/runs/17814581205/job/50645370316?pr=22
+       # We update manually to the latest
+       bundle exec appraisal update rspec-rails
+    - 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
+        bundle exec appraisal rbs collection update
+        rspec_gems=$(bundle exec appraisal ruby -r './lib/solargraph-rspec' -e 'puts Solargraph::Rspec::Gems.gem_names.join(" ")' 2>/dev/null | tail -n1)
+        bundle exec appraisal solargraph gems $rspec_gems
+    - name: Run specs
+      run: |
+        cd ../solargraph-rspec
+        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

.github/workflows/rspec.yml

@@ -29,12 +29,24 @@ jobs:
             rbs-version: '3.9.4'
           - ruby-version: '3.0'
             rbs-version: '4.0.0.dev.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'
     steps:
     - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
+        # see https://github.com/castwide/solargraph/actions/runs/19391419903/job/55485410493?pr=1119
+        #
+        # match version in Gemfile.lock and use same version below
+        bundler: 2.5.23
         bundler-cache: false
     - name: Set rbs version
       run: echo "gem 'rbs', '${{ matrix.rbs-version }}'" >> .Gemfile
@@ -46,8 +58,13 @@ jobs:
       run: echo "gem 'tsort'" >> .Gemfile
     - name: Install gems
       run: |
-        bundle install
+        bundle _2.5.23_ install
         bundle update rbs # use latest available for this Ruby version
+        bundle list
+        bundle exec solargraph pin 'Bundler::Dsl#source'
+    - name: Update types
+      run: |
+        bundle exec rbs collection update
     - name: Run tests
       run: bundle exec rake spec
   undercover:

.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 typed
+      run: SOLARGRAPH_ASSERTS=on bundle exec solargraph typecheck --level strong

.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'
 
@@ -664,14 +663,6 @@ RSpec/LetBeforeExamples:
   Exclude:
     - 'spec/complex_type_spec.rb'
 
-# Configuration parameters: EnforcedStyle.
-# 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'
-
 RSpec/MissingExampleGroupArgument:
   Exclude:
     - 'spec/diagnostics/rubocop_helpers_spec.rb'
@@ -732,10 +723,6 @@ RSpec/ScatteredLet:
   Exclude:
     - 'spec/complex_type_spec.rb'
 
-RSpec/StubbedMock:
-  Exclude:
-    - 'spec/language_server/host/message_worker_spec.rb'
-
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Enabled: false

Rakefile

@@ -9,7 +9,7 @@ task :console do
 end
 
 desc "Run the type checker"
-task typecheck: [:typecheck_typed]
+task typecheck: [:typecheck_strong]
 
 desc "Run the type checker at typed level - return code issues provable without annotations being correct"
 task :typecheck_typed do

bin/solargraph

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 
+# turn off warning diagnostics from Ruby
+$VERBOSE=nil
+
 require 'solargraph'
 
 Solargraph::Shell.start(ARGV)

lib/solargraph/api_map.rb

@@ -240,13 +240,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
@@ -537,7 +530,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)
@@ -546,7 +539,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
@@ -665,7 +658,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>]
@@ -774,17 +767,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
+            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?
@@ -793,7 +777,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)

lib/solargraph/api_map/constants.rb

@@ -12,14 +12,23 @@ 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, non-duck, non-signature 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:
+      # - 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
+      #
+      # @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?('::')
 
@@ -39,7 +48,7 @@ def resolve(name, *gates)
       # @param pin [Pin::Reference]
       # @return [String, nil]
       def dereference pin
-        resolve(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.
@@ -51,27 +60,37 @@ 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, *gates)&.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? ||
+                       type.tag == 'Boolean'
 
         gates.push '' unless gates.include?('')
-        fqns = resolve(name, gates)
+        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
-          resolve(const, pin.gates)
-        else
-          fqns
+          fqns = resolve(const, *pin.gates)
         end
+        type.recreate(new_name: fqns, make_rooted: true)
       end
 
       # @return [void]
@@ -126,7 +145,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.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)
             next unless mixin