ruby-lsp-rails 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76155fcaf046652d4e13655bf8f1d38764a0a755cd4e090a70a7e551e77dc598
-  data.tar.gz: d417e7a57d97dbd0a7b1b2aa2ec999793ef6a8fb3ada39a0c1ad06688af8fd3b
+  metadata.gz: d7d6af6475f53648fe445527ec54ec22c5ba94df79ad5da635520f2937d8d25e
+  data.tar.gz: 1977cf0285fe9d29f7b4b4eeccbe8b7d57887e5aa0d2ecac64f5b3ea0519fa01
 SHA512:
-  metadata.gz: 5f53d2aebe48cb0ce755541d4af87e564d2ca5dcdd70f411390c4d685890f6d398da400f223a77678c56e915b6a34ea6330b4495a02f407967040c07d9a5a164
-  data.tar.gz: 063117bc235a4bf99f148d65c8170601a35b58b7d95ad8098114ccd213c930f0d9a8ea12f51b12022c7ad6284672209ae0eafbd475f079c325ff8bc236c08688
+  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/code_lens.rb

@@ -75,7 +75,7 @@ module RubyLsp
       include Requests::Support::Common
       include ActiveSupportTestCaseHelper
 
-      #: (RunnerClient client, GlobalState global_state, ResponseBuilders::CollectionResponseBuilder[Interface::CodeLens] response_builder, URI::Generic uri, Prism::Dispatcher dispatcher) -> void
+      #: (RunnerClient, GlobalState, ResponseBuilders::CollectionResponseBuilder[Interface::CodeLens], URI::Generic, Prism::Dispatcher) -> void
       def initialize(client, global_state, response_builder, uri, dispatcher)
         @client = client
         @global_state = global_state
@@ -98,8 +98,10 @@ module RubyLsp
 
       #: (Prism::CallNode node) -> void
       def on_call_node_enter(node)
-        content = extract_test_case_name(node)
+        # Remove this method once the rollout is complete
+        return if @global_state.enabled_feature?(:fullTestDiscovery)
 
+        content = extract_test_case_name(node)
         return unless content
 
         line_number = node.location.start_line
@@ -110,12 +112,15 @@ module RubyLsp
       # Although uncommon, Rails tests can be written with the classic "def test_name" syntax.
       #: (Prism::DefNode node) -> void
       def on_def_node_enter(node)
-        method_name = node.name.to_s
-
-        if method_name.start_with?("test_")
-          line_number = node.location.start_line
-          command = "#{test_command} #{@path}:#{line_number}"
-          add_test_code_lens(node, name: method_name, command: command, kind: :example)
+        # Remove this entire unless block once the rollout is complete
+        unless @global_state.enabled_feature?(:fullTestDiscovery)
+          method_name = node.name.to_s
+
+          if method_name.start_with?("test_")
+            line_number = node.location.start_line
+            command = "#{test_command} #{@path}:#{line_number}"
+            add_test_code_lens(node, name: method_name, command: command, kind: :example)
+          end
         end
 
         if controller?
@@ -134,7 +139,8 @@ module RubyLsp
         # back in a controller context. This part is used in other places in the LSP
         @constant_name_stack << [class_name, superclass_name]
 
-        if class_name.end_with?("Test")
+        # Remove this entire if block once the rollout is complete
+        if class_name.end_with?("Test") && !@global_state.enabled_feature?(:fullTestDiscovery)
           fully_qualified_name = @constant_name_stack.map(&:first).join("::")
           command = "#{test_command} #{@path} --name \"/#{Shellwords.escape(fully_qualified_name)}(#|::)/\""
           add_test_code_lens(node, name: class_name, command: command, kind: :group)
@@ -155,6 +161,8 @@ module RubyLsp
         if class_name.end_with?("Test")
           @group_id_stack.pop
         end
+        # Remove everything but the `@constant_name_stack.pop` once the rollout is complete
+        return if @global_state.enabled_feature?(:fullTestDiscovery)
 
         @constant_name_stack.pop
       end

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,11 +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
@@ -124,26 +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)
 
-        test_item.add(Requests::Support::TestItem.new(
-          "#{test_item.id}##{test_name}",
+        example_item = Requests::Support::TestItem.new(
+          "#{parent.id}##{test_name}",
           test_name,
           @uri,
           range_from_node(node),
           framework: :rails,
-        ))
+        )
+        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/ruby_lsp_rails/server.rb

@@ -17,7 +17,7 @@ module RubyLsp
           @supports_progress = supports_progress
         end
 
-        #: (percentage: Integer?, message: String?) -> void
+        #: (?percentage: Integer?, ?message: String?) -> void
         def report(percentage: nil, message: nil)
           return unless @supports_progress
           return unless percentage || message
@@ -40,7 +40,7 @@ module RubyLsp
 
       # Log a message to the editor's output panel. The type is the number of the message type, which can be found in
       # the specification https://microsoft.github.io/language-server-protocol/specification/#messageType
-      #: (String, type: Integer) -> void
+      #: (String, ?type: Integer) -> void
       def log_message(message, type: 4)
         send_notification({ method: "window/logMessage", params: { type: type, message: message } })
       end
@@ -86,7 +86,7 @@ module RubyLsp
         log_message("Request #{notification_name} failed:\n#{e.full_message(highlight: false)}")
       end
 
-      #: (String, String, percentage: Integer?, message: String?) -> void
+      #: (String, String, ?percentage: Integer?, ?message: String?) -> void
       def begin_progress(id, title, percentage: nil, message: nil)
         return unless capabilities[:supports_progress]
 
@@ -112,7 +112,7 @@ module RubyLsp
         })
       end
 
-      #: (String, percentage: Integer?, message: String?) -> void
+      #: (String, ?percentage: Integer?, ?message: String?) -> void
       def report_progress(id, percentage: nil, message: nil)
         return unless capabilities[:supports_progress]
 
@@ -142,7 +142,7 @@ module RubyLsp
         })
       end
 
-      #: (String, String, percentage: Integer?, message: String?) { (Progress) -> void } -> void
+      #: (String, String, ?percentage: Integer?, ?message: String?) { (Progress) -> void } -> void
       def with_progress(id, title, percentage: nil, message: nil, &block)
         progress_block = Progress.new(stderr, id, capabilities[:supports_progress])
         return block.call(progress_block) unless capabilities[:supports_progress]
@@ -231,12 +231,12 @@ module RubyLsp
     end
 
     class IOWrapper < SimpleDelegator
-      #: (untyped) -> void
+      #: (*untyped) -> void
       def puts(*args)
         args.each { |arg| log("#{arg}\n") }
       end
 
-      #: (untyped) -> void
+      #: (*untyped) -> void
       def print(*args)
         args.each { |arg| log(arg.to_s) }
       end
@@ -255,7 +255,7 @@ module RubyLsp
     class Server < ServerComponent
       include Common
 
-      #: (IO | StringIO, IO | StringIO, bool, Hash[Symbol | String, untyped]) -> void
+      #: (?stdout: IO | StringIO, ?stderr: IO | StringIO, ?override_default_output_device: bool, ?capabilities: Hash[Symbol | String, untyped]) -> void
       def initialize(stdout: $stdout, stderr: $stderr, override_default_output_device: true, capabilities: {})
         # Grab references to the original pipes so that we can change the default output device further down
 

data/lib/ruby_lsp_rails/version.rb

@@ -3,6 +3,6 @@
 
 module RubyLsp
   module Rails
-    VERSION = "0.4.2"
+    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.2
+  version: 0.4.4
 platform: ruby
 authors:
 - Shopify
@@ -15,7 +15,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.23.16
+        version: 0.23.18
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.24.0
@@ -25,7 +25,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.23.16
+        version: 0.23.18
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.24.0
@@ -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: []