diff options
Diffstat (limited to 'crates/hir_def/src/src.rs')
| -rw-r--r-- | crates/hir_def/src/src.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crates/hir_def/src/src.rs b/crates/hir_def/src/src.rs index 751d4c052..24e57b469 100644 --- a/crates/hir_def/src/src.rs +++ b/crates/hir_def/src/src.rs | |||
| @@ -14,12 +14,12 @@ impl<N: ItemTreeNode> HasSource for AssocItemLoc<N> { | |||
| 14 | type Value = N::Source; | 14 | type Value = N::Source; |
| 15 | 15 | ||
| 16 | fn source(&self, db: &dyn DefDatabase) -> InFile<N::Source> { | 16 | fn source(&self, db: &dyn DefDatabase) -> InFile<N::Source> { |
| 17 | let tree = db.item_tree(self.id.file_id); | 17 | let tree = self.id.item_tree(db); |
| 18 | let ast_id_map = db.ast_id_map(self.id.file_id); | 18 | let ast_id_map = db.ast_id_map(self.id.file_id()); |
| 19 | let root = db.parse_or_expand(self.id.file_id).unwrap(); | 19 | let root = db.parse_or_expand(self.id.file_id()).unwrap(); |
| 20 | let node = &tree[self.id.value]; | 20 | let node = &tree[self.id.value]; |
| 21 | 21 | ||
| 22 | InFile::new(self.id.file_id, ast_id_map.get(node.ast_id()).to_node(&root)) | 22 | InFile::new(self.id.file_id(), ast_id_map.get(node.ast_id()).to_node(&root)) |
| 23 | } | 23 | } |
| 24 | } | 24 | } |
| 25 | 25 | ||
| @@ -27,12 +27,12 @@ impl<N: ItemTreeNode> HasSource for ItemLoc<N> { | |||
| 27 | type Value = N::Source; | 27 | type Value = N::Source; |
| 28 | 28 | ||
| 29 | fn source(&self, db: &dyn DefDatabase) -> InFile<N::Source> { | 29 | fn source(&self, db: &dyn DefDatabase) -> InFile<N::Source> { |
| 30 | let tree = db.item_tree(self.id.file_id); | 30 | let tree = self.id.item_tree(db); |
| 31 | let ast_id_map = db.ast_id_map(self.id.file_id); | 31 | let ast_id_map = db.ast_id_map(self.id.file_id()); |
| 32 | let root = db.parse_or_expand(self.id.file_id).unwrap(); | 32 | let root = db.parse_or_expand(self.id.file_id()).unwrap(); |
| 33 | let node = &tree[self.id.value]; | 33 | let node = &tree[self.id.value]; |
| 34 | 34 | ||
| 35 | InFile::new(self.id.file_id, ast_id_map.get(node.ast_id()).to_node(&root)) | 35 | InFile::new(self.id.file_id(), ast_id_map.get(node.ast_id()).to_node(&root)) |
| 36 | } | 36 | } |
| 37 | } | 37 | } |
| 38 | 38 | ||