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

use module_for_source

Browse source
This commit is contained in:
Aleksey Kladov 2018-11-04 20:21:20 +03:00
parent cd878658d3
commit 88a15d10d5
3 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,7 @@ use rustc_hash::{FxHashMap, FxHashSet};
use crate::{
db::{self, SyntaxDatabase},
descriptors::function::FnScopes,
descriptors::module::{ModuleId, ModuleScope, ModuleTree},
descriptors::module::{ModuleId, ModuleScope, ModuleTree, ModuleSource},
descriptors::DescriptorDatabase,
input::FilesDatabase,
Cancelable, FileId,
@ -35,7 +35,7 @@ pub(crate) fn resolve_based_completion(
let source_root_id = db.file_source_root(file_id);
let file = db.file_syntax(file_id);
let module_tree = db.module_tree(source_root_id)?;
let module_id = match module_tree.any_module_for_file(file_id) {
let module_id = match module_tree.any_module_for_source(ModuleSource::File(file_id)) {
None => return Ok(None),
Some(it) => it,
};