Skip to content

Commit

Permalink
replaced occurrences of node.slice with node.full_name (#1287)
Browse files Browse the repository at this point in the history
* node.slice replaced with node.full_name

* type errors resolved
  • Loading branch information
haiderashfaq authored Feb 9, 2024
1 parent ef77ed6 commit 1159866
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 6 deletions.
7 changes: 5 additions & 2 deletions lib/ruby_lsp/listeners/completion.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ def on_string_node_enter(node)
def on_constant_read_node_enter(node)
return if DependencyDetector.instance.typechecker

name = node.slice
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
Expand All @@ -62,7 +64,8 @@ def on_constant_read_node_enter(node)
def on_constant_path_node_enter(node)
return if DependencyDetector.instance.typechecker

name = node.slice
name = constant_name(node)
return if name.nil?

top_level_reference = if name.start_with?("::")
name = name.delete_prefix("::")
Expand Down
10 changes: 8 additions & 2 deletions lib/ruby_lsp/listeners/definition.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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(node.slice)
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(node.slice)
name = constant_name(node)
return if name.nil?

find_in_index(name)
end

private
Expand Down
10 changes: 8 additions & 2 deletions lib/ruby_lsp/listeners/hover.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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(node.slice, node.location)
name = constant_name(node)
return if name.nil?

generate_hover(name, node.location)
end

sig { params(node: Prism::ConstantWriteNode).void }
Expand All @@ -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(node.slice, node.location)
name = constant_name(node)
return if name.nil?

generate_hover(name, node.location)
end

sig { params(node: Prism::CallNode).void }
Expand Down
15 changes: 15 additions & 0 deletions lib/ruby_lsp/requests/support/common.rb
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,21 @@ def markdown_from_index_entries(title, entries)
#{categorized_markdown[:documentation]}
MARKDOWN
end

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
nil
end
end
end
end
Expand Down

0 comments on commit 1159866

Please sign in to comment.