Check if global state is already initialized before creating listeners

Shopify · Jan 28, 2025 · daa444d · daa444d
1 parent a1f3cc1
commit daa444d
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/lib/ruby_lsp/ruby_lsp_rails/addon.rb b/lib/ruby_lsp/ruby_lsp_rails/addon.rb
@@ -81,7 +81,9 @@ def version
         ).void
       end
       def create_code_lens_listener(response_builder, uri, dispatcher)
-        CodeLens.new(@rails_runner_client, T.must(@global_state), response_builder, uri, dispatcher)
+        return unless @global_state
+
+        CodeLens.new(@rails_runner_client, @global_state, response_builder, uri, dispatcher)
       end
 
       sig do
@@ -92,7 +94,9 @@ def create_code_lens_listener(response_builder, uri, dispatcher)
         ).void
       end
       def create_hover_listener(response_builder, node_context, dispatcher)
-        Hover.new(@rails_runner_client, response_builder, node_context, T.must(@global_state), dispatcher)
+        return unless @global_state
+
+        Hover.new(@rails_runner_client, response_builder, node_context, @global_state, dispatcher)
       end
 
       sig do
@@ -116,8 +120,9 @@ def create_document_symbol_listener(response_builder, dispatcher)
         ).void
       end
       def create_definition_listener(response_builder, uri, node_context, dispatcher)
-        index = T.must(@global_state).index
-        Definition.new(@rails_runner_client, response_builder, node_context, index, dispatcher)
+        return unless @global_state
+
+        Definition.new(@rails_runner_client, response_builder, node_context, @global_state.index, dispatcher)
       end
 
       sig do