Include line numbers when reporting test start event

Author: vinistock

lib/ruby_lsp/test_reporters/lsp_reporter.rb

@@ -59,9 +59,9 @@ def internal_shutdown
       @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:)
+      send_message("start", id: id, uri: uri.to_s, line: line)
     end
 
     #: (id: String, uri: URI::Generic) -> void

lib/ruby_lsp/test_reporters/minitest_reporter.rb

@@ -51,16 +51,21 @@ def minitest_plugin_init(_options)
 
     #: (singleton(Minitest::Test) test_class, String method_name) -> void
     def prerecord(test_class, method_name)
-      uri = uri_from_test_class(test_class, method_name)
-      return unless uri
+      file_path, line = test_class.instance_method(method_name).source_location
+      return unless file_path
+      return if file_path.start_with?("(eval at ")
 
-      LspReporter.instance.start_test(id: "#{test_class.name}##{method_name}", uri: uri)
+      uri = URI::Generic.from_path(path: File.expand_path(file_path))
+      LspReporter.instance.start_test(id: "#{test_class.name}##{method_name}", uri: uri, line: (line || 1) - 1)
     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 +84,6 @@ def record(result)
     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
 

lib/ruby_lsp/test_reporters/test_unit_reporter.rb

@@ -26,12 +26,14 @@ def initialize(suite, options = {})
     def test_started(test)
       super
 
-      current_test = test
-      @current_uri = uri_for_test(current_test)
-      return unless @current_uri
+      file_path, line = test.method(test.method_name).source_location
+      return unless file_path
+      return if file_path.start_with?("(eval at ")
 
-      @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::Generic.from_path(path: File.expand_path(file_path))
+      @current_test_id = "#{test.class.name}##{test.method_name}"
+
+      LspReporter.instance.start_test(id: @current_test_id, uri: @current_uri, line: line - 1)
     end
 
     #: (::Test::Unit::TestCase test) -> void
@@ -62,18 +64,6 @@ def finished(elapsed_time)
       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

test/test_reporters/minitest_reporter_test.rb

@@ -56,6 +56,7 @@ def test_minitest_output
           "params" => {
             "id" => "SampleTest#test_that_fails",
             "uri" => uri,
+            "line" => 14,
           },
         },
         {
@@ -71,6 +72,7 @@ def test_minitest_output
           "params" => {
             "id" => "SampleTest#test_that_is_pending",
             "uri" => uri,
+            "line" => 18,
           },
         },
         {
@@ -85,6 +87,7 @@ def test_minitest_output
           "params" => {
             "id" => "SampleTest#test_that_passes",
             "uri" => uri,
+            "line" => 9,
           },
         },
         {
@@ -99,6 +102,7 @@ def test_minitest_output
           "params" => {
             "id" => "SampleTest#test_that_raises",
             "uri" => uri,
+            "line" => 22,
           },
         },
         {
@@ -114,6 +118,7 @@ def test_minitest_output
           "params" => {
             "id" => "SampleTest#test_with_output",
             "uri" => uri,
+            "line" => 26,
           },
         },
         {

test/test_reporters/test_unit_reporter_test.rb

@@ -59,6 +59,7 @@ def test_test_runner_output
           "params" => {
             "id" => "SampleTest#test_that_fails",
             "uri" => uri,
+            "line" => 11,
           },
         },
         {
@@ -74,6 +75,7 @@ def test_test_runner_output
           "params" => {
             "id" => "SampleTest#test_that_is_pending",
             "uri" => uri,
+            "line" => 15,
           },
         },
         {
@@ -88,6 +90,7 @@ def test_test_runner_output
           "params" => {
             "id" => "SampleTest#test_that_passes",
             "uri" => uri,
+            "line" => 6,
           },
         },
         {
@@ -102,6 +105,7 @@ def test_test_runner_output
           "params" => {
             "id" => "SampleTest#test_that_raises",
             "uri" => uri,
+            "line" => 19,
           },
         },
         {