language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 22:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Auto merge of #16028 - Young-Flash:fix-issue-16012, r=HKalbasi

Browse source 
fix: make drop inlay hint more readable

![drop_inlay_hint](bb18707f-3278-435d-a938-ccff4c685586)

follow up https://github.com/rust-lang/rust-analyzer/pull/16000, close https://github.com/rust-lang/rust-analyzer/issues/16012
This commit is contained in:
bors 2023-12-07 21:45:24 +00:00
commit bc9c952b6d
1 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/ide/src/inlay_hints/implicit_drop.rs
View file

@ -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())
},
}
}
}
@ -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,
@ -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::{
@ -129,7 +143,7 @@ mod tests {
let x = X;
if 2 == 5 {
return;
//^^^^^^ drop(x)
//^ drop(x)
}
}
//^ drop(x)
@ -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)