Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-16 09:48:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #7991

Browse source 
7991: Simplify hir_def TestDB r=jonas-schievink a=jonas-schievink

bors r+

Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
This commit is contained in:
bors[bot] 2021-03-13 01:25:33 +00:00 committed by GitHub
commit 88f78bdb9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/hir_def/src/test_db.rs
View file

@ -15,7 +15,7 @@ use rustc_hash::FxHashSet;
use syntax::{algo, ast, AstNode, TextRange, TextSize};
use test_utils::extract_annotations;
use crate::{db::DefDatabase, nameres::DefMap, Lookup, ModuleDefId, ModuleId};
use crate::{db::DefDatabase, nameres::DefMap, src::HasSource, Lookup, ModuleDefId, ModuleId};
#[salsa::database(
base_db::SourceDatabaseExtStorage,
@ -115,14 +115,9 @@ impl TestDB {
if file_id != position.file_id.into() {
continue;
}
let root = self.parse_or_expand(file_id).unwrap();
let ast_map = self.ast_id_map(file_id);
let item_tree = self.item_tree(file_id);
for decl in module.scope.declarations() {
if let ModuleDefId::FunctionId(it) = decl {
let ast =
ast_map.get(item_tree[it.lookup(self).id.value].ast_id).to_node(&root);
let range = ast.syntax().text_range();
let range = it.lookup(self).source(self).value.syntax().text_range();
if !range.contains(position.offset) {
continue;