diff options
author | Aleksey Kladov <[email protected]> | 2019-01-03 18:28:35 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-01-03 18:29:17 +0000 |
commit | d61707b4e1f0bdfc7f62b1abf78fdc45c0128699 (patch) | |
tree | 5a278ad534d2de9f308bbdfef323c3b20bf9a653 /crates/ra_analysis/src | |
parent | ebd7c04faa27564ca3f03eed6d4a3636b7d3fc4c (diff) |
index stuff produced by macros
Diffstat (limited to 'crates/ra_analysis/src')
-rw-r--r-- | crates/ra_analysis/src/symbol_index.rs | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/crates/ra_analysis/src/symbol_index.rs b/crates/ra_analysis/src/symbol_index.rs index 55caae5c2..e2b1c88fe 100644 --- a/crates/ra_analysis/src/symbol_index.rs +++ b/crates/ra_analysis/src/symbol_index.rs | |||
@@ -28,11 +28,11 @@ use std::{ | |||
28 | use fst::{self, Streamer}; | 28 | use fst::{self, Streamer}; |
29 | use ra_syntax::{ | 29 | use ra_syntax::{ |
30 | SyntaxNodeRef, SourceFileNode, SmolStr, | 30 | SyntaxNodeRef, SourceFileNode, SmolStr, |
31 | algo::visit::{visitor, Visitor}, | 31 | algo::{visit::{visitor, Visitor}, find_covering_node}, |
32 | SyntaxKind::{self, *}, | 32 | SyntaxKind::{self, *}, |
33 | ast::{self, NameOwner}, | 33 | ast::{self, NameOwner}, |
34 | }; | 34 | }; |
35 | use ra_db::{SyntaxDatabase, SourceRootId, FilesDatabase, LocalSyntaxPtr}; | 35 | use ra_db::{SourceRootId, FilesDatabase, LocalSyntaxPtr}; |
36 | use salsa::ParallelDatabase; | 36 | use salsa::ParallelDatabase; |
37 | use rayon::prelude::*; | 37 | use rayon::prelude::*; |
38 | 38 | ||
@@ -42,7 +42,7 @@ use crate::{ | |||
42 | }; | 42 | }; |
43 | 43 | ||
44 | salsa::query_group! { | 44 | salsa::query_group! { |
45 | pub(crate) trait SymbolsDatabase: SyntaxDatabase { | 45 | pub(crate) trait SymbolsDatabase: hir::db::HirDatabase { |
46 | fn file_symbols(file_id: FileId) -> Cancelable<Arc<SymbolIndex>> { | 46 | fn file_symbols(file_id: FileId) -> Cancelable<Arc<SymbolIndex>> { |
47 | type FileSymbolsQuery; | 47 | type FileSymbolsQuery; |
48 | } | 48 | } |
@@ -53,10 +53,23 @@ salsa::query_group! { | |||
53 | } | 53 | } |
54 | } | 54 | } |
55 | 55 | ||
56 | fn file_symbols(db: &impl SyntaxDatabase, file_id: FileId) -> Cancelable<Arc<SymbolIndex>> { | 56 | fn file_symbols(db: &impl SymbolsDatabase, file_id: FileId) -> Cancelable<Arc<SymbolIndex>> { |
57 | db.check_canceled()?; | 57 | db.check_canceled()?; |
58 | let syntax = db.source_file(file_id); | 58 | let source_file = db.source_file(file_id); |
59 | Ok(Arc::new(SymbolIndex::for_file(file_id, syntax))) | 59 | let mut symbols = source_file |
60 | .syntax() | ||
61 | .descendants() | ||
62 | .filter_map(to_symbol) | ||
63 | .map(move |(name, ptr)| FileSymbol { name, ptr, file_id }) | ||
64 | .collect::<Vec<_>>(); | ||
65 | |||
66 | for (name, text_range) in hir::source_binder::macro_symbols(db, file_id)? { | ||
67 | let node = find_covering_node(source_file.syntax(), text_range); | ||
68 | let ptr = LocalSyntaxPtr::new(node); | ||
69 | symbols.push(FileSymbol { file_id, name, ptr }) | ||
70 | } | ||
71 | |||
72 | Ok(Arc::new(SymbolIndex::new(symbols))) | ||
60 | } | 73 | } |
61 | 74 | ||
62 | pub(crate) fn world_symbols(db: &RootDatabase, query: Query) -> Cancelable<Vec<FileSymbol>> { | 75 | pub(crate) fn world_symbols(db: &RootDatabase, query: Query) -> Cancelable<Vec<FileSymbol>> { |
@@ -141,10 +154,6 @@ impl SymbolIndex { | |||
141 | .collect::<Vec<_>>(); | 154 | .collect::<Vec<_>>(); |
142 | SymbolIndex::new(symbols) | 155 | SymbolIndex::new(symbols) |
143 | } | 156 | } |
144 | |||
145 | fn for_file(file_id: FileId, file: SourceFileNode) -> SymbolIndex { | ||
146 | SymbolIndex::for_files(rayon::iter::once((file_id, file))) | ||
147 | } | ||
148 | } | 157 | } |
149 | 158 | ||
150 | impl Query { | 159 | impl Query { |