diff options
author | Aleksey Kladov <[email protected]> | 2019-12-21 16:26:05 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-12-21 16:26:28 +0000 |
commit | 02f79e37ca1c4a617a46b85bf897dffbf4abed9e (patch) | |
tree | ed2274938d6e2991a25077d2df8413fd36dfc4a0 /crates/ra_hir_def/src/nameres/raw.rs | |
parent | ec56f59ac17ad5ae797ce431883be8f31e795d1b (diff) |
Remove import source map
Diffstat (limited to 'crates/ra_hir_def/src/nameres/raw.rs')
-rw-r--r-- | crates/ra_hir_def/src/nameres/raw.rs | 56 |
1 files changed, 12 insertions, 44 deletions
diff --git a/crates/ra_hir_def/src/nameres/raw.rs b/crates/ra_hir_def/src/nameres/raw.rs index df5dac88a..73e57f1e5 100644 --- a/crates/ra_hir_def/src/nameres/raw.rs +++ b/crates/ra_hir_def/src/nameres/raw.rs | |||
@@ -7,23 +7,21 @@ | |||
7 | 7 | ||
8 | use std::{ops::Index, sync::Arc}; | 8 | use std::{ops::Index, sync::Arc}; |
9 | 9 | ||
10 | use either::Either; | ||
11 | use hir_expand::{ | 10 | use hir_expand::{ |
12 | ast_id_map::AstIdMap, | 11 | ast_id_map::AstIdMap, |
13 | db::AstDatabase, | 12 | db::AstDatabase, |
14 | hygiene::Hygiene, | 13 | hygiene::Hygiene, |
15 | name::{AsName, Name}, | 14 | name::{AsName, Name}, |
16 | }; | 15 | }; |
17 | use ra_arena::{impl_arena_id, map::ArenaMap, Arena, RawId}; | 16 | use ra_arena::{impl_arena_id, Arena, RawId}; |
18 | use ra_syntax::{ | 17 | use ra_syntax::{ |
19 | ast::{self, AttrsOwner, NameOwner}, | 18 | ast::{self, AttrsOwner, NameOwner}, |
20 | AstNode, AstPtr, | 19 | AstNode, |
21 | }; | 20 | }; |
22 | use test_utils::tested_by; | 21 | use test_utils::tested_by; |
23 | 22 | ||
24 | use crate::{ | 23 | use crate::{ |
25 | attr::Attrs, db::DefDatabase, path::ModPath, trace::Trace, FileAstId, HirFileId, InFile, | 24 | attr::Attrs, db::DefDatabase, path::ModPath, FileAstId, HirFileId, InFile, LocalImportId, |
26 | LocalImportId, | ||
27 | }; | 25 | }; |
28 | 26 | ||
29 | /// `RawItems` is a set of top-level items in a file (except for impls). | 27 | /// `RawItems` is a set of top-level items in a file (except for impls). |
@@ -41,29 +39,14 @@ pub struct RawItems { | |||
41 | items: Vec<RawItem>, | 39 | items: Vec<RawItem>, |
42 | } | 40 | } |
43 | 41 | ||
44 | #[derive(Debug, Default, PartialEq, Eq)] | ||
45 | pub struct ImportSourceMap { | ||
46 | map: ArenaMap<LocalImportId, ImportSourcePtr>, | ||
47 | } | ||
48 | |||
49 | type ImportSourcePtr = Either<AstPtr<ast::UseTree>, AstPtr<ast::ExternCrateItem>>; | ||
50 | |||
51 | impl RawItems { | 42 | impl RawItems { |
52 | pub(crate) fn raw_items_query( | 43 | pub(crate) fn raw_items_query( |
53 | db: &(impl DefDatabase + AstDatabase), | 44 | db: &(impl DefDatabase + AstDatabase), |
54 | file_id: HirFileId, | 45 | file_id: HirFileId, |
55 | ) -> Arc<RawItems> { | 46 | ) -> Arc<RawItems> { |
56 | db.raw_items_with_source_map(file_id).0 | ||
57 | } | ||
58 | |||
59 | pub(crate) fn raw_items_with_source_map_query( | ||
60 | db: &(impl DefDatabase + AstDatabase), | ||
61 | file_id: HirFileId, | ||
62 | ) -> (Arc<RawItems>, Arc<ImportSourceMap>) { | ||
63 | let mut collector = RawItemsCollector { | 47 | let mut collector = RawItemsCollector { |
64 | raw_items: RawItems::default(), | 48 | raw_items: RawItems::default(), |
65 | source_ast_id_map: db.ast_id_map(file_id), | 49 | source_ast_id_map: db.ast_id_map(file_id), |
66 | imports: Trace::new(), | ||
67 | file_id, | 50 | file_id, |
68 | hygiene: Hygiene::new(db, file_id), | 51 | hygiene: Hygiene::new(db, file_id), |
69 | }; | 52 | }; |
@@ -74,11 +57,8 @@ impl RawItems { | |||
74 | collector.process_module(None, item_list); | 57 | collector.process_module(None, item_list); |
75 | } | 58 | } |
76 | } | 59 | } |
77 | let mut raw_items = collector.raw_items; | 60 | let raw_items = collector.raw_items; |
78 | let (arena, map) = collector.imports.into_arena_and_map(); | 61 | Arc::new(raw_items) |
79 | raw_items.imports = arena; | ||
80 | let source_map = ImportSourceMap { map }; | ||
81 | (Arc::new(raw_items), Arc::new(source_map)) | ||
82 | } | 62 | } |
83 | 63 | ||
84 | pub(super) fn items(&self) -> &[RawItem] { | 64 | pub(super) fn items(&self) -> &[RawItem] { |
@@ -217,7 +197,6 @@ pub(super) struct ImplData { | |||
217 | 197 | ||
218 | struct RawItemsCollector { | 198 | struct RawItemsCollector { |
219 | raw_items: RawItems, | 199 | raw_items: RawItems, |
220 | imports: Trace<LocalImportId, ImportData, ImportSourcePtr>, | ||
221 | source_ast_id_map: Arc<AstIdMap>, | 200 | source_ast_id_map: Arc<AstIdMap>, |
222 | file_id: HirFileId, | 201 | file_id: HirFileId, |
223 | hygiene: Hygiene, | 202 | hygiene: Hygiene, |
@@ -324,7 +303,7 @@ impl RawItemsCollector { | |||
324 | ModPath::expand_use_item( | 303 | ModPath::expand_use_item( |
325 | InFile { value: use_item, file_id: self.file_id }, | 304 | InFile { value: use_item, file_id: self.file_id }, |
326 | &self.hygiene, | 305 | &self.hygiene, |
327 | |path, use_tree, is_glob, alias| { | 306 | |path, _use_tree, is_glob, alias| { |
328 | let import_data = ImportData { | 307 | let import_data = ImportData { |
329 | path, | 308 | path, |
330 | alias, | 309 | alias, |
@@ -333,11 +312,11 @@ impl RawItemsCollector { | |||
333 | is_extern_crate: false, | 312 | is_extern_crate: false, |
334 | is_macro_use: false, | 313 | is_macro_use: false, |
335 | }; | 314 | }; |
336 | buf.push((import_data, Either::Left(AstPtr::new(use_tree)))); | 315 | buf.push(import_data); |
337 | }, | 316 | }, |
338 | ); | 317 | ); |
339 | for (import_data, ptr) in buf { | 318 | for import_data in buf { |
340 | self.push_import(current_module, attrs.clone(), import_data, ptr); | 319 | self.push_import(current_module, attrs.clone(), import_data); |
341 | } | 320 | } |
342 | } | 321 | } |
343 | 322 | ||
@@ -360,12 +339,7 @@ impl RawItemsCollector { | |||
360 | is_extern_crate: true, | 339 | is_extern_crate: true, |
361 | is_macro_use, | 340 | is_macro_use, |
362 | }; | 341 | }; |
363 | self.push_import( | 342 | self.push_import(current_module, attrs, import_data); |
364 | current_module, | ||
365 | attrs, | ||
366 | import_data, | ||
367 | Either::Right(AstPtr::new(&extern_crate)), | ||
368 | ); | ||
369 | } | 343 | } |
370 | } | 344 | } |
371 | 345 | ||
@@ -396,14 +370,8 @@ impl RawItemsCollector { | |||
396 | self.push_item(current_module, attrs, RawItemKind::Impl(imp)) | 370 | self.push_item(current_module, attrs, RawItemKind::Impl(imp)) |
397 | } | 371 | } |
398 | 372 | ||
399 | fn push_import( | 373 | fn push_import(&mut self, current_module: Option<Module>, attrs: Attrs, data: ImportData) { |
400 | &mut self, | 374 | let import = self.raw_items.imports.alloc(data); |
401 | current_module: Option<Module>, | ||
402 | attrs: Attrs, | ||
403 | data: ImportData, | ||
404 | source: ImportSourcePtr, | ||
405 | ) { | ||
406 | let import = self.imports.alloc(|| source, || data); | ||
407 | self.push_item(current_module, attrs, RawItemKind::Import(import)) | 375 | self.push_item(current_module, attrs, RawItemKind::Import(import)) |
408 | } | 376 | } |
409 | 377 | ||