rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rebuild ra_lsp_server and nest helper function.

Browse Source 
Completion now works again, so there's no need not to nest
This commit is contained in:
Aleksey Kladov
2019-12-20 11:30:22 +01:00
parent d316ba9a13
commit 67c2aea182
1 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/ra_hir/src/from_source.rs
View File

@@ -212,10 +212,9 @@ impl Module {
} }
fn analyze_container(db: &impl DefDatabase, src: InFile<&SyntaxNode>) -> DynMap { fn analyze_container(db: &impl DefDatabase, src: InFile<&SyntaxNode>) -> DynMap {
_analyze_container(db, src).unwrap_or_default() return child_by_source(db, src).unwrap_or_default();
}
fn _analyze_container(db: &impl DefDatabase, src: InFile<&SyntaxNode>) -> Option<DynMap> { fn child_by_source(db: &impl DefDatabase, src: InFile<&SyntaxNode>) -> Option<DynMap> {
for container in src.value.ancestors().skip(1) { for container in src.value.ancestors().skip(1) {
let res = match_ast! { let res = match_ast! {
match container { match container {
@@ -251,4 +250,5 @@ fn _analyze_container(db: &impl DefDatabase, src: InFile<&SyntaxNode>) -> Option
let module_source = ModuleSource::from_child_node(db, src); let module_source = ModuleSource::from_child_node(db, src);
let c = Module::from_definition(db, src.with_value(module_source))?; let c = Module::from_definition(db, src.with_value(module_source))?;
Some(c.id.child_by_source(db)) Some(c.id.child_by_source(db))
}
} }