ruby-lsp-rails 0.3.18 → 0.3.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 159bd26f9edd1f611d7f13cb5864e63d8ecc1c6180bbf5a426b9e40a98ce25ba
-  data.tar.gz: 5266ed45904e0d62f074684a3a943ac1ef66b7827c4177ee7631d5ae46118553
+  metadata.gz: 17851fd3a4e5eb644fb2de5ee5f33ae07d38c4a12ffd6b8c868651002e8c3870
+  data.tar.gz: e4f0096f8874f4c34157fe0d1cd491ea0f278ebd1cbf1445d5a13b09e8c6b725
 SHA512:
-  metadata.gz: ab185650a7d5d24f1d7e7faf29cea5eabc99d905525ea840b2000003059393c60be8b79ef9f97ef3a78bf58ae695a5d5f19aa5bbecc9ea367d48090c9614538c
-  data.tar.gz: ef04db908af2f8ce9ee58a0059e51736f969f487b769a421d7df141cfc0518f31c2aa503eace5cc5ad24db36f56a1855ba55ffc4d5990f1eccc5d8cea1a4931c
+  metadata.gz: 97fe780b035265db5f2f8b96e58e8d6f89f66b64e43d0b7450604b3920ea818932dd581b76d1e13dea202a936446ca2a26f4c2d5341736f2d4a6c15059453bd6
+  data.tar.gz: 8a913fd58675f31da51c3175fd44b83b32ce5790a947461d8bf986e4c7e9d1de21a8b66a518e4ab16a18f6350e6b089823af5472ac6cac4e40ea3b9af734614f

data/lib/ruby_lsp/ruby_lsp_rails/document_symbol.rb

@@ -141,7 +141,7 @@ module RubyLsp
 
             arg_receiver = argument.receiver
 
-            name = arg_receiver.full_name if arg_receiver.is_a?(Prism::ConstantReadNode) ||
+            name = constant_name(arg_receiver) if arg_receiver.is_a?(Prism::ConstantReadNode) ||
               arg_receiver.is_a?(Prism::ConstantPathNode)
             next unless name
 
@@ -201,8 +201,8 @@ module RubyLsp
         arguments.each do |argument|
           case argument
           when Prism::ConstantReadNode, Prism::ConstantPathNode
-            name = argument.full_name
-            next if name.empty?
+            name = constant_name(argument)
+            next unless name
 
             append_document_symbol(
               name: "#{message} #{name}",

data/lib/ruby_lsp/ruby_lsp_rails/indexing_enhancement.rb

@@ -13,9 +13,13 @@ module RubyLsp
           owner: T.nilable(RubyIndexer::Entry::Namespace),
           node: Prism::CallNode,
           file_path: String,
+          code_units_cache: T.any(
+            T.proc.params(arg0: Integer).returns(Integer),
+            Prism::CodeUnitsCache,
+          ),
         ).void
       end
-      def on_call_node(index, owner, node, file_path)
+      def on_call_node(index, owner, node, file_path, code_units_cache)
         return unless owner
 
         name = node.name
@@ -24,7 +28,7 @@ module RubyLsp
         when :extend
           handle_concern_extend(index, owner, node)
         when :has_one, :has_many, :belongs_to, :has_and_belongs_to_many
-          handle_association(index, owner, node, file_path)
+          handle_association(index, owner, node, file_path, code_units_cache)
         end
       end
 
@@ -36,9 +40,13 @@ module RubyLsp
           owner: RubyIndexer::Entry::Namespace,
           node: Prism::CallNode,
           file_path: String,
+          code_units_cache: T.any(
+            T.proc.params(arg0: Integer).returns(Integer),
+            Prism::CodeUnitsCache,
+          ),
         ).void
       end
-      def handle_association(index, owner, node, file_path)
+      def handle_association(index, owner, node, file_path, code_units_cache)
         arguments = node.arguments&.arguments
         return unless arguments
 
@@ -53,14 +61,15 @@ module RubyLsp
 
         return unless name
 
+        loc = RubyIndexer::Location.from_prism_location(name_arg.location, code_units_cache)
+
         # Reader
         index.add(RubyIndexer::Entry::Method.new(
           name,
           file_path,
-          name_arg.location,
-          name_arg.location,
+          loc,
+          loc,
           nil,
-          index.configuration.encoding,
           [RubyIndexer::Entry::Signature.new([])],
           RubyIndexer::Entry::Visibility::PUBLIC,
           owner,
@@ -70,10 +79,9 @@ module RubyLsp
         index.add(RubyIndexer::Entry::Method.new(
           "#{name}=",
           file_path,
-          name_arg.location,
-          name_arg.location,
+          loc,
+          loc,
           nil,
-          index.configuration.encoding,
           [RubyIndexer::Entry::Signature.new([RubyIndexer::Entry::RequiredParameter.new(name: name.to_sym)])],
           RubyIndexer::Entry::Visibility::PUBLIC,
           owner,

data/lib/ruby_lsp/ruby_lsp_rails/server.rb

@@ -15,8 +15,8 @@ module RubyLsp
         @stdout.write("Content-Length: #{json_message.length}\r\n\r\n#{json_message}")
       end
 
-      # Log a debug message to the editor's output
-      def debug_message(message)
+      # Log a message to the editor's output panel
+      def log_message(message)
         $stderr.puts(message)
       end
     end
@@ -119,12 +119,17 @@ module RubyLsp
           require params[:server_addon_path]
           ServerAddon.finalize_registrations!(@stdout)
         when "server_addon/delegate"
-          server_addon_name = params.delete(:server_addon_name)
-          request_name = params.delete(:request_name)
-          ServerAddon.delegate(server_addon_name, request_name, params)
+          server_addon_name = params[:server_addon_name]
+          request_name = params[:request_name]
+          ServerAddon.delegate(server_addon_name, request_name, params.except(:request_name, :server_addon_name))
         end
+        request_name = request
+        request_name = "#{params[:server_addon_name]}##{params[:request_name]}" if request == "server_addon/delegate"
+      # Since this is a common problem, we show a specific error message to the user, instead of the full stack trace.
+      rescue ActiveRecord::ConnectionNotEstablished
+        log_message("Request #{request_name} failed because database connection was not established.")
       rescue => e
-        send_message({ error: e.full_message(highlight: false) })
+        log_message("Request #{request_name} failed:\n" + e.full_message(highlight: false))
       end
 
       private

data/lib/ruby_lsp_rails/version.rb

@@ -3,6 +3,6 @@
 
 module RubyLsp
   module Rails
-    VERSION = "0.3.18"
+    VERSION = "0.3.20"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.18
+  version: 0.3.20
 platform: ruby
 authors:
 - Shopify
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-07 00:00:00.000000000 Z
+date: 2024-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-lsp
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.20.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.20.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.21.0
 description: A Ruby LSP addon that adds extra editor functionality for Rails applications
 email:
 - ruby@shopify.com
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.20
+rubygems_version: 3.5.21
 signing_key:
 specification_version: 4
 summary: A Ruby LSP addon for Rails