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

rename MFileId -> HirFileId

Browse Source
This commit is contained in:
Aleksey Kladov
2019-01-01 23:21:16 +03:00
parent 9c65e61849
commit 37ed2f35ba
13 changed files with 135 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/ra_analysis/src/completion/complete_scope.rs
View File

@@ -27,7 +27,7 @@ pub(super) fn complete_scope(acc: &mut Completions, ctx: &CompletionContext) ->
match res.import {
None => true,
Some(import) => {
let range = import.range(ctx.db, module.source().file_id());
let range = import.range(ctx.db, module.file_id());
!range.is_subrange(&ctx.leaf.range())
}
}

2
crates/ra_analysis/src/db.rs
View File

@@ -91,7 +91,7 @@ salsa::database_storage! {
fn library_symbols() for symbol_index::LibrarySymbolsQuery;
}
impl hir::db::HirDatabase {
fn m_source_file() for hir::db::MSourceFileQuery;
fn hir_source_file() for hir::db::HirSourceFileQuery;
fn expand_macro_invocation() for hir::db::ExpandMacroCallQuery;
fn module_tree() for hir::db::ModuleTreeQuery;
fn fn_scopes() for hir::db::FnScopesQuery;

4
crates/ra_analysis/src/imp.rs
View File

@@ -230,7 +230,7 @@ impl AnalysisImpl {
Some(it) => it,
};
let root = descr.crate_root();
let file_id = root.source().file_id();
let file_id = root.file_id();
let crate_graph = self.db.crate_graph();
let crate_id = crate_graph.crate_id_for_crate_root(file_id);
@@ -283,7 +283,7 @@ impl AnalysisImpl {
if let Some(child_module) =
source_binder::module_from_declaration(&*self.db, position.file_id, module)?
{
let file_id = child_module.source().file_id();
let file_id = child_module.file_id();
let name = match child_module.name() {
Some(name) => name.to_string().into(),
None => "".into(),