solargraph 0.54.4 → 0.58.3

data/lib/solargraph/pin/parameter.rb

@@ -1,212 +1,275 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Pin
-    class Parameter < LocalVariable
-      # @return [::Symbol]
-      attr_reader :decl
-
-      # @return [String]
-      attr_reader :asgn_code
-
-      # @param decl [::Symbol] :arg, :optarg, :kwarg, :kwoptarg, :restarg, :kwrestarg, :block, :blockarg
-      # @param asgn_code [String, nil]
-      # @param return_type [ComplexType, nil]
-      def initialize decl: :arg, asgn_code: nil, return_type: nil, **splat
-        super(**splat)
-        @asgn_code = asgn_code
-        @decl = decl
-        @return_type = return_type
-      end
-
-      def keyword?
-        [:kwarg, :kwoptarg].include?(decl)
-      end
-
-      def kwrestarg?
-        decl == :kwrestarg || (assignment && [:HASH, :hash].include?(assignment.type))
-      end
-
-      def arg?
-        decl == :arg
-      end
-
-      def restarg?
-        decl == :restarg
-      end
-
-      def rest?
-        decl == :restarg || decl == :kwrestarg
-      end
-
-      def block?
-        [:block, :blockarg].include?(decl)
-      end
-
-      def to_rbs
-        case decl
-        when :optarg
-          "?#{super}"
-        when :kwarg
-          "#{name}: #{return_type.to_rbs}"
-        when :kwoptarg
-          "?#{name}: #{return_type.to_rbs}"
-        when :restarg
-          "*#{super}"
-        when :kwrestarg
-          "**#{super}"
-        else
-          super
-        end
-      end
-
-      # @return [String]
-      def full
-        case decl
-        when :optarg
-          "#{name} = #{asgn_code || '?'}"
-        when :kwarg
-          "#{name}:"
-        when :kwoptarg
-          "#{name}: #{asgn_code || '?'}"
-        when :restarg
-          "*#{name}"
-        when :kwrestarg
-          "**#{name}"
-        when :block, :blockarg
-          "&#{name}"
-        else
-          name
-        end
-      end
-
-      # @return [ComplexType]
-      def return_type
-        if @return_type.nil?
-          @return_type = ComplexType::UNDEFINED
-          found = param_tag
-          @return_type = ComplexType.try_parse(*found.types) unless found.nil? or found.types.nil?
-          if @return_type.undefined?
-            if decl == :restarg
-              @return_type = ComplexType.try_parse('::Array')
-            elsif decl == :kwrestarg
-              @return_type = ComplexType.try_parse('::Hash')
-            elsif decl == :blockarg
-              @return_type = ComplexType.try_parse('::Proc')
-            end
-          end
-        end
-        super
-        @return_type
-      end
-
-      # The parameter's zero-based location in the block's signature.
-      #
-      # @return [Integer]
-      def index
-        # @type [Method, Block]
-        method_pin = closure
-        method_pin.parameter_names.index(name)
-      end
-
-      # @param api_map [ApiMap]
-      def typify api_map
-        return return_type.qualify(api_map, closure.context.namespace) unless return_type.undefined?
-        closure.is_a?(Pin::Block) ? typify_block_param(api_map) : typify_method_param(api_map)
-      end
-
-      def documentation
-        tag = param_tag
-        return '' if tag.nil? || tag.text.nil?
-        tag.text
-      end
-
-      # @param pin [Pin::Parameter]
-      def try_merge! pin
-        return false unless super && closure == pin.closure
-        true
-      end
-
-      private
-
-      # @return [YARD::Tags::Tag, nil]
-      def param_tag
-        params = closure.docstring.tags(:param)
-        params.each do |p|
-          return p if p.name == name
-        end
-        params[index] if index && params[index] && (params[index].name.nil? || params[index].name.empty?)
-      end
-
-      # @param api_map [ApiMap]
-      # @return [ComplexType]
-      def typify_block_param api_map
-        if closure.is_a?(Pin::Block) && closure.receiver
-          return closure.typify_parameters(api_map)[index]
-        end
-        ComplexType::UNDEFINED
-      end
-
-      # @param api_map [ApiMap]
-      # @return [ComplexType]
-      def typify_method_param api_map
-        meths = api_map.get_method_stack(closure.full_context.tag, closure.name, scope: closure.scope)
-        # meths.shift # Ignore the first one
-        meths.each do |meth|
-          found = nil
-          params = meth.docstring.tags(:param) + see_reference(docstring, api_map)
-          params.each do |p|
-            next unless p.name == name
-            found = p
-            break
-          end
-          if found.nil? and !index.nil?
-            found = params[index] if params[index] && (params[index].name.nil? || params[index].name.empty?)
-          end
-          return ComplexType.try_parse(*found.types).qualify(api_map, meth.context.namespace) unless found.nil? || found.types.nil?
-        end
-        ComplexType::UNDEFINED
-      end
-
-      # @param heredoc [YARD::Docstring]
-      # @param api_map [ApiMap]
-      # @param skip [::Array]
-      # @return [::Array<YARD::Tags::Tag>]
-      def see_reference heredoc, api_map, skip = []
-        heredoc.ref_tags.each do |ref|
-          next unless ref.tag_name == 'param' && ref.owner
-          result = resolve_reference(ref.owner.to_s, api_map, skip)
-          return result unless result.nil?
-        end
-        []
-      end
-
-      # @param ref [String]
-      # @param api_map [ApiMap]
-      # @param skip [::Array]
-      # @return [::Array<YARD::Tags::Tag>, nil]
-      def resolve_reference ref, api_map, skip
-        return nil if skip.include?(ref)
-        skip.push ref
-        parts = ref.split(/[\.#]/)
-        if parts.first.empty?
-          path = "#{namespace}#{ref}"
-        else
-          fqns = api_map.qualify(parts.first, namespace)
-          return nil if fqns.nil?
-          path = fqns + ref[parts.first.length] + parts.last
-        end
-        pins = api_map.get_path_pins(path)
-        pins.each do |pin|
-          params = pin.docstring.tags(:param)
-          return params unless params.empty?
-        end
-        pins.each do |pin|
-          params = see_reference(pin.docstring, api_map, skip)
-          return params unless params.empty?
-        end
-        nil
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Pin
+    class Parameter < LocalVariable
+      # @return [::Symbol]
+      attr_reader :decl
+
+      # @return [String]
+      attr_reader :asgn_code
+
+      # allow this to be set to the method after the method itself has
+      # been created
+      attr_writer :closure
+
+      # @param decl [::Symbol] :arg, :optarg, :kwarg, :kwoptarg, :restarg, :kwrestarg, :block, :blockarg
+      # @param asgn_code [String, nil]
+      def initialize decl: :arg, asgn_code: nil, **splat
+        super(**splat)
+        @asgn_code = asgn_code
+        @decl = decl
+      end
+
+      def type_location
+        super || closure&.type_location
+      end
+
+      def location
+        super || closure&.type_location
+      end
+
+      def combine_with(other, attrs={})
+        new_attrs = {
+          decl: assert_same(other, :decl),
+          presence: choose(other, :presence),
+          asgn_code: choose(other, :asgn_code),
+        }.merge(attrs)
+        super(other, new_attrs)
+      end
+
+      def keyword?
+        [:kwarg, :kwoptarg].include?(decl)
+      end
+
+      def kwrestarg?
+        decl == :kwrestarg || (assignment && [:HASH, :hash].include?(assignment.type))
+      end
+
+      def needs_consistent_name?
+        keyword?
+      end
+
+      # @return [String]
+      def arity_decl
+        name = (self.name || '(anon)')
+        type = (return_type&.to_rbs || 'untyped')
+        case decl
+        when :arg
+          ""
+        when :optarg
+          "?"
+        when :kwarg
+          "#{name}:"
+        when :kwoptarg
+          "?#{name}:"
+        when :restarg
+          "*"
+        when :kwrestarg
+          "**"
+        else
+          "(unknown decl: #{decl})"
+        end
+      end
+
+      def arg?
+        decl == :arg
+      end
+
+      def restarg?
+        decl == :restarg
+      end
+
+      def rest?
+        decl == :restarg || decl == :kwrestarg
+      end
+
+      def block?
+        [:block, :blockarg].include?(decl)
+      end
+
+      def to_rbs
+        case decl
+        when :optarg
+          "?#{super}"
+        when :kwarg
+          "#{name}: #{return_type.to_rbs}"
+        when :kwoptarg
+          "?#{name}: #{return_type.to_rbs}"
+        when :restarg
+          "*#{super}"
+        when :kwrestarg
+          "**#{super}"
+        else
+          super
+        end
+      end
+
+      # @return [String] the full name of the parameter, including any
+      #   declarative symbols such as `*` or `:` indicating type of
+      #   parameter. This is used in method signatures.
+      def full_name
+        case decl
+        when :kwarg, :kwoptarg
+          "#{name}:"
+        when :restarg
+          "*#{name}"
+        when :kwrestarg
+          "**#{name}"
+        when :block, :blockarg
+          "&#{name}"
+        else
+          name
+        end
+      end
+
+      # @return [String]
+      def full
+        full_name + case decl
+                    when :optarg
+                      " = #{asgn_code || '?'}"
+                    when :kwoptarg
+                      " #{asgn_code || '?'}"
+                    else
+                      ''
+                    end
+      end
+
+      # @return [ComplexType]
+      def return_type
+        if @return_type.nil?
+          @return_type = ComplexType::UNDEFINED
+          found = param_tag
+          @return_type = ComplexType.try_parse(*found.types) unless found.nil? or found.types.nil?
+          if @return_type.undefined?
+            if decl == :restarg
+              @return_type = ComplexType.try_parse('::Array')
+            elsif decl == :kwrestarg
+              @return_type = ComplexType.try_parse('::Hash')
+            elsif decl == :blockarg
+              @return_type = ComplexType.try_parse('::Proc')
+            end
+          end
+        end
+        super
+        @return_type
+      end
+
+      # The parameter's zero-based location in the block's signature.
+      #
+      # @return [Integer]
+      def index
+        # @type [Method, Block]
+        method_pin = closure
+        method_pin.parameter_names.index(name)
+      end
+
+      # @param api_map [ApiMap]
+      def typify api_map
+        return return_type.qualify(api_map, *closure.gates) unless return_type.undefined?
+        closure.is_a?(Pin::Block) ? typify_block_param(api_map) : typify_method_param(api_map)
+      end
+
+      # @param atype [ComplexType]
+      # @param api_map [ApiMap]
+      def compatible_arg?(atype, api_map)
+        # make sure we get types from up the method
+        # inheritance chain if we don't have them on this pin
+        ptype = typify api_map
+        ptype.undefined? || ptype.can_assign?(api_map, atype) || ptype.generic?
+      end
+
+      def documentation
+        tag = param_tag
+        return '' if tag.nil? || tag.text.nil?
+        tag.text
+      end
+
+      private
+
+      # @return [YARD::Tags::Tag, nil]
+      def param_tag
+        params = closure.docstring.tags(:param)
+        params.each do |p|
+          return p if p.name == name
+        end
+        params[index] if index && params[index] && (params[index].name.nil? || params[index].name.empty?)
+      end
+
+      # @param api_map [ApiMap]
+      # @return [ComplexType]
+      def typify_block_param api_map
+        block_pin = closure
+        if block_pin.is_a?(Pin::Block) && block_pin.receiver
+          return block_pin.typify_parameters(api_map)[index]
+        end
+        ComplexType::UNDEFINED
+      end
+
+      # @param api_map [ApiMap]
+      # @return [ComplexType]
+      def typify_method_param api_map
+        meths = api_map.get_method_stack(closure.full_context.tag, closure.name, scope: closure.scope)
+        # meths.shift # Ignore the first one
+        meths.each do |meth|
+          found = nil
+          params = meth.docstring.tags(:param) + see_reference(docstring, api_map)
+          params.each do |p|
+            next unless p.name == name
+            found = p
+            break
+          end
+          if found.nil? and !index.nil?
+            found = params[index] if params[index] && (params[index].name.nil? || params[index].name.empty?)
+          end
+          return ComplexType.try_parse(*found.types).qualify(api_map, *meth.closure.gates) unless found.nil? || found.types.nil?
+        end
+        ComplexType::UNDEFINED
+      end
+
+      # @param heredoc [YARD::Docstring]
+      # @param api_map [ApiMap]
+      # @param skip [::Array]
+      # @return [::Array<YARD::Tags::Tag>]
+      def see_reference heredoc, api_map, skip = []
+        # This should actually be an intersection type
+        # @param ref [YARD::Tags::Tag, Solargraph::Yard::Tags::RefTag]
+        heredoc.ref_tags.each do |ref|
+          # @sg-ignore ref should actually be an intersection type
+          next unless ref.tag_name == 'param' && ref.owner
+          # @sg-ignore ref should actually be an intersection type
+          result = resolve_reference(ref.owner.to_s, api_map, skip)
+          return result unless result.nil?
+        end
+        []
+      end
+
+      # @param ref [String]
+      # @param api_map [ApiMap]
+      # @param skip [::Array]
+      # @return [::Array<YARD::Tags::Tag>, nil]
+      def resolve_reference ref, api_map, skip
+        return nil if skip.include?(ref)
+        skip.push ref
+        parts = ref.split(/[.#]/)
+        if parts.first.empty?
+          path = "#{namespace}#{ref}"
+        else
+          fqns = api_map.qualify(parts.first, namespace)
+          return nil if fqns.nil?
+          path = fqns + ref[parts.first.length] + parts.last
+        end
+        pins = api_map.get_path_pins(path)
+        pins.each do |pin|
+          params = pin.docstring.tags(:param)
+          return params unless params.empty?
+        end
+        pins.each do |pin|
+          params = see_reference(pin.docstring, api_map, skip)
+          return params unless params.empty?
+        end
+        nil
+      end
+    end
+  end
+end

data/lib/solargraph/pin/proxy_type.rb

@@ -1,29 +1,39 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Pin
-    class ProxyType < Base
-      # @param return_type [ComplexType]
-      def initialize return_type: ComplexType::UNDEFINED, **splat
-        super(**splat)
-        @return_type = return_type
-      end
-
-      def context
-        @return_type
-      end
-
-      # @param return_type [ComplexType]
-      # @return [ProxyType]
-      def self.anonymous return_type
-        parts = return_type.namespace.split('::')
-        namespace = parts[0..-2].join('::').to_s
-        # name = parts.last.to_s
-        # ProxyType.new(nil, namespace, name, return_type)
-        ProxyType.new(
-          closure: Solargraph::Pin::Namespace.new(name: namespace), return_type: return_type
-        )
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Pin
+    class ProxyType < Base
+      # @param return_type [ComplexType]
+      # @param gates [Array<String>, nil] Namespaces to try while resolving non-rooted types
+      # @param binder [ComplexType, ComplexType::UniqueType, nil]
+      # @param gates [Array<String>, nil]
+      def initialize return_type: ComplexType::UNDEFINED, binder: nil, gates: nil, **splat
+        super(**splat)
+        @gates = gates
+        @return_type = return_type
+        @binder = binder if binder
+      end
+
+      def context
+        @return_type
+      end
+
+      # @param context [ComplexType, ComplexType::UniqueType] Used as context for this pin
+      # @param closure [Pin::Namespace, nil] Used as the closure for this pin
+      # @param binder [ComplexType, ComplexType::UniqueType, nil]
+      # @return [ProxyType]
+      def self.anonymous context, closure: nil, binder: nil, **kwargs
+        unless closure
+          parts = context.namespace.split('::')
+          namespace = parts[0..-2].join('::').to_s
+          closure = Solargraph::Pin::Namespace.new(name: namespace, source: :proxy_type)
+        end
+        # name = parts.last.to_s
+        # ProxyType.new(nil, namespace, name, return_type)
+        ProxyType.new(
+          closure: closure, return_type: context, binder: binder || context, **kwargs
+        )
+      end
+    end
+  end
+end

data/lib/solargraph/pin/reference/override.rb

@@ -1,29 +1,47 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Pin
-    class Reference
-      class Override < Reference
-        # @return [::Array<YARD::Tags::Tag>]
-        attr_reader :tags
-
-        # @return [::Array<Symbol>]
-        attr_reader :delete
-
-        def initialize location, name, tags, delete = []
-          super(location: location, name: name)
-          @tags = tags
-          @delete = delete
-        end
-
-        def self.method_return name, *tags, delete: []
-          new(nil, name, [YARD::Tags::Tag.new('return', nil, tags)], delete)
-        end
-
-        def self.from_comment name, comment
-          new(nil, name, Solargraph::Source.parse_docstring(comment).to_docstring.tags)
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Pin
+    class Reference
+      class Override < Reference
+        # @return [::Array<YARD::Tags::Tag>]
+        attr_reader :tags
+
+        # @return [::Array<Symbol>]
+        attr_reader :delete
+
+        def closure
+          nil
+        end
+
+        # @param location [Location, nil]
+        # @param name [String]
+        # @param tags [::Array<YARD::Tags::Tag>]
+        # @param delete [::Array<Symbol>]
+        # @param splat [Hash]
+        def initialize location, name, tags, delete = [], **splat
+          super(location: location, name: name, **splat)
+          @tags = tags
+          @delete = delete
+        end
+
+        # @param name [String]
+        # @param tags [::Array<String>]
+        # @param delete [::Array<Symbol>]
+        # @param splat [Hash]
+        # @return [Solargraph::Pin::Reference::Override]
+        def self.method_return name, *tags, delete: [], **splat
+          new(nil, name, [YARD::Tags::Tag.new('return', '', tags)], delete, **splat)
+        end
+
+        # @param name [String]
+        # @param comment [String]
+        # @param splat [Hash]
+        # @return [Solargraph::Pin::Reference::Override]
+        def self.from_comment name, comment, **splat
+          new(nil, name, Solargraph::Source.parse_docstring(comment).to_docstring.tags, **splat)
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/pin/reference/require.rb

@@ -4,9 +4,9 @@ module Solargraph
   module Pin
     class Reference
       class Require < Reference
-        def initialize location, name
+        def initialize location, name, **splat
           # super(location, '', name)
-          super(location: location, name: name)
+          super(location: location, name: name, closure: Pin::ROOT_PIN, **splat)
         end
       end
     end