ruby-lsp 0.23.17 → 0.23.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 783a43ad6688b46f4edcb4662a06d9fa9277ecc35475e64189c02547ab4f980b
-  data.tar.gz: 3f4b78c3f7909886d8642d7608d4ef7d358c41ca55fa118380fa2082119864ff
+  metadata.gz: ccc13fa3f30ae54cbb92ce72ea8ae2c6707a94cbed29991c6df6eb424de1797e
+  data.tar.gz: d30bbc7515361249d332006aac49f73256912cedf5afd0690e6ac37970ed3bcb
 SHA512:
-  metadata.gz: cb4be502edd93cd9ce01b505486f035733927076138447bd30607dda326bb40432c1ce0c8c50751252acf5098fbed24824a2c7e578b9914206411cbb7e869268
-  data.tar.gz: ce0ec2cdf2311ae7fda5c5c53fd3abcc122a7c6bcf031dd2dd30d8d65555e51e722985fbc58f75cce94b8591e36f6e404283f67d17c8ad58438c8ba5d7b82b39
+  metadata.gz: 7667f639640708645275f8c8980d0da6a40943883729eb96f6c7d5ebbf26dbe66f167bcc0dccef77899a7f028db20c029a0c9808646b7113ce2cfed4cf48d689
+  data.tar.gz: 84f1da1bb1150b55e8667f2ca8aac9249e0d86cae5c4a9d9ac6494c79eba7c17d54bbed43aa8c4a263614e9cbec1d0e8a30876395295c86b3747d62020bf2a4e

data/VERSION

@@ -1 +1 @@
-0.23.17
+0.23.18

data/lib/ruby_indexer/lib/ruby_indexer/index.rb

@@ -661,6 +661,11 @@ module RubyIndexer
       @ancestors.clear if original_map.any? { |name, hash| updated_map[name] != hash }
     end
 
+    #: -> void
+    def clear_ancestors
+      @ancestors.clear
+    end
+
     #: -> bool
     def empty?
       @entries.empty?

data/lib/ruby_indexer/lib/ruby_indexer/prefix_tree.rb

@@ -32,14 +32,14 @@ module RubyIndexer
   # `Value` type.
   #
   # See https://en.wikipedia.org/wiki/Trie for more information
+  #: [Value]
   class PrefixTree
-    extend T::Generic
-
-    Value = type_member
-
     #: -> void
     def initialize
-      @root = Node.new("", "") #: Node[Value]
+      @root = Node.new(
+        "",
+        "", #: as untyped
+      ) #: Node[Value]
     end
 
     # Search the PrefixTree based on a given `prefix`. If `foo` is an entry in the tree, then searching for `fo` will
@@ -106,11 +106,8 @@ module RubyIndexer
       node
     end
 
+    #: [Value]
     class Node
-      extend T::Generic
-
-      Value = type_member
-
       #: Hash[String, Node[Value]]
       attr_reader :children
 

data/lib/ruby_indexer/test/prefix_tree_test.rb

@@ -22,7 +22,7 @@ module RubyIndexer
     end
 
     def test_multiple_items
-      tree = PrefixTree[String].new
+      tree = PrefixTree.new #: PrefixTree[String]
       ["foo", "bar", "baz"].each { |item| tree.insert(item, item) }
 
       assert_equal(["baz", "bar", "foo"], tree.search(""))
@@ -34,7 +34,7 @@ module RubyIndexer
     end
 
     def test_multiple_prefixes
-      tree = PrefixTree[String].new
+      tree = PrefixTree.new #: PrefixTree[String]
       ["fo", "foo"].each { |item| tree.insert(item, item) }
 
       assert_equal(["fo", "foo"], tree.search(""))
@@ -45,7 +45,7 @@ module RubyIndexer
     end
 
     def test_multiple_prefixes_with_shuffled_order
-      tree = PrefixTree[String].new
+      tree = PrefixTree.new #: PrefixTree[String]
       [
         "foo/bar/base",
         "foo/bar/on",
@@ -97,7 +97,7 @@ module RubyIndexer
     end
 
     def test_deletion
-      tree = PrefixTree[String].new
+      tree = PrefixTree.new #: PrefixTree[String]
       ["foo/bar", "foo/baz"].each { |item| tree.insert(item, item) }
       assert_equal(["foo/baz", "foo/bar"], tree.search("foo"))
 
@@ -107,7 +107,7 @@ module RubyIndexer
     end
 
     def test_delete_does_not_impact_other_keys_with_the_same_value
-      tree = PrefixTree[String].new
+      tree = PrefixTree.new #: PrefixTree[String]
       tree.insert("key1", "value")
       tree.insert("key2", "value")
       assert_equal(["value", "value"], tree.search("key"))
@@ -118,7 +118,7 @@ module RubyIndexer
     end
 
     def test_deleted_node_is_removed_from_the_tree
-      tree = PrefixTree[String].new
+      tree = PrefixTree.new #: PrefixTree[String]
       tree.insert("foo/bar", "foo/bar")
       assert_equal(["foo/bar"], tree.search("foo"))
 
@@ -128,7 +128,7 @@ module RubyIndexer
     end
 
     def test_deleting_non_terminal_nodes
-      tree = PrefixTree[String].new
+      tree = PrefixTree.new #: PrefixTree[String]
       tree.insert("abc", "value1")
       tree.insert("abcdef", "value2")
 
@@ -138,7 +138,7 @@ module RubyIndexer
     end
 
     def test_overriding_values
-      tree = PrefixTree[Integer].new
+      tree = PrefixTree.new #: PrefixTree[Integer]
 
       tree.insert("foo/bar", 123)
       assert_equal([123], tree.search("foo/bar"))

data/lib/ruby_lsp/client_capabilities.rb

@@ -10,7 +10,8 @@ module RubyLsp
       :supports_request_delegation,
       :window_show_message_supports_extra_properties,
       :supports_progress,
-      :supports_diagnostic_refresh
+      :supports_diagnostic_refresh,
+      :supports_code_lens_refresh
 
     #: -> void
     def initialize
@@ -34,6 +35,9 @@ module RubyLsp
 
       # The editor supports server initiated refresh for diagnostics
       @supports_diagnostic_refresh = false #: bool
+
+      # The editor supports server initiated refresh for code lenses
+      @supports_code_lens_refresh = false #: bool
     end
 
     #: (Hash[Symbol, untyped] capabilities) -> void
@@ -61,6 +65,7 @@ module RubyLsp
       @supports_progress = progress if progress
 
       @supports_diagnostic_refresh = workspace_capabilities.dig(:diagnostics, :refreshSupport) || false
+      @supports_code_lens_refresh = workspace_capabilities.dig(:codeLens, :refreshSupport) || false
     end
 
     #: -> bool

data/lib/ruby_lsp/document.rb

@@ -2,13 +2,12 @@
 # frozen_string_literal: true
 
 module RubyLsp
+  #: [ParseResultType]
   class Document
     extend T::Sig
     extend T::Helpers
-    extend T::Generic
 
     class LocationNotFoundError < StandardError; end
-    ParseResultType = type_member
 
     # This maximum number of characters for providing expensive features, like semantic highlighting and diagnostics.
     # This is the same number used by the TypeScript extension in VS Code
@@ -86,6 +85,11 @@ module RubyLsp
       @cache[request_name]
     end
 
+    #: (String request_name) -> void
+    def clear_cache(request_name)
+      @cache[request_name] = EMPTY_CACHE
+    end
+
     #: (Array[Hash[Symbol, untyped]] edits, version: Integer) -> void
     def push_edits(edits, version:)
       edits.each do |edit|

data/lib/ruby_lsp/erb_document.rb

@@ -2,11 +2,8 @@
 # frozen_string_literal: true
 
 module RubyLsp
+  #: [ParseResultType = Prism::ParseResult]
   class ERBDocument < Document
-    extend T::Generic
-
-    ParseResultType = type_member { { fixed: Prism::ParseResult } }
-
     #: String
     attr_reader :host_language_source
 

data/lib/ruby_lsp/internal.rb

@@ -14,7 +14,12 @@ Bundler.ui.level = :silent
 
 require "json"
 require "uri"
-require "cgi"
+require "cgi/escape"
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.5")
+  # Just requiring `cgi/escape` leaves CGI.unescape broken on older rubies
+  # Some background on why this is necessary: https://bugs.ruby-lang.org/issues/21258
+  require "cgi/util"
+end
 require "set"
 require "strscan"
 require "prism"

data/lib/ruby_lsp/listeners/hover.rb

@@ -86,6 +86,14 @@ module RubyLsp
 
       #: (Prism::StringNode node) -> void
       def on_string_node_enter(node)
+        if @path && File.basename(@path) == GEMFILE_NAME
+          call_node = @node_context.call_node
+          if call_node && call_node.name == :gem && call_node.arguments&.arguments&.first == node
+            generate_gem_hover(call_node)
+            return
+          end
+        end
+
         generate_heredoc_hover(node)
       end
 
@@ -123,11 +131,6 @@ module RubyLsp
 
       #: (Prism::CallNode node) -> void
       def on_call_node_enter(node)
-        if @path && File.basename(@path) == GEMFILE_NAME && node.name == :gem
-          generate_gem_hover(node)
-          return
-        end
-
         return if @sorbet_level.true_or_higher? && self_receiver?(node)
 
         message = node.message

data/lib/ruby_lsp/listeners/test_discovery.rb

@@ -71,7 +71,7 @@ module RubyLsp
         slice.gsub(/((?<=::)|^)[a-z]\w*/, DYNAMIC_REFERENCE_MARKER)
       end
 
-      #: (Prism::ClassNode node, ^(String name, Array[String] ancestors) -> void block) -> void
+      #: (Prism::ClassNode node) { (String name, Array[String] ancestors) -> void } -> void
       def with_test_ancestor_tracking(node, &block)
         @visibility_stack << :public
         name = constant_name(node.constant_path)

data/lib/ruby_lsp/listeners/test_style.rb

@@ -202,7 +202,7 @@ module RubyLsp
           framework: @framework,
         )
         test_item.add(example_item)
-        @response_builder.add_code_lens(test_item)
+        @response_builder.add_code_lens(example_item)
       end
 
       #: (Prism::CallNode node) -> void

data/lib/ruby_lsp/rbs_document.rb

@@ -2,11 +2,8 @@
 # frozen_string_literal: true
 
 module RubyLsp
+  #: [ParseResultType = Array[RBS::AST::Declarations::Base]]
   class RBSDocument < Document
-    extend T::Generic
-
-    ParseResultType = type_member { { fixed: T::Array[RBS::AST::Declarations::Base] } }
-
     #: (source: String, version: Integer, uri: URI::Generic, global_state: GlobalState) -> void
     def initialize(source:, version:, uri:, global_state:)
       @syntax_error = false #: bool

data/lib/ruby_lsp/requests/code_lens.rb

@@ -14,7 +14,7 @@ module RubyLsp
       class << self
         #: -> Interface::CodeLensOptions
         def provider
-          Interface::CodeLensOptions.new(resolve_provider: false)
+          Interface::CodeLensOptions.new(resolve_provider: true)
         end
       end
 

data/lib/ruby_lsp/requests/definition.rb

@@ -9,8 +9,6 @@ module RubyLsp
     # request](https://microsoft.github.io/language-server-protocol/specification#textDocument_definition) jumps to the
     # definition of the symbol under the cursor.
     class Definition < Request
-      extend T::Generic
-
       #: ((RubyDocument | ERBDocument) document, GlobalState global_state, Hash[Symbol, untyped] position, Prism::Dispatcher dispatcher, SorbetLevel sorbet_level) -> void
       def initialize(document, global_state, position, dispatcher, sorbet_level)
         super()

data/lib/ruby_lsp/requests/hover.rb

@@ -7,9 +7,8 @@ module RubyLsp
   module Requests
     # The [hover request](https://microsoft.github.io/language-server-protocol/specification#textDocument_hover)
     # displays the documentation for the symbol currently under the cursor.
+    #: [ResponseType = Interface::Hover?]
     class Hover < Request
-      extend T::Generic
-
       class << self
         #: -> Interface::HoverOptions
         def provider
@@ -17,8 +16,6 @@ module RubyLsp
         end
       end
 
-      ResponseType = type_member { { fixed: T.nilable(Interface::Hover) } }
-
       #: ((RubyDocument | ERBDocument) document, GlobalState global_state, Hash[Symbol, untyped] position, Prism::Dispatcher dispatcher, SorbetLevel sorbet_level) -> void
       def initialize(document, global_state, position, dispatcher, sorbet_level)
         super()

data/lib/ruby_lsp/requests/request.rb

@@ -4,7 +4,7 @@
 module RubyLsp
   module Requests
     class Request
-      extend T::Generic
+      extend T::Helpers
       extend T::Sig
 
       class InvalidFormatter < StandardError; end

data/lib/ruby_lsp/requests/support/test_item.rb

@@ -19,7 +19,7 @@ module RubyLsp
         #: Interface::Range
         attr_reader :range
 
-        #: (String id, String label, URI::Generic uri, Interface::Range range, Symbol framework) -> void
+        #: (String id, String label, URI::Generic uri, Interface::Range range, framework: Symbol) -> void
         def initialize(id, label, uri, range, framework:)
           @id = id
           @label = label

data/lib/ruby_lsp/response_builders/collection_response_builder.rb

@@ -3,11 +3,8 @@
 
 module RubyLsp
   module ResponseBuilders
+    #: [ResponseType < Object]
     class CollectionResponseBuilder < ResponseBuilder
-      extend T::Generic
-
-      ResponseType = type_member { { upper: Object } }
-
       #: -> void
       def initialize
         super

data/lib/ruby_lsp/response_builders/document_symbol.rb

@@ -3,9 +3,8 @@
 
 module RubyLsp
   module ResponseBuilders
+    #: [ResponseType = Array[Interface::DocumentSymbol]]
     class DocumentSymbol < ResponseBuilder
-      ResponseType = type_member { { fixed: T::Array[Interface::DocumentSymbol] } }
-
       class SymbolHierarchyRoot
         #: Array[Interface::DocumentSymbol]
         attr_reader :children

data/lib/ruby_lsp/response_builders/hover.rb

@@ -3,11 +3,8 @@
 
 module RubyLsp
   module ResponseBuilders
+    #: [ResponseType = String]
     class Hover < ResponseBuilder
-      extend T::Generic
-
-      ResponseType = type_member { { fixed: String } }
-
       #: -> void
       def initialize
         super

data/lib/ruby_lsp/response_builders/response_builder.rb

@@ -4,8 +4,8 @@
 module RubyLsp
   module ResponseBuilders
     class ResponseBuilder
-      extend T::Generic
       extend T::Sig
+      extend T::Helpers
 
       abstract!
 

data/lib/ruby_lsp/response_builders/semantic_highlighting.rb

@@ -3,6 +3,7 @@
 
 module RubyLsp
   module ResponseBuilders
+    #: [ResponseType = Interface::SemanticTokens]
     class SemanticHighlighting < ResponseBuilder
       class UndefinedTokenType < StandardError; end
 
@@ -45,8 +46,6 @@ module RubyLsp
         default_library: 9,
       }.freeze #: Hash[Symbol, Integer]
 
-      ResponseType = type_member { { fixed: Interface::SemanticTokens } }
-
       #: ((^(Integer arg0) -> Integer | Prism::CodeUnitsCache) code_units_cache) -> void
       def initialize(code_units_cache)
         super()

data/lib/ruby_lsp/response_builders/signature_help.rb

@@ -3,9 +3,8 @@
 
 module RubyLsp
   module ResponseBuilders
+    #: [ResponseType = Interface::SignatureHelp?]
     class SignatureHelp < ResponseBuilder
-      ResponseType = type_member { { fixed: T.nilable(Interface::SignatureHelp) } }
-
       #: -> void
       def initialize
         super

data/lib/ruby_lsp/response_builders/test_collection.rb

@@ -3,11 +3,8 @@
 
 module RubyLsp
   module ResponseBuilders
+    #: [ResponseType = Requests::Support::TestItem]
     class TestCollection < ResponseBuilder
-      extend T::Generic
-
-      ResponseType = type_member { { fixed: Requests::Support::TestItem } }
-
       #: Array[Interface::CodeLens]
       attr_reader :code_lens
 
@@ -25,34 +22,26 @@ module RubyLsp
 
       #: (ResponseType item) -> void
       def add_code_lens(item)
-        range = item.range
         arguments = [item.uri.to_standardized_path, item.id]
+        start = item.range.start
+        range = Interface::Range.new(
+          start: start,
+          end: Interface::Position.new(line: start.line, character: start.character + 1),
+        )
 
         @code_lens << Interface::CodeLens.new(
           range: range,
-          command: Interface::Command.new(
-            title: "▶ Run",
-            command: "rubyLsp.runTest",
-            arguments: arguments,
-          ),
+          data: { arguments: arguments, kind: "run_test" },
         )
 
         @code_lens << Interface::CodeLens.new(
           range: range,
-          command: Interface::Command.new(
-            title: "▶ Run In Terminal",
-            command: "rubyLsp.runTestInTerminal",
-            arguments: arguments,
-          ),
+          data: { arguments: arguments, kind: "run_test_in_terminal" },
         )
 
         @code_lens << Interface::CodeLens.new(
           range: range,
-          command: Interface::Command.new(
-            title: "⚙ Debug",
-            command: "rubyLsp.debugTest",
-            arguments: arguments,
-          ),
+          data: { arguments: arguments, kind: "debug_test" },
         )
       end
 

data/lib/ruby_lsp/ruby_document.rb

@@ -2,11 +2,8 @@
 # frozen_string_literal: true
 
 module RubyLsp
+  #: [ParseResultType = Prism::ParseResult]
   class RubyDocument < Document
-    extend T::Generic
-
-    ParseResultType = type_member { { fixed: Prism::ParseResult } }
-
     METHODS_THAT_CHANGE_DECLARATIONS = [
       :private_constant,
       :attr_reader,

data/lib/ruby_lsp/server.rb

@@ -32,6 +32,8 @@ module RubyLsp
         text_document_document_link(message)
       when "textDocument/codeLens"
         text_document_code_lens(message)
+      when "codeLens/resolve"
+        code_lens_resolve(message)
       when "textDocument/semanticTokens/full"
         text_document_semantic_tokens_full(message)
       when "textDocument/semanticTokens/full/delta"
@@ -1124,7 +1126,7 @@ module RubyLsp
       # Clear all document caches for pull diagnostics
       @global_state.synchronize do
         @store.each do |_uri, document|
-          document.cache_set("textDocument/diagnostic", Document::EMPTY_CACHE)
+          document.clear_cache("textDocument/diagnostic")
         end
       end
 
@@ -1280,9 +1282,25 @@ module RubyLsp
         # allocations and garbage collections are faster
         GC.compact unless @test_mode
 
+        @global_state.synchronize do
+          # If we linearize ancestors while the index is not fully populated, we may end up caching incorrect results
+          # that were missing namespaces. After indexing is complete, we need to clear the ancestors cache and start
+          # again
+          @global_state.index.clear_ancestors
+
+          # The results for code lens depend on ancestor linearization, so we need to clear any previously computed
+          # responses
+          @store.each { |_uri, document| document.clear_cache("textDocument/codeLens") }
+        end
+
         # Always end the progress notification even if indexing failed or else it never goes away and the user has no
         # way of dismissing it
         end_progress("indexing-progress")
+
+        # Request a code lens refresh if we populated them before all test parent classes were indexed
+        if @global_state.client_capabilities.supports_code_lens_refresh
+          send_message(Request.new(id: @current_request_id, method: "workspace/codeLens/refresh", params: nil))
+        end
       end
     end
 
@@ -1497,5 +1515,26 @@ module RubyLsp
         },
       ))
     end
+
+    #: (Hash[Symbol, untyped] message) -> void
+    def code_lens_resolve(message)
+      code_lens = message[:params]
+      args = code_lens.dig(:data, :arguments)
+
+      case code_lens.dig(:data, :kind)
+      when "run_test"
+        code_lens[:command] = Interface::Command.new(title: "▶ Run", command: "rubyLsp.runTest", arguments: args)
+      when "run_test_in_terminal"
+        code_lens[:command] =
+          Interface::Command.new(title: "▶ Run in terminal", command: "rubyLsp.runTestInTerminal", arguments: args)
+      when "debug_test"
+        code_lens[:command] = Interface::Command.new(title: "⚙ Debug", command: "rubyLsp.debugTest", arguments: args)
+      end
+
+      send_message(Result.new(
+        id: message[:id],
+        response: code_lens,
+      ))
+    end
   end
 end

data/lib/ruby_lsp/test_reporters/lsp_reporter.rb

@@ -59,9 +59,9 @@ module RubyLsp
       @io.close
     end
 
-    #: (id: String, uri: URI::Generic) -> void
-    def start_test(id:, uri:)
-      send_message("start", id: id, uri: uri.to_s)
+    #: (id: String, uri: URI::Generic, ?line: Integer?) -> void
+    def start_test(id:, uri:, line: nil)
+      send_message("start", id: id, uri: uri.to_s, line: line)
     end
 
     #: (id: String, uri: URI::Generic) -> void
@@ -84,6 +84,17 @@ module RubyLsp
       send_message("error", id: id, message: message, uri: uri.to_s)
     end
 
+    #: (Method | UnboundMethod) -> [URI::Generic, Integer?]?
+    def uri_and_line_for(method_object)
+      file_path, line = method_object.source_location
+      return unless file_path
+      return if file_path.start_with?("(eval at ")
+
+      uri = URI::Generic.from_path(path: File.expand_path(file_path))
+      zero_based_line = line ? line - 1 : nil
+      [uri, zero_based_line]
+    end
+
     # Gather the results returned by Coverage.result and format like the VS Code test explorer expects
     #
     # Coverage result format:
@@ -115,10 +126,9 @@ module RubyLsp
     def gather_coverage_results
       # Ignore coverage results inside dependencies
       bundle_path = Bundler.bundle_path.to_s
-      default_gems_path = File.dirname(RbConfig::CONFIG["rubylibdir"])
 
       result = Coverage.result.reject do |file_path, _coverage_info|
-        file_path.start_with?(bundle_path, default_gems_path, "eval")
+        file_path.start_with?(bundle_path) || !file_path.start_with?(Dir.pwd)
       end
 
       result.to_h do |file_path, coverage_info|
@@ -163,7 +173,7 @@ module RubyLsp
 
     private
 
-    #: (method_name: String?, params: untyped) -> void
+    #: (String?, **untyped) -> void
     def send_message(method_name, **params)
       json_message = { method: method_name, params: params }.to_json
       @io.write("Content-Length: #{json_message.bytesize}\r\n\r\n#{json_message}")

data/lib/ruby_lsp/test_reporters/minitest_reporter.rb

@@ -51,16 +51,19 @@ module RubyLsp
 
     #: (singleton(Minitest::Test) test_class, String method_name) -> void
     def prerecord(test_class, method_name)
-      uri = uri_from_test_class(test_class, method_name)
+      uri, line = LspReporter.instance.uri_and_line_for(test_class.instance_method(method_name))
       return unless uri
 
-      LspReporter.instance.start_test(id: "#{test_class.name}##{method_name}", uri: uri)
+      LspReporter.instance.start_test(id: "#{test_class.name}##{method_name}", uri: uri, line: line)
     end
 
     #: (Minitest::Result result) -> void
     def record(result)
       id = "#{result.klass}##{result.name}"
-      uri = uri_from_result(result)
+      file_path, _line = result.source_location
+      return unless file_path
+
+      uri = URI::Generic.from_path(path: File.expand_path(file_path))
 
       if result.error?
         message = result.failures.first.message
@@ -79,26 +82,6 @@ module RubyLsp
     def report
       LspReporter.instance.shutdown
     end
-
-    private
-
-    #: (Minitest::Result result) -> URI::Generic
-    def uri_from_result(result)
-      file = result.source_location[0]
-      absolute_path = File.expand_path(file, Dir.pwd)
-      URI::Generic.from_path(path: absolute_path)
-    end
-
-    #: (singleton(Minitest::Test) test_class, String method_name) -> URI::Generic?
-    def uri_from_test_class(test_class, method_name)
-      file, _line = test_class.instance_method(method_name).source_location
-      return unless file
-
-      return if file.start_with?("(eval at ") # test is dynamically defined
-
-      absolute_path = File.expand_path(file, Dir.pwd)
-      URI::Generic.from_path(path: absolute_path)
-    end
   end
 end
 

data/lib/ruby_lsp/test_reporters/test_unit_reporter.rb

@@ -26,12 +26,12 @@ module RubyLsp
     def test_started(test)
       super
 
-      current_test = test
-      @current_uri = uri_for_test(current_test)
-      return unless @current_uri
+      uri, line = LspReporter.instance.uri_and_line_for(test.method(test.method_name))
+      return unless uri
 
-      @current_test_id = "#{current_test.class.name}##{current_test.method_name}"
-      LspReporter.instance.start_test(id: @current_test_id, uri: @current_uri)
+      @current_uri = uri
+      @current_test_id = "#{test.class.name}##{test.method_name}"
+      LspReporter.instance.start_test(id: @current_test_id, uri: @current_uri, line: line)
     end
 
     #: (::Test::Unit::TestCase test) -> void
@@ -62,18 +62,6 @@ module RubyLsp
       LspReporter.instance.shutdown
     end
 
-    #: (::Test::Unit::TestCase test) -> URI::Generic?
-    def uri_for_test(test)
-      location = test.method(test.method_name).source_location
-      return unless location
-
-      file, _line = location
-      return if file.start_with?("(eval at ")
-
-      absolute_path = File.expand_path(file, Dir.pwd)
-      URI::Generic.from_path(path: absolute_path)
-    end
-
     #: -> void
     def attach_to_mediator
       # Events we care about

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp
 version: !ruby/object:Gem::Version
-  version: 0.23.17
+  version: 0.23.18
 platform: ruby
 authors:
 - Shopify