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

rename module source

Browse source
This commit is contained in:
Aleksey Kladov 2018-11-07 18:42:30 +03:00
parent 2ed1514df3
commit 22949dab26
4 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,19 +41,18 @@ impl ModuleTree {
/// `ModuleSource` is the syntax tree element that produced this module:
/// either a file, or an inlinde module.
/// TODO: we don't produce Inline modules yet
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
pub(crate) enum ModuleSource {
File(FileId),
SourceFile(FileId),
#[allow(dead_code)]
Inline(SyntaxPtr),
Module(SyntaxPtr),
}
/// An owned syntax node for a module. Unlike `ModuleSource`,
/// this holds onto the AST for the whole file.
enum ModuleSourceNode {
Root(ast::SourceFileNode),
Inline(ast::ModuleNode),
SourceFile(ast::SourceFileNode),
Module(ast::ModuleNode),
}
#[derive(Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord, Debug)]
@ -135,14 +134,14 @@ impl LinkId {
) -> ast::ModuleNode {
let owner = self.owner(tree);
match owner.source(tree).resolve(db) {
ModuleSourceNode::Root(root) => {
ModuleSourceNode::SourceFile(root) => {
let ast = imp::modules(root.borrowed())
.find(|(name, _)| name == &tree.link(self).name)
.unwrap()
.1;
ast.owned()
}
ModuleSourceNode::Inline(it) => it,
ModuleSourceNode::Module(it) => it,
}
}
}
@ -158,34 +157,34 @@ impl ModuleSource {
pub(crate) fn new_inline(file_id: FileId, module: ast::Module) -> ModuleSource {
assert!(!module.has_semi());
let ptr = SyntaxPtr::new(file_id, module.syntax());
ModuleSource::Inline(ptr)
ModuleSource::Module(ptr)
}
pub(crate) fn as_file(self) -> Option<FileId> {
match self {
ModuleSource::File(f) => Some(f),
ModuleSource::Inline(..) => None,
ModuleSource::SourceFile(f) => Some(f),
ModuleSource::Module(..) => None,
}
}
pub(crate) fn file_id(self) -> FileId {
match self {
ModuleSource::File(f) => f,
ModuleSource::Inline(ptr) => ptr.file_id(),
ModuleSource::SourceFile(f) => f,
ModuleSource::Module(ptr) => ptr.file_id(),
}
}
fn resolve(self, db: &impl SyntaxDatabase) -> ModuleSourceNode {
match self {
ModuleSource::File(file_id) => {
ModuleSource::SourceFile(file_id) => {
let syntax = db.file_syntax(file_id);
ModuleSourceNode::Root(syntax.ast().owned())
ModuleSourceNode::SourceFile(syntax.ast().owned())
}
ModuleSource::Inline(ptr) => {
ModuleSource::Module(ptr) => {
let syntax = db.resolve_syntax_ptr(ptr);
let syntax = syntax.borrowed();
let module = ast::Module::cast(syntax).unwrap();
ModuleSourceNode::Inline(module.owned())
ModuleSourceNode::Module(module.owned())
}
}
}