language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 22:01:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

do not use associated types placeholder for inlay hint #6191

Browse source 
Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
This commit is contained in:
Benjamin Coenen 2020-10-27 20:23:09 +01:00
parent a03f004766
commit 73161cc9cd
3 changed files with 61 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

26
crates/hir_ty/src/display.rs
View file

@ -390,11 +390,27 @@ impl HirDisplay for ApplicationTy {
};
let trait_ = f.db.trait_data(trait_);
let type_alias = f.db.type_alias_data(type_alias);
write!(f, "{}::{}", trait_.name, type_alias.name)?;
if self.parameters.len() > 0 {
write!(f, "<")?;
f.write_joined(&*self.parameters.0, ", ")?;
write!(f, ">")?;
// Use placeholder associated types when the target is source code (https://rust-lang.github.io/chalk/book/clauses/type_equality.html#placeholder-associated-types)
if f.display_target.is_source_code() || self.parameters.len() > 1 {
write!(f, "{}::{}", trait_.name, type_alias.name)?;
if self.parameters.len() > 0 {
write!(f, "<")?;
f.write_joined(&*self.parameters.0, ", ")?;
write!(f, ">")?;
}
} else {
if self.parameters.len() == 1 {
write!(
f,
"<{} as {}>::{}",
self.parameters.as_single().display(f.db),
trait_.name,
type_alias.name
)?;
} else {
write!(f, "{}::{}", trait_.name, type_alias.name)?;
}
}
}
TypeCtor::ForeignType(type_alias) => {