solargraph 0.54.4 → 0.55.0

data/lib/solargraph/source_map/clip.rb

@@ -11,7 +11,9 @@ module Solargraph
       def initialize api_map, cursor
         @api_map = api_map
         @cursor = cursor
-        block.rebind(api_map) if block.is_a?(Pin::Block)
+        block_pin = block
+        block_pin.rebind(api_map) if block_pin.is_a?(Pin::Block) && !Solargraph::Range.from_node(block_pin.receiver).contain?(cursor.range.start)
+        @in_block = nil
       end
 
       # @return [Array<Pin::Base>] Relevant pins for infering the type of the Cursor's position

data/lib/solargraph/type_checker/checks.rb

@@ -50,6 +50,8 @@ module Solargraph
       # @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
@@ -71,6 +73,8 @@ module Solargraph
       # @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?

data/lib/solargraph/type_checker.rb

@@ -470,12 +470,22 @@ module Solargraph
     # @param pin [Pin::Method]
     # @return [Hash{String => Hash{Symbol => String, ComplexType}}]
     def param_hash(pin)
-      tags = pin.docstring.tags(:param)
-      return {} if tags.empty?
       # @type [Hash{String => Hash{Symbol => String, ComplexType}}]
       result = {}
+      pin.parameters.each do |param|
+        type = param.typify(api_map)
+        next if type.nil? || type.undefined?
+        result[param.name.to_s] = {
+          tagged: type.tags,
+          qualified: type
+        }
+      end
+      # see if we have additional tags to pay attention to from YARD -
+      # e.g., kwargs in a **restkwargs splat
+      tags = pin.docstring.tags(:param)
       tags.each do |tag|
-        next if tag.types.nil? || tag.types.empty?
+        next if result.key? tag.name.to_s
+        next if tag.types.nil?
         result[tag.name.to_s] = {
           tagged: tag.types.join(', '),
           qualified: Solargraph::ComplexType.try_parse(*tag.types).qualify(api_map, pin.full_context.namespace)
@@ -487,11 +497,27 @@ module Solargraph
     # @param pins [Array<Pin::Method>]
     # @return [Hash{String => Hash{Symbol => String, ComplexType}}]
     def first_param_hash(pins)
-      pins.each do |pin|
-        result = param_hash(pin)
-        return result unless result.empty?
+      return {} if pins.empty?
+      first_pin_type = pins.first.typify(api_map)
+      first_pin = pins.first.proxy first_pin_type
+      param_names = first_pin.parameter_names
+      results = param_hash(first_pin)
+      pins[1..].each do |pin|
+        # @todo this assignment from parametric use of Hash should not lose its generic
+        # @type [Hash{String => Hash{Symbol => BasicObject}}]
+
+        # documentation of types in superclasses should fail back to
+        # subclasses if the subclass hasn't documented something
+        superclass_results = param_hash(pin)
+        superclass_results.each do |param_name, details|
+          next unless param_names.include?(param_name)
+
+          results[param_name] ||= {}
+          results[param_name][:tagged] ||= details[:tagged]
+          results[param_name][:qualified] ||= details[:qualified]
+        end
       end
-      {}
+      results
     end
 
     # @param pin [Pin::Base]
@@ -584,7 +610,8 @@ module Solargraph
                   kwargs.delete param.name.to_sym
                   settled_kwargs += 1
                 elsif param.decl == :kwarg
-                  return [] if arguments.last.links.last.is_a?(Solargraph::Source::Chain::Hash) && arguments.last.links.last.splatted?
+                  last_arg_last_link = arguments.last.links.last
+                  return [] if last_arg_last_link.is_a?(Solargraph::Source::Chain::Hash) && last_arg_last_link.splatted?
                   return [Problem.new(location, "Missing keyword argument #{param.name} to #{pin.path}")]
                 end
               end

data/lib/solargraph/version.rb

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

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

@@ -16,29 +16,55 @@ module Solargraph
         def self.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]
+            gates: [code_object.namespace.to_s],
+            type: code_object.namespace.is_a?(YARD::CodeObjects::ClassObject) ? :class : :module,
+            source: :yardoc,
           )
           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,
-            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?,
-            return_type: return_type
-          )
-          pin.parameters.concat get_parameters(code_object, location, comments, pin)
+          final_scope = scope || code_object.scope
+          final_visibility = visibility || code_object.visibility
+          if code_object.is_alias?
+            origin_code_object = code_object.namespace.aliases[code_object]
+            pin = Pin::MethodAlias.new(
+              name: name,
+              location: location,
+              original: origin_code_object.name.to_s,
+              closure: closure,
+              comments: comments,
+              scope: final_scope,
+              visibility: final_visibility,
+              explicit: code_object.is_explicit?,
+              return_type: return_type,
+              parameters: [],
+              source: :yardoc,
+            )
+          else
+            pin = Pin::Method.new(
+              location: location,
+              closure: closure,
+              name: name,
+              comments: comments,
+              scope: final_scope,
+              visibility: final_visibility,
+              # @todo Might need to convert overloads to signatures
+              explicit: code_object.is_explicit?,
+              return_type: return_type,
+              attribute: code_object.is_attribute?,
+              parameters: [],
+              source: :yardoc,
+            )
+            pin.parameters.concat get_parameters(code_object, location, comments, pin)
+          end
+          logger.debug { "ToMethod.make: Just created method pin: #{pin.inspect}" }
           pin
         end
 
         class << self
+          include Logging
+
           private
 
           # @param code_object [YARD::CodeObjects::Base]
@@ -59,7 +85,8 @@ module Solargraph
                 name: arg_name(a),
                 presence: nil,
                 decl: arg_type(a),
-                asgn_code: a[1]
+                asgn_code: a[1],
+                source: :yardoc,
               )
             end
           end

data/lib/solargraph/yardoc.rb

@@ -35,7 +35,7 @@ module Solargraph
     # @param gemspec [Gem::Specification]
     # @return [String]
     def path_for(gemspec)
-      File.join(Solargraph::Cache.work_dir, 'gems', "#{gemspec.name}-#{gemspec.version}.yardoc")
+      File.join(Solargraph::Cache.base_dir, "yard-#{YARD::VERSION}", "#{gemspec.name}-#{gemspec.version}.yardoc")
     end
 
     # Load a gem's yardoc and return its code objects.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.54.4
+  version: 0.55.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-14 00:00:00.000000000 Z
+date: 2025-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -410,6 +410,9 @@ files:
 - lib/solargraph/convention/gemfile.rb
 - lib/solargraph/convention/gemspec.rb
 - lib/solargraph/convention/rakefile.rb
+- lib/solargraph/convention/struct_definition.rb
+- lib/solargraph/convention/struct_definition/struct_assignment_node.rb
+- lib/solargraph/convention/struct_definition/struct_definition_node.rb
 - lib/solargraph/converters/dd.rb
 - lib/solargraph/converters/dl.rb
 - lib/solargraph/converters/dt.rb
@@ -493,6 +496,7 @@ files:
 - lib/solargraph/page.rb
 - lib/solargraph/parser.rb
 - lib/solargraph/parser/comment_ripper.rb
+- lib/solargraph/parser/flow_sensitive_typing.rb
 - lib/solargraph/parser/node_methods.rb
 - lib/solargraph/parser/node_processor.rb
 - lib/solargraph/parser/node_processor/base.rb
@@ -503,6 +507,7 @@ files:
 - lib/solargraph/parser/parser_gem/node_methods.rb
 - lib/solargraph/parser/parser_gem/node_processors.rb
 - lib/solargraph/parser/parser_gem/node_processors/alias_node.rb
+- lib/solargraph/parser/parser_gem/node_processors/and_node.rb
 - lib/solargraph/parser/parser_gem/node_processors/args_node.rb
 - lib/solargraph/parser/parser_gem/node_processors/begin_node.rb
 - lib/solargraph/parser/parser_gem/node_processors/block_node.rb
@@ -511,21 +516,26 @@ files:
 - lib/solargraph/parser/parser_gem/node_processors/def_node.rb
 - lib/solargraph/parser/parser_gem/node_processors/defs_node.rb
 - lib/solargraph/parser/parser_gem/node_processors/gvasgn_node.rb
+- lib/solargraph/parser/parser_gem/node_processors/if_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/opasgn_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/while_node.rb
 - lib/solargraph/parser/region.rb
 - lib/solargraph/parser/snippet.rb
 - lib/solargraph/pin.rb
 - lib/solargraph/pin/base.rb
 - lib/solargraph/pin/base_variable.rb
 - lib/solargraph/pin/block.rb
+- lib/solargraph/pin/breakable.rb
 - lib/solargraph/pin/callable.rb
 - lib/solargraph/pin/class_variable.rb
 - lib/solargraph/pin/closure.rb
@@ -556,6 +566,8 @@ files:
 - lib/solargraph/pin/signature.rb
 - lib/solargraph/pin/singleton.rb
 - lib/solargraph/pin/symbol.rb
+- lib/solargraph/pin/until.rb
+- lib/solargraph/pin/while.rb
 - lib/solargraph/position.rb
 - lib/solargraph/range.rb
 - lib/solargraph/rbs_map.rb
@@ -643,7 +655,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: A Ruby language server