Handle custom view paths of controller subclasses

While here, we undo changes in code lens to handle custom view paths. If
this approach is accepted, we can always update the code lens later.

Author: janko

lib/ruby_lsp/ruby_lsp_rails/code_lens.rb

@@ -194,14 +194,7 @@ def add_jump_to_view(node)
         action_name = node.name
         controller_name = underscore(class_name.delete_suffix("Controller"))
 
-        controller_info = @client.controller(class_name)
-        return unless controller_info
-
-        view_paths = controller_info[:view_paths].select do |path|
-          path.start_with?(@client.rails_root)
-        end
-
-        view_uris = Dir.glob("{#{view_paths.join(",")}}/#{controller_name}/#{action_name}*").filter_map do |path|
+        view_uris = Dir.glob("#{@client.rails_root}/app/views/#{controller_name}/#{action_name}*").filter_map do |path|
           # it's possible we could have a directory with the same name as the action, so we need to skip those
           next if File.directory?(path)
 

lib/ruby_lsp/ruby_lsp_rails/definition.rb

@@ -1,6 +1,8 @@
 # typed: strict
 # frozen_string_literal: true
 
+require "pathname"
+
 module RubyLsp
   module Rails
     # ![Definition demo](../../definition.gif)
@@ -280,20 +282,27 @@ def view_template_details(arguments)
         end
       end
 
+      # Determine controller name for given template path by matching segments
+      # of its directory path to controller paths and checking if the controllers'
+      # view paths complete the rest of the template directory path.
+      #
       #: (String template_path) -> String?
       def controller_for_template(template_path)
-        controller_info = @client.controller("ActionController::Base")
-        return unless controller_info
-
-        view_paths = controller_info[:view_paths]
-        template_directory = File.dirname(template_path)
-
-        view_path = view_paths.find { |path| template_directory.start_with?(path + "/") }
-        return unless view_path
+        template_directory = Pathname(template_path).dirname.relative_path_from(@client.rails_root)
+        directory_segments = template_directory.each_filename.to_a
+        possible_controller_paths = (1..directory_segments.count).map do |n|
+          directory_segments.last(n).join("/")
+        end
 
-        controller_path = template_directory.delete_prefix(view_path + "/")
+        controller_path = possible_controller_paths.find do |controller_path|
+          controller_name = camelize(controller_path) + "Controller"
+          view_paths = @client.controller(controller_name)&.dig(:view_paths) || []
+          view_paths.any? do |view_path|
+            File.join(view_path, controller_path) == File.dirname(template_path)
+          end
+        end
 
-        camelize(controller_path) + "Controller"
+        camelize(controller_path) + "Controller" if controller_path
       end
     end
   end

test/ruby_lsp_rails/definition_test.rb

@@ -503,6 +503,27 @@ def name; end
         FileUtils.rm("#{dummy_root}/app/views/users/_partial.html.erb")
       end
 
+      test "handles custom view paths" do
+        FileUtils.mkdir_p("#{dummy_root}/app/custom/views/admin")
+        FileUtils.touch("#{dummy_root}/app/custom/views/admin/_partial.html.erb")
+        File.write("#{dummy_root}/app/controllers/admin_controller.rb", <<~RUBY)
+          class AdminController < ApplicationController
+            prepend_view_path "#{dummy_root}/app/custom/views"
+          end
+        RUBY
+
+        uri = Kernel.URI("file://#{dummy_root}/app/custom/views/admin/render.html.erb")
+        source = <<~ERB
+          <%= render "partial" %>
+        ERB
+
+        response = generate_definitions_for_source(source, { line: 0, character: 12 }, uri)
+        assert_equal("file://#{dummy_root}/app/custom/views/admin/_partial.html.erb", response.first.uri)
+      ensure
+        FileUtils.rm_r("#{dummy_root}/app/custom/views/admin")
+        FileUtils.rm("#{dummy_root}/app/controllers/admin_controller.rb")
+      end
+
       test "handles template formats, variants and handlers" do
         FileUtils.touch("#{dummy_root}/app/views/users/_partial.html.erb")
         FileUtils.touch("#{dummy_root}/app/views/users/_partial.text.erb")