ruby-lsp-rspec 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1ad8f1f88836c6c7cb084237b83d36b7b8d73edf94eebe765f0fba6bb32e1a3
-  data.tar.gz: 632cc2d492f00b07d966aaa53b8534721e17753b258edfaa43205a96e6bab906
+  metadata.gz: ea19794fda048857798f87bb194d7c693da87320ba684cb7bcfb834ee7aaf124
+  data.tar.gz: 4daa91246afac9919461a362d0ce2f289c03f531840811ef25e8c94bb75f43b5
 SHA512:
-  metadata.gz: 9de20795a46221eeab3932fe830c25f019d940b757fbfd5e8dfe88bfae922e7658791747ae361ab51a6c30dbfdd30bbf97708cdb7b144414fecdb8e477c7c7c1
-  data.tar.gz: e2c796c111cdba975216f7856fdcbd0765e2d898cc0389f2fb2df7898a5a2d58d1a8f4a64bd98afb4de556a0df6e48e2a610d005db520993becbeaa2dd877529
+  metadata.gz: 9ddbd1cb07a8856899e0587d42e565d114b2317178617c116d8b11836a5cadc79f6c14145e45c35562af4287105834d789be5dc96dcba305361f05047ee098d2
+  data.tar.gz: c8efb631e8d65970138c4b8d1bbe3e84afaccbc0b20c94150014afbb7c439c19fdf99117edf7ab6c320337cbe30e2dc8ac2c32fa213b1bd7ce8c1a2f362ba88b

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,8 +14,8 @@ 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)
@@ -40,7 +40,7 @@ module RubyLsp
           String,
         )
 
-        super(dispatcher, message_queue)
+        super(dispatcher)
       end
 
       sig { params(node: Prism::CallNode).void }
@@ -50,7 +50,7 @@ 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 unless valid_group?(node)
 
           name = generate_name(node)
           add_test_code_lens(node, name: name, kind: :group)
@@ -64,16 +64,25 @@ module RubyLsp
       def on_call_node_leave(node)
         case node.message
         when "context", "describe"
-          return if node.receiver && node.receiver.name.to_s != "RSpec"
+          return unless valid_group?(node)
 
           @group_id_stack.pop
         end
       end
 
+      private
+
+      sig { params(node: Prism::CallNode).returns(T::Boolean) }
+      def valid_group?(node)
+        !(node.block.nil? || (node.receiver && node.receiver&.slice != "RSpec"))
+      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
@@ -90,8 +99,6 @@ module RubyLsp
         end
       end
 
-      private
-
       sig { params(node: Prism::Node, name: String, kind: Symbol).void }
       def add_test_code_lens(node, name:, kind:)
         line_number = node.location.start_line

data/lib/ruby_lsp_rspec/version.rb

@@ -3,6 +3,6 @@
 
 module RubyLsp
   module RSpec
-    VERSION = "0.1.7"
+    VERSION = "0.1.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-rspec
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Stan Lo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-30 00:00:00.000000000 Z
+date: 2024-01-16 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
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.1
 signing_key:
 specification_version: 4
 summary: RSpec addon for ruby-lsp