solargraph 0.58.1 → 0.59.0.dev.1

data/rbs_collection.yaml

@@ -2,7 +2,7 @@
 sources:
   - type: local
     name: shims
-    path: sig/shims
+    path: rbs/shims
 
   - type: git
     name: ruby/gem_rbs_collection

data/solargraph.gemspec

@@ -1,3 +1,4 @@
+# @sg-ignore Should better support meaning of '&' in RBS
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/lib'
 require 'solargraph/version'
 require 'date'
@@ -42,7 +43,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'open3', '~> 0.2.1'
   s.add_runtime_dependency 'parser', '~> 3.0'
   s.add_runtime_dependency 'prism', '~> 1.4'
-  s.add_runtime_dependency 'rbs', ['>= 3.6.1', '<= 4.0.0.dev.4']
+  s.add_runtime_dependency 'rbs', ['>= 3.6.1', '<= 4.0.0.dev.5']
   s.add_runtime_dependency 'reverse_markdown', '~> 3.0'
   s.add_runtime_dependency 'rubocop', '~> 1.76'
   s.add_runtime_dependency 'thor', '~> 1.0'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.58.1
+  version: 0.59.0.dev.1
 platform: ruby
 authors:
 - Fred Snyder
 bindir: bin
 cert_chain: []
-date: 2026-01-02 00:00:00.000000000 Z
+date: 2026-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -220,7 +220,7 @@ dependencies:
         version: 3.6.1
     - - "<="
       - !ruby/object:Gem::Version
-        version: 4.0.0.dev.4
+        version: 4.0.0.dev.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -230,7 +230,7 @@ dependencies:
         version: 3.6.1
     - - "<="
       - !ruby/object:Gem::Version
-        version: 4.0.0.dev.4
+        version: 4.0.0.dev.5
 - !ruby/object:Gem::Dependency
   name: reverse_markdown
   requirement: !ruby/object:Gem::Requirement
@@ -538,6 +538,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".envrc"
 - ".gitattributes"
 - ".github/FUNDING.yml"
 - ".github/workflows/linting.yml"
@@ -566,6 +567,7 @@ files:
 - lib/solargraph/api_map/store.rb
 - lib/solargraph/bench.rb
 - lib/solargraph/complex_type.rb
+- lib/solargraph/complex_type/conformance.rb
 - lib/solargraph/complex_type/type_methods.rb
 - lib/solargraph/complex_type/unique_type.rb
 - lib/solargraph/convention.rb
@@ -688,12 +690,14 @@ files:
 - 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/or_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/when_node.rb
 - lib/solargraph/parser/parser_gem/node_processors/while_node.rb
 - lib/solargraph/parser/region.rb
 - lib/solargraph/parser/snippet.rb
@@ -706,6 +710,7 @@ files:
 - lib/solargraph/pin/class_variable.rb
 - lib/solargraph/pin/closure.rb
 - lib/solargraph/pin/common.rb
+- lib/solargraph/pin/compound_statement.rb
 - lib/solargraph/pin/constant.rb
 - lib/solargraph/pin/conversions.rb
 - lib/solargraph/pin/delegated_method.rb
@@ -774,8 +779,6 @@ files:
 - lib/solargraph/source_map/data.rb
 - lib/solargraph/source_map/mapper.rb
 - lib/solargraph/type_checker.rb
-- lib/solargraph/type_checker/checks.rb
-- lib/solargraph/type_checker/param_def.rb
 - lib/solargraph/type_checker/problem.rb
 - lib/solargraph/type_checker/rules.rb
 - lib/solargraph/version.rb
@@ -788,6 +791,7 @@ files:
 - lib/solargraph/views/search.erb
 - lib/solargraph/workspace.rb
 - lib/solargraph/workspace/config.rb
+- lib/solargraph/workspace/gemspecs.rb
 - lib/solargraph/workspace/require_paths.rb
 - lib/solargraph/yard_map.rb
 - lib/solargraph/yard_map/cache.rb
@@ -796,27 +800,28 @@ files:
 - 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
 - lib/solargraph/yard_tags.rb
 - lib/solargraph/yardoc.rb
 - rbs/fills/bundler/0/bundler.rbs
 - rbs/fills/open3/0/open3.rbs
 - rbs/fills/rubygems/0/basic_specification.rbs
+- rbs/fills/rubygems/0/dependency.rbs
 - rbs/fills/rubygems/0/errors.rbs
 - rbs/fills/rubygems/0/spec_fetcher.rbs
 - rbs/fills/rubygems/0/specification.rbs
 - rbs/fills/tuple/tuple.rbs
+- rbs/shims/ast/0/node.rbs
+- rbs/shims/ast/2.4/.rbs_meta.yaml
+- rbs/shims/ast/2.4/ast.rbs
+- rbs/shims/diff-lcs/1.5/diff-lcs.rbs
+- rbs/shims/parser/3.2.0.1/builders/default.rbs
+- rbs/shims/parser/3.2.0.1/manifest.yaml
+- rbs/shims/parser/3.2.0.1/parser.rbs
+- rbs/shims/parser/3.2.0.1/polyfill.rbs
+- rbs/shims/thor/1.2.0.1/.rbs_meta.yaml
+- rbs/shims/thor/1.2.0.1/manifest.yaml
+- rbs/shims/thor/1.2.0.1/thor.rbs
 - rbs_collection.yaml
-- sig/shims/ast/0/node.rbs
-- sig/shims/ast/2.4/.rbs_meta.yaml
-- sig/shims/ast/2.4/ast.rbs
-- sig/shims/parser/3.2.0.1/builders/default.rbs
-- sig/shims/parser/3.2.0.1/manifest.yaml
-- sig/shims/parser/3.2.0.1/parser.rbs
-- sig/shims/parser/3.2.0.1/polyfill.rbs
-- sig/shims/thor/1.2.0.1/.rbs_meta.yaml
-- sig/shims/thor/1.2.0.1/manifest.yaml
-- sig/shims/thor/1.2.0.1/thor.rbs
 - solargraph.gemspec
 homepage: https://solargraph.org
 licenses:

data/lib/solargraph/type_checker/checks.rb

@@ -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

data/lib/solargraph/type_checker/param_def.rb

@@ -1,37 +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
-
-      # @param name [String]
-      # @param type [Symbol] The type of parameter, such as :req, :opt, :rest, etc.
-      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

data/lib/solargraph/yard_map/to_method.rb

@@ -1,89 +0,0 @@
-# frozen_string_literal: true
-
-module Solargraph
-  class YardMap
-    class ToMethod
-      module InnerMethods
-        module_function
-
-        # @param code_object [YARD::CodeObjects::Base]
-        # @param location [Solargraph::Location]
-        # @param comments [String]
-        # @return [Array<Solargraph::Pin::Parameter>]
-        def get_parameters code_object, location, comments
-          return [] unless code_object.is_a?(YARD::CodeObjects::MethodObject)
-          # HACK: Skip `nil` and `self` parameters that are sometimes emitted
-          # for methods defined in C
-          # See https://github.com/castwide/solargraph/issues/345
-          # @sg-ignore https://github.com/castwide/solargraph/pull/1114
-          code_object.parameters.select { |a| a[0] && a[0] != 'self' }.map do |a|
-            Solargraph::Pin::Parameter.new(
-              location: location,
-              closure: self,
-              comments: comments,
-              name: arg_name(a),
-              presence: nil,
-              decl: arg_type(a),
-              asgn_code: a[1],
-              source: :yard_map
-            )
-          end
-        end
-
-        # @param a [Array<String>]
-        # @return [String]
-        def arg_name a
-          a[0].gsub(/[^a-z0-9_]/i, '')
-        end
-
-        # @param a [Array]
-        # @return [::Symbol]
-        def arg_type a
-          if a[0].start_with?('**')
-            :kwrestarg
-          elsif a[0].start_with?('*')
-            :restarg
-          elsif a[0].start_with?('&')
-            :blockarg
-          elsif a[0].end_with?(':')
-            a[1] ? :kwoptarg : :kwarg
-          elsif a[1]
-            :optarg
-          else
-            :arg
-          end
-        end
-      end
-      private_constant :InnerMethods
-
-      include Helpers
-
-      # @param code_object [YARD::CodeObjects::MethodObject]
-      # @param name [String, nil]
-      # @param scope [Symbol, nil]
-      # @param visibility [Symbol, nil]
-      # @param closure [Solargraph::Pin::Base, nil]
-      # @param spec [Solargraph::Pin::Base, nil]
-      # @return [Solargraph::Pin::Method]
-      def make code_object, name = nil, scope = nil, visibility = nil, closure = nil, spec = nil
-        closure ||= Solargraph::Pin::Namespace.new(
-          name: code_object.namespace.to_s,
-          gates: [code_object.namespace.to_s]
-        )
-        location = object_location(code_object, spec)
-        comments = code_object.docstring ? code_object.docstring.all.to_s : ''
-        Pin::Method.new(
-          location: location,
-          closure: closure,
-          name: name || code_object.name.to_s,
-          comments: comments,
-          scope: scope || code_object.scope,
-          visibility: visibility || code_object.visibility,
-          parameters: InnerMethods.get_parameters(code_object, location, comments),
-          explicit: code_object.is_explicit?,
-          source: :yard_map
-        )
-      end
-    end
-  end
-end

data/sig/shims/ast/0/node.rbs

@@ -1,5 +0,0 @@
-module ::AST
-  class Node
-     def children: () -> [self, Integer, String, Symbol, nil]
-  end
-end