Skip to content

server: simplify GotoDefinitionResponse creation #895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 1 commit into from
Jan 28, 2026
Merged

server: simplify GotoDefinitionResponse creation #895

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 13 additions & 31 deletions crates/squawk_server/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,39 +192,21 @@ fn handle_goto_definition(
let line_index = LineIndex::new(content);
let offset = lsp_utils::offset(&line_index, position).unwrap();

let ranges = goto_definition(file, offset);

let result = if ranges.is_empty() {
GotoDefinitionResponse::Array(vec![])
} else if ranges.len() == 1 {
// TODO: can we just always use the array response?
let target_range = ranges[0];
debug_assert!(
!target_range.contains(offset),
"Our target destination range must not include the source range otherwise go to def won't work in vscode."
);
GotoDefinitionResponse::Scalar(Location {
uri: uri.clone(),
range: lsp_utils::range(&line_index, target_range),
let ranges = goto_definition(file, offset)
.into_iter()
.map(|target_range| {
debug_assert!(
!target_range.contains(offset),
"Our target destination range must not include the source range otherwise go to def won't work in vscode."
);
Location {
uri: uri.clone(),
range: lsp_utils::range(&line_index, target_range),
}
})
} else {
GotoDefinitionResponse::Array(
ranges
.into_iter()
.map(|target_range| {
debug_assert!(
!target_range.contains(offset),
"Our target destination range must not include the source range otherwise go to def won't work in vscode."
);
Location {
uri: uri.clone(),
range: lsp_utils::range(&line_index, target_range),
}
})
.collect(),
)
};
.collect();

let result = GotoDefinitionResponse::Array(ranges);
let resp = Response {
id: req.id,
result: Some(serde_json::to_value(&result).unwrap()),
Expand Down
Loading