ruby-lsp 0.23.19 → 0.23.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1237fb89845265d5dc2ba67bf59c9b373b7e5df85259ab56405be981a17a997
-  data.tar.gz: b44d385952e75531073d25adc2722d9e10f440ace7411980d1e850e88b7e4912
+  metadata.gz: 63ffbd4bd2ac09693c25c61a71ec89528578c3eaeaf35bf547e5ee748085f3d6
+  data.tar.gz: f3390b3e9f7f86c3dcf98130c04d18a40720ab21a6b521035859bafdac67ae60
 SHA512:
-  metadata.gz: 25025186295d6a07319c0e12fe4caa072ba9639a00094570c4d141a9d53dcdc993a4fd86f639ca9a0061952391ddd8e3c64ac0d90280787f13da6ae227f2aac4
-  data.tar.gz: 4af77a8ff3d1d32d291a82a296df56595710eb0932872aed8fdce95135b9b1c091563cc63be4efd28598fe86dcd14178c96979a7880b923ee114eff74db0bf40
+  metadata.gz: 0232de2d936eaa8baa579293884fdb47c69d70be87b834b655292111b50ab9609f0d52d2a627a679483919116a6215df25c0966fc725b9c5a11a5b0160f12550
+  data.tar.gz: 3c744d0e29846cc5bf4406a06675fb789d1d6efe959cf982fba2505ca58b151ea45b4c800aceedfd2b242d75e792f557d99ffea5108afdc3894c76d0885ea5ae

data/VERSION

@@ -1 +1 @@
-0.23.19
+0.23.20

data/lib/ruby_lsp/test_reporters/lsp_reporter.rb

@@ -1,6 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
+require "English"
 require "json"
 require "socket"
 require "singleton"
@@ -171,6 +172,30 @@ module RubyLsp
       end
     end
 
+    #: -> void
+    def at_coverage_exit
+      coverage_results = gather_coverage_results
+      File.write(File.join(".ruby-lsp", "coverage_result.json"), coverage_results.to_json)
+      internal_shutdown
+    end
+
+    #: -> void
+    def at_exit
+      internal_shutdown unless invoked_shutdown
+    end
+
+    class << self
+      #: -> bool
+      def start_coverage?
+        ENV["RUBY_LSP_TEST_RUNNER"] == "coverage"
+      end
+
+      #: -> bool
+      def executed_under_test_runner?
+        !!(ENV["RUBY_LSP_TEST_RUNNER"] && ENV["RUBY_LSP_ENV"] != "test")
+      end
+    end
+
     private
 
     #: (String?, **untyped) -> void
@@ -181,21 +206,17 @@ module RubyLsp
   end
 end
 
-if ENV["RUBY_LSP_TEST_RUNNER"] == "coverage"
+if RubyLsp::LspReporter.start_coverage?
   # Auto start coverage when running tests under that profile. This avoids the user from having to configure coverage
   # manually for their project or adding extra dependencies
   require "coverage"
   Coverage.start(:all)
+end
 
+if RubyLsp::LspReporter.executed_under_test_runner?
   at_exit do
-    coverage_results = RubyLsp::LspReporter.instance.gather_coverage_results
-    File.write(File.join(".ruby-lsp", "coverage_result.json"), coverage_results.to_json)
-    RubyLsp::LspReporter.instance.internal_shutdown
-  end
-elsif ENV["RUBY_LSP_TEST_RUNNER"] && ENV["RUBY_LSP_ENV"] != "test"
-  at_exit do
-    # If the test process crashed immediately without finishing the tests, we still need to tell the extension that the
-    # execution ended so that it can clean up
-    RubyLsp::LspReporter.instance.internal_shutdown unless RubyLsp::LspReporter.instance.invoked_shutdown
+    # Regular finish events are registered per test reporter. However, if the test crashes during loading the files
+    # (e.g.: a bad require), we need to ensure that the execution is finalized so that the extension is not left hanging
+    RubyLsp::LspReporter.instance.at_exit if $ERROR_INFO
   end
 end

data/lib/ruby_lsp/test_reporters/minitest_reporter.rb

@@ -86,3 +86,13 @@ module RubyLsp
 end
 
 Minitest.extensions << RubyLsp::MinitestReporter
+
+if RubyLsp::LspReporter.start_coverage?
+  Minitest.after_run do
+    RubyLsp::LspReporter.instance.at_coverage_exit
+  end
+elsif RubyLsp::LspReporter.executed_under_test_runner?
+  Minitest.after_run do
+    RubyLsp::LspReporter.instance.at_exit
+  end
+end

data/lib/ruby_lsp/test_reporters/test_unit_reporter.rb

@@ -59,6 +59,7 @@ module RubyLsp
 
     #: (Float) -> void
     def finished(elapsed_time)
+      super
       LspReporter.instance.shutdown
     end
 
@@ -80,3 +81,13 @@ end
 
 Test::Unit::AutoRunner.register_runner(:ruby_lsp) { |_auto_runner| RubyLsp::TestUnitReporter }
 Test::Unit::AutoRunner.default_runner = :ruby_lsp
+
+if RubyLsp::LspReporter.start_coverage?
+  Test::Unit.at_exit do
+    RubyLsp::LspReporter.instance.at_coverage_exit
+  end
+elsif RubyLsp::LspReporter.executed_under_test_runner?
+  Test::Unit.at_exit do
+    RubyLsp::LspReporter.instance.at_exit
+  end
+end

metadata

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