ruby-lsp-rails 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 164043cff79bd96fb8d2db4cdc17bc38eb9ae8961a47d025ff876d1de7506527
-  data.tar.gz: 2270c6c26b9e38896add0e73ad263800907de59779003957b5f87cb57a7051d8
+  metadata.gz: d7d6af6475f53648fe445527ec54ec22c5ba94df79ad5da635520f2937d8d25e
+  data.tar.gz: 1977cf0285fe9d29f7b4b4eeccbe8b7d57887e5aa0d2ecac64f5b3ea0519fa01
 SHA512:
-  metadata.gz: bf6b0115be4ed91883daadd10f2fdf1cc531264dee8ae62f50feb72b5ee5d0caa97e83cb2092d2bc2165f1788b6e08c52dc227a2dbcbc71d9f7740d3fec431fc
-  data.tar.gz: 65012c96ae44392d278d53a72e094fc2d75c10b864c643087186113b2490b42f483d6660f7af170a5479ae37ce533ae85af5411439bdcfe0ae8c80f66c75c35b
+  metadata.gz: 443fc7b9ba824d4ce578d503ed1269cc94ef3626a8fbdd7a1b81c2b1e8fc88e91692fb7e3210be510bbe3852efb2e97522aad13f75446f30128e51bdd211e924
+  data.tar.gz: 1adb0fe993a8a3cb3b8d0ad1d4ff40c5eaf550bc71126e1080b2a3cc84238bcb42631ed37f1efa69d4c8f18adb04b23d2006691e02ba39bca2aa1cf107d4a249

data/lib/ruby_lsp/ruby_lsp_rails/addon.rb

@@ -91,7 +91,7 @@ module RubyLsp
       def create_discover_tests_listener(response_builder, dispatcher, uri)
         return unless @global_state
 
-        RailsTestStyle.new(@rails_runner_client, response_builder, @global_state, dispatcher, uri)
+        RailsTestStyle.new(response_builder, @global_state, dispatcher, uri)
       end
 
       # @override

data/lib/ruby_lsp/ruby_lsp_rails/rails_test_style.rb

@@ -50,10 +50,12 @@ module RubyLsp
         end
       end
 
-      #: (RunnerClient client, ResponseBuilders::TestCollection response_builder, GlobalState global_state, Prism::Dispatcher dispatcher, URI::Generic uri) -> void
-      def initialize(client, response_builder, global_state, dispatcher, uri)
+      #: (ResponseBuilders::TestCollection response_builder, GlobalState global_state, Prism::Dispatcher dispatcher, URI::Generic uri) -> void
+      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,33 @@ module RubyLsp
               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
+        super
+      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 +148,24 @@ module RubyLsp
 
       #: (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

data/lib/ruby_lsp_rails/version.rb

@@ -3,6 +3,6 @@
 
 module RubyLsp
   module Rails
-    VERSION = "0.4.3"
+    VERSION = "0.4.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Shopify
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.8
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A Ruby LSP addon for Rails
 test_files: []