has_state_machine 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d311fd40183ff49f406df6216c0a48f910f05bae0d91dc8a77d1456cfbafadd5
-  data.tar.gz: a08e788ca3012cb4a74570d463f0c30344b476732702848184439efaa3a6b79a
+  metadata.gz: 4f9619070408aa690d1e8b70c31baf787c91d949c0e28665a42af8b17ff79955
+  data.tar.gz: '099784a11f816d49d75b18432a1497688838aac08a775d15fe5d29827eb7ac38'
 SHA512:
-  metadata.gz: a6cd82cab96a81efd97f3495770baa6542c65f23ae602d00362c27b6517779df747b330460f833eb318e313e23e40318ef32c0fe4c9685a3c587df6912a4e6ab
-  data.tar.gz: 86620a6b8db88cfd2a267c06197269cea8f7320f2cc0cc70829d04e9d00736b276609af2bf0ba93d376d079aa2e6afcd16bb4bad0059f707a1bd63c7edff0856
+  metadata.gz: 749b711582fc925fd8efbfcb7dcdee7dfb3f9902e945d5cc26e1f7f3737ea77f646087a117ccf9e6675444a858acb2497ae52dba0a3c8b2777628ebae33297af
+  data.tar.gz: a8cbe864ada7ab74316c55c14704ea33fa18bae5050d3a728d2f5458cb16b561419643805af0824fd7bdcca10cf42e5023e708d84f88ed1e3478a9b24bad2d43

data/lib/has_state_machine/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HasStateMachine
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/lib/ruby_lsp/has_state_machine/addon.rb

@@ -12,12 +12,25 @@ module RubyLsp
     class Addon < ::RubyLsp::Addon
       def activate(global_state, outgoing_queue)
         @global_state = global_state
+        @model_name_cache = {}
         @rails_client = register_rails_server_addon(outgoing_queue)
+
+        rails_status = if @rails_client
+          "registered"
+        else
+          "unavailable, using naming convention only"
+        end
+
+        log(
+          outgoing_queue,
+          "Activating Has State Machine Ruby LSP add-on v#{version} (Rails integration: #{rails_status})"
+        )
       end
 
       def deactivate
         @global_state = nil
         @rails_client = nil
+        @model_name_cache = nil
       end
 
       def name
@@ -35,7 +48,8 @@ module RubyLsp
           node_context,
           dispatcher,
           index: @global_state&.index,
-          rails_client: @rails_client
+          rails_client: @rails_client,
+          model_name_cache: @model_name_cache
         )
       end
 
@@ -53,6 +67,7 @@ module RubyLsp
 
         client = rails_addon.rails_runner_client
         return unless client.respond_to?(:register_server_addon)
+        return if client.respond_to?(:connected?) && !client.connected?
 
         client.register_server_addon(File.expand_path("rails_server_addon.rb", __dir__))
         client

data/lib/ruby_lsp/has_state_machine/definition.rb

@@ -7,6 +7,10 @@ module RubyLsp
     class Definition
       SERVER_ADDON_NAME = "has_state_machine"
 
+      # AR methods that return self, so `object.reload.foo` targets the model
+      # just like `object.foo`.
+      SELF_RETURNING_METHODS = ["reload"].freeze
+
       def initialize(response_builder, _uri, node_context, dispatcher, index: nil, rails_client: nil,
         model_name_cache: nil)
         @response_builder = response_builder
@@ -33,6 +37,7 @@ module RubyLsp
           method_name = message(node)
           entries = method_entries(resolved_model_name, method_name)
           entries = association_entries(resolved_model_name, method_name) if entries.empty?
+          entries = constant_entries(resolved_model_name) if entries.empty?
 
           push_entries(entries)
         end
@@ -84,7 +89,7 @@ module RubyLsp
       end
 
       def model_name_from_rails(workflow_namespace)
-        return unless workflow_namespace && rails_client
+        return unless workflow_namespace && rails_client_available?
 
         # Cache hits and misses for the life of the LSP process; the set of
         # models rarely changes mid-session. Failures raise past the cache
@@ -114,8 +119,17 @@ module RubyLsp
         constant_entries(association_model_name)
       end
 
+      # Delegating a request to a disconnected client (ruby-lsp-rails NullClient)
+      # never produces a response, so read_response would block forever and the
+      # convention fallback would never run.
+      def rails_client_available?
+        return false unless rails_client
+
+        !rails_client.respond_to?(:connected?) || rails_client.connected?
+      end
+
       def association_model_name(model_name, association_name)
-        return unless rails_client&.respond_to?(:association_target)
+        return unless rails_client_available? && rails_client.respond_to?(:association_target)
 
         result = rails_client.association_target(model_name: model_name, association_name: association_name)
         response_name(result)
@@ -189,7 +203,14 @@ module RubyLsp
       end
 
       def object_method_call?(node)
-        message(node) && object_call?(receiver(node))
+        message(node) && object_chain?(receiver(node))
+      end
+
+      def object_chain?(node)
+        return false unless node
+        return true if object_call?(node)
+
+        SELF_RETURNING_METHODS.include?(message(node)) && object_chain?(receiver(node))
       end
 
       def object_call?(node)

data/lib/ruby_lsp/has_state_machine/rails_server_addon.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "ruby_lsp/ruby_lsp_rails/server"
+require "ruby_lsp/ruby_lsp_rails/server" unless defined?(::RubyLsp::Rails::ServerAddon)
 
 module RubyLsp
   module HasStateMachine
@@ -13,7 +13,7 @@ module RubyLsp
         with_request_error_handling(request) do
           case request
           when "model_for_workflow_namespace"
-            send_result(model_for_workflow_namespace(params.fetch("workflow_namespace")))
+            send_result(model_for_workflow_namespace(params[:workflow_namespace] || params.fetch("workflow_namespace")))
           else
             raise NotImplementedError, "Unknown request: #{request}"
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_state_machine
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Benjamin Hargett