ruby-lsp-rails 0.3.9 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2499b5ff0e291d166c0fe823ccd3c34d3c60606500a7f9db6a152508cb6f1346
-  data.tar.gz: 7ef48a79261a23f531f0b86ca18f7cec27c9a75490b4b111a495badcdf267fa5
+  metadata.gz: 8e684ecacd45b09fee18e386a95d0dfa61bd3cce2c64869bf34f711d9d0c2fa3
+  data.tar.gz: c575d062c88f997967989f1cca84a1241fb6d07750a0535e122112b890e9dd0e
 SHA512:
-  metadata.gz: ee15545d1a6e8dd9221b06f403af4219e59a0b823b527d92edce63539ca11b7fa01faeea1a7c2d8f91933686c8b92884a961698075d7c8826ba24e27619cd509
-  data.tar.gz: dbee9b4f8dc8658254ec9db2d2e585a0fa6a78545a8e296d3b3f4d5881a53cb642475cf92c0915ddfaeeede2306d925957bb75e0d0c52029d3bca4ba39195061
+  metadata.gz: 17c1805f2e1d7363e2734d6983fdba8b11b72e083ff07b0d872745121f9b4c1d20898e439a19c7dc9f179f8729260cf2f90e701e47967d4901576166fe66c420
+  data.tar.gz: '039f940ff0ea3247316609b379396a7096ada44ed0b4127969223c3277d946bbbd913e106ede27912fc29c53a0e349999231e1561940e5d75ff6adbf0cea1a89'

data/lib/ruby_lsp/ruby_lsp_rails/addon.rb

@@ -51,9 +51,7 @@ module RubyLsp
         ).void
       end
       def create_code_lens_listener(response_builder, uri, dispatcher)
-        return unless T.must(@global_state).test_library == "rails"
-
-        CodeLens.new(@client, response_builder, uri, dispatcher)
+        CodeLens.new(@client, T.must(@global_state), response_builder, uri, dispatcher)
       end
 
       sig do

data/lib/ruby_lsp/ruby_lsp_rails/code_lens.rb

@@ -79,20 +79,30 @@ module RubyLsp
       sig do
         params(
           client: RunnerClient,
+          global_state: GlobalState,
           response_builder:  ResponseBuilders::CollectionResponseBuilder[Interface::CodeLens],
           uri: URI::Generic,
           dispatcher: Prism::Dispatcher,
         ).void
       end
-      def initialize(client, response_builder, uri, dispatcher)
+      def initialize(client, global_state, response_builder, uri, dispatcher)
         @client = client
+        @global_state = global_state
         @response_builder = response_builder
         @path = T.let(uri.to_standardized_path, T.nilable(String))
         @group_id = T.let(1, Integer)
         @group_id_stack = T.let([], T::Array[Integer])
         @constant_name_stack = T.let([], T::Array[[String, T.nilable(String)]])
 
-        dispatcher.register(self, :on_call_node_enter, :on_class_node_enter, :on_def_node_enter, :on_class_node_leave)
+        dispatcher.register(
+          self,
+          :on_call_node_enter,
+          :on_class_node_enter,
+          :on_def_node_enter,
+          :on_class_node_leave,
+          :on_module_node_enter,
+          :on_module_node_leave,
+        )
       end
 
       sig { params(node: Prism::CallNode).void }
@@ -119,6 +129,7 @@ module RubyLsp
 
         if controller?
           add_route_code_lens_to_action(node)
+          add_jump_to_view(node)
         end
       end
 
@@ -156,43 +167,63 @@ module RubyLsp
         @constant_name_stack.pop
       end
 
+      sig { params(node: Prism::ModuleNode).void }
+      def on_module_node_enter(node)
+        @constant_name_stack << [node.constant_path.slice, nil]
+      end
+
+      sig { params(node: Prism::ModuleNode).void }
+      def on_module_node_leave(node)
+        @constant_name_stack.pop
+      end
+
       private
 
       sig { returns(T.nilable(T::Boolean)) }
       def controller?
-        class_name, superclass_name = T.must(@constant_name_stack.last)
-        class_name.end_with?("Controller") && superclass_name&.end_with?("Controller")
+        class_name, superclass_name = @constant_name_stack.last
+        return false unless class_name && superclass_name
+
+        class_name.end_with?("Controller") && superclass_name.end_with?("Controller")
       end
 
       sig { params(node: Prism::DefNode).void }
-      def add_route_code_lens_to_action(node)
-        class_name, _ = T.must(@constant_name_stack.last)
-        route = @client.route(
-          controller: class_name,
-          action: node.name.to_s,
+      def add_jump_to_view(node)
+        class_name = @constant_name_stack.map(&:first).join("::")
+        action_name = node.name
+        controller_name = class_name
+          .delete_suffix("Controller")
+          .gsub(/([a-z])([A-Z])/, "\\1_\\2")
+          .gsub("::", "/")
+          .downcase
+
+        view_uris = Dir.glob("#{@client.rails_root}/app/views/#{controller_name}/#{action_name}*").map! do |path|
+          URI::Generic.from_path(path: path).to_s
+        end
+        return if view_uris.empty?
+
+        @response_builder << create_code_lens(
+          node,
+          title: "Jump to view",
+          command_name: "rubyLsp.openFile",
+          arguments: [view_uris],
+          data: { type: "file" },
         )
+      end
 
+      sig { params(node: Prism::DefNode).void }
+      def add_route_code_lens_to_action(node)
+        class_name, _ = T.must(@constant_name_stack.last)
+        route = @client.route(controller: class_name, action: node.name.to_s)
         return unless route
 
-        path = route[:path]
-        verb = route[:verb]
-        source_location = route[:source_location]
-
-        arguments = [
-          source_location,
-          {
-            start_line: node.location.start_line - 1,
-            start_column: node.location.start_column,
-            end_line: node.location.end_line - 1,
-            end_column: node.location.end_column,
-          },
-        ]
+        file_path, line = route[:source_location]
 
         @response_builder << create_code_lens(
           node,
-          title: [verb, path].join(" "),
+          title: "#{route[:verb]} #{route[:path]}",
           command_name: "rubyLsp.openFile",
-          arguments: arguments,
+          arguments: [["file://#{file_path}#L#{line}"]],
           data: { type: "file" },
         )
       end
@@ -228,6 +259,7 @@ module RubyLsp
       sig { params(node: Prism::Node, name: String, command: String, kind: Symbol).void }
       def add_test_code_lens(node, name:, command:, kind:)
         return unless @path
+        return unless @global_state.test_library == "rails"
 
         arguments = [
           @path,

data/lib/ruby_lsp/ruby_lsp_rails/runner_client.rb

@@ -36,6 +36,9 @@ module RubyLsp
 
       extend T::Sig
 
+      sig { returns(String) }
+      attr_reader :rails_root
+
       sig { void }
       def initialize
         # Spring needs a Process session ID. It uses this ID to "attach" itself to the parent process, so that when the
@@ -67,7 +70,8 @@ module RubyLsp
 
         begin
           count += 1
-          read_response
+          initialize_response = T.must(read_response)
+          @rails_root = T.let(initialize_response[:root], String)
         rescue EmptyMessageError
           $stderr.puts("Ruby LSP Rails is retrying initialize (#{count})")
           retry if count < MAX_RETRIES
@@ -218,6 +222,11 @@ module RubyLsp
         true
       end
 
+      sig { override.returns(String) }
+      def rails_root
+        Dir.pwd
+      end
+
       private
 
       sig { override.params(request: String, params: T.nilable(T::Hash[Symbol, T.untyped])).void }

data/lib/ruby_lsp/ruby_lsp_rails/server.rb

@@ -24,7 +24,7 @@ module RubyLsp
         routes_reloader = ::Rails.application.routes_reloader
         routes_reloader.execute_unless_loaded if routes_reloader&.respond_to?(:execute_unless_loaded)
 
-        initialize_result = { result: { message: "ok" } }.to_json
+        initialize_result = { result: { message: "ok", root: ::Rails.root.to_s } }.to_json
         $stdout.write("Content-Length: #{initialize_result.length}\r\n\r\n#{initialize_result}")
 
         while @running

data/lib/ruby_lsp_rails/version.rb

@@ -3,6 +3,6 @@
 
 module RubyLsp
   module Rails
-    VERSION = "0.3.9"
+    VERSION = "0.3.11"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.11
 platform: ruby
 authors:
 - Shopify
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-10 00:00:00.000000000 Z
+date: 2024-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-lsp
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.14
+rubygems_version: 3.5.15
 signing_key:
 specification_version: 4
 summary: A Ruby LSP addon for Rails