language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 22:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

rename ROOT -> SOURCE_FILE

Browse source
This commit is contained in:
Aleksey Kladov 2018-11-07 18:38:43 +03:00
parent f8b36bbc3b
commit 2ed1514df3
185 changed files with 235 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/ra_analysis/src/completion.rs
View file

@ -124,7 +124,7 @@ pub(crate) fn scope_completion(
.last()
.unwrap();
match top_node.parent().map(|it| it.kind()) {
Some(ROOT) | Some(ITEM_LIST) => complete_mod_item_snippets(&mut res),
Some(SOURCE_FILE) | Some(ITEM_LIST) => complete_mod_item_snippets(&mut res),
_ => (),
}
}
@ -171,7 +171,7 @@ fn complete_name_ref(file: &SourceFileNode, name_ref: ast::NameRef, acc: &mut Ve
let mut visited_fn = false;
for node in name_ref.syntax().ancestors() {
if let Some(items) = visitor()
.visit::<ast::Root, _>(|it| Some(it.items()))
.visit::<ast::SourceFile, _>(|it| Some(it.items()))
.visit::<ast::Module, _>(|it| Some(it.item_list()?.items()))
.accept(node)
{
@ -195,7 +195,7 @@ fn param_completions(ctx: SyntaxNodeRef, acc: &mut Vec<CompletionItem>) {
let mut params = FxHashMap::default();
for node in ctx.ancestors() {
let _ = visitor_ctx(&mut params)
.visit::<ast::Root, _>(process)
.visit::<ast::SourceFile, _>(process)
.visit::<ast::ItemList, _>(process)
.accept(node);
}

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

@ -52,7 +52,7 @@ pub(crate) enum ModuleSource {
/// An owned syntax node for a module. Unlike `ModuleSource`,
/// this holds onto the AST for the whole file.
enum ModuleSourceNode {
Root(ast::RootNode),
Root(ast::SourceFileNode),
Inline(ast::ModuleNode),
}