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

Generalize Owned nodes

Browse source
This commit is contained in:
Aleksey Kladov 2018-11-06 21:52:00 +03:00
parent 21797bf0ef
commit a5301e94d5
6 changed files with 1249 additions and 1818 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/ra_analysis/src/descriptors/module/mod.rs
View file

@ -117,7 +117,7 @@ impl ModuleId {
.filter_map(|&it| {
let p = tree.link(it).problem.clone()?;
let s = it.bind_source(tree, db);
let s = s.ast().name().unwrap().syntax().owned();
let s = s.borrowed().name().unwrap().syntax().owned();
Some((s, p))
})
.collect()
@ -136,11 +136,11 @@ impl LinkId {
let owner = self.owner(tree);
match owner.source(tree).resolve(db) {
ModuleSourceNode::Root(root) => {
let ast = imp::modules(root.ast())
let ast = imp::modules(root.borrowed())
.find(|(name, _)| name == &tree.link(self).name)
.unwrap()
.1;
ast.into()
ast.owned()
}
ModuleSourceNode::Inline(it) => it,
}
@ -179,13 +179,13 @@ impl ModuleSource {
match self {
ModuleSource::File(file_id) => {
let syntax = db.file_syntax(file_id);
ModuleSourceNode::Root(syntax.ast().into())
ModuleSourceNode::Root(syntax.ast().owned())
}
ModuleSource::Inline(ptr) => {
let syntax = db.resolve_syntax_ptr(ptr);
let syntax = syntax.borrowed();
let module = ast::Module::cast(syntax).unwrap();
ModuleSourceNode::Inline(module.into())
ModuleSourceNode::Inline(module.owned())
}
}
}