Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 13:33:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge binding_mode inlay hints into one

Browse source
This commit is contained in:
Lukas Wirth 2024-10-22 17:00:30 +02:00
parent db60fb42bb
commit 3ae93bcb82
1 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
crates/ide/src/inlay_hints/binding_mode.rs
View file

@ -2,13 +2,15 @@
//! ```no_run //! ```no_run
//! let /* & */ (/* ref */ x,) = &(0,); //! let /* & */ (/* ref */ x,) = &(0,);
//! ``` //! ```
use std::mem;
use hir::Mutability; use hir::Mutability;
use ide_db::famous_defs::FamousDefs; use ide_db::famous_defs::FamousDefs;
use span::EditionedFileId; use span::EditionedFileId;
use syntax::ast::{self, AstNode}; use syntax::ast::{self, AstNode};
use crate::{InlayHint, InlayHintPosition, InlayHintsConfig, InlayKind}; use crate::{InlayHint, InlayHintLabel, InlayHintPosition, InlayHintsConfig, InlayKind};
pub(super) fn hints( pub(super) fn hints(
acc: &mut Vec<InlayHint>, acc: &mut Vec<InlayHint>,
@ -42,7 +44,18 @@ pub(super) fn hints(
}, },
|it| it.syntax().text_range(), |it| it.syntax().text_range(),
); );
let mut hint = InlayHint {
range,
kind: InlayKind::BindingMode,
label: InlayHintLabel::default(),
text_edit: None,
position: InlayHintPosition::Before,
pad_left: false,
pad_right: false,
resolve_parent: Some(pat.syntax().text_range()),
};
let pattern_adjustments = sema.pattern_adjustments(pat); let pattern_adjustments = sema.pattern_adjustments(pat);
let mut was_mut_last = false;
pattern_adjustments.iter().for_each(|ty| { pattern_adjustments.iter().for_each(|ty| {
let reference = ty.is_reference(); let reference = ty.is_reference();
let mut_reference = ty.is_mutable_reference(); let mut_reference = ty.is_mutable_reference();
@ -51,17 +64,15 @@ pub(super) fn hints(
(true, false) => "&", (true, false) => "&",
_ => return, _ => return,
}; };
acc.push(InlayHint { if mem::replace(&mut was_mut_last, mut_reference) {
range, hint.label.append_str(" ");
kind: InlayKind::BindingMode, }
label: r.into(), hint.label.append_str(r);
text_edit: None,
position: InlayHintPosition::Before,
pad_left: false,
pad_right: mut_reference,
resolve_parent: Some(pat.syntax().text_range()),
});
}); });
hint.pad_right = was_mut_last;
if !hint.label.parts.is_empty() {
acc.push(hint);
}
match pat { match pat {
ast::Pat::IdentPat(pat) if pat.ref_token().is_none() && pat.mut_token().is_none() => { ast::Pat::IdentPat(pat) if pat.ref_token().is_none() && pat.mut_token().is_none() => {
let bm = sema.binding_mode_of_pat(pat)?; let bm = sema.binding_mode_of_pat(pat)?;
@ -117,6 +128,13 @@ fn __(
(x,): &mut (u32,) (x,): &mut (u32,)
//^^^^&mut //^^^^&mut
//^ ref mut //^ ref mut
(x,): &mut &mut (u32,)
//^^^^&mut &mut
//^ ref mut
(x,): &&(u32,)
//^^^^&&
//^ ref
) { ) {
let (x,) = (0,); let (x,) = (0,);
let (x,) = &(0,); let (x,) = &(0,);