type errors resolved

Shopify · Feb 9, 2024 · 835505e · 835505e
1 parent 143c0ce
commit 835505e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 5 deletions.
diff --git a/lib/ruby_lsp/listeners/completion.rb b/lib/ruby_lsp/listeners/completion.rb
@@ -44,6 +44,8 @@ def on_constant_read_node_enter(node)
         return if DependencyDetector.instance.typechecker
 
         name = constant_name(node)
+        return if name.nil?
+
         candidates = @index.prefix_search(name, @nesting)
         candidates.each do |entries|
           complete_name = T.must(entries.first).name
@@ -63,6 +65,7 @@ def on_constant_path_node_enter(node)
         return if DependencyDetector.instance.typechecker
 
         name = constant_name(node)
+        return if name.nil?
 
         top_level_reference = if name.start_with?("::")
           name = name.delete_prefix("::")

diff --git a/lib/ruby_lsp/listeners/definition.rb b/lib/ruby_lsp/listeners/definition.rb
@@ -45,12 +45,18 @@ def on_call_node_enter(node)
 
       sig { params(node: Prism::ConstantPathNode).void }
       def on_constant_path_node_enter(node)
-        find_in_index(constant_name(node))
+        name = constant_name(node)
+        return if name.nil?
+
+        find_in_index(name)
       end
 
       sig { params(node: Prism::ConstantReadNode).void }
       def on_constant_read_node_enter(node)
-        find_in_index(constant_name(node))
+        name = constant_name(node)
+        return if name.nil?
+
+        find_in_index(name)
       end
 
       private

diff --git a/lib/ruby_lsp/listeners/hover.rb b/lib/ruby_lsp/listeners/hover.rb
@@ -55,7 +55,10 @@ def initialize(response_builder, uri, nesting, index, dispatcher, typechecker_en
       def on_constant_read_node_enter(node)
         return if @typechecker_enabled
 
-        generate_hover(constant_name(node), node.location)
+        name = constant_name(node)
+        return if name.nil?
+
+        generate_hover(name, node.location)
       end
 
       sig { params(node: Prism::ConstantWriteNode).void }
@@ -69,7 +72,10 @@ def on_constant_write_node_enter(node)
       def on_constant_path_node_enter(node)
         return if DependencyDetector.instance.typechecker
 
-        generate_hover(constant_name(node), node.location)
+        name = constant_name(node)
+        return if name.nil?
+
+        generate_hover(name, node.location)
       end
 
       sig { params(node: Prism::CallNode).void }

diff --git a/lib/ruby_lsp/requests/support/common.rb b/lib/ruby_lsp/requests/support/common.rb
@@ -117,7 +117,15 @@ def markdown_from_index_entries(title, entries)
           MARKDOWN
         end
 
-        sig { params(node: Prism::Node).returns(T.nilable(String)) }
+        sig do
+          params(
+            node: T.any(
+              Prism::ConstantPathNode,
+              Prism::ConstantReadNode,
+              Prism::ConstantPathTargetNode,
+            ),
+          ).returns(T.nilable(String))
+        end
         def constant_name(node)
           node.full_name
         rescue Prism::ConstantPathNode::DynamicPartsInConstantPathError