Fix test hierarchy for nested groups (#612)

* Upgrade Ruby LSP version

* Fix test hierarchy for nested groups

Author: vinistock

lib/ruby_lsp/ruby_lsp_rails/rails_test_style.rb

@@ -54,6 +54,8 @@ def resolve_test_commands(items)
       def initialize(response_builder, global_state, dispatcher, uri)
         super(response_builder, global_state, dispatcher, uri)
 
+        @parent_stack = [@response_builder] #: Array[(Requests::Support::TestItem | ResponseBuilders::TestCollection)?]
+
         dispatcher.register(
           self,
           :on_class_node_enter,
@@ -74,12 +76,32 @@ def on_class_node_enter(node)
               framework: :rails,
             )
 
-            @response_builder.add(test_item)
+            last_test_group.add(test_item)
             @response_builder.add_code_lens(test_item)
+            @parent_stack << test_item
+          else
+            @parent_stack << nil
           end
         end
       end
 
+      #: (Prism::ClassNode node) -> void
+      def on_class_node_leave(node)
+        @parent_stack.pop
+        super
+      end
+
+      #: (Prism::ModuleNode node) -> void
+      def on_module_node_enter(node)
+        @parent_stack << nil
+      end
+
+      #: (Prism::ModuleNode node) -> void
+      def on_module_node_leave(node)
+        @parent_stack.pop
+        super
+      end
+
       #: (Prism::CallNode node) -> void
       def on_call_node_enter(node)
         return unless node.name == :test
@@ -125,28 +147,24 @@ def declarative_minitest?(attached_ancestors, fully_qualified_name)
 
       #: (Prism::Node node, String test_name) -> void
       def add_test_item(node, test_name)
-        test_item = group_test_item
-        return unless test_item
+        parent = @parent_stack.last
+        return unless parent.is_a?(Requests::Support::TestItem)
 
         example_item = Requests::Support::TestItem.new(
-          "#{test_item.id}##{test_name}",
+          "#{parent.id}##{test_name}",
           test_name,
           @uri,
           range_from_node(node),
           framework: :rails,
         )
-        test_item.add(example_item)
+        parent.add(example_item)
         @response_builder.add_code_lens(example_item)
       end
 
-      #: -> Requests::Support::TestItem?
-      def group_test_item
-        current_group_name = RubyIndexer::Index.actual_nesting(@nesting, nil).join("::")
-
-        # If we're finding a test method, but for the wrong framework, then the group test item will not have been
-        # previously pushed and thus we return early and avoid adding items for a framework this listener is not
-        # interested in
-        @response_builder[current_group_name]
+      #: -> (Requests::Support::TestItem | ResponseBuilders::TestCollection)
+      def last_test_group
+        index = @parent_stack.rindex { |i| i } #: as !nil
+        @parent_stack[index] #: as Requests::Support::TestItem | ResponseBuilders::TestCollection
       end
     end
   end

test/ruby_lsp_rails/rails_test_style_test.rb

@@ -286,6 +286,38 @@ class TestCase < Minitest::Test
         end
       end
 
+      test "nested test groups" do
+        source = <<~RUBY
+          class SampleTest < ActiveSupport::TestCase
+            class InnerTest < ActiveSupport::TestCase
+              test "first" do
+              end
+            end
+
+            class AnotherGroupTest < ActiveSupport::TestCase
+              test "second" do
+              end
+            end
+          end
+        RUBY
+
+        with_active_support_declarative_tests(source) do |items|
+          assert_equal(["SampleTest"], items.map { |i| i[:id] })
+          assert_equal(
+            ["SampleTest::InnerTest", "SampleTest::AnotherGroupTest"],
+            items.dig(0, :children).map { |i| i[:label] },
+          )
+          assert_equal(
+            ["SampleTest::InnerTest#test_first"],
+            items.dig(0, :children, 0, :children).map { |i| i[:id] },
+          )
+          assert_equal(
+            ["SampleTest::AnotherGroupTest#test_second"],
+            items.dig(0, :children, 1, :children).map { |i| i[:id] },
+          )
+        end
+      end
+
       private
 
       def with_active_support_declarative_tests(source, file: "/fake.rb", &block)