Cache tests discovered during code lens request

Author: vinistock

lib/ruby_lsp/requests/code_lens.rb

@@ -18,13 +18,15 @@ def provider
         end
       end
 
-      #: (GlobalState global_state, URI::Generic uri, Prism::Dispatcher dispatcher) -> void
-      def initialize(global_state, uri, dispatcher)
+      #: (GlobalState, RubyDocument | ERBDocument, Prism::Dispatcher) -> void
+      def initialize(global_state, document, dispatcher)
         @response_builder = ResponseBuilders::CollectionResponseBuilder
           .new #: ResponseBuilders::CollectionResponseBuilder[Interface::CodeLens]
         super()
 
+        @document = document
         @test_builder = ResponseBuilders::TestCollection.new #: ResponseBuilders::TestCollection
+        uri = document.uri
 
         if global_state.enabled_feature?(:fullTestDiscovery)
           Listeners::TestStyle.new(@test_builder, global_state, dispatcher, uri)
@@ -45,6 +47,7 @@ def initialize(global_state, uri, dispatcher)
       # @override
       #: -> Array[Interface::CodeLens]
       def perform
+        @document.cache_set("rubyLsp/discoverTests", @test_builder.response)
         @response_builder.response + @test_builder.code_lens
       end
     end

lib/ruby_lsp/server.rb

@@ -512,12 +512,12 @@ def run_combined_requests(message)
           @global_state.index.handle_change(uri) do |index|
             index.delete(uri, skip_require_paths_tree: true)
             RubyIndexer::DeclarationListener.new(index, dispatcher, parse_result, uri, collect_comments: true)
-            code_lens = Requests::CodeLens.new(@global_state, uri, dispatcher)
+            code_lens = Requests::CodeLens.new(@global_state, document, dispatcher)
             dispatcher.dispatch(parse_result.value)
           end
         end
       else
-        code_lens = Requests::CodeLens.new(@global_state, uri, dispatcher)
+        code_lens = Requests::CodeLens.new(@global_state, document, dispatcher)
         dispatcher.dispatch(parse_result.value)
       end
 

test/requests/code_lens_expectations_test.rb

@@ -13,7 +13,7 @@ def run_expectations(source)
 
     dispatcher = Prism::Dispatcher.new
     stub_test_library("minitest")
-    listener = RubyLsp::Requests::CodeLens.new(@global_state, uri, dispatcher)
+    listener = RubyLsp::Requests::CodeLens.new(@global_state, document, dispatcher)
     dispatcher.dispatch(document.parse_result.value)
     listener.perform
   end
@@ -30,7 +30,7 @@ def test_bar; end
     document = RubyLsp::RubyDocument.new(source: source, version: 1, uri: uri, global_state: @global_state)
 
     dispatcher = Prism::Dispatcher.new
-    listener = RubyLsp::Requests::CodeLens.new(@global_state, uri, dispatcher)
+    listener = RubyLsp::Requests::CodeLens.new(@global_state, document, dispatcher)
     dispatcher.dispatch(document.parse_result.value)
     response = listener.perform
 
@@ -64,7 +64,7 @@ class FooTest < MiniTest::Spec
     document = RubyLsp::RubyDocument.new(source: source, version: 1, uri: uri, global_state: @global_state)
 
     dispatcher = Prism::Dispatcher.new
-    listener = RubyLsp::Requests::CodeLens.new(@global_state, uri, dispatcher)
+    listener = RubyLsp::Requests::CodeLens.new(@global_state, document, dispatcher)
     dispatcher.dispatch(document.parse_result.value)
     response = listener.perform
 
@@ -102,7 +102,7 @@ def test_command_generation_for_minitest_spec_handles_specify_alias_for_it
     document = RubyLsp::RubyDocument.new(source: source, version: 1, uri: uri, global_state: @global_state)
 
     dispatcher = Prism::Dispatcher.new
-    listener = RubyLsp::Requests::CodeLens.new(@global_state, uri, dispatcher)
+    listener = RubyLsp::Requests::CodeLens.new(@global_state, document, dispatcher)
     dispatcher.dispatch(document.parse_result.value)
     response = listener.perform
 
@@ -122,7 +122,7 @@ def test_bar; end
     document = RubyLsp::RubyDocument.new(source: source, version: 1, uri: uri, global_state: @global_state)
 
     dispatcher = Prism::Dispatcher.new
-    listener = RubyLsp::Requests::CodeLens.new(@global_state, uri, dispatcher)
+    listener = RubyLsp::Requests::CodeLens.new(@global_state, document, dispatcher)
     dispatcher.dispatch(document.parse_result.value)
     response = listener.perform
 
@@ -154,7 +154,7 @@ def test_bar; end
 
     dispatcher = Prism::Dispatcher.new
     stub_test_library("unknown")
-    listener = RubyLsp::Requests::CodeLens.new(@global_state, uri, dispatcher)
+    listener = RubyLsp::Requests::CodeLens.new(@global_state, document, dispatcher)
     dispatcher.dispatch(document.parse_result.value)
     response = listener.perform
 
@@ -173,7 +173,7 @@ def test_bar; end
 
     dispatcher = Prism::Dispatcher.new
     stub_test_library("rspec")
-    listener = RubyLsp::Requests::CodeLens.new(@global_state, uri, dispatcher)
+    listener = RubyLsp::Requests::CodeLens.new(@global_state, document, dispatcher)
     dispatcher.dispatch(document.parse_result.value)
     response = listener.perform
 
@@ -192,7 +192,7 @@ def test_bar; end
 
     dispatcher = Prism::Dispatcher.new
     stub_test_library("minitest")
-    listener = RubyLsp::Requests::CodeLens.new(@global_state, uri, dispatcher)
+    listener = RubyLsp::Requests::CodeLens.new(@global_state, document, dispatcher)
     dispatcher.dispatch(document.parse_result.value)
     response = listener.perform
 
@@ -211,7 +211,7 @@ def test_no_code_lens_for_unsaved_specs
 
     dispatcher = Prism::Dispatcher.new
     stub_test_library("minitest")
-    listener = RubyLsp::Requests::CodeLens.new(@global_state, uri, dispatcher)
+    listener = RubyLsp::Requests::CodeLens.new(@global_state, document, dispatcher)
     dispatcher.dispatch(document.parse_result.value)
     response = listener.perform
 
@@ -266,7 +266,7 @@ def test_baz; end
     document = RubyLsp::RubyDocument.new(source: source, version: 1, uri: uri, global_state: @global_state)
 
     dispatcher = Prism::Dispatcher.new
-    listener = RubyLsp::Requests::CodeLens.new(@global_state, uri, dispatcher)
+    listener = RubyLsp::Requests::CodeLens.new(@global_state, document, dispatcher)
     dispatcher.dispatch(document.parse_result.value)
     response = listener.perform
 

test/server_test.rb

@@ -1593,6 +1593,48 @@ def test_code_lens_resolve_populates_debug_test_command
     assert_equal(arguments, command.arguments)
   end
 
+  def test_code_lens_caches_discovered_tests
+    uri = URI::Generic.from_path(path: "/foo.rb")
+    text = <<~RUBY
+      class MyTest < Minitest::Test
+        def test_something
+        end
+      end
+    RUBY
+
+    @server.process_message({
+      method: "textDocument/didOpen",
+      params: {
+        textDocument: {
+          uri: uri,
+          text: text,
+          version: 1,
+          languageId: "ruby",
+        },
+      },
+    })
+
+    @server.process_message({
+      id: 1,
+      method: "textDocument/codeLens",
+      params: {
+        textDocument: { uri: uri },
+      },
+    })
+
+    result = find_message(RubyLsp::Result, id: 1)
+    assert_equal(6, result.response.length)
+
+    RubyLsp::Requests::DiscoverTests.any_instance.expects(:perform).never
+    @server.process_message({
+      id: 2,
+      method: "rubyLsp/discoverTests",
+      params: {
+        textDocument: { uri: uri },
+      },
+    })
+  end
+
   private
 
   def wait_for_indexing