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

hir_ty: deal with TypeRef::Macro in HirFormatter

Browse source
This commit is contained in:
cynecx 2021-04-12 16:24:48 +02:00
parent cf3b4f1e20
commit 28ef7c20d7
2 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,7 @@ use std::{
use chalk_ir::BoundVar;
use hir_def::{
body,
db::DefDatabase,
find_path,
generics::TypeParamProvenance,
@ -18,7 +19,7 @@ use hir_def::{
visibility::Visibility,
AssocContainerId, Lookup, ModuleId, TraitId,
};
use hir_expand::name::Name;
use hir_expand::{hygiene::Hygiene, name::Name};
use crate::{
const_from_placeholder_idx, db::HirDatabase, from_assoc_type_id, from_foreign_def_id,
@ -997,7 +998,19 @@ impl HirDisplay for TypeRef {
write!(f, "dyn ")?;
f.write_joined(bounds, " + ")?;
}
TypeRef::Error | TypeRef::Macro(_) => write!(f, "{{error}}")?,
TypeRef::Macro(macro_call) => {
let macro_call = macro_call.to_node(f.db.upcast());
let ctx = body::LowerCtx::with_hygiene(&Hygiene::new_unhygienic());
match macro_call.path() {
Some(path) => match Path::from_src(path, &ctx) {
Some(path) => path.hir_fmt(f)?,
None => write!(f, "{{macro}}")?,
},
None => write!(f, "{{macro}}")?,
}
write!(f, "!(..)")?;
}
TypeRef::Error => write!(f, "{{error}}")?,
}
Ok(())
}