solargraph 0.51.2 → 0.52.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c031e57a0f9eb482a517ed584966ecfff9fd431aaee66d6c97d624393b56fb99
-  data.tar.gz: d6cc56999dc9da2073584a54f5b2ed045e24e573c84408359a9c7f94f8bd8571
+  metadata.gz: fdf3486fdfc29fad9450f6c8dade8f6f9d2446b400c8032055adc93a0c9ed80f
+  data.tar.gz: 30cbae5663273333f57dd66eec6cc336a318bca17ea9ff2ba9da257d94f25ad3
 SHA512:
-  metadata.gz: aa5be8998891287e3a92429f2317c3bc64235d71977476248cbf3ba1167842b2e65c666b7f1bb49254bcc9c1ad67b2f4ea7f4cd1c50ef3c16723bdbd5286049a
-  data.tar.gz: 30b453fc424796b8b776d2c79b014d19645dd2f091fb6cb6822a6f373e1df719809d845bef66fc3146c821c42a7268f60ff65e034a93f5d51708e5a0028f7fb1
+  metadata.gz: '0739d9be8146ea6b09a9bf8151328d95bea64c3fe3ddd7af6334f140c0a2eedaacff84a0e6e5b70fb5e6909b8f25ff85fb5d18f7d73f06a0294ea617dde90263'
+  data.tar.gz: 29de344f99fc2f5f96b2ccc6df9fea4b6220074315ef4a04777e4afaa16253e166f238e51fbe18914ad6f9af6c1983587b7898d7abe003f4ad420f7e508b6edc

data/.yardopts

@@ -1,2 +1,2 @@
-lib/**/*.rb
--e lib/yard-solargraph.rb
+lib/**/*.rb
+--plugin yard-solargraph

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 0.52.0 - February 28, 2025
+- Chains resolve identical names with different contexts (#679)
+- Handle symbol tags in method tag values (#744)
+- Infer more specific Array types when possible (#745)
+- Handle interpolated symbol literals (#747)
+- Handle combined conditions, else clauses in case statements (#746)
+- fix: support find require xxx.rb in local workspace. (#722)
+- Don't require redundant attribute @return and @param tags (#748)
+- Use @yieldreturn tags for type inference (#749)
+- Fix type annotations identified at 'typed' level (#750)
+- Support RBS class aliases (#751)
+- Better support for generics via Class @param tags (#743)
+- Generic module support through RBS (#757)
+- Fix inference of begin expression types (#754)
+- Add argument to satisfy typechecker on which signature to use (#755)
+- Fix RBS ingestion implicit initializer issues, missing param types (#756)
+- Validate zsuper arity
+- Use yard-solargraph plugin (#759)
+- Add missing RBS types
+
 ## 0.51.2 - February 1, 2025
 - Fix exception from parser when anonymous block forwarding is used (#740)
 - Parameterized Object types
@@ -5,10 +25,10 @@
 
 ## 0.51.1 - January 23, 2025
 - Format example code
-- Block infers yieldself from chain
+- Block infers yieldreceiver from chain
 
 ## 0.51.0 - January 19, 2025
-- Resolve self in yieldself tags
+- Resolve self in yieldreceiver tags
 - Include absolute paths in config (#674)
 - Enable diagnostics by default
 - Fix cache resolution (#704)
@@ -597,7 +617,7 @@
 ## 0.31.2 - January 27, 2019
 - Use YARD documentation rules to associate directives with namespaces
 - Handle non-unique pin locations in completionItem/resolve
-- Clip#complete handles @yieldself and @yieldpublic contexts
+- Clip#complete handles @yieldreceiver and @yieldpublic contexts
 - Host::Dispatch filters library updates (castwide/vscode-solargraph#99)
 - Qualify included namespaces (#148)
 
@@ -953,7 +973,7 @@
 
 ## 0.17.0 - February 1, 2018
 - Support Solargraph configurations in workspace folders.
-- Use @yieldself tag to change block contexts.
+- Use @yieldreceiver tag to change block contexts.
 - Handle whitespace in signatures.
 - Convert 'self' when inferring signature types.
 - Handle bare periods without signatures.
@@ -996,7 +1016,7 @@
 - Map pins to code objects.
 - Infer return types from domain (DSL) methods.
 - Fixed visibility and results for superclasses.
-- Experimental @yieldself tag.
+- Experimental @yieldreceiver tag.
 - Improved syntax error handling in Source.fix.
 - Gem ships with Ruby 2.2.2 yardocs.
 - Experimental plugin architecture and Runtime plugin.

data/lib/solargraph/api_map/cache.rb

@@ -4,6 +4,7 @@ module Solargraph
   class ApiMap
     class Cache
       def initialize
+        # @type [Hash{Array => Array<Pin::Method>}]
         @methods = {}
         @constants = {}
         @qualified_namespaces = {}
@@ -15,6 +16,7 @@ module Solargraph
         @methods[[fqns, scope, visibility.sort, deep]]
       end
 
+      # @return [Array<Pin::Method>]
       def set_methods fqns, scope, visibility, deep, value
         @methods[[fqns, scope, visibility.sort, deep]] = value
       end

data/lib/solargraph/api_map/store.rb

@@ -147,8 +147,6 @@ module Solargraph
         @pin_select_cache[klass] ||= @pin_class_hash.each_with_object(Set.new) { |(key, o), n| n.merge(o) if key <= klass }
       end
 
-      private
-
       # @param fqns [String]
       # @return [Array<Solargraph::Pin::Namespace>]
       def fqns_pins fqns
@@ -164,6 +162,8 @@ module Solargraph
         fqns_pins_map[[base, name]]
       end
 
+      private
+
       def fqns_pins_map
         @fqns_pins_map ||= Hash.new do |h, (base, name)|
           value = namespace_children(base).select { |pin| pin.name == name && pin.is_a?(Pin::Namespace) }

data/lib/solargraph/api_map.rb

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'set'
 require 'pathname'
 require 'yard'
-require 'yard-solargraph'
+require 'solargraph/yard_tags'
 
 module Solargraph
   # An aggregate provider for information about workspaces, sources, gems, and
@@ -137,7 +137,7 @@ module Solargraph
       api_map
     end
 
-    # @return [Array<Solargraph::Pin::Base>]
+    # @return [Enumerable<Solargraph::Pin::Base>]
     def pins
       store.pins
     end
@@ -199,6 +199,13 @@ module Solargraph
       result
     end
 
+    # @param namespace [String]
+    # @param context [String]
+    # @return [Array<Pin::Namespace>]
+    def get_namespace_pins namespace, context
+      store.fqns_pins(qualify(namespace, context))
+    end
+
     # Get a fully qualified namespace name. This method will start the search
     # in the specified context until it finds a match for the name.
     #
@@ -245,12 +252,12 @@ module Solargraph
       prefer_non_nil_variables(store.get_class_variables(namespace))
     end
 
-    # @return [Array<Solargraph::Pin::Base>]
+    # @return [Enumerable<Solargraph::Pin::Base>]
     def get_symbols
       store.get_symbols
     end
 
-    # @return [Array<Solargraph::Pin::GlobalVariable>]
+    # @return [Enumerable<Solargraph::Pin::GlobalVariable>]
     def get_global_variable_pins
       store.pins_by_class(Pin::GlobalVariable)
     end

data/lib/solargraph/complex_type/type_methods.rb

@@ -101,7 +101,7 @@ module Solargraph
       # @param context [String] The namespace from which to resolve names
       # @return [ComplexType] The generated ComplexType
       def qualify api_map, context = ''
-        return self if name == 'param'
+        return self if name == GENERIC_TAG_NAME
         return ComplexType.new([self]) if duck_type? || void? || undefined?
         recon = (rooted? ? '' : context)
         fqns = api_map.qualify(name, recon)

data/lib/solargraph/complex_type/unique_type.rb

@@ -51,35 +51,42 @@ module Solargraph
         tag
       end
 
+      def items
+        [self]
+      end
+
       def to_rbs
         "#{namespace}#{parameters? ? "[#{subtypes.map { |s| s.to_rbs }.join(', ')}]" : ''}"
       end
-  
-      def parameterized?
-        name == 'param' || all_params.any?(&:parameterized?)
+
+      def generic?
+        name == GENERIC_TAG_NAME || all_params.any?(&:generic?)
       end
 
-      def resolve_parameters definitions, context
-        new_name = if name == 'param'
-          idx = definitions.parameters.index(subtypes.first.name)
+      # @param definitions [Pin::Namespace]
+      # @param context_type [ComplexType]
+      # @return [UniqueType]
+      def resolve_generics definitions, context_type
+        new_name = if name == GENERIC_TAG_NAME
+          idx = definitions.generics.index(subtypes.first&.name)
           return ComplexType::UNDEFINED if idx.nil?
-          param_type = context.return_type.all_params[idx]
+          param_type = context_type.all_params[idx]
           return ComplexType::UNDEFINED unless param_type
           param_type.to_s
         else
           name
         end
-        new_key_types = if name != 'param'
-          @key_types.map { |t| t.resolve_parameters(definitions, context) }.select(&:defined?)
+        new_key_types = if name != GENERIC_TAG_NAME
+          @key_types.map { |t| t.resolve_generics(definitions, context_type) }.select(&:defined?)
         else
           []
         end
-        new_subtypes = if name != 'param'
-          @subtypes.map { |t| t.resolve_parameters(definitions, context) }.select(&:defined?)
+        new_subtypes = if name != GENERIC_TAG_NAME
+          @subtypes.map { |t| t.resolve_generics(definitions, context_type) }.select(&:defined?)
         else
           []
         end
-        if name != 'param' && !(new_key_types.empty? && new_subtypes.empty?)
+        if name != GENERIC_TAG_NAME && !(new_key_types.empty? && new_subtypes.empty?)
           if hash_parameters?
             UniqueType.new(new_name, "{#{new_key_types.join(', ')} => #{new_subtypes.join(', ')}}")
           elsif parameters?
@@ -124,7 +131,7 @@ module Solargraph
       def selfy?
         @name == 'self' || @key_types.any?(&:selfy?) || @subtypes.any?(&:selfy?)
       end
-  
+
       UNDEFINED = UniqueType.new('undefined')
       BOOLEAN = UniqueType.new('Boolean')
     end

data/lib/solargraph/complex_type.rb

@@ -4,15 +4,16 @@ module Solargraph
   # A container for type data based on YARD type tags.
   #
   class ComplexType
+    GENERIC_TAG_NAME = 'generic'.freeze
     # @!parse
     #   include TypeMethods
 
     autoload :TypeMethods, 'solargraph/complex_type/type_methods'
     autoload :UniqueType,  'solargraph/complex_type/unique_type'
 
-    # @param types [Array<UniqueType>]
+    # @param types [Array<[UniqueType, ComplexType]>]
     def initialize types = [UniqueType::UNDEFINED]
-      @items = types.uniq(&:to_s)
+      @items = types.flat_map(&:items).uniq(&:to_s)
     end
 
     # @param api_map [ApiMap]
@@ -42,7 +43,7 @@ module Solargraph
     end
 
     # @yieldparam [UniqueType]
-    # @return [Array]
+    # @return [Enumerator<UniqueType>]
     def each &block
       @items.each &block
     end
@@ -106,12 +107,15 @@ module Solargraph
       @items.any?(&:selfy?)
     end
 
-    def parameterized?
-      any?(&:parameterized?)
+    def generic?
+      any?(&:generic?)
     end
 
-    def resolve_parameters definitions, context
-      result = @items.map { |i| i.resolve_parameters(definitions, context) }
+    # @param definitions [Pin::Namespace]
+    # @param context_type [ComplexType]
+    # @return [ComplexType]
+    def resolve_generics definitions, context_type
+      result = @items.map { |i| i.resolve_generics(definitions, context_type) }
       ComplexType.parse(*result.map(&:tag))
     end
 
@@ -132,10 +136,10 @@ module Solargraph
       @items.first.all_params || []
     end
 
-    protected
-
     attr_reader :items
 
+    protected
+
     def reduce_object
       return self if name != 'Object' || subtypes.empty?
       ComplexType.try_parse(reduce_class(subtypes.join(', ')))

data/lib/solargraph/documentor.rb

@@ -56,7 +56,7 @@ module Solargraph
     end
 
     # @param directory [String]
-    # @return [Hash]
+    # @return [Hash{String => BasicObject}]
     def self.specs_from_bundle directory
       Solargraph.with_clean_env do
         cmd = [

data/lib/solargraph/library.rb

@@ -283,10 +283,15 @@ module Solargraph
       return if map.nil?
       pin = map.requires.select { |p| p.location.range.contain?(location.range.start) }.first
       return nil if pin.nil?
+      return_if_match = proc do |full|
+        if source_map_hash.key?(full)
+          return Location.new(full, Solargraph::Range.from_to(0, 0, 0, 0))
+        end
+      end
       workspace.require_paths.each do |path|
-        full = Pathname.new(path).join("#{pin.name}.rb").to_s
-        next unless source_map_hash.key?(full)
-        return Location.new(full, Solargraph::Range.from_to(0, 0, 0, 0))
+        full = File.join path, pin.name
+        return_if_match.(full)
+        return_if_match.(full << ".rb")
       end
       nil
     rescue FileNotFoundError
@@ -497,10 +502,12 @@ module Solargraph
     def find_external_requires source_map
       new_set = source_map.requires.map(&:name).to_set
       # return if new_set == source_map_external_require_hash[source_map.filename]
+      _filenames = nil
+      filenames = ->{ _filenames ||= workspace.filenames.to_set }
       source_map_external_require_hash[source_map.filename] = new_set.reject do |path|
         workspace.require_paths.any? do |base|
-          full = Pathname.new(base).join("#{path}.rb").to_s
-          workspace.filenames.include?(full)
+          full = File.join(base, path)
+          filenames[].include?(full) or filenames[].include?(full << ".rb")
         end
       end
       @external_requires = nil

data/lib/solargraph/parser/comment_ripper.rb

@@ -42,6 +42,7 @@ module Solargraph
         result
       end
 
+      # @return [Hash{Integer => String}]
       def parse
         @comments = {}
         super

data/lib/solargraph/parser/legacy/class_methods.rb

@@ -5,7 +5,7 @@ module Solargraph
     module Legacy
       module ClassMethods
         # @param code [String]
-        # @param filename [String]
+        # @param filename [String, nil]
         # @return [Array(Parser::AST::Node, Array<Parser::Source::Comment>)]
         def parse_with_comments code, filename = nil
           buffer = ::Parser::Source::Buffer.new(filename, 0)
@@ -128,7 +128,7 @@ module Solargraph
             end
           end
           result
-        end  
+        end
       end
     end
   end

data/lib/solargraph/parser/legacy/node_chainer.rb

@@ -10,7 +10,7 @@ module Solargraph
         Chain = Source::Chain
 
         # @param node [Parser::AST::Node]
-        # @param filename [String]
+        # @param filename [String, nil]
         def initialize node, filename = nil, in_block = false
           @node = node
           @filename = filename
@@ -25,7 +25,7 @@ module Solargraph
 
         class << self
           # @param node [Parser::AST::Node]
-          # @param filename [String]
+          # @param filename [String, nil]
           # @return [Source::Chain]
           def chain node, filename = nil, in_block = false
             NodeChainer.new(node, filename, in_block).chain
@@ -47,7 +47,6 @@ module Solargraph
         # @return [Array<Chain::Link>]
         def generate_links n
           return [] unless n.is_a?(::Parser::AST::Node)
-          return generate_links(n.children[0]) if n.type == :begin
           return generate_links(n.children[0]) if n.type == :splat
           result = []
           if n.type == :block
@@ -95,6 +94,9 @@ module Solargraph
           elsif n.type == :super
             args = n.children.map { |c| NodeChainer.chain(c) }
             result.push Chain::Call.new('super', args, @in_block > 0 || block_passed?(n))
+          elsif n.type == :yield
+            args = n.children.map { |c| NodeChainer.chain(c) }
+            result.push Chain::Call.new('yield', args, @in_block > 0 || block_passed?(n))
           elsif n.type == :const
             const = unpack_name(n)
             result.push Chain::Constant.new(const)
@@ -116,7 +118,7 @@ module Solargraph
           elsif n.type == :or
             result.push Chain::Or.new([NodeChainer.chain(n.children[0], @filename), NodeChainer.chain(n.children[1], @filename)])
           elsif [:begin, :kwbegin].include?(n.type)
-            result.concat generate_links(n.children[0])
+            result.concat generate_links(n.children.last)
           elsif n.type == :block_pass
             block_variable_name_node = n.children[0]
             if block_variable_name_node.nil?
@@ -128,6 +130,9 @@ module Solargraph
             end
           elsif n.type == :hash
             result.push Chain::Hash.new('::Hash', hash_is_splatted?(n))
+          elsif n.type == :array
+            chained_children = n.children.map { |c| NodeChainer.chain(c) }
+            result.push Source::Chain::Array.new(chained_children)
           else
             lit = infer_literal_node_type(n)
             result.push (lit ? Chain::Literal.new(lit) : Chain::Link.new)

data/lib/solargraph/parser/legacy/node_methods.rb

@@ -48,7 +48,7 @@ module Solargraph
             return '::Integer'
           elsif node.type == :float
             return '::Float'
-          elsif node.type == :sym
+          elsif node.type == :sym || node.type == :dsym
             return '::Symbol'
           elsif node.type == :regexp
             return '::Regexp'
@@ -244,9 +244,11 @@ module Solargraph
                 node.children[1..-1].each do |cc|
                   if cc.nil?
                     result.push NIL_NODE
-                  else
-                    result.concat reduce_to_value_nodes(cc.children[1..-2]) unless cc.children.length < 1
+                  elsif cc.type == :when
                     result.concat reduce_to_value_nodes([cc.children.last])
+                  else
+                    # else clause in case
+                    result.concat reduce_to_value_nodes([cc])
                   end
                 end
               else

data/lib/solargraph/parser/node_methods.rb

@@ -27,6 +27,7 @@ module Solargraph
         raise NotImplementedError
       end
 
+      # @return [Source::Chain]
       def chain node, filename = nil, in_block = false
         raise NotImplementedError
       end

data/lib/solargraph/parser/region.rb

@@ -23,7 +23,7 @@ module Solargraph
 
       # @param source [Source]
       # @param namespace [String]
-      # @param scope [Symbol]
+      # @param scope [Symbol, nil]
       # @param visibility [Symbol]
       def initialize source: Solargraph::Source.load_string(''), closure: nil,
                      scope: nil, visibility: :public, lvars: []

data/lib/solargraph/parser/rubyvm/class_methods.rb

@@ -6,9 +6,8 @@ module Solargraph
     module Rubyvm
       module ClassMethods
         # @param code [String]
-        # @param filename [String]
+        # @param filename [String, nil]
         # @return [Array(Parser::AST::Node, Array<Parser::Source::Comment>)]
-        # @sg-ignore
         def parse_with_comments code, filename = nil
           node = RubyVM::AbstractSyntaxTree.parse(code).children[2]
           node &&= RubyVM::AbstractSyntaxTree::NodeWrapper.from(node, code.lines)
@@ -22,7 +21,6 @@ module Solargraph
         # @param filename [String, nil]
         # @param line [Integer]
         # @return [Parser::AST::Node]
-        # @sg-ignore
         def parse code, filename = nil, line = 0
           node = RubyVM::AbstractSyntaxTree.parse(code).children[2]
           node and RubyVM::AbstractSyntaxTree::NodeWrapper.from(node, code.lines)

data/lib/solargraph/parser/rubyvm/node_chainer.rb

@@ -11,7 +11,7 @@ module Solargraph
         Chain = Source::Chain
 
         # @param node [Parser::AST::Node]
-        # @param filename [String]
+        # @param filename [String, nil]
         def initialize node, filename = nil, in_block = false
           @node = node
           @filename = filename
@@ -26,7 +26,7 @@ module Solargraph
 
         class << self
           # @param node [Parser::AST::Node]
-          # @param filename [String]
+          # @param filename [String, nil]
           # @return [Source::Chain]
           def chain node, filename = nil, in_block = false
             NodeChainer.new(node, filename, in_block).chain
@@ -104,6 +104,9 @@ module Solargraph
             result.push Chain::BlockVariable.new("&#{n.children[1].children[0].to_s}")
           elsif n.type == :HASH
             result.push Chain::Hash.new('::Hash', hash_is_splatted?(n))
+          elsif n.type == :ARRAY
+            chained_children = n.children[0..-2].map { |c| NodeChainer.chain(c) }
+            result.push Source::Chain::Array.new(chained_children)
           else
             lit = infer_literal_node_type(n)
             if lit

data/lib/solargraph/parser.rb

@@ -19,6 +19,8 @@ module Solargraph
 
     selected = rubyvm? ? Rubyvm : Legacy
     # include selected
+    # @!parse
+    #   extend Solargraph::Parser::Legacy::ClassMethods
     extend selected::ClassMethods
 
     NodeMethods = (rubyvm? ? Rubyvm::NodeMethods : Legacy::NodeMethods)

data/lib/solargraph/pin/base.rb

@@ -217,7 +217,7 @@ module Solargraph
       end
 
       def identity
-        @identity ||= "#{closure.context.namespace}|#{name}"
+        @identity ||= "#{closure.path}|#{name}"
       end
 
       def inspect

data/lib/solargraph/pin/block.rb

@@ -58,10 +58,10 @@ module Solargraph
             return Solargraph::ComplexType.parse(closure.binder.namespace)
           end
         end
-        # other case without early return, read block yieldself tags
+        # other case without early return, read block yieldreceiver tags
         receiver_pin = chain.define(api_map, self, locals).first
         if receiver_pin && receiver_pin.docstring
-          ys = receiver_pin.docstring.tag(:yieldself)
+          ys = receiver_pin.docstring.tag(:yieldreceiver)
           if ys && ys.types && !ys.types.empty?
             target = if chain.links.first.is_a?(Source::Chain::Constant)
               receiver_pin.full_context.namespace

data/lib/solargraph/pin/delegated_method.rb

@@ -12,7 +12,7 @@ module Solargraph
       # to a method pin on that type.
       #
       # @param resolved_method [Method] an already resolved method pin.
-      # @param receiver [Source::Chain] the source code used to resolve the receiver for this delegated method.
+      # @param receiver [Source::Chain, nil] the source code used to resolve the receiver for this delegated method.
       # @param receiver_method_name [String] the method name that will be called on the receiver (defaults to :name).
       def initialize(method: nil, receiver: nil, name: method&.name, receiver_method_name: name, **splat)
         raise ArgumentError, 'either :method or :receiver is required' if (method && receiver) || (!method && !receiver)

data/lib/solargraph/pin/method.rb

@@ -19,7 +19,7 @@ module Solargraph
       # @param visibility [::Symbol] :public, :protected, or :private
       # @param explicit [Boolean]
       # @param parameters [Array<Pin::Parameter>]
-      # @param node [Parser::AST::Node, RubyVM::AbstractSyntaxTree::Node]
+      # @param node [Parser::AST::Node, RubyVM::AbstractSyntaxTree::Node, nil]
       # @param attribute [Boolean]
       def initialize visibility: :public, explicit: true, parameters: [], node: nil, attribute: false, signatures: nil, anon_splat: false, **splat
         super(**splat)
@@ -46,7 +46,38 @@ module Solargraph
       end
 
       def return_type
-        @return_type ||= ComplexType.try_parse(*signatures.map(&:return_type).map(&:to_s))
+        @return_type ||= ComplexType.new(signatures.map(&:return_type).flat_map(&:items))
+      end
+
+      # @return [Signature]
+      def generate_signature(parameters, return_type)
+        block = nil
+        yieldparam_tags = docstring.tags(:yieldparam)
+        yieldreturn_tags = docstring.tags(:yieldreturn)
+        needs_block_param_signature =
+          parameters.last&.block? || !yieldreturn_tags.empty? || !yieldparam_tags.empty?
+        if needs_block_param_signature
+          yield_parameters = yieldparam_tags.map do |p|
+            name = p.name
+            decl = :arg
+            if name
+              decl = select_decl(name, false)
+              name = clean_param(name)
+            end
+            Pin::Parameter.new(
+              location: location,
+              closure: self,
+              comments: p.text,
+              name: name,
+              decl: decl,
+              presence: location ? location.range : nil,
+              return_type: ComplexType.try_parse(*p.types)
+            )
+          end
+          yield_return_type = ComplexType.try_parse(*yieldreturn_tags.flat_map(&:types))
+          block = Signature.new(yield_parameters, yield_return_type)
+        end
+        Signature.new(parameters, return_type, block)
       end
 
       # @return [Array<Signature>]
@@ -54,9 +85,9 @@ module Solargraph
         @signatures ||= begin
           top_type = generate_complex_type
           result = []
-          result.push Signature.new(parameters, top_type) if top_type.defined?
-          result.concat(overloads.map { |meth| Signature.new(meth.parameters, meth.return_type) })
-          result.push Signature.new(parameters, top_type) if result.empty?
+          result.push generate_signature(parameters, top_type) if top_type.defined?
+          result.concat(overloads.map { |meth| generate_signature(meth.parameters, meth.return_type) }) unless overloads.empty?
+          result.push generate_signature(parameters, top_type) if result.empty?
           result
         end
       end
@@ -115,6 +146,32 @@ module Solargraph
             end
             @documentation += lines.join("\n")
           end
+          yieldparam_tags = docstring.tags(:yieldparam)
+          unless yieldparam_tags.nil? or yieldparam_tags.empty?
+            @documentation += "\n\n" unless @documentation.empty?
+            @documentation += "Block Params:\n"
+            lines = []
+            yieldparam_tags.each do |p|
+              l = "* #{p.name}"
+              l += " [#{escape_brackets(p.types.join(', '))}]" unless p.types.nil? or p.types.empty?
+              l += " #{p.text}"
+              lines.push l
+            end
+            @documentation += lines.join("\n")
+          end
+          yieldreturn_tags = docstring.tags(:yieldreturn)
+          unless yieldreturn_tags.empty?
+            @documentation += "\n\n" unless @documentation.empty?
+            @documentation += "Block Returns:\n"
+            lines = []
+            yieldreturn_tags.each do |r|
+              l = "*"
+              l += " [#{escape_brackets(r.types.join(', '))}]" unless r.types.nil? or r.types.empty?
+              l += " #{r.text}"
+              lines.push l
+            end
+            @documentation += lines.join("\n")
+          end
           return_tags = docstring.tags(:return)
           unless return_tags.empty?
             @documentation += "\n\n" unless @documentation.empty?