ruby-lsp 0.23.22 → 0.23.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48c7e1cdc0e7f0a31cbc69002bf6a6c3dea0779272757ee40ae90e4199199446
-  data.tar.gz: 1cd0d4a426ed4b1c44540e9e3344f73623f0ea0193374cab8faa727528474bf2
+  metadata.gz: 2079a33c4ec7e87a6b90bcb3cc11eca81e0d2a9c6d591c2fc14b07234b56c60b
+  data.tar.gz: 2837a0acd68b11e065236fb3190baee2e358520694710676fe214e125ae74902
 SHA512:
-  metadata.gz: ac87c3a6dcc52b2696076d9793b42f03f56a4e0fbe258cc20f09502bbb289f91acccb3593ebfd36d61b5eeb0ec0bc3ab697acc332b61889fd256db2600029eca
-  data.tar.gz: be146b667f656ddb1103756a4cf79bd294981fa5f3d0cebc38e44498168799b14941c1768e9f030e80d4f4f7e8c4e4b0107e9cbaf694184ddc037824a05a2f1f
+  metadata.gz: fd82d565032cf65414ea926313dfbb7be1c5a21c1d49f9191ed6b9d3c6f4d28458db21f78f14d37af03b84223dc40e4d8cb4c24a1a4a754359757048d84e930a
+  data.tar.gz: 48c1dd2271b23e585c37a941db30729d727ceaffb7c12c1b3f806a138834192b9073df72c83bec48a7015bad7d2b109e08f591dc0a69767c39a30c8a6bd96c94

data/VERSION

@@ -1 +1 @@
-0.23.22
+0.23.23

data/lib/ruby_lsp/listeners/spec_style.rb

@@ -41,8 +41,20 @@ module RubyLsp
 
       #: (Prism::ClassNode) -> void
       def on_class_node_leave(node) # rubocop:disable RubyLsp/UseRegisterWithHandlerMethod
+        @spec_group_id_stack.pop
         super
+      end
+
+      #: (Prism::ModuleNode) -> void
+      def on_module_node_enter(node) # rubocop:disable RubyLsp/UseRegisterWithHandlerMethod
+        @spec_group_id_stack << nil
+        super
+      end
+
+      #: (Prism::ModuleNode) -> void
+      def on_module_node_leave(node) # rubocop:disable RubyLsp/UseRegisterWithHandlerMethod
         @spec_group_id_stack.pop
+        super
       end
 
       #: (Prism::CallNode) -> void
@@ -61,6 +73,12 @@ module RubyLsp
       def on_call_node_leave(node)
         return unless node.name == :describe && !node.receiver
 
+        current_group = @spec_group_id_stack.last
+        return unless current_group.is_a?(DescribeGroup)
+
+        description = extract_description(node)
+        return unless description && current_group.id.end_with?(description)
+
         @spec_group_id_stack.pop
       end
 
@@ -76,6 +94,8 @@ module RubyLsp
         return unless description
 
         parent = latest_group
+        return unless parent
+
         id = case parent
         when Requests::Support::TestItem
           "#{parent.id}::#{description}"
@@ -135,26 +155,50 @@ module RubyLsp
         end
       end
 
-      #: -> (Requests::Support::TestItem | ResponseBuilders::TestCollection)
+      #: -> (Requests::Support::TestItem | ResponseBuilders::TestCollection)?
       def latest_group
+        # If we haven't found anything yet, then return the response builder
         return @response_builder if @spec_group_id_stack.compact.empty?
+        # If we found something that isn't a group last, then we're inside a random module or class, but not a spec
+        # group
+        return unless @spec_group_id_stack.last
 
-        first_class_index = @spec_group_id_stack.rindex { |i| i.is_a?(ClassGroup) } || 0
-        first_class = @spec_group_id_stack[0] #: as !nil
-        item = @response_builder[first_class.id] #: as !nil
+        # Specs using at least one class as a group require special handling
+        closest_class_index = @spec_group_id_stack.rindex { |i| i.is_a?(ClassGroup) }
 
-        # Descend into child items from the beginning all the way to the latest class group, ignoring describes
-        @spec_group_id_stack[1..first_class_index] #: as !nil
-          .each do |group|
-          next unless group.is_a?(ClassGroup)
+        if closest_class_index
+          first_class_index = @spec_group_id_stack.index { |i| i.is_a?(ClassGroup) } #: as !nil
+          first_class = @spec_group_id_stack[first_class_index] #: as !nil
+          item = @response_builder[first_class.id] #: as !nil
 
-          item = item[group.id] #: as !nil
+          # Descend into child items from the beginning all the way to the latest class group, ignoring describes
+          @spec_group_id_stack[first_class_index + 1..closest_class_index] #: as !nil
+            .each do |group|
+            next unless group.is_a?(ClassGroup)
+
+            item = item[group.id] #: as !nil
+          end
+
+          # From the class forward, we must take describes into account
+          @spec_group_id_stack[closest_class_index + 1..] #: as !nil
+            .each do |group|
+            next unless group
+
+            item = item[group.id] #: as !nil
+          end
+
+          return item
         end
 
-        # From the class forward, we must take describes into account
-        @spec_group_id_stack[first_class_index + 1..] #: as !nil
+        # Specs only using describes
+        first_group = @spec_group_id_stack.find { |i| i.is_a?(DescribeGroup) }
+        return unless first_group
+
+        item = @response_builder[first_group.id] #: as !nil
+
+        @spec_group_id_stack[1..] #: as !nil
           .each do |group|
-          next unless group
+          next unless group.is_a?(DescribeGroup)
 
           item = item[group.id] #: as !nil
         end

data/lib/ruby_lsp/listeners/test_style.rb

@@ -92,7 +92,7 @@ module RubyLsp
         #: (String, Hash[String, Hash[Symbol, untyped]]) -> String
         def handle_minitest_groups(file_path, groups_and_examples)
           regexes = groups_and_examples.flat_map do |group, info|
-            examples = info[:examples].map { |e| e.gsub(/test_\d{4}/, "test_\\d{4}") }
+            examples = info[:examples].map { |e| Shellwords.escape(e).gsub(/test_\d{4}/, "test_\\d{4}") }
             group_regex = Shellwords.escape(group).gsub(
               Shellwords.escape(TestDiscovery::DYNAMIC_REFERENCE_MARKER),
               ".*",

data/lib/ruby_lsp/requests/code_lens.rb

@@ -18,13 +18,15 @@ module RubyLsp
         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 @@ module RubyLsp
       # @override
       #: -> Array[Interface::CodeLens]
       def perform
+        @document.cache_set("rubyLsp/discoverTests", @test_builder.response)
         @response_builder.response + @test_builder.code_lens
       end
     end

data/lib/ruby_lsp/server.rb

@@ -512,12 +512,12 @@ module RubyLsp
           @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
 

metadata

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