solargraph 0.53.4 → 0.54.1

data/lib/solargraph/type_checker.rb

@@ -90,11 +90,11 @@ module Solargraph
     def method_return_type_problems_for pin
       return [] if pin.is_a?(Pin::MethodAlias)
       result = []
-      declared = pin.typify(api_map).self_to(pin.full_context.namespace)
+      declared = pin.typify(api_map).self_to_type(pin.full_context).qualify(api_map, pin.full_context.tag)
       if declared.undefined?
         if pin.return_type.undefined? && rules.require_type_tags?
           if pin.attribute?
-            inferred = pin.probe(api_map).self_to(pin.full_context.namespace)
+            inferred = pin.probe(api_map).self_to_type(pin.full_context)
             result.push Problem.new(pin.location, "Missing @return tag for #{pin.path}", pin: pin) unless inferred.defined?
           else
             result.push Problem.new(pin.location, "Missing @return tag for #{pin.path}", pin: pin)
@@ -106,14 +106,14 @@ module Solargraph
         end
       elsif rules.validate_tags?
         unless pin.node.nil? || declared.void? || virtual_pin?(pin) || abstract?(pin)
-          inferred = pin.probe(api_map).self_to(pin.full_context.namespace)
+          inferred = pin.probe(api_map).self_to_type(pin.full_context)
           if inferred.undefined?
             unless rules.ignore_all_undefined? || external?(pin)
               result.push Problem.new(pin.location, "#{pin.path} return type could not be inferred", pin: pin)
             end
           else
-            unless (rules.rank > 1 ? all_types_match?(api_map, inferred, declared) : any_types_match?(api_map, declared, inferred))
-              result.push Problem.new(pin.location, "Declared return type #{declared} does not match inferred type #{inferred} for #{pin.path}", pin: pin)
+            unless (rules.require_all_return_types_match_inferred? ? all_types_match?(api_map, inferred, declared) : any_types_match?(api_map, declared, inferred))
+              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
         end
@@ -154,7 +154,7 @@ module Solargraph
             break if par.decl == :restarg || par.decl == :kwrestarg || par.decl == :blockarg
             unless params[par.name]
               if pin.attribute?
-                inferred = pin.probe(api_map).self_to(pin.full_context.namespace)
+                inferred = pin.probe(api_map).self_to_type(pin.full_context)
                 if inferred.undefined?
                   result.push Problem.new(pin.location, "Missing @param tag for #{par.name} on #{pin.path}", pin: pin)
                 end
@@ -291,13 +291,19 @@ module Solargraph
       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)
 
-        if pins.first.is_a?(Pin::DelegatedMethod) && !pins.first.resolvable?(api_map)
+        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 pins.first.is_a?(Pin::Method)
+        elsif first_pin.is_a?(Pin::Method)
           # @type [Pin::Method]
-          pin = pins.first
+          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'
@@ -307,9 +313,9 @@ module Solargraph
               base.base.infer(api_map, block_pin, locals).namespace
             end
             init = api_map.get_method_stack(fqns, 'initialize').first
-            init ? arity_problems_for(init, base.links.last.arguments, location) : []
+            init ? arity_problems_for(init, arguments, location) : []
           else
-            arity_problems_for(pin, base.links.last.arguments, location)
+            arity_problems_for(pin, arguments, location)
           end
           unless ap.empty?
             result.concat ap
@@ -322,24 +328,26 @@ module Solargraph
           all_errors = []
           pin.signatures.sort { |sig| sig.parameters.length }.each do |sig|
             errors = []
-            # @todo these should be able to be probed
-            # @param par [Parameter]
-            # @param idx [Integer]
             sig.parameters.each_with_index do |par, idx|
-              argchain = base.links.last.arguments[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
-                  last = base.links.last.arguments.last
-                  if last && last.node.type == :splat
-                    argchain = last
+                  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
-                  last = base.links.last.arguments.last
-                  argchain = last if last && [:kwsplat, :hash].include?(last.node.type)
+                  final_arg = arguments.last
+                  argchain = final_arg if final_arg && [:kwsplat, :hash].include?(final_arg.node.type)
                 end
               end
               if argchain
@@ -347,12 +355,29 @@ module Solargraph
                   errors.concat kwarg_problems_for sig, argchain, api_map, block_pin, locals, location, pin, params, idx
                   next
                 else
-                  last = base.links.last.arguments.last
-                  if last && last.node.type == :splat
-                    next # don't try to apply the type of the splat - unlikely to be specific enough
+                  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(par.context.namespace)
+                  ptype = ptype.self_to_type(par.context)
                   if ptype.nil?
                     # @todo Some level (strong, I guess) should require the param here
                   else
@@ -462,7 +487,7 @@ module Solargraph
     def first_param_hash(pins)
       pins.each do |pin|
         # @todo this assignment from parametric use of Hash should not lose its generic
-        # @type [Hash{String => Hash{Symbol => BasicObject}]
+        # @type [Hash{String => Hash{Symbol => BasicObject}}]
         result = param_hash(pin)
         return result unless result.empty?
       end

data/lib/solargraph/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Solargraph
-  VERSION = '0.53.4'
+  VERSION = '0.54.1'
 end

data/lib/solargraph/views/environment.erb

@@ -35,11 +35,9 @@
     <li>
       Core Cache Directory: N/A <%# @todo Fix %>
     </li>
-    <% unless Solargraph::Parser.rubyvm? %>
-      <li>
-        Parser Target Version: <%= Solargraph::Parser.version %>
-      </li>
-    <% end %>
+    <li>
+      Parser Target Version: <%= Solargraph::Parser.version %>
+    </li>
     <li>
       Using Bundler: <%= ENV.key?('BUNDLE_BIN_PATH') %>
     </li>

data/lib/solargraph/workspace/config.rb

@@ -14,7 +14,8 @@ module Solargraph
       # @return [String]
       attr_reader :directory
 
-      # @return [Hash{String => BasicObject}]
+      # @todo To make this strongly typed we'll need a record syntax
+      # @return [Hash{String => undefined}]
       attr_reader :raw_data
 
       # @param directory [String]

data/lib/solargraph/workspace.rb

@@ -128,6 +128,11 @@ module Solargraph
       end
     end
 
+    # @return [String, nil]
+    def rbs_collection_path
+      @gem_rbs_collection ||= read_rbs_collection_path
+    end
+
     # Synchronize the workspace from the provided updater.
     #
     # @param updater [Source::Updater]
@@ -222,5 +227,13 @@ module Solargraph
         end
       end
     end
+
+    # @return [String, nil]
+    def read_rbs_collection_path
+      yaml_file = File.join(directory, 'rbs_collection.yaml')
+      return unless File.file?(yaml_file)
+
+      YAML.load_file(yaml_file)&.fetch('path')
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.53.4
+  version: 0.54.1
 platform: ruby
 authors:
 - Fred Snyder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-30 00:00:00.000000000 Z
+date: 2025-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -428,7 +428,6 @@ files:
 - lib/solargraph/language_server/completion_item_kinds.rb
 - lib/solargraph/language_server/error_codes.rb
 - lib/solargraph/language_server/host.rb
-- lib/solargraph/language_server/host/cataloger.rb
 - lib/solargraph/language_server/host/diagnoser.rb
 - lib/solargraph/language_server/host/dispatch.rb
 - lib/solargraph/language_server/host/message_worker.rb
@@ -479,6 +478,7 @@ files:
 - lib/solargraph/language_server/message/workspace/did_change_workspace_folders.rb
 - lib/solargraph/language_server/message/workspace/workspace_symbol.rb
 - lib/solargraph/language_server/message_types.rb
+- lib/solargraph/language_server/progress.rb
 - lib/solargraph/language_server/request.rb
 - lib/solargraph/language_server/symbol_kinds.rb
 - lib/solargraph/language_server/transport.rb
@@ -511,6 +511,7 @@ files:
 - lib/solargraph/parser/parser_gem/node_processors/gvasgn_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/orasgn_node.rb
 - lib/solargraph/parser/parser_gem/node_processors/resbody_node.rb
@@ -523,6 +524,7 @@ files:
 - lib/solargraph/pin/base.rb
 - lib/solargraph/pin/base_variable.rb
 - lib/solargraph/pin/block.rb
+- lib/solargraph/pin/callable.rb
 - lib/solargraph/pin/class_variable.rb
 - lib/solargraph/pin/closure.rb
 - lib/solargraph/pin/common.rb
@@ -588,6 +590,7 @@ files:
 - lib/solargraph/source_map.rb
 - lib/solargraph/source_map/clip.rb
 - lib/solargraph/source_map/completion.rb
+- lib/solargraph/source_map/data.rb
 - lib/solargraph/source_map/mapper.rb
 - lib/solargraph/type_checker.rb
 - lib/solargraph/type_checker/checks.rb

data/lib/solargraph/language_server/host/cataloger.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module LanguageServer
-    class Host
-      # An asynchronous library cataloging handler.
-      #
-      class Cataloger
-        # @param host [Host]
-        def initialize host
-          @host = host
-          @stopped = true
-        end
-
-        # Stop the catalog thread.
-        #
-        # @return [void]
-        def stop
-          @stopped = true
-        end
-
-        # True if the cataloger is stopped.
-        #
-        # @return [Boolean]
-        def stopped?
-          @stopped
-        end
-
-        # Start the catalog thread.
-        #
-        # @return [void]
-        def start
-          return unless stopped?
-          @stopped = false
-          Thread.new do
-            until stopped?
-              tick
-              sleep 0.1
-            end
-          end
-        end
-
-        # Perform cataloging.
-        #
-        # @return [void]
-        def tick
-          host.catalog
-        end
-
-        private
-
-        # @return [Host]
-        attr_reader :host
-      end
-    end
-  end
-end