ruby-lsp-rails 0.2.7 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9abe40b8b01b5f0e7e81a3831b3da7fa57902d64f17cb0ce3a950d043d895ab
-  data.tar.gz: 02b60ff2b040617a25fea20d715066a17092459532f56dc08a4350997e1369bc
+  metadata.gz: 54789b1f5da58f025ec88cfcff5cf95f800ae68af9dc409d31a4cdf6307e8286
+  data.tar.gz: c03bd0623133606a7ba2290198939fb7de0071bdcc2e52bea30efdb3ed1fc7e2
 SHA512:
-  metadata.gz: e76db2c3f6ea300e1b7a935b958a60b18a322e5039f518a0ccbc4efe2dbe7c69f65401987c0969d9fff479e3526831600a24788f477cbd19d3a2d528dc63a293
-  data.tar.gz: 1556932fe8c67752607b15e2520c2f71c0c88c2e1a005c78c1c72b31e49a2efac9e38a9da499bb91478ea8f8386661a269c18ab300809823d80c519cf517afa1
+  metadata.gz: 7426ceebeabe03877d10b49fcb05b88c435d968fdcfd300d898768289aff80dfac7936c604d43f46de58eaa1649c5047ae9f7f0edbdb708e86b260cb52827591
+  data.tar.gz: 52c94c5e2c2fe0c37e1fd3e807805ad2b80d5749903366a4dc41ff73885b150f8db03dd2a2154a9364e63b0eb36bf065cf0795eb5a19b801c201e8d5e93d40df

data/README.md

@@ -48,8 +48,9 @@ See the [documentation](https://shopify.github.io/ruby-lsp-rails) for more in-de
 1. Open a test which inherits from `ActiveSupport::TestCase` or one of its descendants, such as `ActionDispatch::IntegrationTest`.
 2. Click on the "Run", "Run in Terminal" or "Debug" code lens which appears above the test class, or an individual test.
 
-Note: When using the Test Explorer view, if your code contains a statement to pause execution (e.g. `debugger`) it will
-cause the test runner to hang.
+> [!NOTE]
+> When using the Test Explorer view, if your code contains a statement to pause execution (e.g. `debugger`) it will
+> cause the test runner to hang.
 
 ## How It Works
 
@@ -60,8 +61,7 @@ This gem consists of two components that enable enhanced Rails functionality in
 
 This is why the Rails server needs to be running for some features to work.
 
-> **Note**
->
+> [!NOTE]
 > There is no need to restart the Ruby LSP every time the Rails server is booted.
 > If the server is shut down, the extra features will temporarily disappear and reappear once the server is running again.
 

data/lib/ruby_lsp/ruby_lsp_rails/addon.rb

@@ -17,8 +17,8 @@ module RubyLsp
         @client ||= T.let(RailsClient.new, T.nilable(RailsClient))
       end
 
-      sig { override.void }
-      def activate
+      sig { override.params(message_queue: Thread::Queue).void }
+      def activate(message_queue)
         client.check_if_server_is_running!
       end
 
@@ -30,11 +30,10 @@ module RubyLsp
         override.params(
           uri: URI::Generic,
           dispatcher: Prism::Dispatcher,
-          message_queue: Thread::Queue,
         ).returns(T.nilable(Listener[T::Array[Interface::CodeLens]]))
       end
-      def create_code_lens_listener(uri, dispatcher, message_queue)
-        CodeLens.new(uri, dispatcher, message_queue)
+      def create_code_lens_listener(uri, dispatcher)
+        CodeLens.new(uri, dispatcher)
       end
 
       sig do
@@ -42,11 +41,10 @@ module RubyLsp
           nesting: T::Array[String],
           index: RubyIndexer::Index,
           dispatcher: Prism::Dispatcher,
-          message_queue: Thread::Queue,
         ).returns(T.nilable(Listener[T.nilable(Interface::Hover)]))
       end
-      def create_hover_listener(nesting, index, dispatcher, message_queue)
-        Hover.new(client, nesting, index, dispatcher, message_queue)
+      def create_hover_listener(nesting, index, dispatcher)
+        Hover.new(client, nesting, index, dispatcher)
       end
 
       sig { override.returns(String) }

data/lib/ruby_lsp/ruby_lsp_rails/code_lens.rb

@@ -42,13 +42,16 @@ 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)
         @path = T.let(uri.to_standardized_path, T.nilable(String))
-        dispatcher.register(self, :on_call_node_enter, :on_class_node_enter, :on_def_node_enter)
+        @group_id = T.let(1, Integer)
+        @group_id_stack = T.let([], T::Array[Integer])
 
-        super(dispatcher, message_queue)
+        dispatcher.register(self, :on_call_node_enter, :on_class_node_enter, :on_def_node_enter, :on_class_node_leave)
+
+        super(dispatcher)
       end
 
       sig { params(node: Prism::CallNode).void }
@@ -62,13 +65,11 @@ module RubyLsp
         first_argument = arguments.first
 
         content = case first_argument
-        when Prism::StringConcatNode
-          left = first_argument.left
-          right = first_argument.right
-          # We only support two lines of concatenation on test names
-          if left.is_a?(Prism::StringNode) &&
-              right.is_a?(Prism::StringNode)
-            left.content + right.content
+        when Prism::InterpolatedStringNode
+          parts = first_argument.parts
+
+          if parts.all? { |part| part.is_a?(Prism::StringNode) }
+            T.cast(parts, T::Array[Prism::StringNode]).map(&:content).join
           end
         when Prism::StringNode
           first_argument.content
@@ -99,6 +100,14 @@ module RubyLsp
           command = "#{BASE_COMMAND} #{@path}"
           add_test_code_lens(node, name: class_name, command: command, kind: :group)
         end
+
+        @group_id_stack.push(@group_id)
+        @group_id += 1
+      end
+
+      sig { params(node: Prism::ClassNode).void }
+      def on_class_node_leave(node)
+        @group_id_stack.pop
       end
 
       private
@@ -119,12 +128,15 @@ module RubyLsp
           },
         ]
 
+        grouping_data = { group_id: @group_id_stack.last, kind: kind }
+        grouping_data[:id] = @group_id if kind == :group
+
         @_response << create_code_lens(
           node,
           title: "Run",
           command_name: "rubyLsp.runTest",
           arguments: arguments,
-          data: { type: "test", kind: kind },
+          data: { type: "test", **grouping_data },
         )
 
         @_response << create_code_lens(
@@ -132,7 +144,7 @@ module RubyLsp
           title: "Run In Terminal",
           command_name: "rubyLsp.runTestInTerminal",
           arguments: arguments,
-          data: { type: "test_in_terminal", kind: kind },
+          data: { type: "test_in_terminal", **grouping_data },
         )
 
         @_response << create_code_lens(
@@ -140,7 +152,7 @@ module RubyLsp
           title: "Debug",
           command_name: "rubyLsp.debugTest",
           arguments: arguments,
-          data: { type: "debug", kind: kind },
+          data: { type: "debug", **grouping_data },
         )
       end
     end

data/lib/ruby_lsp/ruby_lsp_rails/hover.rb

@@ -31,11 +31,10 @@ module RubyLsp
           nesting: T::Array[String],
           index: RubyIndexer::Index,
           dispatcher: Prism::Dispatcher,
-          message_queue: Thread::Queue,
         ).void
       end
-      def initialize(client, nesting, index, dispatcher, message_queue)
-        super(dispatcher, message_queue)
+      def initialize(client, nesting, index, dispatcher)
+        super(dispatcher)
 
         @_response = T.let(nil, ResponseType)
         @client = client

data/lib/ruby_lsp_rails/railtie.rb

@@ -12,15 +12,13 @@ module RubyLsp
 
       initializer "ruby_lsp_rails.setup" do |_app|
         config.after_initialize do |app|
-          unless config.ruby_lsp_rails.server == false
+          # If we start the app with `bin/rails console` then `Rails::Server` is not defined.
+          if defined?(::Rails::Server) && config.ruby_lsp_rails.server
             app.routes.prepend do
               T.bind(self, ActionDispatch::Routing::Mapper)
               mount(RackApp.new => RackApp::BASE_PATH)
             end
-          end
 
-          # If we start the app with `bin/rails console` then `Rails::Server` is not defined.
-          if defined?(::Rails::Server)
             ssl_enable, host, port = ::Rails::Server::Options.new.parse!(ARGV).values_at(:SSLEnable, :Host, :Port)
             app_uri = "#{ssl_enable ? "https" : "http"}://#{host}:#{port}"
             app_uri_path = ::Rails.root.join("tmp", "app_uri.txt")

data/lib/ruby_lsp_rails/version.rb

@@ -3,6 +3,6 @@
 
 module RubyLsp
   module Rails
-    VERSION = "0.2.7"
+    VERSION = "0.2.9"
   end
 end

metadata

@@ -1,17 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.9
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-19 00:00:00.000000000 Z
+date: 2024-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -30,20 +58,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.5.4
 signing_key: 
 specification_version: 4
 summary: A Ruby LSP addon for Rails