ruby-lsp-rails 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70557479de3e98dce68fda3bf76ee6ee6a547ee2d123b7e26bf687306bdd1879
-  data.tar.gz: 1c4560bc452b582ef4c40f793977ef4854cb4e8877bbd3850dbc1aa34b9e4f4a
+  metadata.gz: c3d8b40085e6c7ca1e23283423a0966da489180e36e4fb50415f41b1a37f5294
+  data.tar.gz: e98455cb80f6c386e9aa1c3fa516a29cbf0027826aed8c5af029cc1de61aaa05
 SHA512:
-  metadata.gz: 01c4c4e000f1d0fb7996ed31a9474bc36a0ddabebdfe3d71dc276572172f0421be818037fb5d001bb77a8bd48cfd58466d1c3431595b8aad071466011f4e4d02
-  data.tar.gz: 937340398445803a2413513a739c771bc9e21ae41813bd5529c3c68c654a2714803a0a9cf3d6d850df279188d8ef2d565767f1f157481091e5c8be891e3c0af5
+  metadata.gz: ff23cfda2194b449136438eee3475801c4568d7efa9dea08c9c60bd11f732af31c10a30b95014c7d366fbf5ad86dd7471dd3419ef4ef2808f031307d1ffc841e
+  data.tar.gz: 4a776b1c73b4c2683ba6db906afc3dccd2221f0dd4943a56d1a7fd1f0b4c43f92a789231d82e85aec2ba664fd505013c3c3a594a7b57d6931b35bfd433998ca0

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
 
@@ -29,24 +29,22 @@ module RubyLsp
       sig do
         override.params(
           uri: URI::Generic,
-          emitter: EventEmitter,
-          message_queue: Thread::Queue,
+          dispatcher: Prism::Dispatcher,
         ).returns(T.nilable(Listener[T::Array[Interface::CodeLens]]))
       end
-      def create_code_lens_listener(uri, emitter, message_queue)
-        CodeLens.new(uri, emitter, message_queue)
+      def create_code_lens_listener(uri, dispatcher)
+        CodeLens.new(uri, dispatcher)
       end
 
       sig do
         override.params(
           nesting: T::Array[String],
           index: RubyIndexer::Index,
-          emitter: EventEmitter,
-          message_queue: Thread::Queue,
+          dispatcher: Prism::Dispatcher,
         ).returns(T.nilable(Listener[T.nilable(Interface::Hover)]))
       end
-      def create_hover_listener(nesting, index, emitter, message_queue)
-        Hover.new(client, emitter, 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,17 +42,20 @@ module RubyLsp
       sig { override.returns(ResponseType) }
       attr_reader :_response
 
-      sig { params(uri: URI::Generic, emitter: EventEmitter, message_queue: Thread::Queue).void }
-      def initialize(uri, emitter, 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))
-        emitter.register(self, :on_call, :on_class, :on_def)
+        @group_id = T.let(1, Integer)
+        @group_id_stack = T.let([], T::Array[Integer])
 
-        super(emitter, 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: YARP::CallNode).void }
-      def on_call(node)
+      sig { params(node: Prism::CallNode).void }
+      def on_call_node_enter(node)
         message_value = node.message
         return unless message_value == "test"
 
@@ -62,15 +65,13 @@ module RubyLsp
         first_argument = arguments.first
 
         content = case first_argument
-        when YARP::StringConcatNode
-          left = first_argument.left
-          right = first_argument.right
-          # We only support two lines of concatenation on test names
-          if left.is_a?(YARP::StringNode) &&
-              right.is_a?(YARP::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 YARP::StringNode
+        when Prism::StringNode
           first_argument.content
         end
 
@@ -82,8 +83,8 @@ module RubyLsp
       end
 
       # Although uncommon, Rails tests can be written with the classic "def test_name" syntax.
-      sig { params(node: YARP::DefNode).void }
-      def on_def(node)
+      sig { params(node: Prism::DefNode).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
@@ -92,18 +93,26 @@ module RubyLsp
         end
       end
 
-      sig { params(node: YARP::ClassNode).void }
-      def on_class(node)
+      sig { params(node: Prism::ClassNode).void }
+      def on_class_node_enter(node)
         class_name = node.constant_path.slice
         if class_name.end_with?("Test")
           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
 
-      sig { params(node: YARP::Node, name: String, command: String, kind: Symbol).void }
+      sig { params(node: Prism::Node, name: String, command: String, kind: Symbol).void }
       def add_test_code_lens(node, name:, command:, kind:)
         return unless @path
 
@@ -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

@@ -25,37 +25,56 @@ module RubyLsp
       sig { override.returns(ResponseType) }
       attr_reader :_response
 
-      sig { params(client: RailsClient, emitter: RubyLsp::EventEmitter, message_queue: Thread::Queue).void }
-      def initialize(client, emitter, message_queue)
-        super(emitter, message_queue)
+      sig do
+        params(
+          client: RailsClient,
+          nesting: T::Array[String],
+          index: RubyIndexer::Index,
+          dispatcher: Prism::Dispatcher,
+        ).void
+      end
+      def initialize(client, nesting, index, dispatcher)
+        super(dispatcher)
 
         @_response = T.let(nil, ResponseType)
         @client = client
-        emitter.register(self, :on_constant_path, :on_constant_read, :on_call)
+        @nesting = nesting
+        @index = index
+        dispatcher.register(self, :on_constant_path_node_enter, :on_constant_read_node_enter, :on_call_node_enter)
       end
 
-      sig { params(node: YARP::ConstantPathNode).void }
-      def on_constant_path(node)
-        @_response = generate_rails_document_link_hover(node.slice, node.location)
+      sig { params(node: Prism::ConstantPathNode).void }
+      def on_constant_path_node_enter(node)
+        entries = @index.resolve(node.slice, @nesting)
+        return unless entries
+
+        name = T.must(entries.first).name
+        content = +""
+        column_info = generate_column_content(name)
+        content << column_info if column_info
+
+        urls = Support::RailsDocumentClient.generate_rails_document_urls(name)
+        content << urls.join("\n\n") unless urls.empty?
+        return if content.empty?
+
+        contents = RubyLsp::Interface::MarkupContent.new(kind: "markdown", value: content)
+        @_response = RubyLsp::Interface::Hover.new(range: range_from_location(node.location), contents: contents)
       end
 
-      sig { params(node: YARP::ConstantReadNode).void }
-      def on_constant_read(node)
-        model = @client.model(node.name.to_s)
-        return if model.nil?
+      sig { params(node: Prism::ConstantReadNode).void }
+      def on_constant_read_node_enter(node)
+        entries = @index.resolve(node.name.to_s, @nesting)
+        return unless entries
+
+        content = generate_column_content(T.must(entries.first).name)
+        return unless content
 
-        schema_file = model[:schema_file]
-        content = +""
-        if schema_file
-          content << "[Schema](#{URI::Generic.build(scheme: "file", path: schema_file)})\n\n"
-        end
-        content << model[:columns].map { |name, type| "**#{name}**: #{type}\n" }.join("\n")
         contents = RubyLsp::Interface::MarkupContent.new(kind: "markdown", value: content)
-        @_response = RubyLsp::Interface::Hover.new(range: range_from_node(node), contents: contents)
+        @_response = RubyLsp::Interface::Hover.new(range: range_from_location(node.location), contents: contents)
       end
 
-      sig { params(node: YARP::CallNode).void }
-      def on_call(node)
+      sig { params(node: Prism::CallNode).void }
+      def on_call_node_enter(node)
         message_value = node.message
         message_loc = node.message_loc
 
@@ -66,7 +85,19 @@ module RubyLsp
 
       private
 
-      sig { params(name: String, location: YARP::Location).returns(T.nilable(Interface::Hover)) }
+      sig { params(name: String).returns(T.nilable(String)) }
+      def generate_column_content(name)
+        model = @client.model(name)
+        return if model.nil?
+
+        schema_file = model[:schema_file]
+        content = +""
+        content << "[Schema](#{URI::Generic.build(scheme: "file", path: schema_file)})\n\n" if schema_file
+        content << model[:columns].map { |name, type| "**#{name}**: #{type}\n" }.join("\n")
+        content
+      end
+
+      sig { params(name: String, location: Prism::Location).returns(T.nilable(Interface::Hover)) }
       def generate_rails_document_link_hover(name, location)
         urls = Support::RailsDocumentClient.generate_rails_document_urls(name)
         return if urls.empty?

data/lib/ruby_lsp_rails/version.rb

@@ -3,6 +3,6 @@
 
 module RubyLsp
   module Rails
-    VERSION = "0.2.6"
+    VERSION = "0.2.8"
   end
 end

metadata

@@ -1,17 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-04 00:00:00.000000000 Z
+date: 2023-12-04 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.11.0
+        version: 0.13.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.13.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.12.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.20
+rubygems_version: 3.4.21
 signing_key: 
 specification_version: 4
 summary: A Ruby LSP addon for Rails