solargraph 0.55.3 → 0.55.4

data/lib/solargraph/source/chain/hash.rb

@@ -22,7 +22,7 @@ module Solargraph
         end
 
         def resolve api_map, name_pin, locals
-          [Pin::ProxyType.anonymous(@complex_type)]
+          [Pin::ProxyType.anonymous(@complex_type, source: :chain)]
         end
 
         def splatted?

data/lib/solargraph/source/chain/head.rb

@@ -9,7 +9,7 @@ module Solargraph
       # @note Chain::Head is only intended to handle `self` and `super`.
       class Head < Link
         def resolve api_map, name_pin, locals
-          return [Pin::ProxyType.anonymous(name_pin.binder)] if word == 'self'
+          return [Pin::ProxyType.anonymous(name_pin.binder, source: :chain)] if word == 'self'
           # return super_pins(api_map, name_pin) if word == 'super'
           []
         end

data/lib/solargraph/source/chain/if.rb

@@ -20,7 +20,7 @@ module Solargraph
 
         def resolve api_map, name_pin, locals
           types = @links.map { |link| link.infer(api_map, name_pin, locals) }
-          [Solargraph::Pin::ProxyType.anonymous(Solargraph::ComplexType.try_parse(types.map(&:tag).uniq.join(', ')))]
+          [Solargraph::Pin::ProxyType.anonymous(Solargraph::ComplexType.try_parse(types.map(&:tag).uniq.join(', ')), source: :chain)]
         end
       end
     end

data/lib/solargraph/source/chain/literal.rb

@@ -36,10 +36,10 @@ module Solargraph
 
         def resolve api_map, name_pin, locals
           if api_map.super_and_sub?(@complex_type.name, @literal_type.name)
-            [Pin::ProxyType.anonymous(@literal_type)]
+            [Pin::ProxyType.anonymous(@literal_type, source: :chain)]
           else
             # we don't support this value as a literal type
-            [Pin::ProxyType.anonymous(@complex_type)]
+            [Pin::ProxyType.anonymous(@complex_type, source: :chain)]
           end
         end
       end

data/lib/solargraph/source/chain/or.rb

@@ -15,7 +15,7 @@ module Solargraph
 
         def resolve api_map, name_pin, locals
           types = @links.map { |link| link.infer(api_map, name_pin, locals) }
-          [Solargraph::Pin::ProxyType.anonymous(Solargraph::ComplexType.new(types.uniq))]
+          [Solargraph::Pin::ProxyType.anonymous(Solargraph::ComplexType.new(types.uniq), source: :chain)]
         end
       end
     end

data/lib/solargraph/source/chain.rb

@@ -122,7 +122,7 @@ module Solargraph
           # evaluation.  However, we use the last link's return type
           # for the binder, as this is chaining off of it, and the
           # binder is now the lhs of the rhs we are evaluating.
-          working_pin = Pin::ProxyType.anonymous(name_pin.context, binder: type, closure: name_pin)
+          working_pin = Pin::ProxyType.anonymous(name_pin.context, binder: type, closure: name_pin, source: :chain)
           logger.debug { "Chain#define(links=#{links.map(&:desc)}, name_pin=#{name_pin.inspect}, locals=#{locals}) - after processing #{link.desc}, new working_pin=#{working_pin} with binder #{working_pin.binder}" }
         end
         links.last.last_context = working_pin
@@ -130,7 +130,7 @@ module Solargraph
       end
 
       # @param api_map [ApiMap]
-      # @param name_pin [Pin::Base]
+      # @param name_pin [Pin::Base] The pin for the closure in which this code runs
       # @param locals [::Array<Pin::LocalVariable>]
       # @return [ComplexType]
       # @sg-ignore

data/lib/solargraph/source_map/mapper.rb

@@ -41,7 +41,7 @@ module Solargraph
         s = Position.new(0, 0)
         e = Position.from_offset(code, code.length)
         location = Location.new(filename, Range.new(s, e))
-        [[Pin::Namespace.new(location: location, name: '')], []]
+        [[Pin::Namespace.new(location: location, name: '', source: :source_map)], []]
       end
 
       class << self
@@ -55,6 +55,7 @@ module Solargraph
 
       # @return [Array<Solargraph::Pin::Base>]
       def pins
+        # @type [Array<Solargraph::Pin::Base>]
         @pins ||= []
       end
 
@@ -140,7 +141,8 @@ module Solargraph
               scope: namespace.is_a?(Pin::Singleton) ? :class : :instance,
               visibility: :public,
               explicit: false,
-              attribute: true
+              attribute: true,
+              source: :source_map
             )
           end
           if t.nil? || t.include?('w')
@@ -151,10 +153,11 @@ module Solargraph
               comments: docstring.all.to_s,
               scope: namespace.is_a?(Pin::Singleton) ? :class : :instance,
               visibility: :public,
-              attribute: true
+              attribute: true,
+              source: :source_map
             )
             pins.push method_pin
-            method_pin.parameters.push Pin::Parameter.new(name: 'value', decl: :arg, closure: pins.last)
+            method_pin.parameters.push Pin::Parameter.new(name: 'value', decl: :arg, closure: pins.last, source: :source_map)
             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
@@ -205,7 +208,8 @@ module Solargraph
           namespace = closure_at(source_position) || Pin::ROOT_PIN
           namespace.domains.concat directive.tag.types unless directive.tag.types.nil?
         when 'override'
-          pins.push Pin::Reference::Override.new(location, directive.tag.name, docstring.tags)
+          pins.push Pin::Reference::Override.new(location, directive.tag.name, docstring.tags,
+                                                 source: :source_map)
         when 'macro'
           # @todo Handle macros
         end

data/lib/solargraph/version.rb

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

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

@@ -10,14 +10,16 @@ module Solargraph
         def self.make code_object, 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],
+            source: :yardoc,
           )
           Pin::Constant.new(
             location: object_location(code_object, spec),
             closure: closure,
             name: code_object.name.to_s,
             comments: code_object.docstring ? code_object.docstring.all.to_s : '',
-            visibility: code_object.visibility
+            visibility: code_object.visibility,
+            source: :yardoc
           )
         end
       end

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

@@ -6,6 +6,11 @@ module Solargraph
       module ToMethod
         extend YardMap::Helpers
 
+        VISIBILITY_OVERRIDE = {
+          # YARD pays attention to 'private' statements prior to class methods but shouldn't
+          ["Rails::Engine", :class, "find_root_with_flag"] => :public
+        }
+
         # @param code_object [YARD::CodeObjects::Base]
         # @param name [String, nil]
         # @param scope [Symbol, nil]
@@ -25,7 +30,14 @@ module Solargraph
           return_type = ComplexType::SELF if name == 'new'
           comments = code_object.docstring ? code_object.docstring.all.to_s : ''
           final_scope = scope || code_object.scope
-          final_visibility = visibility || code_object.visibility
+          override_key = [closure.path, final_scope, name]
+          final_visibility = VISIBILITY_OVERRIDE[override_key]
+          final_visibility ||= VISIBILITY_OVERRIDE[override_key[0..-2]]
+          final_visibility ||= :private if closure.path == 'Kernel' && Kernel.private_instance_methods(false).include?(name)
+          final_visibility ||= visibility
+          final_visibility ||= :private if code_object.module_function? && final_scope == :instance
+          final_visibility ||= :public if code_object.module_function? && final_scope == :class
+          final_visibility ||= code_object.visibility
           if code_object.is_alias?
             origin_code_object = code_object.namespace.aliases[code_object]
             pin = Pin::MethodAlias.new(
@@ -57,6 +69,7 @@ module Solargraph
               source: :yardoc,
             )
             pin.parameters.concat get_parameters(code_object, location, comments, pin)
+            pin.parameters.freeze
           end
           logger.debug { "ToMethod.make: Just created method pin: #{pin.inspect}" }
           pin

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

@@ -11,7 +11,8 @@ module Solargraph
           closure ||= Solargraph::Pin::Namespace.new(
             name: code_object.namespace.to_s,
             closure: Pin::ROOT_PIN,
-            gates: [code_object.namespace.to_s]
+            gates: [code_object.namespace.to_s],
+            source: :yardoc,
           )
           Pin::Namespace.new(
             location: object_location(code_object, spec),
@@ -19,7 +20,8 @@ module Solargraph
             comments: code_object.docstring ? code_object.docstring.all.to_s : '',
             type: code_object.is_a?(YARD::CodeObjects::ClassObject) ? :class : :module,
             visibility: code_object.visibility,
-            closure: closure
+            closure: closure,
+            source: :yardoc,
           )
         end
       end

data/lib/solargraph/yard_map/mapper.rb

@@ -47,15 +47,16 @@ module Solargraph
             else
               code_object.superclass.to_s
             end
-            result.push Solargraph::Pin::Reference::Superclass.new(name: superclass, closure: nspin)
+            result.push Solargraph::Pin::Reference::Superclass.new(name: superclass, closure: nspin, source: :yard_map)
           end
           code_object.class_mixins.each do |m|
-            result.push Solargraph::Pin::Reference::Extend.new(closure: nspin, name: m.path)
+            result.push Solargraph::Pin::Reference::Extend.new(closure: nspin, name: m.path, source: :yard_map)
           end
           code_object.instance_mixins.each do |m|
             result.push Solargraph::Pin::Reference::Include.new(
               closure: nspin, # @todo Fix this
-              name: m.path
+              name: m.path,
+              source: :yard_map
             )
           end
         elsif code_object.is_a?(YARD::CodeObjects::MethodObject)

data/lib/solargraph/yard_map/to_method.rb

@@ -23,7 +23,8 @@ module Solargraph
               name: arg_name(a),
               presence: nil,
               decl: arg_type(a),
-              asgn_code: a[1]
+              asgn_code: a[1],
+              source: :yard_map
             )
           end
         end
@@ -78,7 +79,8 @@ module Solargraph
           scope: scope || code_object.scope,
           visibility: visibility || code_object.visibility,
           parameters: InnerMethods.get_parameters(code_object, location, comments),
-          explicit: code_object.is_explicit?
+          explicit: code_object.is_explicit?,
+          source: :yard_map
         )
       end
     end

data/lib/solargraph.rb

@@ -53,6 +53,25 @@ module Solargraph
   dir = File.dirname(__FILE__)
   VIEWS_PATH = File.join(dir, 'solargraph', 'views')
 
+  # @param type [Symbol] Type of assert.  Not used yet, but may be
+  #   used in the future to allow configurable asserts mixes for
+  #   different situations.
+  def self.asserts_on?(type)
+    @asserts_on ||= if ENV['SOLARGRAPH_ASSERTS'].nil? || ENV['SOLARGRAPH_ASSERTS'].empty?
+                      false
+                    elsif ENV['SOLARGRAPH_ASSERTS'] == 'on'
+                      true
+                    else
+                      logger.warn "Unrecognized SOLARGRAPH_ASSERTS value: #{ENV['SOLARGRAPH_ASSERTS']}"
+                      false
+                    end
+  end
+
+  def self.assert_or_log(type, msg = nil, &block)
+    raise (msg || block.call) if asserts_on?(type) && ![:combine_with_visibility].include?(type)
+    logger.info msg, &block
+  end
+
   # A convenience method for Solargraph::Logging.logger.
   #
   # @return [Logger]

data/rbs/fills/tuple.rbs

@@ -0,0 +1,150 @@
+# <-- liberally borrowed from
+#     https://github.com/ruby/rbs/blob/master/core/array.rbs, which
+#     was generated from
+#     https://github.com/ruby/ruby/blob/master/array.c
+#     -->
+module Solargraph
+  module Fills
+    class Tuple[unchecked out A,
+                unchecked out B = A,
+                unchecked out C = A | B,
+                unchecked out D = A | B | C,
+                unchecked out E = A | B | C | D,
+                unchecked out F = A | B | C | D | E,
+                unchecked out G = A | B | C | D | E | F,
+                unchecked out H = A | B | C | D | E | F | G,
+                unchecked out I = A | B | C | D | E | F | G | H,
+                unchecked out J = A | B | C | D | E | F | G | H | I] < Array[A | B | C | D | E | F | G | H | I | J]
+      # <!--
+      #   rdoc-file=array.c
+      #   - self[index] -> object or nil
+      # -->
+      # Returns elements from `self`; does not modify `self`.
+      #
+      # In brief:
+      #
+      #     a = [:foo, 'bar', 2]
+      #
+      #     # Single argument index: returns one element.
+      #     a[0]     # => :foo          # Zero-based index.
+      #
+      # When a single integer argument `index` is given, returns the element at offset
+      # `index`:
+      #
+      #     a = [:foo, 'bar', 2]
+      #     a[0] # => :foo
+      #     a[2] # => 2
+      #     a # => [:foo, "bar", 2]
+      def []: (0 index) -> A
+            | (1 index) -> B
+            | (2 index) -> C
+            | (3 index) -> D
+            | (4 index) -> E
+            | (5 index) -> F
+            | (6 index) -> G
+            | (7 index) -> H
+            | (8 index) -> I
+            | (9 index) -> J
+            | (0 index) -> K
+            | (int index) -> nil
+
+      # <!--
+      #   rdoc-file=array.c
+      #   - at(index) -> object or nil
+      # -->
+      # Returns the element of `self` specified by the given `index` or `nil` if there
+      # is no such element; `index` must be an [integer-convertible
+      # object](rdoc-ref:implicit_conversion.rdoc@Integer-Convertible+Objects).
+      #
+      # For non-negative `index`, returns the element of `self` at offset `index`:
+      #
+      #     a = [:foo, 'bar', 2]
+      #     a.at(0)   # => :foo
+      #     a.at(2)   # => 2
+      #     a.at(2.0) # => 2
+      #
+      # Related: Array#[]; see also [Methods for
+      # Fetching](rdoc-ref:Array@Methods+for+Fetching).
+      #
+      def at: (0 index) -> A
+            | (1 index) -> B
+            | (2 index) -> C
+            | (3 index) -> D
+            | (4 index) -> E
+            | (5 index) -> F
+            | (6 index) -> G
+            | (7 index) -> H
+            | (8 index) -> I
+            | (9 index) -> J
+            | (int index) -> nil
+
+      # <!--
+      #   rdoc-file=array.c
+      #   - fetch(index) -> element
+      #   - fetch(index, default_value) -> element or default_value
+      #   - fetch(index) {|index| ... } -> element or block_return_value
+      # -->
+      # Returns the element of `self` at offset `index` if `index` is in range;
+      # `index` must be an [integer-convertible
+      # object](rdoc-ref:implicit_conversion.rdoc@Integer-Convertible+Objects).
+      #
+      # With the single argument `index` and no block, returns the element at offset
+      # `index`:
+      #
+      #     a = [:foo, 'bar', 2]
+      #     a.fetch(1)   # => "bar"
+      #     a.fetch(1.1) # => "bar"
+      #
+      # With arguments `index` and `default_value` (which may be any object) and no
+      # block, returns `default_value` if `index` is out-of-range:
+      #
+      #     a = [:foo, 'bar', 2]
+      #     a.fetch(1, nil)  # => "bar"
+      #     a.fetch(3, :foo) # => :foo
+      #
+      # With argument `index` and a block, returns the element at offset `index` if
+      # index is in range (and the block is not called); otherwise calls the block
+      # with index and returns its return value:
+      #
+      #     a = [:foo, 'bar', 2]
+      #     a.fetch(1) {|index| raise 'Cannot happen' } # => "bar"
+      #     a.fetch(50) {|index| "Value for #{index}" } # => "Value for 50"
+      #
+      # Related: see [Methods for Fetching](rdoc-ref:Array@Methods+for+Fetching).
+      #
+      def fetch: (0 index) -> A
+               | (1 index) -> B
+               | (2 index) -> C
+               | (3 index) -> D
+               | (4 index) -> E
+               | (5 index) -> F
+               | (6 index) -> G
+               | (7 index) -> H
+               | (8 index) -> I
+               | (9 index) -> J
+               | (int index) -> void
+               | [T] (0 index, T default) -> (A | T)
+               | [T] (1 index, T default) -> (B | T)
+               | [T] (2 index, T default) -> (C | T)
+               | [T] (3 index, T default) -> (D | T)
+               | [T] (4 index, T default) -> (E | T)
+               | [T] (5 index, T default) -> (F | T)
+               | [T] (6 index, T default) -> (G | T)
+               | [T] (7 index, T default) -> (H | T)
+               | [T] (8 index, T default) -> (I | T)
+               | [T] (9 index, T default) -> (J | T)
+               | [T] (int index, T default) -> (A | B | C | D | E | F |G | H | I | J | T)
+               | [T] (0 index) { (int index) -> T } -> (A | T)
+               | [T] (1 index) { (int index) -> T } -> (B | T)
+               | [T] (2 index) { (int index) -> T } -> (C | T)
+               | [T] (3 index) { (int index) -> T } -> (D | T)
+               | [T] (4 index) { (int index) -> T } -> (E | T)
+               | [T] (5 index) { (int index) -> T } -> (F | T)
+               | [T] (6 index) { (int index) -> T } -> (G | T)
+               | [T] (7 index) { (int index) -> T } -> (H | T)
+               | [T] (8 index) { (int index) -> T } -> (I | T)
+               | [T] (9 index) { (int index) -> T } -> (J | T)
+               | [T] (int index) { (int index) -> T } -> (A | B | C | D | E | F |G | H | I | J | T)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.55.3
+  version: 0.55.4
 platform: ruby
 authors:
 - Fred Snyder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-25 00:00:00.000000000 Z
+date: 2025-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -631,6 +631,7 @@ files:
 - lib/solargraph/yard_map/to_method.rb
 - lib/solargraph/yard_tags.rb
 - lib/solargraph/yardoc.rb
+- rbs/fills/tuple.rbs
 - solargraph.gemspec
 homepage: https://solargraph.org
 licenses: