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

Make more use of the HIR in rename::rename_to_self

Browse source
This commit is contained in:
Lukas Wirth 2021-03-23 16:50:36 +01:00
parent 0469280c8a
commit 638dcac092
2 changed files with 48 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/hir/src/lib.rs
View file

@ -852,6 +852,7 @@ impl Function {
})
.collect()
}
pub fn method_params(self, db: &dyn HirDatabase) -> Option<Vec<Param>> {
if self.self_param(db).is_none() {
return None;
@ -909,7 +910,7 @@ impl From<hir_ty::Mutability> for Access {
}
}
#[derive(Debug)]
#[derive(Clone, Debug)]
pub struct Param {
func: Function,
/// The index in parameter list, including self parameter.
@ -922,13 +923,25 @@ impl Param {
&self.ty
}
pub fn as_local(&self, db: &dyn HirDatabase) -> Local {
let parent = DefWithBodyId::FunctionId(self.func.into());
let body = db.body(parent);
Local { parent, pat_id: body.params[self.idx] }
}
pub fn pattern_source(&self, db: &dyn HirDatabase) -> Option<ast::Pat> {
let params = self.func.source(db)?.value.param_list()?;
self.source(db).and_then(|p| p.value.pat())
}
pub fn source(&self, db: &dyn HirDatabase) -> Option<InFile<ast::Param>> {
let InFile { file_id, value } = self.func.source(db)?;
let params = value.param_list()?;
if params.self_param().is_some() {
params.params().nth(self.idx.checked_sub(1)?)?.pat()
params.params().nth(self.idx.checked_sub(1)?)
} else {
params.params().nth(self.idx)?.pat()
params.params().nth(self.idx)
}
.map(|value| InFile { file_id, value })
}
}