mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't emit edits for postfix adjustment hints

Browse Source
This commit is contained in:
Lukas Wirth 2024-10-23 10:24:58 +02:00
parent 41fc1fbaab
commit 4fdc63ce38
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/tools/rust-analyzer/crates/ide/src/inlay_hints/adjustment.rs
View File

@ -104,6 +104,7 @@ pub(super) fn hints(
}; };
let iter: &mut dyn Iterator<Item = _> = iter.as_mut().either(|it| it as _, |it| it as _); let iter: &mut dyn Iterator<Item = _> = iter.as_mut().either(|it| it as _, |it| it as _);
let mut allow_edit = !postfix;
for Adjustment { source, target, kind } in iter { for Adjustment { source, target, kind } in iter {
if source == target { if source == target {
cov_mark::hit!(same_type_adjustment); cov_mark::hit!(same_type_adjustment);
@ -113,6 +114,7 @@ pub(super) fn hints(
// FIXME: Add some nicer tooltips to each of these // FIXME: Add some nicer tooltips to each of these
let (text, coercion) = match kind { let (text, coercion) = match kind {
Adjust::NeverToAny if config.adjustment_hints == AdjustmentHints::Always => { Adjust::NeverToAny if config.adjustment_hints == AdjustmentHints::Always => {
allow_edit = false;
("<never-to-any>", "never to any") ("<never-to-any>", "never to any")
} }
Adjust::Deref(None) => ("*", "dereference"), Adjust::Deref(None) => ("*", "dereference"),
@ -133,6 +135,7 @@ pub(super) fn hints(
// some of these could be represented via `as` casts, but that's not too nice and // some of these could be represented via `as` casts, but that's not too nice and
// handling everything as a prefix expr makes the `(` and `)` insertion easier // handling everything as a prefix expr makes the `(` and `)` insertion easier
Adjust::Pointer(cast) if config.adjustment_hints == AdjustmentHints::Always => { Adjust::Pointer(cast) if config.adjustment_hints == AdjustmentHints::Always => {
allow_edit = false;
match cast { match cast {
PointerCast::ReifyFnPointer => { PointerCast::ReifyFnPointer => {
("<fn-item-to-fn-pointer>", "fn item to fn pointer") ("<fn-item-to-fn-pointer>", "fn item to fn pointer")
@ -179,30 +182,32 @@ pub(super) fn hints(
if pre.is_none() && post.is_none() { if pre.is_none() && post.is_none() {
return None; return None;
} }
let edit = { if allow_edit {
let mut b = TextEditBuilder::default(); let edit = {
if let Some(pre) = &pre { let mut b = TextEditBuilder::default();
b.insert( if let Some(pre) = &pre {
pre.range.start(), b.insert(
pre.label.parts.iter().map(|part| &*part.text).collect::<String>(), pre.range.start(),
); pre.label.parts.iter().map(|part| &*part.text).collect::<String>(),
);
}
if let Some(post) = &post {
b.insert(
post.range.end(),
post.label.parts.iter().map(|part| &*part.text).collect::<String>(),
);
}
b.finish()
};
match (&mut pre, &mut post) {
(Some(pre), Some(post)) => {
pre.text_edit = Some(edit.clone());
post.text_edit = Some(edit);
}
(Some(pre), None) => pre.text_edit = Some(edit),
(None, Some(post)) => post.text_edit = Some(edit),
(None, None) => (),
} }
if let Some(post) = &post {
b.insert(
post.range.end(),
post.label.parts.iter().map(|part| &*part.text).collect::<String>(),
);
}
b.finish()
};
match (&mut pre, &mut post) {
(Some(pre), Some(post)) => {
pre.text_edit = Some(edit.clone());
post.text_edit = Some(edit);
}
(Some(pre), None) => pre.text_edit = Some(edit),
(None, Some(post)) => post.text_edit = Some(edit),
(None, None) => (),
} }
acc.extend(pre); acc.extend(pre);
acc.extend(post); acc.extend(post);