solargraph 0.55.3 → 0.55.4

data/lib/solargraph/parser/parser_gem/node_processors/send_node.rb

@@ -34,7 +34,7 @@ module Solargraph
                 return if process_private_class_method
               end
             elsif node.children[1] == :require && node.children[0].to_s == '(const nil :Bundler)'
-              pins.push Pin::Reference::Require.new(Solargraph::Location.new(region.filename, Solargraph::Range.from_to(0, 0, 0, 0)), 'bundler/require')
+              pins.push Pin::Reference::Require.new(Solargraph::Location.new(region.filename, Solargraph::Range.from_to(0, 0, 0, 0)), 'bundler/require', source: :parser)
             end
             process_children
           end
@@ -76,7 +76,8 @@ module Solargraph
                   comments: cmnt,
                   scope: region.scope || :instance,
                   visibility: region.visibility,
-                  attribute: true
+                  attribute: true,
+                  source: :parser
                 )
               end
               if node.children[1] == :attr_writer || node.children[1] == :attr_accessor
@@ -87,10 +88,11 @@ module Solargraph
                   comments: cmnt,
                   scope: region.scope || :instance,
                   visibility: region.visibility,
-                  attribute: true
+                  attribute: true,
+                  source: :parser
                 )
                 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: :parser)
                 if method_pin.return_type.defined?
                   pins.last.docstring.add_tag YARD::Tags::Tag.new(:param, '', pins.last.return_type.items.map(&:rooted_tags), 'value')
                 end
@@ -107,7 +109,8 @@ module Solargraph
                 pins.push type.new(
                   location: get_node_location(i),
                   closure: cp,
-                  name: unpack_name(i)
+                  name: unpack_name(i),
+                  source: :parser
                 )
               end
             end
@@ -121,7 +124,8 @@ module Solargraph
                 pins.push Pin::Reference::Prepend.new(
                   location: get_node_location(i),
                   closure: cp,
-                  name: unpack_name(i)
+                  name: unpack_name(i),
+                  source: :parser
                 )
               end
             end
@@ -135,13 +139,15 @@ module Solargraph
                 pins.push Pin::Reference::Extend.new(
                   location: loc,
                   closure: region.closure,
-                  name: region.closure.full_context.namespace
+                  name: region.closure.full_context.namespace,
+                  source: :parser
                 )
               else
                 pins.push Pin::Reference::Extend.new(
                   location: loc,
                   closure: region.closure,
-                  name: unpack_name(i)
+                  name: unpack_name(i),
+                  source: :parser
                 )
               end
             end
@@ -151,7 +157,7 @@ module Solargraph
           def process_require
             if node.children[2].is_a?(AST::Node) && node.children[2].type == :str
               path = node.children[2].children[0].to_s
-              pins.push Pin::Reference::Require.new(get_node_location(node), path)
+              pins.push Pin::Reference::Require.new(get_node_location(node), path, source: :parser)
             end
           end
 
@@ -159,7 +165,7 @@ module Solargraph
           def process_autoload
             if node.children[3].is_a?(AST::Node) && node.children[3].type == :str
               path = node.children[3].children[0].to_s
-              pins.push Pin::Reference::Require.new(get_node_location(node), path)
+              pins.push Pin::Reference::Require.new(get_node_location(node), path, source: :parser)
             end
           end
 
@@ -171,7 +177,8 @@ module Solargraph
             elsif node.children[2].type == :sym || node.children[2].type == :str
               node.children[2..-1].each do |x|
                 cn = x.children[0].to_s
-                ref = pins.select{ |p| p.is_a?(Pin::Method) && p.namespace == region.closure.full_context.namespace && p.name == cn }.first
+                # @type [Pin::Method]
+                ref = pins.find { |p| p.is_a?(Pin::Method) && p.namespace == region.closure.full_context.namespace && p.name == cn }
                 unless ref.nil?
                   pins.delete ref
                   mm = Solargraph::Pin::Method.new(
@@ -182,7 +189,8 @@ module Solargraph
                     comments: ref.comments,
                     scope: :class,
                     visibility: :public,
-                    node: ref.node
+                    node: ref.node,
+                    source: :parser
                   )
                   cm = Solargraph::Pin::Method.new(
                     location: ref.location,
@@ -192,7 +200,8 @@ module Solargraph
                     comments: ref.comments,
                     scope: :instance,
                     visibility: :private,
-                    node: ref.node)
+                    node: ref.node,
+                    source: :parser)
                   pins.push mm, cm
                   pins.select{|pin| pin.is_a?(Pin::InstanceVariable) && pin.closure.path == ref.path}.each do |ivar|
                     pins.delete ivar
@@ -201,14 +210,16 @@ module Solargraph
                       closure: cm,
                       name: ivar.name,
                       comments: ivar.comments,
-                      assignment: ivar.assignment
+                      assignment: ivar.assignment,
+                      source: :parser
                     )
                     pins.push Solargraph::Pin::InstanceVariable.new(
                       location: ivar.location,
                       closure: mm,
                       name: ivar.name,
                       comments: ivar.comments,
-                      assignment: ivar.assignment
+                      assignment: ivar.assignment,
+                      source: :parser
                     )
                   end
                 end
@@ -236,7 +247,8 @@ module Solargraph
               closure: region.closure,
               name: node.children[2].children[0].to_s,
               original: node.children[3].children[0].to_s,
-              scope: region.scope || :instance
+              scope: region.scope || :instance,
+              source: :parser
             )
           end
 

data/lib/solargraph/parser/parser_gem/node_processors/sym_node.rb

@@ -8,7 +8,8 @@ module Solargraph
           def process
             pins.push Solargraph::Pin::Symbol.new(
               get_node_location(node),
-              ":#{node.children[0]}"
+              ":#{node.children[0]}",
+              source: :parser
             )
           end
         end

data/lib/solargraph/parser/parser_gem/node_processors/until_node.rb

@@ -18,6 +18,7 @@ module Solargraph
               closure: region.closure,
               node: node,
               comments: comments_for(node),
+              source: :parser,
             )
             process_children region
           end

data/lib/solargraph/parser/parser_gem/node_processors/while_node.rb

@@ -18,6 +18,7 @@ module Solargraph
               closure: region.closure,
               node: node,
               comments: comments_for(node),
+              source: :parser,
             )
             process_children region
           end

data/lib/solargraph/parser/region.rb

@@ -29,7 +29,7 @@ module Solargraph
                      scope: nil, visibility: :public, lvars: []
         @source = source
         # @closure = closure
-        @closure = closure || Pin::Namespace.new(name: '', location: source.location)
+        @closure = closure || Pin::Namespace.new(name: '', location: source.location, source: :parser)
         @scope = scope
         @visibility = visibility
         @lvars = lvars

data/lib/solargraph/pin/base.rb

@@ -41,9 +41,13 @@ module Solargraph
         @type_location = type_location
         @closure = closure
         @name = name
-        @source = source
         @comments = comments
         @source = source
+        assert_source_provided
+      end
+
+      def assert_source_provided
+        Solargraph.assert_or_log(:source, "source not provided - #{@path} #{@source} #{self.class}") if source.nil?
       end
 
       # @return [String]
@@ -299,14 +303,33 @@ module Solargraph
       end
 
       # @return [String]
-      def desc
+      def inner_desc
         closure_info = closure&.desc
         binder_info = binder&.desc
-        "[name=#{name.inspect} return_type=#{type_desc}, context=#{context.rooted_tags}, closure=#{closure_info}, binder=#{binder_info}]"
+        "name=#{name.inspect} return_type=#{type_desc}, context=#{context.rooted_tags}, closure=#{closure_info}, binder=#{binder_info}"
+      end
+
+      def desc
+        "[#{inner_desc}]"
       end
 
       def inspect
-        "#<#{self.class} `#{self.desc}` at #{self.location.inspect}>"
+        "#<#{self.class} `#{self.inner_desc}`#{all_location_text} via #{source.inspect}>"
+      end
+
+      def all_location_text
+        if location.nil? && type_location.nil?
+          ''
+        elsif !location.nil? && type_location.nil?
+          " at #{location.inspect})"
+        elsif !type_location.nil? && location.nil?
+          " at #{type_location.inspect})"
+        else
+          " at (#{location.inspect} and #{type_location.inspect})"
+        end
+      end
+
+      def reset_generated!
       end
 
       protected

data/lib/solargraph/pin/callable.rb

@@ -6,7 +6,7 @@ module Solargraph
       # @return [Signature]
       attr_reader :block
 
-      attr_reader :parameters
+      attr_accessor :parameters
 
       # @return [ComplexType, nil]
       attr_reader :return_type
@@ -21,6 +21,10 @@ module Solargraph
         @parameters = parameters
       end
 
+      def method_namespace
+        closure.namespace
+      end
+
       # @return [::Array<String>]
       def parameter_names
         @parameter_names ||= parameters.map(&:name)
@@ -140,8 +144,6 @@ module Solargraph
       protected
 
       attr_writer :block
-
-      attr_writer :parameters
     end
   end
 end

data/lib/solargraph/pin/closure.rb

@@ -8,10 +8,15 @@ module Solargraph
 
       # @param scope [::Symbol] :class or :instance
       # @param generics [::Array<Pin::Parameter>, nil]
-      def initialize scope: :class, generics: nil, **splat
+      def initialize scope: :class, generics: nil, generic_defaults: {},  **splat
         super(**splat)
         @scope = scope
         @generics = generics
+        @generic_defaults = generic_defaults
+      end
+
+      def generic_defaults
+        @generic_defaults ||= {}
       end
 
       def context

data/lib/solargraph/pin/common.rb

@@ -9,6 +9,11 @@ module Solargraph
       # @return [Pin::Closure, nil]
       attr_reader :closure
 
+      def closure
+        Solargraph.assert_or_log(:closure, "Closure not set on #{self.class} #{name.inspect} from #{source.inspect}") unless @closure
+        @closure
+      end
+
       # @return [String]
       def name
         @name ||= ''

data/lib/solargraph/pin/delegated_method.rb

@@ -43,6 +43,7 @@ module Solargraph
 
       %i[comments parameters return_type signatures].each do |method|
         define_method(method) do
+          # @sg-ignore Need to set context correctly in define_method blocks
           @resolved_method ? @resolved_method.send(method) : super()
         end
       end
@@ -51,6 +52,7 @@ module Solargraph
         # @param api_map [ApiMap]
         define_method(method) do |api_map|
           resolve_method(api_map)
+          # @sg-ignore Need to set context correctly in define_method blocks
           @resolved_method ? @resolved_method.send(method, api_map) : super(api_map)
         end
       end

data/lib/solargraph/pin/documenting.rb

@@ -9,6 +9,22 @@ require 'solargraph/converters/dt'
 require 'solargraph/converters/dd'
 require 'solargraph/converters/misc'
 
+# @todo upstream this definition
+
+# @!parse
+#   module ::Kramdown
+#     class Document
+#       # @return [String]
+#       def to_html; end
+#     end
+#   end
+#   module ReverseMarkdown
+#     # @param input [String]
+#     # @param options [Hash]
+#     # @return [String]
+#     def self.convert(input, options = {}); end
+#   end
+
 module Solargraph
   module Pin
     # A module to add the Pin::Base#documentation method.

data/lib/solargraph/pin/keyword.rb

@@ -3,8 +3,13 @@
 module Solargraph
   module Pin
     class Keyword < Base
-      def initialize name
-        super(name: name)
+      def initialize(name, **kwargs)
+        # @sg-ignore "Unrecognized keyword argument kwargs to Solargraph::Pin::Base#initialize"
+        super(name: name, **kwargs)
+      end
+
+      def closure
+        @closure ||= Pin::ROOT_PIN
       end
 
       def name

data/lib/solargraph/pin/method.rb

@@ -10,6 +10,8 @@ module Solargraph
       # @return [::Symbol] :public, :private, or :protected
       attr_reader :visibility
 
+      attr_writer :signatures
+
       # @return [Parser::AST::Node]
       attr_reader :node
 
@@ -116,13 +118,16 @@ module Solargraph
               name: name,
               decl: decl,
               presence: location ? location.range : nil,
-              return_type: ComplexType.try_parse(*p.types)
+              return_type: ComplexType.try_parse(*p.types),
+              source: source
             )
           end
           yield_return_type = ComplexType.try_parse(*yieldreturn_tags.flat_map(&:types))
-          block = Signature.new(generics: generics, parameters: yield_parameters, return_type: yield_return_type)
+          block = Signature.new(generics: generics, parameters: yield_parameters, return_type: yield_return_type, source: source)
         end
-        Signature.new(generics: generics, parameters: parameters, return_type: return_type, block: block)
+        signature = Signature.new(generics: generics, parameters: parameters, return_type: return_type, block: block, closure: self, source: source)
+        block.closure = signature if block
+        signature
       end
 
       # @return [::Array<Signature>]
@@ -163,7 +168,7 @@ module Solargraph
         end
       end
 
-      def desc
+      def inner_desc
         # ensure the signatures line up when logged
         if signatures.length > 1
           path + " \n#{to_rbs}\n"
@@ -304,10 +309,12 @@ module Solargraph
                 name: name,
                 decl: decl,
                 presence: location ? location.range : nil,
-                return_type: param_type_from_name(tag, src.first)
+                return_type: param_type_from_name(tag, src.first),
+                source: :overloads
               )
             end,
-            return_type: ComplexType.try_parse(*tag.docstring.tags(:return).flat_map(&:types))
+            return_type: ComplexType.try_parse(*tag.docstring.tags(:return).flat_map(&:types)),
+            source: :overloads,
           )
         end
         @overloads
@@ -344,8 +351,6 @@ module Solargraph
 
       attr_writer :block
 
-      attr_writer :signatures
-
       attr_writer :signature_help
 
       attr_writer :documentation
@@ -523,7 +528,7 @@ module Solargraph
 
       protected
 
-      attr_writer :signatures
+      attr_writer :return_type
     end
   end
 end

data/lib/solargraph/pin/namespace.rb

@@ -11,6 +11,11 @@ module Solargraph
       # @return [::Symbol] :class or :module
       attr_reader :type
 
+      # does not assert like super, as a namespace without a closure
+      # may be the root level namespace, or it may not yet be
+      # qualified
+      attr_reader :closure
+
       # @param type [::Symbol] :class or :module
       # @param visibility [::Symbol] :public or :private
       # @param gates [::Array<String>]
@@ -37,7 +42,7 @@ module Solargraph
             closure.full_context.namespace + '::'
           end
           closure_name += parts.join('::')
-          @closure = Pin::Namespace.new(name: closure_name, gates: [parts.join('::')])
+          @closure = Pin::Namespace.new(name: closure_name, gates: [parts.join('::')], source: :namespace)
           @context = nil
         end
         @name = name
@@ -47,7 +52,7 @@ module Solargraph
         "#{@type.to_s} #{return_type.all_params.first.to_rbs}#{rbs_generics}".strip
       end
 
-      def desc
+      def inner_desc
         if name.nil? || name.empty?
           '(top-level)'
         else

data/lib/solargraph/pin/parameter.rb

@@ -9,6 +9,10 @@ module Solargraph
       # @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

data/lib/solargraph/pin/proxy_type.rb

@@ -18,16 +18,16 @@ module Solargraph
       # @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
+      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)
+          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
+          closure: closure, return_type: context, binder: binder || context, **kwargs
         )
       end
     end

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

@@ -10,18 +10,22 @@ module Solargraph
         # @return [::Array<Symbol>]
         attr_reader :delete
 
-        def initialize location, name, tags, delete = []
-          super(location: location, name: name)
+        def closure
+          nil
+        end
+
+        def initialize location, name, tags, delete = [], **splat
+          super(location: location, name: name, **splat)
           @tags = tags
           @delete = delete
         end
 
-        def self.method_return name, *tags, delete: []
-          new(nil, name, [YARD::Tags::Tag.new('return', nil, tags)], delete)
+        def self.method_return name, *tags, delete: [], **splat
+          new(nil, name, [YARD::Tags::Tag.new('return', nil, tags)], delete, **splat)
         end
 
-        def self.from_comment name, comment
-          new(nil, name, Solargraph::Source.parse_docstring(comment).to_docstring.tags)
+        def self.from_comment name, comment, **splat
+          new(nil, name, Solargraph::Source.parse_docstring(comment).to_docstring.tags, **splat)
         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

data/lib/solargraph/pin/signature.rb

@@ -1,6 +1,10 @@
 module Solargraph
   module Pin
     class Signature < Callable
+      # allow signature to be created before method pin, then set this
+      # to the method pin
+      attr_writer :closure
+
       def initialize **splat
         super(**splat)
       end

data/lib/solargraph/pin/singleton.rb

@@ -3,7 +3,7 @@
 module Solargraph
   module Pin
     class Singleton < Closure
-      def initialize name: '', location: nil, closure: nil
+      def initialize name: '', location: nil, closure: nil, **splat
         super
       end
     end

data/lib/solargraph/pin/symbol.rb

@@ -5,8 +5,9 @@ module Solargraph
     class Symbol < Base
       # @param location [Solargraph::Location]
       # @param name [String]
-      def initialize location, name
-        super(location: location, name: name)
+      def initialize(location, name, **kwargs)
+        # @sg-ignore "Unrecognized keyword argument kwargs to Solargraph::Pin::Base#initialize"
+        super(location: location, name: name, **kwargs)
         # @name = name
         # @location = location
       end

data/lib/solargraph/pin.rb

@@ -39,6 +39,6 @@ module Solargraph
     autoload :While,            'solargraph/pin/while'
     autoload :Callable,         'solargraph/pin/callable'
 
-    ROOT_PIN = Pin::Namespace.new(type: :class, name: '', closure: nil)
+    ROOT_PIN = Pin::Namespace.new(type: :class, name: '', closure: nil, source: :pin_rb)
   end
 end