ruby-lsp-rails 0.4.6 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6864307f69d34de0709f4329a56fca1b82821117c62e245343a4f59252bda54
-  data.tar.gz: f474eb2f32c87df0fa8e1e4be4f1c910400d354c1d3d81ff14f1b3cfd4a84835
+  metadata.gz: 03be48ffee8e42576471456d11c3ddd9b483d1795b09adce6faf768bc0c07b8e
+  data.tar.gz: 17a31e143ed3b32899004f74bd54d0feb9f8a1284669f5b3448c18e42f2fe6ad
 SHA512:
-  metadata.gz: 343481434aee260a0e67460c2f28da7ebe7ce5feac8f7ca26871c8bbc463064810a5d72bfe66dc59921ea6a7617006c319b95413089e7d82ad767ce7be071c5f
-  data.tar.gz: 62557459049c0f1a6ee0f2679a24f46c395342b0fe5f746c857dcde4fd489cfd382a64044de87c8f85c7b2fa5a933b842a64392a05b53b02d694d6d03a5181f7
+  metadata.gz: 7332a6411c36903267d8bcb448513eb21636205ca13290d71c2eeee26efa326c40dca280d639332428e863638e9db0fe12ffbd35f0a5e517ccc1ed777ce6a59b
+  data.tar.gz: b1c3e40c0def28339e948db1d336754197e697d1aa483b83e87786fa834f83f3c0088cbf7c3699dc7783df1f20c3ad6a8b1d104ab63e60c7bfb6a4a6962e7fa3

data/lib/ruby_lsp/ruby_lsp_rails/definition.rb

@@ -109,7 +109,7 @@ module RubyLsp
 
         association_name = first_argument.unescaped
 
-        result = @client.association_target_location(
+        result = @client.association_target(
           model_name: @nesting.join("::"),
           association_name: association_name,
         )

data/lib/ruby_lsp/ruby_lsp_rails/hover.rb

@@ -21,9 +21,15 @@ module RubyLsp
       def initialize(client, response_builder, node_context, global_state, dispatcher)
         @client = client
         @response_builder = response_builder
+        @node_context = node_context
         @nesting = node_context.nesting #: Array[String]
         @index = global_state.index #: RubyIndexer::Index
-        dispatcher.register(self, :on_constant_path_node_enter, :on_constant_read_node_enter)
+        dispatcher.register(
+          self,
+          :on_constant_path_node_enter,
+          :on_constant_read_node_enter,
+          :on_symbol_node_enter,
+        )
       end
 
       #: (Prism::ConstantPathNode node) -> void
@@ -45,6 +51,11 @@ module RubyLsp
         generate_column_content(item.name)
       end
 
+      #: (Prism::SymbolNode node) -> void
+      def on_symbol_node_enter(node)
+        handle_possible_dsl(node)
+      end
+
       private
 
       #: (String name) -> void
@@ -104,6 +115,55 @@ module RubyLsp
           default_value
         end
       end
+
+      #: (Prism::SymbolNode node) -> void
+      def handle_possible_dsl(node)
+        node = @node_context.call_node
+        return unless node
+        return unless self_receiver?(node)
+
+        message = node.message
+
+        return unless message
+
+        if Support::Associations::ALL.include?(message)
+          handle_association(node)
+        end
+      end
+
+      #: (Prism::CallNode node) -> void
+      def handle_association(node)
+        first_argument = node.arguments&.arguments&.first
+        return unless first_argument.is_a?(Prism::SymbolNode)
+
+        association_name = first_argument.unescaped
+
+        result = @client.association_target(
+          model_name: @nesting.join("::"),
+          association_name: association_name,
+        )
+
+        return unless result
+
+        generate_hover(result[:name])
+      end
+
+      # Copied from `RubyLsp::Listeners::Hover#generate_hover`
+      #: (String name) -> void
+      def generate_hover(name)
+        entries = @index.resolve(name, @node_context.nesting)
+        return unless entries
+
+        # We should only show hover for private constants if the constant is defined in the same namespace as the
+        # reference
+        first_entry = entries.first #: as !nil
+        full_name = first_entry.name
+        return if first_entry.private? && full_name != "#{@node_context.fully_qualified_name}::#{name}"
+
+        categorized_markdown_from_index_entries(full_name, entries).each do |category, content|
+          @response_builder.push(content, category: category)
+        end
+      end
     end
   end
 end

data/lib/ruby_lsp/ruby_lsp_rails/rails_test_style.rb

@@ -4,7 +4,7 @@
 module RubyLsp
   module Rails
     class RailsTestStyle < Listeners::TestDiscovery
-      BASE_COMMAND = "#{RbConfig.ruby} bin/rails test" #: String
+      BASE_COMMAND = "bundle exec ruby -r#{Listeners::TestStyle::MINITEST_REPORTER_PATH} bin/rails test" #: String
 
       class << self
         #: (Array[Hash[Symbol, untyped]]) -> Array[String]

data/lib/ruby_lsp/ruby_lsp_rails/runner_client.rb

@@ -144,9 +144,9 @@ module RubyLsp
       end
 
       #: (model_name: String, association_name: String) -> Hash[Symbol, untyped]?
-      def association_target_location(model_name:, association_name:)
+      def association_target(model_name:, association_name:)
         make_request(
-          "association_target_location",
+          "association_target",
           model_name: model_name,
           association_name: association_name,
         )

data/lib/ruby_lsp/ruby_lsp_rails/server.rb

@@ -68,8 +68,10 @@ module RubyLsp
         send_error_response("Request #{request_name} failed because database connection was not established.")
       rescue ActiveRecord::NoDatabaseError
         send_error_response("Request #{request_name} failed because the database does not exist.")
-      rescue => e
-        send_error_response("Request #{request_name} failed:\n#{e.full_message(highlight: false)}")
+      rescue NotImplementedError, LoadError, SyntaxError, SystemExit, SystemStackError => e
+        send_error_response("Request #{request_name} failed with #{e.class}:\n#{e.full_message(highlight: false)}")
+      rescue StandardError => e
+        send_error_response("Request #{request_name} failed with StandardError:\n#{e.full_message(highlight: false)}")
       end
 
       # Handle possible errors for a notification. This should only be used for notifications, which means messages that
@@ -82,8 +84,10 @@ module RubyLsp
         log_message("Request #{notification_name} failed because database connection was not established.")
       rescue ActiveRecord::NoDatabaseError
         log_message("Request #{notification_name} failed because the database does not exist.")
-      rescue => e
-        log_message("Request #{notification_name} failed:\n#{e.full_message(highlight: false)}")
+      rescue NotImplementedError, LoadError, SyntaxError, SystemExit, SystemStackError => e
+        log_message("Request #{notification_name} failed with #{e.class}:\n#{e.full_message(highlight: false)}")
+      rescue StandardError => e
+        log_message("Request #{notification_name} failed with StandardError:\n#{e.full_message(highlight: false)}")
       end
 
       #: (String, String, ?percentage: Integer?, ?message: String?) -> void
@@ -302,7 +306,7 @@ module RubyLsp
           with_request_error_handling(request) do
             send_result(resolve_database_info_from_model(params.fetch(:name)))
           end
-        when "association_target_location"
+        when "association_target"
           with_request_error_handling(request) do
             send_result(resolve_association_target(params))
           end
@@ -427,7 +431,7 @@ module RubyLsp
         source_location = Object.const_source_location(association_klass.to_s)
         return unless source_location
 
-        { location: "#{source_location[0]}:#{source_location[1]}" }
+        { location: "#{source_location[0]}:#{source_location[1]}", name: association_klass.name }
       rescue NameError
         nil
       end

data/lib/ruby_lsp/ruby_lsp_rails/support/callbacks.rb

@@ -55,7 +55,13 @@ module RubyLsp
           "before_perform",
         ].freeze
 
-        ALL = (MODELS + CONTROLLERS + JOBS).freeze #: Array[String]
+        MAILBOX = [
+          "after_processing",
+          "before_processing",
+          "around_processing",
+        ].freeze
+
+        ALL = (MODELS + CONTROLLERS + JOBS + MAILBOX).freeze #: Array[String]
       end
     end
   end

data/lib/ruby_lsp_rails/version.rb

@@ -3,6 +3,6 @@
 
 module RubyLsp
   module Rails
-    VERSION = "0.4.6"
+    VERSION = "0.4.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.8
 platform: ruby
 authors:
 - Shopify
@@ -15,20 +15,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.26.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.27.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.26.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.27.0
 description: A Ruby LSP addon that adds extra editor functionality for Rails applications
 email:
 - ruby@shopify.com