solargraph 0.53.0 → 0.54.0

data/lib/solargraph/source/updater.rb

@@ -42,6 +42,7 @@ module Solargraph
         @output
       end
 
+      # @param text [String]
       # @return [String]
       def repair text
         changes.each do |ch|

data/lib/solargraph/source.rb

@@ -92,50 +92,6 @@ module Solargraph
       stack
     end
 
-    # Start synchronizing the source. This method updates the code without
-    # parsing a new AST. The resulting Source object will be marked not
-    # synchronized (#synchronized? == false).
-    #
-    # @param updater [Source::Updater]
-    # @return [Source]
-    def start_synchronize updater
-      raise 'Invalid synchronization' unless updater.filename == filename
-      real_code = updater.write(@code)
-      src = Source.allocate
-      src.filename = filename
-      src.code = real_code
-      src.version = updater.version
-      src.parsed = parsed?
-      src.repaired = updater.repair(@repaired)
-      src.synchronized = false
-      src.node = @node
-      src.comments = @comments
-      src.error_ranges = error_ranges
-      src.last_updater = updater
-      return src.finish_synchronize unless real_code.lines.length == @code.lines.length
-      src
-    end
-
-    # Finish synchronizing a source that was updated via #start_synchronize.
-    # This method returns self if the source is already synchronized. Otherwise
-    # it parses the AST and returns a new synchronized Source.
-    #
-    # @return [Source]
-    def finish_synchronize
-      return self if synchronized?
-      synced = Source.new(@code, filename)
-      if synced.parsed?
-        synced.version = version
-        return synced
-      end
-      synced = Source.new(@repaired, filename)
-      synced.error_ranges.concat (error_ranges + last_updater.changes.map(&:range))
-      synced.code = @code
-      synced.synchronized = true
-      synced.version = version
-      synced
-    end
-
     # Synchronize the Source with an update. This method applies changes to the
     # code, parses the new code's AST, and returns the resulting Source object.
     #

data/lib/solargraph/source_map/clip.rb

@@ -11,6 +11,7 @@ module Solargraph
       def initialize api_map, cursor
         @api_map = api_map
         @cursor = cursor
+        block.rebind(api_map) if block.is_a?(Pin::Block)
       end
 
       # @return [Array<Pin::Base>] Relevant pins for infering the type of the Cursor's position
@@ -50,9 +51,9 @@ module Solargraph
       def infer
         result = cursor.chain.infer(api_map, block, locals)
         if result.tag == 'Class'
-          # HACK: Exception to return Object from Class#new
+          # HACK: Exception to return BasicObject from Class#new
           dfn = cursor.chain.define(api_map, block, locals).first
-          return ComplexType.try_parse('Object') if dfn && dfn.path == 'Class#new'
+          return ComplexType.try_parse('BasicObject') if dfn && dfn.path == 'Class#new'
         end
         return result unless result.tag == 'self'
         ComplexType.try_parse(cursor.chain.base.infer(api_map, block, locals).tag)

data/lib/solargraph/source_map/mapper.rb

@@ -144,7 +144,7 @@ module Solargraph
             )
           end
           if t.nil? || t.include?('w')
-            pins.push Solargraph::Pin::Method.new(
+            method_pin = Solargraph::Pin::Method.new(
               location: location,
               closure: namespace,
               name: "#{directive.tag.name}=",
@@ -153,7 +153,8 @@ module Solargraph
               visibility: :public,
               attribute: true
             )
-            pins.last.parameters.push Pin::Parameter.new(name: 'value', decl: :arg, closure: pins.last)
+            pins.push method_pin
+            method_pin.parameters.push Pin::Parameter.new(name: 'value', decl: :arg, closure: pins.last)
             if pins.last.return_type.defined?
               pins.last.docstring.add_tag YARD::Tags::Tag.new(:param, '', pins.last.return_type.to_s.split(', '), 'value')
             end

data/lib/solargraph/source_map.rb

@@ -40,12 +40,14 @@ module Solargraph
       @pin_select_cache[klass] ||= @pin_class_hash.select { |key, _| key <= klass }.values.flatten
     end
 
-    # @return [Set<String>]
-    def rebindable_method_names
-      @rebindable_method_names ||= pins_by_class(Pin::Method)
-        .select { |pin| pin.comments && pin.comments.include?('@yieldreceiver') }
-        .map(&:name)
-        .to_set
+    # A hash representing the state of the source map's API.
+    #
+    # ApiMap#catalog uses this value to determine whether it needs to clear its
+    # cache.
+    #
+    # @return [Integer]
+    def api_hash
+      @api_hash ||= (pins_by_class(Pin::Constant) + pins_by_class(Pin::Namespace).select { |pin| pin.namespace.to_s > '' } + pins_by_class(Pin::Reference) + pins_by_class(Pin::Method).map(&:node)).hash
     end
 
     # @return [String]

data/lib/solargraph/type_checker.rb

@@ -268,6 +268,7 @@ module Solargraph
             base = base.base
           end
           closest = found.typify(api_map) if found
+          # @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}")
@@ -290,17 +291,31 @@ 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'
+            fqns = if base.links.one?
+              block_pin.namespace
+            else
+              base.base.infer(api_map, block_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, base.links.last.arguments, location)
+            arity_problems_for(pin, arguments, location)
           end
           unless ap.empty?
             result.concat ap
@@ -313,18 +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
-                  errors.push Problem.new(location, "Not enough arguments to #{pin.path}")
-                  next
+                  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
@@ -332,7 +355,29 @@ module Solargraph
                   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(par.context.namespace)
                   if ptype.nil?
                     # @todo Some level (strong, I guess) should require the param here
                   else
@@ -442,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.0'
+  VERSION = '0.54.0'
 end

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

@@ -25,9 +25,11 @@ module Solargraph
 
     # @param directory [String]
     # @param config [Config, nil]
-    def initialize directory = '', config = nil
+    # @param server [Hash]
+    def initialize directory = '', config = nil, server = {}
       @directory = directory
       @config = config
+      @server = server
       load_sources
       @gemnames = []
       @require_paths = generate_require_paths
@@ -126,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]
@@ -134,8 +141,19 @@ module Solargraph
       source_hash[updater.filename] = source_hash[updater.filename].synchronize(updater)
     end
 
+    # @return [String]
+    def command_path
+      server['commandPath'] || 'solargraph'
+    end
+
     private
 
+    # The language server configuration (or an empty hash if the workspace was
+    # not initialized from a server).
+    #
+    # @return [Hash]
+    attr_reader :server
+
     # @return [Hash{String => Solargraph::Source}]
     def source_hash
       @source_hash ||= {}
@@ -209,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

data/lib/solargraph/yard_map/mapper/to_method.rb

@@ -19,17 +19,20 @@ module Solargraph
             gates: [code_object.namespace.to_s]
           )
           location = object_location(code_object, spec)
+          name ||= code_object.name.to_s
+          return_type = ComplexType::SELF if name == 'new'
           comments = code_object.docstring ? code_object.docstring.all.to_s : ''
           pin = Pin::Method.new(
             location: location,
             closure: closure,
-            name: name || code_object.name.to_s,
+            name: name,
             comments: comments,
             scope: scope || code_object.scope,
             visibility: visibility || code_object.visibility,
             # @todo Might need to convert overloads to signatures
             parameters: [],
-            explicit: code_object.is_explicit?
+            explicit: code_object.is_explicit?,
+            return_type: return_type
           )
           pin.parameters.concat get_parameters(code_object, location, comments, pin)
           pin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.53.0
+  version: 0.54.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-25 00:00:00.000000000 Z
+date: 2025-04-14 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
@@ -558,7 +559,6 @@ files:
 - lib/solargraph/rbs_map/conversions.rb
 - lib/solargraph/rbs_map/core_fills.rb
 - lib/solargraph/rbs_map/core_map.rb
-- lib/solargraph/rbs_map/core_signs.rb
 - lib/solargraph/rbs_map/stdlib_map.rb
 - lib/solargraph/server_methods.rb
 - lib/solargraph/shell.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

data/lib/solargraph/rbs_map/core_signs.rb

@@ -1,35 +0,0 @@
-module Solargraph
-  class RbsMap
-    module CoreSigns
-      Override = Pin::Reference::Override
-
-      class Stub
-        attr_reader :parameters
-
-        attr_reader :return_type
-
-        # @param parameters [Array<Hash>]
-        # @param return_type [String]
-        def initialize parameters, return_type
-          @parameters = parameters
-          @return_type = return_type
-        end
-      end
-
-      SIGNATURE_MAP = {
-        'Object#class' => [
-          Stub.new(
-            [],
-            'Class<self>'
-          )
-        ]
-      }
-
-      # @param path [String]
-      # @return [Array<Stub>]
-      def self.sign path
-        SIGNATURE_MAP[path]
-      end
-    end
-  end
-end