solargraph 0.50.0 → 0.51.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a6e7990068e276537a53e6af24d45685d73aba32af134def16d8a66ea671f64
-  data.tar.gz: 57292437f34d43394a161fe4909eb27931d5d33e1b367276faecc7b0132525e9
+  metadata.gz: 925e6692e134d83820ade3224a10e1e25ba8b7f65c5a8399b185574f225ad8e7
+  data.tar.gz: 319f943451956ac714e110f48db851391cfb5c4b2ceb1e3e8d2eb2d22dc56c05
 SHA512:
-  metadata.gz: 1d751b364593fa60cc51c3b9a67086c7a8006dcfe37107daaba4ca1db3f001da28eb289978d81fbe7e84c3a5c9add902417731479517be61269acd958456a057
-  data.tar.gz: 1c38faac70a696f81c5063d5ef64341a41a8d244c47c070ab557dbef8e4ca2180f5c22d5d0338c4b6f24598ea27850895bed2eab7c4d747b7bb2efeb71309eb2
+  metadata.gz: df03f1f0ed8e51f8c286395c4b87b1c254c78a897761ec71a9af896ef86c01e6d4285530ddf2e40c72f17afb6b5d87be11e219cc46859d7d7b7c2e05e24687bf
+  data.tar.gz: dd6b4f96bc8e6361bcfd313129a4ba9d680c8db45484deea040ec5fa6ba5a8873dcefa2980af4824d26f2ecc16d68bd5b5554e4978ae71853e22df49ed427894

data/.github/workflows/rspec.yml

@@ -22,19 +22,17 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0', '3.1']
+        ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4', 'head']
 
     steps:
     - uses: actions/checkout@v3
     - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-    # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@2b019609e2b0f1ea1a2bc8ca11cb82ab46ada124
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: false
-    - run: bundle install
+    - name: Install gems
+      run: bundle install
     - name: Set up yardocs
       run: bundle exec yard gems
     - name: Run tests

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 0.51.0 - January 19, 2025
+- Resolve self in yieldself tags
+- Include absolute paths in config (#674)
+- Enable diagnostics by default
+- Fix cache resolution (#704)
+- Modify rubocop option for rubocop < 1.30 (#665)
+- Include absolute paths in config (#674)
+- Enable diagnostics by default
+- Remove RSpec convention (#716)
+- Include convention pins in document_symbols (#724)
+- Remove e2mmap dependency (#699)
+- Update rbs to 3.0
+- Relax reverse_markdown dependency (#729)
+- Fix Ruby 3.4 and move all parsing to whitequark (#739)
+- Add Pin::DelegatedMethod (#602)
+- Complete global methods from a file inside namespaces (#714)
+- gemspec dashes and required path slashes (#697)
+
 ## 0.50.0 - December 5, 2023
 - Remove .travis.yml as its not longer used (#627)
 - Fix empty string case when processing requires (#644)

data/SPONSORS.md

@@ -7,11 +7,10 @@ The following people and organizations provide funding or other resources. [Beco
 ## Linked Sponsors
 
 - **[Calyptix Security](https://www.calyptix.com/)**
-- **[Lightward](https://lightward.com)**
 
 ## Named Sponsors
 
 - Akira Yamada
-- Jesus Castello
 - Joel Drapper
 - Spencer
+- Vince Broz

data/lib/solargraph/cache.rb

@@ -10,7 +10,7 @@ module Solargraph
         # The directory is not stored in a variable so it can be overridden
         # in specs.
         ENV['SOLARGRAPH_CACHE'] ||
-          ENV['XDG_CACHE_HOME'] ? File.join(ENV['XDG_CACHE_HOME'], 'solargraph') :
+          (ENV['XDG_CACHE_HOME'] ? File.join(ENV['XDG_CACHE_HOME'], 'solargraph') : nil) ||
           File.join(Dir.home, '.cache', 'solargraph')
       end
 

data/lib/solargraph/complex_type.rb

@@ -67,11 +67,18 @@ module Solargraph
     def select &block
       @items.select &block
     end
+
+    # @return [String]
     def namespace
       # cache this attr for high frequency call
       @namespace ||= method_missing(:namespace).to_s
     end
 
+    # @return [Array<String>]
+    def namespaces
+      @items.map(&:namespace)
+    end
+
     def method_missing name, *args, &block
       return if @items.first.nil?
       return @items.first.send(name, *args, &block) if respond_to_missing?(name)

data/lib/solargraph/convention.rb

@@ -9,7 +9,6 @@ module Solargraph
   module Convention
     autoload :Base,    'solargraph/convention/base'
     autoload :Gemfile, 'solargraph/convention/gemfile'
-    autoload :Rspec,   'solargraph/convention/rspec'
     autoload :Gemspec, 'solargraph/convention/gemspec'
     autoload :Rakefile, 'solargraph/convention/rakefile'
 
@@ -43,7 +42,6 @@ module Solargraph
 
     register Gemfile
     register Gemspec
-    register Rspec
     register Rakefile
   end
 end

data/lib/solargraph/language_server/host.rb

@@ -533,6 +533,15 @@ module Solargraph
         library.definitions_at(uri_to_file(uri), line, column)
       end
 
+      # @param uri [String]
+      # @param line [Integer]
+      # @param column [Integer]
+      # @return [Array<Solargraph::Pin::Base>]
+      def type_definitions_at uri, line, column
+        library = library_for(uri)
+        library.type_definitions_at(uri_to_file(uri), line, column)
+      end
+
       # @param uri [String]
       # @param line [Integer]
       # @param column [Integer]
@@ -630,10 +639,11 @@ module Solargraph
           'hover' => true,
           'symbols' => true,
           'definitions' => true,
+          'typeDefinitions' => true,
           'rename' => true,
           'references' => true,
           'autoformat' => false,
-          'diagnostics' => false,
+          'diagnostics' => true,
           'formatting' => false,
           'folding' => true,
           'highlights' => true,

data/lib/solargraph/language_server/message/initialize.rb

@@ -34,6 +34,7 @@ module Solargraph
           result[:capabilities].merge! static_document_formatting unless dynamic_registration_for?('textDocument', 'formatting')
           result[:capabilities].merge! static_document_symbols unless dynamic_registration_for?('textDocument', 'documentSymbol')
           result[:capabilities].merge! static_definitions unless dynamic_registration_for?('textDocument', 'definition')
+          result[:capabilities].merge! static_type_definitions unless dynamic_registration_for?('textDocument', 'typeDefinition')
           result[:capabilities].merge! static_rename unless dynamic_registration_for?('textDocument', 'rename')
           result[:capabilities].merge! static_references unless dynamic_registration_for?('textDocument', 'references')
           result[:capabilities].merge! static_workspace_symbols unless dynamic_registration_for?('workspace', 'symbol')
@@ -121,6 +122,13 @@ module Solargraph
           }
         end
 
+        def static_type_definitions
+          return {} unless host.options['type_definitions']
+          {
+            definitionProvider: true
+          }
+        end
+
         def static_rename
           {
             renameProvider: {prepareProvider: true}

data/lib/solargraph/language_server/message/initialized.rb

@@ -13,6 +13,7 @@ module Solargraph
             textDocument/formatting
             textDocument/documentSymbol
             textDocument/definition
+            textDocument/typeDefinition
             textDocument/references
             textDocument/rename
             textDocument/prepareRename

data/lib/solargraph/language_server/message/text_document/document_symbol.rb

@@ -6,6 +6,8 @@ class Solargraph::LanguageServer::Message::TextDocument::DocumentSymbol < Solarg
   def process
     pins = host.document_symbols params['textDocument']['uri']
     info = pins.map do |pin|
+      next nil unless pin.location&.filename
+
       result = {
         name: pin.name,
         containerName: pin.namespace,
@@ -17,7 +19,8 @@ class Solargraph::LanguageServer::Message::TextDocument::DocumentSymbol < Solarg
         deprecated: pin.deprecated?
       }
       result
-    end
+    end.compact
+
     set_result info
   end
 end

data/lib/solargraph/language_server/message/text_document/formatting.rb

@@ -17,17 +17,17 @@ module Solargraph
             args = cli_args(file_uri, config)
 
             require_rubocop(config['version'])
-            options, paths = RuboCop::Options.new.parse(args)
+            options, paths = ::RuboCop::Options.new.parse(args)
             options[:stdin] = original
             corrections = redirect_stdout do
-              RuboCop::Runner.new(options, RuboCop::ConfigStore.new).run(paths)
+              ::RuboCop::Runner.new(options, ::RuboCop::ConfigStore.new).run(paths)
             end
             result = options[:stdin]
 
             log_corrections(corrections)
 
             format original, result
-          rescue RuboCop::ValidationError, RuboCop::ConfigNotFoundError => e
+          rescue ::RuboCop::ValidationError, ::RuboCop::ConfigNotFoundError => e
             set_error(Solargraph::LanguageServer::ErrorCodes::INTERNAL_ERROR, "[#{e.class}] #{e.message}")
           end
 
@@ -54,7 +54,7 @@ module Solargraph
           def cli_args file_uri, config
             file = UriHelpers.uri_to_file(file_uri)
             args = [
-              config['cops'] == 'all' ? '--autocorrect-all' : '--autocorrect',
+              config['cops'] == 'all' ? '-A' : '-a',
               '--cache', 'false',
               '--format', formatter_class(config).name,
             ]

data/lib/solargraph/language_server/message/text_document/type_definition.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Solargraph::LanguageServer::Message::TextDocument
+  class TypeDefinition < Base
+    def process
+      @line = params['position']['line']
+      @column = params['position']['character']
+      set_result(code_location || [])
+    end
+
+    private
+
+    def code_location
+      suggestions = host.type_definitions_at(params['textDocument']['uri'], @line, @column)
+      return nil if suggestions.empty?
+      suggestions.reject { |pin| pin.location.nil? || pin.location.filename.nil? }.map do |pin|
+        {
+          uri: file_to_uri(pin.location.filename),
+          range: pin.location.range.to_hash
+        }
+      end
+    end
+  end
+end

data/lib/solargraph/language_server/message/text_document.rb

@@ -15,6 +15,7 @@ module Solargraph
         autoload :DiagnosticsQueue,  'solargraph/language_server/message/text_document/diagnostics_queue'
         autoload :OnTypeFormatting,  'solargraph/language_server/message/text_document/on_type_formatting'
         autoload :Definition,        'solargraph/language_server/message/text_document/definition'
+        autoload :TypeDefinition,    'solargraph/language_server/message/text_document/type_definition'
         autoload :DocumentSymbol,    'solargraph/language_server/message/text_document/document_symbol'
         autoload :Formatting,        'solargraph/language_server/message/text_document/formatting'
         autoload :References,        'solargraph/language_server/message/text_document/references'

data/lib/solargraph/language_server/message.rb

@@ -66,6 +66,7 @@ module Solargraph
       register 'textDocument/didClose',               TextDocument::DidClose
       register 'textDocument/hover',                  TextDocument::Hover
       register 'textDocument/definition',             TextDocument::Definition
+      register 'textDocument/typeDefinition',         TextDocument::TypeDefinition
       register 'textDocument/formatting',             TextDocument::Formatting
       register 'textDocument/onTypeFormatting',       TextDocument::OnTypeFormatting
       register 'textDocument/documentSymbol',         TextDocument::DocumentSymbol

data/lib/solargraph/library.rb

@@ -97,7 +97,7 @@ module Solargraph
     def create filename, text
       result = false
       mutex.synchronize do
-        next unless contain?(filename) || open?(filename) || workspace.would_merge?(filename)
+        next unless contain?(filename) || open?(filename)
         @synchronized = false
         source = Solargraph::Source.load_string(text, filename)
         workspace.merge(source)
@@ -199,6 +199,22 @@ module Solargraph
       handle_file_not_found(filename, e)
     end
 
+    # Get type definition suggestions for the expression at the specified file and
+    # location.
+    #
+    # @param filename [String] The file to analyze
+    # @param line [Integer] The zero-based line number
+    # @param column [Integer] The zero-based column number
+    # @return [Array<Solargraph::Pin::Base>]
+    # @todo Take filename/position instead of filename/line/column
+    def type_definitions_at filename, line, column
+      position = Position.new(line, column)
+      cursor = Source::Cursor.new(read(filename), position)
+      api_map.clip(cursor).types
+    rescue FileNotFoundError => e
+      handle_file_not_found filename, e
+    end
+
     # Get signature suggestions for the method at the specified file and
     # location.
     #

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

@@ -108,9 +108,13 @@ module Solargraph
         end
 
         def node_range node
+          if node.nil?
+            nil
+          else
           st = Position.new(node.first_lineno - 1, node.first_column)
           en = Position.new(node.last_lineno - 1, node.last_column)
           Range.new(st, en)
+          end
         end
 
         def recipient_node tree

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

@@ -98,7 +98,7 @@ module Solargraph
             result.concat generate_links(n.children.last)
           elsif n.type == :OR
             result.push Chain::Or.new([NodeChainer.chain(n.children[0], @filename), NodeChainer.chain(n.children[1], @filename)])
-          elsif n.type == :begin
+          elsif n.type == :BEGIN
             result.concat generate_links(n.children[0])
           elsif n.type == :BLOCK_PASS
             result.push Chain::BlockVariable.new("&#{n.children[1].children[0].to_s}")

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

@@ -32,10 +32,12 @@ module Solargraph
         def infer_literal_node_type node
           return nil unless Parser.is_ast_node?(node)
           case node.type
-          when :LIT, :STR
+          when :LIT, :STR, :SYM
             "::#{node.children.first.class.to_s}"
           when :DSTR
             "::String"
+          when :INTEGER
+            '::Integer'
           when :ARRAY, :ZARRAY, :LIST, :ZLIST
             '::Array'
           when :HASH

data/lib/solargraph/parser/rubyvm/node_processors/resbody_node.rb

@@ -22,7 +22,7 @@ module Solargraph
                 locals.push Solargraph::Pin::LocalVariable.new(
                   location: loc,
                   closure: region.closure,
-                  name: node.children[1].children.first.children.first.to_s,
+                  name: node.children[1].children.first.to_s,
                   comments: "@type [#{types.join(',')}]",
                   presence: presence
                 )
@@ -34,9 +34,15 @@ module Solargraph
           private
 
           def exception_variable?
-            Parser.is_ast_node?(node.children[1]) &&
-              Parser.is_ast_node?(node.children[1].children.first) &&
-              node.children[1].children.first.type == :LASGN
+            if RUBY_VERSION =~ /^3\.4\./
+              Parser.is_ast_node?(node.children[1]) &&
+                # Parser.is_ast_node?(node.children[1].children.first) &&
+                node.children[1].type == :LASGN
+            else
+              Parser.is_ast_node?(node.children[1]) &&
+                Parser.is_ast_node?(node.children[1].children.first) &&
+                node.children[1].children.first.type == :LASGN
+            end
           end
         end
       end

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

@@ -43,7 +43,7 @@ module Solargraph
             if node.type == :FCALL && Parser.is_ast_node?(node.children.last)
               node.children.last.children[0..-2].each do |child|
                 # next unless child.is_a?(AST::Node) && (child.type == :sym || child.type == :str)
-                if child.type == :LIT || child.type == :STR
+                if child.type == :LIT || child.type == :STR || child.type == :SYM
                   name = child.children[0].to_s
                   matches = pins.select{ |pin| pin.is_a?(Pin::Method) && pin.name == name && pin.namespace == region.closure.full_context.namespace && pin.context.scope == (region.scope || :instance)}
                   matches.each do |pin|
@@ -175,7 +175,7 @@ module Solargraph
               NodeProcessor.process node.children.last.children[0], region.update(visibility: :module_function), pins, locals
             else
               node.children.last.children[0..-2].each do |x|
-                next unless [:LIT, :STR].include?(x.type)
+                next unless [:LIT, :STR, :SYM].include?(x.type)
                 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
                 unless ref.nil?

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

@@ -58,6 +58,7 @@ module Solargraph
       register :FOR,        Rubyvm::NodeProcessors::BlockNode
       register :OP_ASGN_OR, Rubyvm::NodeProcessors::OrasgnNode
       register :LIT,        Rubyvm::NodeProcessors::LitNode
+      register :SYM,        Rubyvm::NodeProcessors::LitNode
     end
   end
 end

data/lib/solargraph/parser.rb

@@ -13,8 +13,8 @@ module Solargraph
     # True if the parser can use RubyVM.
     #
     def self.rubyvm?
-      !!defined?(RubyVM::AbstractSyntaxTree)
-      # false
+      # !!defined?(RubyVM::AbstractSyntaxTree)
+      false
     end
 
     selected = rubyvm? ? Rubyvm : Legacy

data/lib/solargraph/pin/block.rb

@@ -63,7 +63,7 @@ module Solargraph
         if receiver_pin && receiver_pin.docstring
           ys = receiver_pin.docstring.tag(:yieldself)
           if ys && ys.types && !ys.types.empty?
-            return ComplexType.try_parse(*ys.types).qualify(api_map, receiver_pin.context.namespace)
+            return ComplexType.try_parse(*ys.types).qualify(api_map, receiver_pin.context.namespace).self_to(receiver_pin.full_context.namespace)
           end
         end
         nil

data/lib/solargraph/pin/delegated_method.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+module Solargraph
+  module Pin
+    # A DelegatedMethod is a more complicated version of a MethodAlias that
+    # allows aliasing a method from a different closure (class/module etc).
+    class DelegatedMethod < Pin::Method
+      # A DelegatedMethod can be constructed with either a :resolved_method
+      # pin, or a :receiver_chain. When a :receiver_chain is supplied, it
+      # will be used to *dynamically* resolve a receiver type within the
+      # given closure/scope, and the delegated method will then be resolved
+      # 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_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)
+        super(name: name, **splat)
+
+        @receiver_chain = receiver
+        @resolved_method = method
+        @receiver_method_name = receiver_method_name
+      end
+
+      %i[comments parameters return_type location].each do |method|
+        define_method(method) do
+          @resolved_method ? @resolved_method.send(method) : super()
+        end
+      end
+
+      %i[typify realize infer probe].each do |method|
+        # @param api_map [ApiMap]
+        define_method(method) do |api_map|
+          resolve_method(api_map)
+          @resolved_method ? @resolved_method.send(method, api_map) : super(api_map)
+        end
+      end
+
+      def resolvable?(api_map)
+        resolve_method(api_map)
+        !!@resolved_method
+      end
+
+      private
+
+      # Resolves the receiver chain and method name to a method pin, resetting any previously resolution.
+      #
+      # @param api_map [ApiMap]
+      # @return [Pin::Method, nil]
+      def resolve_method api_map
+        return if @resolved_method
+
+        resolver = @receiver_chain.define(api_map, self, []).first
+
+        unless resolver
+          Solargraph.logger.warn \
+            "Delegated receiver for #{path} was resolved to nil from `#{print_chain(@receiver_chain)}'"
+          return
+        end
+
+        receiver_type = resolver.return_type
+
+        return if receiver_type.undefined?
+
+        receiver_path, method_scope =
+          if @receiver_chain.constant?
+            # HACK: the `return_type` of a constant is Class<Whatever>, but looking up a method expects
+            # the arguments `"Whatever"` and `scope: :class`.
+            [receiver_type.to_s.sub(/^Class<(.+)>$/, '\1'), :class]
+          else
+            [receiver_type.to_s, :instance]
+          end
+
+        method_stack = api_map.get_method_stack(receiver_path, @receiver_method_name, scope: method_scope)
+        @resolved_method = method_stack.first
+      end
+
+      # helper to print a source chain as code, probably not 100% correct.
+      #
+      # @param chain [Source::Chain]
+      def print_chain(chain)
+        out = +''
+        chain.links.each_with_index do |link, index|
+          if index > 0
+            if Source::Chain::Constant
+              out << '::' unless link.word.start_with?('::')
+            else
+              out << '.'
+            end
+          end
+          out << link.word
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/pin/method.rb

@@ -130,6 +130,11 @@ module Solargraph
           end
           @documentation += "\n\n" unless @documentation.empty?
           @documentation += "Visibility: #{visibility}"
+          example_tags = docstring.tags(:example)
+          unless example_tags.empty?
+            @documentation += "\n\nExamples:\n\n"
+            @documentation += example_tags.map(&:text).join("\n")
+          end
         end
         @documentation.to_s
       end

data/lib/solargraph/pin/search.rb

@@ -49,7 +49,7 @@ module Solargraph
       # @return [Float]
       def fuzzy_string_match str1, str2
         return (1.0 + (str2.length.to_f / str1.length.to_f)) if str1.downcase.include?(str2.downcase)
-        JaroWinkler.distance(str1, str2, ignore_case: true)
+        JaroWinkler.similarity(str1, str2, ignore_case: true)
       end
     end
   end

data/lib/solargraph/pin.rb

@@ -12,6 +12,7 @@ module Solargraph
     autoload :Method,           'solargraph/pin/method'
     autoload :Signature,        'solargraph/pin/signature'
     autoload :MethodAlias,      'solargraph/pin/method_alias'
+    autoload :DelegatedMethod,  'solargraph/pin/delegated_method'
     autoload :BaseVariable,     'solargraph/pin/base_variable'
     autoload :InstanceVariable, 'solargraph/pin/instance_variable'
     autoload :ClassVariable,    'solargraph/pin/class_variable'

data/lib/solargraph/range.rb

@@ -65,10 +65,8 @@ module Solargraph
     # @param node [RubyVM::AbstractSyntaxTree::Node, Parser::AST::Node]
     # @return [Range]
     def self.from_node node
-      if defined?(RubyVM::AbstractSyntaxTree::Node)
-        if node.is_a?(RubyVM::AbstractSyntaxTree::Node)
-          Solargraph::Range.from_to(node.first_lineno - 1, node.first_column, node.last_lineno - 1, node.last_column)
-        end
+      if Parser.rubyvm? && node.is_a?(RubyVM::AbstractSyntaxTree::Node)
+        Solargraph::Range.from_to(node.first_lineno - 1, node.first_column, node.last_lineno - 1, node.last_column)
       elsif node&.loc && node.loc.expression
         from_expr(node.loc.expression)
       end

data/lib/solargraph/rbs_map/conversions.rb

@@ -40,7 +40,7 @@ module Solargraph
         when RBS::AST::Declarations::Interface
           # STDERR.puts "Skipping interface #{decl.name.relative!}"
           interface_decl_to_pin decl
-        when RBS::AST::Declarations::Alias
+        when RBS::AST::Declarations::TypeAlias
           type_aliases[decl.name.to_s] = decl
         when RBS::AST::Declarations::Module
           module_decl_to_pin decl
@@ -222,17 +222,19 @@ module Solargraph
       # @param decl [RBS::AST::Members::MethodDefinition]
       # @param pin [Pin::Method]
       def method_def_to_sigs decl, pin
-        decl.types.map do |type|
-          parameters, return_type = parts_of_function(type, pin)
-          block = if type.block
-            Pin::Signature.new(*parts_of_function(type.block, pin))
+        decl.overloads.map do |overload|
+          parameters, return_type = parts_of_function(overload.method_type, pin)
+          block = if overload.method_type.block
+                    Pin::Signature.new(*parts_of_function(overload.method_type.block, pin))
           end
-          return_type = ComplexType.try_parse(method_type_to_tag(type))
+          return_type = ComplexType.try_parse(method_type_to_tag(overload.method_type))
           Pin::Signature.new(parameters, return_type, block)
         end
       end
 
       def parts_of_function type, pin
+        return [[Solargraph::Pin::Parameter.new(decl: :restarg, name: 'arg', closure: pin)], ComplexType.try_parse(method_type_to_tag(type))] if defined?(RBS::Types::UntypedFunction) && type.type.is_a?(RBS::Types::UntypedFunction)
+
         parameters = []
         arg_num = -1
         type.type.required_positionals.each do |param|

data/lib/solargraph/rbs_map/core_fills.rb

@@ -15,6 +15,11 @@ module Solargraph
         'then', 'true', 'undef', 'unless', 'until', 'when', 'while', 'yield'
       ].map { |k| Pin::Keyword.new(k) }
 
+      MISSING = [
+        Solargraph::Pin::Method.new(name: 'tap', scope: :instance, closure: Solargraph::Pin::Namespace.new(name: 'Object')),
+        Solargraph::Pin::Method.new(name: 'class', scope: :instance, closure: Solargraph::Pin::Namespace.new(name: 'Object'), comments: '@return [Class<self>]')
+      ]
+
       YIELDPARAMS = [
         Override.from_comment('Object#tap', %(
 @return [self]
@@ -55,7 +60,8 @@ module Solargraph
       end
       ERRNOS = errnos
 
-      ALL = KEYWORDS + YIELDPARAMS + YIELDPARAM_SINGLE_PARAMETERS + CLASS_RETURN_TYPES + ERRNOS
+      ALL = KEYWORDS + MISSING + YIELDPARAMS + YIELDPARAM_SINGLE_PARAMETERS + CLASS_RETURN_TYPES + ERRNOS
     end
   end
 end
+

data/lib/solargraph/rbs_map/core_map.rb

@@ -12,7 +12,7 @@ module Solargraph
         if cache
           pins.replace cache
         else
-          loader = RBS::EnvironmentLoader.new(repository: RBS::Repository.new(no_stdlib: true))
+          loader = RBS::EnvironmentLoader.new(repository: RBS::Repository.new(no_stdlib: false))
           environment = RBS::Environment.from_loader(loader).resolve_type_names
           environment.declarations.each { |decl| convert_decl_to_pin(decl, Solargraph::Pin::ROOT_PIN) }
           pins.concat RbsMap::CoreFills::ALL

data/lib/solargraph/rbs_map/stdlib_map.rb

@@ -18,6 +18,9 @@ module Solargraph
           pins.replace cache
         else
           super
+          if library == 'yaml'
+            pins.push Solargraph::Pin::Constant.new(name: 'YAML', comments: '@return [Module<Psych>]', closure: Pin::ROOT_PIN)
+          end
           Cache.save('stdlib', "#{library}.ser", pins)
         end
       end

data/lib/solargraph/source_map/clip.rb

@@ -17,10 +17,16 @@ module Solargraph
       def define
         return [] if cursor.comment? || cursor.chain.literal?
         result = cursor.chain.define(api_map, block, locals)
+        result.concat file_global_methods
         result.concat((source_map.pins + source_map.locals).select{ |p| p.name == cursor.word && p.location.range.contain?(cursor.position) }) if result.empty?
         result
       end
 
+      # @return [Array<Pin::Base>]
+      def types
+        infer.namespaces.map { |namespace| api_map.get_path_pins(namespace) }.flatten
+      end
+
       # @return [Completion]
       def complete
         return package_completions([]) if !source_map.source.parsed? || cursor.string?
@@ -214,6 +220,7 @@ module Solargraph
               return package_completions(api_map.get_global_variable_pins)
             end
             result.concat locals
+            result.concat file_global_methods unless block.binder.namespace.empty?
             result.concat api_map.get_constants(context_pin.context.namespace, *gates)
             result.concat api_map.get_methods(block.binder.namespace, scope: block.binder.scope, visibility: [:public, :private, :protected])
             result.concat api_map.get_methods('Kernel')
@@ -224,6 +231,13 @@ module Solargraph
         end
         package_completions(result)
       end
+
+      def file_global_methods
+        return [] if cursor.word.empty?
+        source_map.pins.select do |pin|
+          pin.is_a?(Pin::Method) && pin.namespace == '' && pin.name.start_with?(cursor.word)
+        end
+      end
     end
   end
 end

data/lib/solargraph/source_map.rb

@@ -30,6 +30,7 @@ module Solargraph
       @pins = pins
       @locals = locals
       environ.merge Convention.for_local(self) unless filename.nil?
+      self.convention_pins = environ.pins
       @pin_class_hash = pins.to_set.classify(&:class).transform_values(&:to_a)
       @pin_select_cache = {}
     end
@@ -65,11 +66,12 @@ module Solargraph
       @environ ||= Environ.new
     end
 
+    # all pins except Solargraph::Pin::Reference::Reference
     # @return [Array<Pin::Base>]
     def document_symbols
-      @document_symbols ||= pins.select { |pin|
+      @document_symbols ||= (pins + convention_pins).select do |pin|
         pin.path && !pin.path.empty?
-      }
+      end
     end
 
     # @param query [String]
@@ -159,6 +161,17 @@ module Solargraph
 
     private
 
+    # @return [Array<Pin::Base>]
+    def convention_pins
+      @convention_pins || []
+    end
+
+    def convention_pins=(pins)
+      # unmemoizing the document_symbols in case it was called from any of convnetions
+      @document_symbols = nil
+      @convention_pins = pins
+    end
+
     # @param line [Integer]
     # @param character [Integer]
     # @param klasses [Array<Class>]

data/lib/solargraph/type_checker.rb

@@ -254,12 +254,20 @@ module Solargraph
       result
     end
 
+    # @param chain [Solargraph::Source::Chain]
+    # @param api_map [Solargraph::ApiMap]
+    # @param block_pin [Solargraph::Pin::Base]
+    # @param locals [Array<Solargraph::Pin::Base>]
+    # @param location [Solargraph::Location]
     def argument_problems_for chain, api_map, block_pin, locals, location
       result = []
       base = chain
       until base.links.length == 1 && base.undefined?
         pins = base.define(api_map, block_pin, locals)
-        if pins.first.is_a?(Pin::Method)
+
+        if pins.first.is_a?(Pin::DelegatedMethod) && !pins.first.resolvable?(api_map)
+          # Do nothing, as we can't find the actual method implementation
+        elsif pins.first.is_a?(Pin::Method)
           # @type [Pin::Method]
           pin = pins.first
           ap = if base.links.last.is_a?(Solargraph::Source::Chain::ZSuper)
@@ -279,9 +287,14 @@ module Solargraph
             errors = []
             sig.parameters.each_with_index do |par, idx|
               argchain = base.links.last.arguments[idx]
-              if argchain.nil? && par.decl == :arg
-                errors.push Problem.new(location, "Not enough arguments to #{pin.path}")
-                next
+              if argchain.nil?
+                if par.decl == :arg
+                  errors.push Problem.new(location, "Not enough arguments to #{pin.path}")
+                  next
+                else
+                  last = base.links.last.arguments.last
+                  argchain = last if last && [:kwsplat, :hash].include?(last.node.type)
+                end
               end
               if argchain
                 if par.decl != :arg
@@ -317,30 +330,29 @@ module Solargraph
       result
     end
 
-    def kwarg_problems_for argchain, api_map, block_pin, locals, location, pin, params, first
+    def kwarg_problems_for argchain, api_map, block_pin, locals, location, pin, params, idx
       result = []
       kwargs = convert_hash(argchain.node)
-      pin.signatures.first.parameters[first..-1].each_with_index do |par, cur|
-        idx = first + cur
-        argchain = kwargs[par.name.to_sym]
-        if par.decl == :kwrestarg || (par.decl == :optarg && idx == pin.parameters.length - 1 && par.asgn_code == '{}')
-          result.concat kwrestarg_problems_for(api_map, block_pin, locals, location, pin, params, kwargs)
-        else
-          if argchain
-            data = params[par.name]
-            if data.nil?
-              # @todo Some level (strong, I guess) should require the param here
-            else
-              ptype = data[:qualified]
-              next if ptype.undefined?
+      par = pin.signatures.first.parameters[idx]
+      argchain = kwargs[par.name.to_sym]
+      if par.decl == :kwrestarg || (par.decl == :optarg && idx == pin.parameters.length - 1 && par.asgn_code == '{}')
+        result.concat kwrestarg_problems_for(api_map, block_pin, locals, location, pin, params, kwargs)
+      else
+        if argchain
+          data = params[par.name]
+          if data.nil?
+            # @todo Some level (strong, I guess) should require the param here
+          else
+            ptype = data[:qualified]
+            unless ptype.undefined?
               argtype = argchain.infer(api_map, block_pin, locals)
               if argtype.defined? && ptype && !any_types_match?(api_map, ptype, argtype)
                 result.push Problem.new(location, "Wrong argument type for #{pin.path}: #{par.name} expected #{ptype}, received #{argtype}")
               end
             end
-          elsif par.decl == :kwarg
-            result.push Problem.new(location, "Call to #{pin.path} is missing keyword argument #{par.name}")
           end
+        elsif par.decl == :kwarg
+          result.push Problem.new(location, "Call to #{pin.path} is missing keyword argument #{par.name}")
         end
       end
       result
@@ -542,7 +554,7 @@ module Solargraph
     def without_ignored problems
       problems.reject do |problem|
         node = source_map.source.node_at(problem.location.range.start.line, problem.location.range.start.column)
-        source_map.source.comments_for(node)&.include?('@sg-ignore')
+        node && source_map.source.comments_for(node)&.include?('@sg-ignore')
       end
     end
   end

data/lib/solargraph/version.rb

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

data/lib/solargraph/workspace/config.rb

@@ -19,7 +19,7 @@ module Solargraph
 
       # @param directory [String]
       def initialize directory = ''
-        @directory = directory
+        @directory = File.absolute_path(directory)
         @raw_data = config_data
         included
         excluded
@@ -42,7 +42,8 @@ module Solargraph
       end
 
       def allow? filename
-        filename.start_with?(directory) && 
+        filename = File.absolute_path(filename, directory)
+        filename.start_with?(directory) &&
           !excluded.include?(filename) &&
           excluded_directories.none? { |d| filename.start_with?(d) }
       end
@@ -171,7 +172,7 @@ module Solargraph
       # @return [Array<String>]
       def process_globs globs
         result = globs.flat_map do |glob|
-          Dir[File.join directory, glob]
+          Dir[File.absolute_path(glob, directory)]
             .map{ |f| f.gsub(/\\/, '/') }
             .select { |f| File.file?(f) }
         end
@@ -186,7 +187,7 @@ module Solargraph
       def process_exclusions globs
         remainder = globs.select do |glob|
           if glob_is_directory?(glob)
-            exdir = File.join(directory, glob_to_directory(glob))
+            exdir = File.absolute_path(glob_to_directory(glob), directory)
             included.delete_if { |file| file.start_with?(exdir) }
             false
           else
@@ -224,7 +225,7 @@ module Solargraph
       def excluded_directories
         @raw_data['exclude']
           .select { |g| glob_is_directory?(g) }
-          .map { |g| File.join(directory, glob_to_directory(g)) }
+          .map { |g| File.absolute_path(glob_to_directory(g), directory) }
       end
     end
   end

data/lib/solargraph/yard_map.rb

@@ -220,9 +220,11 @@ module Solargraph
       result = []
       begin
         name = r.split('/').first.to_s
-        return [] if name.empty? || @source_gems.include?(name) || @gem_paths.key?(name)
-        spec = spec_for_require(name)
-        @gem_paths[name] = spec.full_gem_path
+        return [] if name.empty?
+
+        spec = spec_for_require(r)
+        return [] if @source_gems.include?(spec.name) || @gem_paths.key?(spec.name)
+        @gem_paths[spec.name] = spec.full_gem_path
 
         yd = yardoc_file_for_spec(spec)
         # YARD detects gems for certain libraries that do not have a yardoc
@@ -282,13 +284,19 @@ module Solargraph
     # @param path [String]
     # @return [Gem::Specification]
     def spec_for_require path
-      name = path.split('/').first.to_s
-      spec = Gem::Specification.find_by_name(name, @gemset[name])
+      relatives = path.split('/')
+      spec = nil
+      while spec.nil? && !relatives.empty?
+        name = relatives.join('-')
+        spec = Gem::Specification.find_by_name(name, @gemset[name])
+        relatives.pop
+      end
+      raise Gem::LoadError if spec.nil?
 
       # Avoid loading the spec again if it's going to be skipped anyway
       return spec if @source_gems.include?(spec.name)
       # Avoid loading the spec again if it's already the correct version
-      if @gemset[spec.name] && @gemset[spec.name] != spec.version
+      if @gemset[spec.name] && spec.version != @gemset[spec.name]
         begin
           return Gem::Specification.find_by_name(spec.name, "= #{@gemset[spec.name]}")
         rescue Gem::LoadError

data/solargraph.gemspec

@@ -27,13 +27,15 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'benchmark'
   s.add_runtime_dependency 'bundler', '~> 2.0'
   s.add_runtime_dependency 'diff-lcs', '~> 1.4'
-  s.add_runtime_dependency 'e2mmap'
-  s.add_runtime_dependency 'jaro_winkler', '~> 1.5'
+  s.add_runtime_dependency 'jaro_winkler', '~> 1.6'
   s.add_runtime_dependency 'kramdown', '~> 2.3'
   s.add_runtime_dependency 'kramdown-parser-gfm', '~> 1.1'
+  s.add_runtime_dependency 'logger', '~> 1.6'
+  s.add_runtime_dependency 'observer', '~> 0.1'
+  s.add_runtime_dependency 'ostruct', '~> 0.6'
   s.add_runtime_dependency 'parser', '~> 3.0'
-  s.add_runtime_dependency 'rbs', '~> 2.0'
-  s.add_runtime_dependency 'reverse_markdown', '~> 2.0'
+  s.add_runtime_dependency 'rbs', '~> 3.0'
+  s.add_runtime_dependency 'reverse_markdown', '>= 2.0', '< 4'
   s.add_runtime_dependency 'rubocop', '~> 1.38'
   s.add_runtime_dependency 'thor', '~> 1.0'
   s.add_runtime_dependency 'tilt', '~> 2.0'
@@ -41,6 +43,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'pry'
   s.add_development_dependency 'public_suffix', '~> 3.1'
+  s.add_development_dependency 'rake', '~> 13.2'
   s.add_development_dependency 'rspec', '~> 3.5'
   s.add_development_dependency 'simplecov', '~> 0.14'
   s.add_development_dependency 'webmock', '~> 3.6'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.50.0
+  version: 0.51.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-05 00:00:00.000000000 Z
+date: 2025-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -67,61 +67,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: e2mmap
+  name: jaro_winkler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: jaro_winkler
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: kramdown
+  name: kramdown-parser-gfm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: kramdown-parser-gfm
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: observer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -142,28 +170,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: reverse_markdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -254,6 +288,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -332,7 +380,6 @@ files:
 - lib/solargraph/convention/gemfile.rb
 - lib/solargraph/convention/gemspec.rb
 - lib/solargraph/convention/rakefile.rb
-- lib/solargraph/convention/rspec.rb
 - lib/solargraph/converters/dd.rb
 - lib/solargraph/converters/dl.rb
 - lib/solargraph/converters/dt.rb
@@ -395,6 +442,7 @@ files:
 - lib/solargraph/language_server/message/text_document/references.rb
 - lib/solargraph/language_server/message/text_document/rename.rb
 - lib/solargraph/language_server/message/text_document/signature_help.rb
+- lib/solargraph/language_server/message/text_document/type_definition.rb
 - lib/solargraph/language_server/message/workspace.rb
 - lib/solargraph/language_server/message/workspace/did_change_configuration.rb
 - lib/solargraph/language_server/message/workspace/did_change_watched_files.rb
@@ -477,6 +525,7 @@ files:
 - lib/solargraph/pin/common.rb
 - lib/solargraph/pin/constant.rb
 - lib/solargraph/pin/conversions.rb
+- lib/solargraph/pin/delegated_method.rb
 - lib/solargraph/pin/documenting.rb
 - lib/solargraph/pin/duck_method.rb
 - lib/solargraph/pin/global_variable.rb

data/lib/solargraph/convention/rspec.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Convention
-    class Rspec < Base
-      def local source_map
-        return EMPTY_ENVIRON unless File.basename(source_map.filename) =~ /_spec\.rb$/
-        @environ ||= Environ.new(
-          requires: ['rspec'],
-          domains: ['RSpec::Matchers', 'RSpec::ExpectationGroups'],
-          pins: [
-            # This override is necessary due to an erroneous @return tag in
-            # rspec's YARD documentation.
-            # @todo The return types have been fixed (https://github.com/rspec/rspec-expectations/pull/1121)
-            Solargraph::Pin::Reference::Override.method_return('RSpec::Matchers#expect', 'RSpec::Expectations::ExpectationTarget')
-          ].concat(extras)
-        )
-      end
-
-      private
-
-      def extras
-        @@extras ||= SourceMap.load_string(%(
-          def describe(*args); end
-          def it(*args); end
-        )).pins
-      end
-    end
-  end
-end