language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 13:25:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Annotate type hints for pattern name ranges instead of the pattern itself

Browse source
This commit is contained in:
Lukas Wirth 2021-07-31 15:24:21 +02:00
parent b363755901
commit f7c7f89c3c
1 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

38
crates/ide/src/inlay_hints.rs
View file

@ -194,8 +194,12 @@ fn get_bind_pat_hints(
if should_not_display_type_hint(sema, &pat, &ty) { if should_not_display_type_hint(sema, &pat, &ty) {
return None; return None;
} }
acc.push(InlayHint { acc.push(InlayHint {
range: pat.syntax().text_range(), range: match pat.name() {
Some(name) => name.syntax().text_range(),
None => pat.syntax().text_range(),
},
kind: InlayKind::TypeHint, kind: InlayKind::TypeHint,
label: hint_iterator(sema, &famous_defs, config, &ty) label: hint_iterator(sema, &famous_defs, config, &ty)
.unwrap_or_else(|| ty.display_truncated(sema.db, config.max_length).to_string().into()), .unwrap_or_else(|| ty.display_truncated(sema.db, config.max_length).to_string().into()),
@ -799,6 +803,28 @@ fn main() {
); );
} }
#[test]
fn type_hints_bindings_after_at() {
check_types(
r#"
//- minicore: option
fn main() {
let ref foo @ bar @ ref mut baz = 0;
//^^^ &i32
//^^^ i32
//^^^ &mut i32
let [x @ ..] = [0];
//^ [i32; 1]
if let x @ Some(_) = Some(0) {}
//^ Option<i32>
let foo @ (bar, baz) = (3, 3);
//^^^ (i32, i32)
//^^^ i32
//^^^ i32
}"#,
);
}
#[test] #[test]
fn default_generic_types_should_not_be_displayed() { fn default_generic_types_should_not_be_displayed() {
check( check(
@ -839,7 +865,7 @@ impl<T> Iterator for SomeIter<T> {
fn main() { fn main() {
let mut some_iter = SomeIter::new(); let mut some_iter = SomeIter::new();
//^^^^^^^^^^^^^ SomeIter<Take<Repeat<i32>>> //^^^^^^^^^ SomeIter<Take<Repeat<i32>>>
some_iter.push(iter::repeat(2).take(2)); some_iter.push(iter::repeat(2).take(2));
let iter_of_iters = some_iter.take(2); let iter_of_iters = some_iter.take(2);
//^^^^^^^^^^^^^ impl Iterator<Item = impl Iterator<Item = i32>> //^^^^^^^^^^^^^ impl Iterator<Item = impl Iterator<Item = i32>>
@ -938,7 +964,7 @@ fn main() {
//^^^^ i32 //^^^^ i32
let test: i32 = 33; let test: i32 = 33;
let mut test = 33; let mut test = 33;
//^^^^^^^^ i32 //^^^^ i32
let _ = 22; let _ = 22;
let test = "test"; let test = "test";
//^^^^ &str //^^^^ &str
@ -1048,7 +1074,7 @@ impl<T> IntoIterator for Vec<T> {
fn main() { fn main() {
let mut data = Vec::new(); let mut data = Vec::new();
//^^^^^^^^ Vec<&str> //^^^^ Vec<&str>
data.push("foo"); data.push("foo");
for i in for i in
@ -1076,7 +1102,7 @@ impl<T> IntoIterator for Vec<T> {
fn main() { fn main() {
let mut data = Vec::new(); let mut data = Vec::new();
//^^^^^^^^ Vec<&str> //^^^^ Vec<&str>
data.push("foo"); data.push("foo");
for i in data { for i in data {
//^ &str //^ &str
@ -1153,7 +1179,7 @@ fn main() {
r#" r#"
fn main() { fn main() {
let mut start = 0; let mut start = 0;
//^^^^^^^^^ i32 //^^^^^ i32
(0..2).for_each(|increment| { start += increment; }); (0..2).for_each(|increment| { start += increment; });
//^^^^^^^^^ i32 //^^^^^^^^^ i32