Skip to content

Commit

Permalink
Deduplicate tuple indices for completion
Browse files Browse the repository at this point in the history
  • Loading branch information
lowr committed Jun 13, 2023
1 parent 42eab5e commit d01283b
Showing 1 changed file with 28 additions and 2 deletions.
30 changes: 28 additions & 2 deletions crates/ide-completion/src/completions/dot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,12 @@ fn complete_fields(
}
}
for (i, ty) in receiver.tuple_fields(ctx.db).into_iter().enumerate() {
// Tuple fields are always public (tuple struct fields are handled above).
tuple_index(acc, i, ty);
// Tuples are always the last type in a deref chain, so just check if the name is
// already seen without inserting into the hashset.
if !seen_names.contains(&hir::Name::new_tuple_field(i)) {
// Tuple fields are always public (tuple struct fields are handled above).
tuple_index(acc, i, ty);
}
}
}
}
Expand Down Expand Up @@ -720,6 +724,28 @@ fn test(a: A) {
);
}

#[test]
fn test_tuple_struct_deref_to_tuple_no_same_index() {
check(
r#"
//- minicore: deref
struct A(u8);
impl core::ops::Deref for A {
type Target = (u16, u32);
fn deref(&self) -> &Self::Target { loop {} }
}
fn test(a: A) {
a.$0
}
"#,
expect![[r#"
fd 0 u8
fd 1 u32
me deref() (use core::ops::Deref) fn(&self) -> &<Self as Deref>::Target
"#]],
);
}

#[test]
fn test_completion_works_in_consts() {
check(
Expand Down

0 comments on commit d01283b

Please sign in to comment.