solargraph 0.59.0.dev.2 → 0.59.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19ddbaec3539796c7153fbf1aff54f930614e54999b5f24a2b8e4ad478c6a2e7
-  data.tar.gz: 90eae8d9572c92b8d850e610a7bb838154e6327c0635169812355d3838243f80
+  metadata.gz: 48702da784ad5e4ba9333e3389532a20af5bd0474cde01f0b00b9b07a53203ce
+  data.tar.gz: 93df9a47dde759e2de2f92f6e65609e4de5ba83403c4f481915e984d05111bab
 SHA512:
-  metadata.gz: becab03886479b51dc82e71ee532204409c47693951d83c7c12fb17172ed16ab9684ac994b5450dac9cf8ee66796f44af5ad3f6f66de2d3e2786189421f262d9
-  data.tar.gz: 826aee919004aa45ae2d5dec314d4e3d466e79771a7f2a56e1738de93ecabdf649a8b45162d605ed5b7ea9271db17015edc2dc7e8de9a8c6557aa9785ae8fa33
+  metadata.gz: 40c2a0be04ee36e8c0c7328e51e751c04becaddd5f405a302ec369bb7bae365705f75bf3852c1c99183e8ac00d58a61177216e75f60b2af9fb0d064c95496715
+  data.tar.gz: 41c1a1dd7c926debbb79a8f63b24e550d6b3a389ad71f09e392ce8216b66fa33b73d2a6269d5b624ecdf5aa86add0a81e40c2b3b24483a4555fb3a53d61e1e9c

data/.github/workflows/linting.yml

@@ -36,7 +36,9 @@ jobs:
 
       - name: Update to best available RBS
         run: |
-          bundle update --pre rbs # use latest available for this Ruby version
+          # Add optional gem to be able to typecheck related code
+          echo "gem 'vernier', '>1.0', '<2'" >> .Gemfile
+          bundle install
 
       - name: Restore cache of gem annotations
         id: dot-cache-restore

data/.github/workflows/plugins.yml

@@ -33,8 +33,9 @@ jobs:
       run: |
         echo 'gem "solargraph-rails"' > .Gemfile
         echo 'gem "solargraph-rspec"' >> .Gemfile
+        # Add optional gem to be able to typecheck related code
+        echo "gem 'vernier', '>1.0', '<2'" >> .Gemfile
         bundle install
-        bundle update --pre rbs
     - name: Configure to use plugins
       run: |
         bundle exec solargraph config
@@ -65,6 +66,8 @@ jobs:
     - name: Install gems
       run: |
         echo 'gem "solargraph-rails"' > .Gemfile
+        # Add optional gem to be able to typecheck related code
+        echo "gem 'vernier', '>1.0', '<2'" >> .Gemfile
         bundle install
         bundle update --pre rbs
     - name: Configure to use plugins
@@ -94,6 +97,8 @@ jobs:
     - name: Install gems
       run: |
         echo 'gem "solargraph-rspec"' >> .Gemfile
+        # Add optional gem to be able to typecheck related code
+        echo "gem 'vernier', '>1.0', '<2'" >> .Gemfile
         bundle install
         bundle update --pre rbs
     - name: Configure to use plugins
@@ -183,7 +188,8 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         # solargraph-rails supports Ruby 3.0+
-        ruby-version: '3.0'
+        # This job uses 3.2 due to a problem compiling sqlite3 in earlier versions
+        ruby-version: '3.2'
         bundler-cache: false
         # https://github.com/apiology/solargraph/actions/runs/19400815835/job/55508092473?pr=17
         rubygems: latest

data/.github/workflows/rspec.yml

@@ -21,49 +21,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4', '4.0', 'head']
-        rbs-version: ['3.6.1', '3.8.1', '3.9.5', '3.10.0', '4.0.0.dev.5']
-        # Ruby 3.0 doesn't work with RBS 3.9.4 or 4.0.0.dev.4
+        ruby-version: ['3.1', '3.2', '3.3', '3.4', '4.0', 'head']
+        rbs-version: ['3.10.0', '4.0.0', '4.0.1', '4.0.2']
         exclude:
-          # only include the 3.0 variants we include later
-          - ruby-version: '3.0'
-          # only include the 3.1 variants we include later
           - ruby-version: '3.1'
-          # only include the 3.2 variants we include later
-          - 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.4'
-          # only include the 4.0 variants we include later
-          - ruby-version: '4.0'
-          # Don't exclude 'head' - let's test all RBS versions we
-          # can there.
-          #
-          #
-          # Just exclude some odd-ball compatibility issues we can't
-          # work around:
-          #
-          # https://github.com/castwide/solargraph/actions/runs/20627923548/job/59241444380?pr=1102
-          - ruby-version: 'head'
-            rbs-version: '3.6.1'
-          - ruby-version: 'head'
-            rbs-version: '3.8.1'
-        include:
-          - ruby-version: '3.0'
-            rbs-version: '3.6.1'
+            rbs-version: '4.0.0'
           - ruby-version: '3.1'
-            rbs-version: '3.6.1'
-          - ruby-version: '3.2'
-            rbs-version: '3.8.1'
-          - ruby-version: '3.3'
-            rbs-version: '3.9.5'
-          - ruby-version: '3.3'
-            rbs-version: '3.10.0'
-          - ruby-version: '3.4'
-            rbs-version: '4.0.0.dev.5'
-          - ruby-version: '4.0'
-            rbs-version: '4.0.0.dev.5'
+            rbs-version: '4.0.1'
+          - ruby-version: '3.1'
+            rbs-version: '4.0.2'
     steps:
     - uses: actions/checkout@v3
     - name: Set up Ruby

data/.github/workflows/typecheck.yml

@@ -31,8 +31,9 @@ jobs:
         bundler-cache: false
     - name: Install gems
       run: |
+        # Add optional gem to be able to typecheck related code
+        echo "gem 'vernier', '>1.0', '<2'" >> .Gemfile
         bundle install
-        bundle update --pre rbs # use latest available for this Ruby version
     - name: Install gem types
       run: bundle exec rbs collection install
     - name: Typecheck self

data/.rubocop.yml

@@ -19,7 +19,7 @@ AllCops:
     - "spec/fixtures/invalid_utf8.rb"
     - "vendor/**/*"
     - "vendor/**/.*"
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.1
 
 Gemspec/RequiredRubyVersion:
   Exclude:
@@ -69,6 +69,11 @@ Metrics/ParameterLists:
 Style/ClassVars:
   Enabled: false
 
+# Allow $stderr.puts for communication with users as 'warn' can be
+# suppressed for unrelated reasons.
+Style/StderrPuts:
+  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

data/.rubocop_todo.yml

@@ -361,3 +361,6 @@ YARD/TagTypeSyntax:
 # URISchemes: http, https
 Layout/LineLength:
   Max: 224
+
+Naming/BlockForwarding:
+  Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0.59.0 - May 13, 2026
+- Ensure pathname is required for rbs in shell caching processes (#1183)
+- Pre-release branch 2026-01-12 (#1152)
+- 2026-01-27 dev branch (#1165)
+- Position linting (#1179)
+- Revert YARD and RBS pin caching (#1180)
+- Ensure pathname is required for rbs in shell caching processes (#1183)
+- Limit default include glob to current directory (#1184) 
+- Require Ruby >= 3.1.0
+- Require RBS >= 3.10.0
+- Stub combine_same_type_arity_signatures (#1186)
+
+## 0.58.3 - March 9, 2026
+- Ignore workspace dependencies in cache processes (#1174)
+
 ## 0.58.2 - January 19, 2026
 - Avoid rbs pollution (#1146)
 - Fix 'solargraph pin --references ClassName' private method call (#1150)

data/lib/solargraph/api_map/constants.rb

@@ -279,7 +279,6 @@ module Solargraph
         sc_ref = store.get_superclass(fqns)
         if sc_ref
           fqsc = dereference(sc_ref)
-          # @sg-ignore Need to add nil check here
           result.concat inner_get_constants(fqsc, [:public], skip) unless %w[Object BasicObject].include?(fqsc)
         end
         result

data/lib/solargraph/api_map/index.rb

@@ -36,6 +36,11 @@ module Solargraph
         @path_pin_hash ||= Hash.new { |h, k| h[k] = [] }
       end
 
+      # @return [Hash{String => ComplexType}]
+      def alias_hash
+        @alias_hash ||= {}
+      end
+
       # @generic T
       # @param klass [Class<generic<T>>]
       # @return [Set<generic<T>>]
@@ -133,6 +138,7 @@ module Solargraph
         map_references Pin::Reference::Extend, extend_references
         map_references Pin::Reference::Superclass, superclass_references
         map_overrides
+        pins_by_class(Pin::Reference::TypeAlias).each { |pin| alias_hash[pin.name] = pin.return_type }
         self
       end
 

data/lib/solargraph/api_map/store.rb

@@ -271,6 +271,12 @@ module Solargraph
         @constants ||= Constants.new(self)
       end
 
+      # @param name [String]
+      # @return [ComplexType, nil]
+      def unalias name
+        index.alias_hash[name]
+      end
+
       private
 
       # @return [Index]

data/lib/solargraph/api_map.rb

@@ -115,8 +115,9 @@ module Solargraph
       end
       unresolved_requires = (bench.external_requires + conventions_environ.requires + bench.workspace.config.required).to_a.compact.uniq
       recreate_docmap = @unresolved_requires != unresolved_requires ||
+                        # @sg-ignore Unresolved call to rbs_collection_path on Solargraph::Workspace, nil
                         workspace.rbs_collection_path != bench.workspace.rbs_collection_path ||
-                        @doc_map.any_uncached?
+                        @doc_map.uncached_gemspecs.any?
 
       if recreate_docmap
         @doc_map = DocMap.new(unresolved_requires, bench.workspace, out: nil) # @todo Implement gem preferences
@@ -137,6 +138,16 @@ module Solargraph
       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
@@ -198,7 +209,7 @@ module Solargraph
     # @param rebuild [Boolean] whether to rebuild the pins even if they are cached
     # @return [void]
     def cache_all_for_doc_map! out: $stderr, rebuild: false
-      doc_map.cache_doc_map_gems!(out, rebuild: rebuild)
+      doc_map.cache_all!(out, rebuild: rebuild)
     end
 
     # @param gemspec [Gem::Specification]
@@ -245,6 +256,12 @@ module Solargraph
       store.pins_by_class(Pin::Keyword)
     end
 
+    # @param name [String]
+    # @return [ComplexType, nil]
+    def unalias name
+      store.unalias(name)
+    end
+
     # True if the namespace exists.
     #
     # @param name [String] The namespace to match
@@ -613,7 +630,6 @@ module Solargraph
     # @param cursor [Source::Cursor]
     # @return [SourceMap::Clip]
     def clip cursor
-      # @sg-ignore Need to add nil check here
       raise FileNotFoundError, "ApiMap did not catalog #{cursor.filename}" unless source_map_hash.key?(cursor.filename)
 
       SourceMap::Clip.new(self, cursor)
@@ -708,7 +724,7 @@ module Solargraph
       GemPins.combine_method_pins_by_path(with_resolved_aliases)
     end
 
-    # @return [Workspace]
+    # @return [Workspace, nil]
     def workspace
       doc_map.workspace
     end

data/lib/solargraph/complex_type/type_methods.rb

@@ -43,8 +43,9 @@ module Solargraph
         @rooted_tag ||= rooted_name + rooted_substring
       end
 
+      # Whether this is an RBS interface like _ToAry or Hash::_Key.
       def interface?
-        name.start_with?('_')
+        name.start_with?('_') || name.include?('::_')
       end
 
       # @return [Boolean]

data/lib/solargraph/complex_type/unique_type.rb

@@ -175,7 +175,6 @@ module Solargraph
         return 'NilClass' if name == 'nil'
         return 'Boolean' if %w[true false].include?(name)
         return 'Symbol' if name[0] == ':'
-        # @sg-ignore Need to add nil check here
         return 'String' if ['"', "'"].include?(name[0])
         return 'Integer' if name.match?(/^-?\d+$/)
         name
@@ -236,9 +235,9 @@ module Solargraph
         end
       end
 
-      # Whether this is an RBS interface like _ToAry or _Each.
+      # Whether this is an RBS interface like _ToAry or Hash::_Key.
       def interface?
-        name.start_with?('_')
+        name.start_with?('_') || name.include?('::_')
       end
 
       # @param other [UniqueType]
@@ -385,7 +384,6 @@ module Solargraph
       def resolve_generics_from_context generics_to_resolve, context_type, resolved_generic_values: {}
         if name == ComplexType::GENERIC_TAG_NAME
           type_param = subtypes.first&.name
-          # @sg-ignore flow sensitive typing needs to eliminate literal from union with [:bar].include?(foo)
           return self unless generics_to_resolve.include? type_param
           # @sg-ignore flow sensitive typing needs to eliminate literal from union with [:bar].include?(foo)
           unless context_type.nil? || !resolved_generic_values[type_param].nil?

data/lib/solargraph/complex_type.rb

@@ -38,7 +38,7 @@ module Solargraph
       types = red.items.map do |t|
         next t if %w[nil void undefined].include?(t.name)
         next t if ['::Boolean'].include?(t.rooted_name)
-        t.qualify api_map, *gates
+        api_map.unalias(t.name) || t.qualify(api_map, *gates)
       end
       ComplexType.new(types).reduce_object
     end