ruby-lsp-rspec 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94c72f8fcd6ded9ad2ce93a0d55b9358bd96f82d8bd33fcffe7bc0a8e871fe49
-  data.tar.gz: d91f21f2f77423d171239cb4a030447d2ab930f95b50209c6672cdb6c9bd1601
+  metadata.gz: 4a2c9365c60f18ec5838ef6b616a1f19de7b28333ea6816a2a730866239baf7d
+  data.tar.gz: 195bbb73070d07492a8e873e0374b453e025ed496916f9df51e14e1fa808c609
 SHA512:
-  metadata.gz: 5ba68d0ac94f0fdd1ca3c738899c7f6fb3b4bf19af6fefd2c8fd8cc8eeb85192c6a8268cd60bd7b638fbee9008cefd8bdfefe7b50d99de4bd8ecb92d726e7818
-  data.tar.gz: 3271d7a453a7cd4623b69626a49b9de22c32d6fdd04b714fea4a8d6b0d2afc4ce4b11046169e79eff4b97f8b172b303378167c0a52b5d5a600a18c09b005f80f
+  metadata.gz: c77f5457e8100cf08eab07c26607f00bb85683d15d69ccb87f85f09a53000c3ffb973365106a2498ba128055e2451ef58c20f9be7267a2b0daea0e5c2e87465c
+  data.tar.gz: a194c571edb9bc0ae68766a2ad6b30b7e245670bd8be66ef82a8796d329edf6e7a92d021b1321ef53e8f14e1d851917414b35dbdc826c749bf41f42712f08e77

data/lib/ruby-lsp-rspec.rb

@@ -3,7 +3,6 @@
 
 require "sorbet-runtime"
 require "ruby_lsp_rspec/version"
-require "ruby_lsp/ruby_lsp_rspec/addon"
 
 module RubyLsp
   module RSpec

data/lib/ruby_lsp/ruby_lsp_rspec/addon.rb

@@ -11,8 +11,8 @@ module RubyLsp
     class Addon < ::RubyLsp::Addon
       extend T::Sig
 
-      sig { override.void }
-      def activate; end
+      sig { override.params(message_queue: Thread::Queue).void }
+      def activate(message_queue); end
 
       sig { override.void }
       def deactivate; end
@@ -22,13 +22,12 @@ module RubyLsp
         override.params(
           uri: URI::Generic,
           emitter: Prism::Dispatcher,
-          message_queue: Thread::Queue,
         ).returns(T.nilable(Listener[T::Array[Interface::CodeLens]]))
       end
-      def create_code_lens_listener(uri, emitter, message_queue)
+      def create_code_lens_listener(uri, emitter)
         return unless uri.to_standardized_path&.end_with?("_test.rb") || uri.to_standardized_path&.end_with?("_spec.rb")
 
-        CodeLens.new(uri, emitter, message_queue)
+        CodeLens.new(uri, emitter)
       end
 
       sig { override.returns(String) }

data/lib/ruby_lsp/ruby_lsp_rspec/code_lens.rb

@@ -14,12 +14,14 @@ module RubyLsp
       sig { override.returns(ResponseType) }
       attr_reader :_response
 
-      sig { params(uri: URI::Generic, dispatcher: Prism::Dispatcher, message_queue: Thread::Queue).void }
-      def initialize(uri, dispatcher, message_queue)
+      sig { params(uri: URI::Generic, dispatcher: Prism::Dispatcher).void }
+      def initialize(uri, dispatcher)
         @_response = T.let([], ResponseType)
         # Listener is only initialized if uri.to_standardized_path is valid
         @path = T.let(T.must(uri.to_standardized_path), String)
-        dispatcher.register(self, :on_call_node_enter)
+        @group_id = T.let(1, Integer)
+        @group_id_stack = T.let([], T::Array[Integer])
+        dispatcher.register(self, :on_call_node_enter, :on_call_node_leave)
 
         @base_command = T.let(
           begin
@@ -38,7 +40,7 @@ module RubyLsp
           String,
         )
 
-        super(dispatcher, message_queue)
+        super(dispatcher)
       end
 
       sig { params(node: Prism::CallNode).void }
@@ -48,17 +50,32 @@ module RubyLsp
           name = generate_name(node)
           add_test_code_lens(node, name: name, kind: :example)
         when "context", "describe"
-          return if node.receiver && node.receiver.name.to_s != "RSpec"
+          return if node.receiver && node.receiver&.slice != "RSpec"
 
           name = generate_name(node)
           add_test_code_lens(node, name: name, kind: :group)
+
+          @group_id_stack.push(@group_id)
+          @group_id += 1
+        end
+      end
+
+      sig { params(node: Prism::CallNode).void }
+      def on_call_node_leave(node)
+        case node.message
+        when "context", "describe"
+          return if node.receiver && node.receiver&.slice != "RSpec"
+
+          @group_id_stack.pop
         end
       end
 
       sig { params(node: Prism::CallNode).returns(String) }
       def generate_name(node)
-        if node.arguments
-          argument = node.arguments.arguments.first
+        arguments = node.arguments&.arguments
+
+        if arguments
+          argument = arguments.first
 
           case argument
           when Prism::StringNode
@@ -82,6 +99,9 @@ module RubyLsp
         line_number = node.location.start_line
         command = "#{@base_command} #{@path}:#{line_number}"
 
+        grouping_data = { group_id: @group_id_stack.last, kind: kind }
+        grouping_data[:id] = @group_id if kind == :group
+
         arguments = [
           @path,
           name,
@@ -99,7 +119,7 @@ module RubyLsp
           title: "Run",
           command_name: "rubyLsp.runTest",
           arguments: arguments,
-          data: { type: "test", kind: kind },
+          data: { type: "test", **grouping_data },
         )
 
         @_response << create_code_lens(
@@ -107,7 +127,7 @@ module RubyLsp
           title: "Run In Terminal",
           command_name: "rubyLsp.runTestInTerminal",
           arguments: arguments,
-          data: { type: "test_in_terminal", kind: kind },
+          data: { type: "test_in_terminal", **grouping_data },
         )
 
         @_response << create_code_lens(
@@ -115,7 +135,7 @@ module RubyLsp
           title: "Debug",
           command_name: "rubyLsp.debugTest",
           arguments: arguments,
-          data: { type: "debug", kind: kind },
+          data: { type: "debug", **grouping_data },
         )
       end
     end

data/lib/ruby_lsp_rspec/version.rb

@@ -3,6 +3,6 @@
 
 module RubyLsp
   module RSpec
-    VERSION = "0.1.6"
+    VERSION = "0.1.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-rspec
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Stan Lo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-28 00:00:00.000000000 Z
+date: 2023-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-lsp
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
 description: RSpec addon for ruby-lsp
 email:
 - stan001212@gmail.com