Skip to content

fix: make drop inlay hint more readable #16028

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
merged 1 commit into from
Dec 7, 2023
Merged

fix: make drop inlay hint more readable #16028

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
22 changes: 18 additions & 4 deletions crates/ide/src/inlay_hints/implicit_drop.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,11 @@ pub(super) fn hints(
match_ast! {
match expr {
ast::BlockExpr(x) => x.stmt_list().and_then(|x| x.r_curly_token()).map(|x| x.text_range()).unwrap_or_else(|| expr.text_range()),
_ => expr.text_range(),
// make the inlay hint appear after the semicolon if there is
_ => {
let nearest_semicolon = nearest_token_after_node(expr, syntax::SyntaxKind::SEMICOLON);
nearest_semicolon.map(|x| x.text_range()).unwrap_or_else(|| expr.text_range())
},
}
}
}
Expand Down Expand Up @@ -95,7 +99,7 @@ pub(super) fn hints(
label.append_str(")");
acc.push(InlayHint {
range,
position: InlayHintPosition::Before,
position: InlayHintPosition::After,
pad_left: true,
pad_right: true,
kind: InlayKind::Drop,
Expand All @@ -109,6 +113,16 @@ pub(super) fn hints(
Some(())
}

fn nearest_token_after_node(
node: &syntax::SyntaxNode,
token_type: syntax::SyntaxKind,
) -> Option<syntax::SyntaxToken> {
node.siblings_with_tokens(syntax::Direction::Next)
.filter_map(|it| it.as_token().map(|it| it.clone()))
.filter(|it| it.kind() == token_type)
.next()
}

#[cfg(test)]
mod tests {
use crate::{
Expand All @@ -129,7 +143,7 @@ mod tests {
let x = X;
if 2 == 5 {
return;
//^^^^^^ drop(x)
//^ drop(x)
}
}
//^ drop(x)
Expand Down Expand Up @@ -176,7 +190,7 @@ mod tests {
let x = X;
let t_opt = Some(2);
let t = t_opt?;
//^^^^^^ drop(x)
//^ drop(x)
Some(())
}
//^ drop(x)
Expand Down