diff options
Diffstat (limited to 'crates/ra_hir')
-rw-r--r-- | crates/ra_hir/src/db.rs | 4 | ||||
-rw-r--r-- | crates/ra_hir/src/function/mod.rs | 41 | ||||
-rw-r--r-- | crates/ra_hir/src/lib.rs | 20 | ||||
-rw-r--r-- | crates/ra_hir/src/mock.rs | 9 | ||||
-rw-r--r-- | crates/ra_hir/src/module/mod.rs | 23 | ||||
-rw-r--r-- | crates/ra_hir/src/query_definitions.rs | 22 |
6 files changed, 60 insertions, 59 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index 2f01bae6d..ff41fd326 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
@@ -7,10 +7,11 @@ use ra_syntax::{ | |||
7 | use ra_db::{SourceRootId, LocationIntener, SyntaxDatabase, FileId, Cancelable}; | 7 | use ra_db::{SourceRootId, LocationIntener, SyntaxDatabase, FileId, Cancelable}; |
8 | 8 | ||
9 | use crate::{ | 9 | use crate::{ |
10 | DefLoc, DefId, FnId, | 10 | DefLoc, DefId, |
11 | SourceFileItems, SourceItemId, | 11 | SourceFileItems, SourceItemId, |
12 | query_definitions, | 12 | query_definitions, |
13 | FnScopes, | 13 | FnScopes, |
14 | function::FnId, | ||
14 | module::{ModuleId, ModuleTree, ModuleSource, | 15 | module::{ModuleId, ModuleTree, ModuleSource, |
15 | nameres::{ItemMap, InputModuleItems}}, | 16 | nameres::{ItemMap, InputModuleItems}}, |
16 | }; | 17 | }; |
@@ -19,7 +20,6 @@ salsa::query_group! { | |||
19 | 20 | ||
20 | pub trait HirDatabase: SyntaxDatabase | 21 | pub trait HirDatabase: SyntaxDatabase |
21 | + AsRef<LocationIntener<DefLoc, DefId>> | 22 | + AsRef<LocationIntener<DefLoc, DefId>> |
22 | + AsRef<LocationIntener<SourceItemId, FnId>> | ||
23 | { | 23 | { |
24 | fn fn_scopes(fn_id: FnId) -> Arc<FnScopes> { | 24 | fn fn_scopes(fn_id: FnId) -> Arc<FnScopes> { |
25 | type FnScopesQuery; | 25 | type FnScopesQuery; |
diff --git a/crates/ra_hir/src/function/mod.rs b/crates/ra_hir/src/function/mod.rs index c8af2e54f..a6757601e 100644 --- a/crates/ra_hir/src/function/mod.rs +++ b/crates/ra_hir/src/function/mod.rs | |||
@@ -12,19 +12,15 @@ use ra_syntax::{ | |||
12 | use ra_db::FileId; | 12 | use ra_db::FileId; |
13 | 13 | ||
14 | use crate::{ | 14 | use crate::{ |
15 | FnId, HirDatabase, SourceItemId, | 15 | Cancelable, |
16 | DefLoc, DefKind, DefId, HirDatabase, SourceItemId, | ||
17 | Module, | ||
16 | }; | 18 | }; |
17 | 19 | ||
18 | pub use self::scope::FnScopes; | 20 | pub use self::scope::FnScopes; |
19 | 21 | ||
20 | impl FnId { | 22 | #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] |
21 | pub fn get(db: &impl HirDatabase, file_id: FileId, fn_def: ast::FnDef) -> FnId { | 23 | pub struct FnId(pub(crate) DefId); |
22 | let file_items = db.file_items(file_id); | ||
23 | let item_id = file_items.id_of(fn_def.syntax()); | ||
24 | let item_id = SourceItemId { file_id, item_id }; | ||
25 | FnId::from_loc(db, &item_id) | ||
26 | } | ||
27 | } | ||
28 | 24 | ||
29 | pub struct Function { | 25 | pub struct Function { |
30 | fn_id: FnId, | 26 | fn_id: FnId, |
@@ -35,16 +31,26 @@ impl Function { | |||
35 | db: &impl HirDatabase, | 31 | db: &impl HirDatabase, |
36 | file_id: FileId, | 32 | file_id: FileId, |
37 | fn_def: ast::FnDef, | 33 | fn_def: ast::FnDef, |
38 | ) -> Function { | 34 | ) -> Cancelable<Option<Function>> { |
39 | let fn_id = FnId::get(db, file_id, fn_def); | 35 | let module = ctry!(Module::guess_from_child_node(db, file_id, fn_def.syntax())?); |
40 | Function { fn_id } | 36 | let file_items = db.file_items(file_id); |
37 | let item_id = file_items.id_of(fn_def.syntax()); | ||
38 | let source_item_id = SourceItemId { file_id, item_id }; | ||
39 | let def_loc = DefLoc { | ||
40 | kind: DefKind::Function, | ||
41 | source_root_id: module.source_root_id, | ||
42 | module_id: module.module_id, | ||
43 | source_item_id, | ||
44 | }; | ||
45 | let fn_id = FnId(def_loc.id(db)); | ||
46 | Ok(Some(Function { fn_id })) | ||
41 | } | 47 | } |
42 | 48 | ||
43 | pub fn guess_for_name_ref( | 49 | pub fn guess_for_name_ref( |
44 | db: &impl HirDatabase, | 50 | db: &impl HirDatabase, |
45 | file_id: FileId, | 51 | file_id: FileId, |
46 | name_ref: ast::NameRef, | 52 | name_ref: ast::NameRef, |
47 | ) -> Option<Function> { | 53 | ) -> Cancelable<Option<Function>> { |
48 | Function::guess_for_node(db, file_id, name_ref.syntax()) | 54 | Function::guess_for_node(db, file_id, name_ref.syntax()) |
49 | } | 55 | } |
50 | 56 | ||
@@ -52,7 +58,7 @@ impl Function { | |||
52 | db: &impl HirDatabase, | 58 | db: &impl HirDatabase, |
53 | file_id: FileId, | 59 | file_id: FileId, |
54 | bind_pat: ast::BindPat, | 60 | bind_pat: ast::BindPat, |
55 | ) -> Option<Function> { | 61 | ) -> Cancelable<Option<Function>> { |
56 | Function::guess_for_node(db, file_id, bind_pat.syntax()) | 62 | Function::guess_for_node(db, file_id, bind_pat.syntax()) |
57 | } | 63 | } |
58 | 64 | ||
@@ -60,10 +66,9 @@ impl Function { | |||
60 | db: &impl HirDatabase, | 66 | db: &impl HirDatabase, |
61 | file_id: FileId, | 67 | file_id: FileId, |
62 | node: SyntaxNodeRef, | 68 | node: SyntaxNodeRef, |
63 | ) -> Option<Function> { | 69 | ) -> Cancelable<Option<Function>> { |
64 | let fn_def = node.ancestors().find_map(ast::FnDef::cast)?; | 70 | let fn_def = ctry!(node.ancestors().find_map(ast::FnDef::cast)); |
65 | let res = Function::guess_from_source(db, file_id, fn_def); | 71 | Function::guess_from_source(db, file_id, fn_def) |
66 | Some(res) | ||
67 | } | 72 | } |
68 | 73 | ||
69 | pub fn scope(&self, db: &impl HirDatabase) -> Arc<FnScopes> { | 74 | pub fn scope(&self, db: &impl HirDatabase) -> Arc<FnScopes> { |
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs index ffc99fd5f..dbcc5e46d 100644 --- a/crates/ra_hir/src/lib.rs +++ b/crates/ra_hir/src/lib.rs | |||
@@ -42,28 +42,13 @@ pub use self::{ | |||
42 | pub use self::function::FnSignatureInfo; | 42 | pub use self::function::FnSignatureInfo; |
43 | 43 | ||
44 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] | 44 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] |
45 | pub struct FnId(u32); | ||
46 | ra_db::impl_numeric_id!(FnId); | ||
47 | |||
48 | impl FnId { | ||
49 | pub fn from_loc( | ||
50 | db: &impl AsRef<LocationIntener<SourceItemId, FnId>>, | ||
51 | loc: &SourceItemId, | ||
52 | ) -> FnId { | ||
53 | db.as_ref().loc2id(loc) | ||
54 | } | ||
55 | pub fn loc(self, db: &impl AsRef<LocationIntener<SourceItemId, FnId>>) -> SourceItemId { | ||
56 | db.as_ref().id2loc(self) | ||
57 | } | ||
58 | } | ||
59 | |||
60 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] | ||
61 | pub struct DefId(u32); | 45 | pub struct DefId(u32); |
62 | ra_db::impl_numeric_id!(DefId); | 46 | ra_db::impl_numeric_id!(DefId); |
63 | 47 | ||
64 | #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] | 48 | #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] |
65 | pub(crate) enum DefKind { | 49 | pub(crate) enum DefKind { |
66 | Module, | 50 | Module, |
51 | Function, | ||
67 | Item, | 52 | Item, |
68 | } | 53 | } |
69 | 54 | ||
@@ -89,6 +74,7 @@ impl DefLoc { | |||
89 | 74 | ||
90 | pub enum Def { | 75 | pub enum Def { |
91 | Module(Module), | 76 | Module(Module), |
77 | Function(Function), | ||
92 | Item, | 78 | Item, |
93 | } | 79 | } |
94 | 80 | ||
@@ -100,7 +86,7 @@ impl DefId { | |||
100 | let descr = Module::new(db, loc.source_root_id, loc.module_id)?; | 86 | let descr = Module::new(db, loc.source_root_id, loc.module_id)?; |
101 | Def::Module(descr) | 87 | Def::Module(descr) |
102 | } | 88 | } |
103 | DefKind::Item => Def::Item, | 89 | DefKind::Item | DefKind::Function => Def::Item, |
104 | }; | 90 | }; |
105 | Ok(res) | 91 | Ok(res) |
106 | } | 92 | } |
diff --git a/crates/ra_hir/src/mock.rs b/crates/ra_hir/src/mock.rs index 8e256b89f..e855df11d 100644 --- a/crates/ra_hir/src/mock.rs +++ b/crates/ra_hir/src/mock.rs | |||
@@ -6,7 +6,7 @@ use ra_db::{LocationIntener, BaseDatabase, FilePosition, mock::FileMap, FileId, | |||
6 | use relative_path::RelativePathBuf; | 6 | use relative_path::RelativePathBuf; |
7 | use test_utils::{parse_fixture, CURSOR_MARKER, extract_offset}; | 7 | use test_utils::{parse_fixture, CURSOR_MARKER, extract_offset}; |
8 | 8 | ||
9 | use crate::{db, DefId, DefLoc, FnId, SourceItemId}; | 9 | use crate::{db, DefId, DefLoc}; |
10 | 10 | ||
11 | #[derive(Debug)] | 11 | #[derive(Debug)] |
12 | pub(crate) struct MockDatabase { | 12 | pub(crate) struct MockDatabase { |
@@ -65,7 +65,6 @@ impl MockDatabase { | |||
65 | 65 | ||
66 | #[derive(Debug, Default)] | 66 | #[derive(Debug, Default)] |
67 | struct IdMaps { | 67 | struct IdMaps { |
68 | fns: LocationIntener<SourceItemId, FnId>, | ||
69 | defs: LocationIntener<DefLoc, DefId>, | 68 | defs: LocationIntener<DefLoc, DefId>, |
70 | } | 69 | } |
71 | 70 | ||
@@ -117,12 +116,6 @@ impl AsRef<LocationIntener<DefLoc, DefId>> for MockDatabase { | |||
117 | } | 116 | } |
118 | } | 117 | } |
119 | 118 | ||
120 | impl AsRef<LocationIntener<SourceItemId, FnId>> for MockDatabase { | ||
121 | fn as_ref(&self) -> &LocationIntener<SourceItemId, FnId> { | ||
122 | &self.id_maps.fns | ||
123 | } | ||
124 | } | ||
125 | |||
126 | impl MockDatabase { | 119 | impl MockDatabase { |
127 | pub(crate) fn log(&self, f: impl FnOnce()) -> Vec<salsa::Event<MockDatabase>> { | 120 | pub(crate) fn log(&self, f: impl FnOnce()) -> Vec<salsa::Event<MockDatabase>> { |
128 | *self.events.lock() = Some(Vec::new()); | 121 | *self.events.lock() = Some(Vec::new()); |
diff --git a/crates/ra_hir/src/module/mod.rs b/crates/ra_hir/src/module/mod.rs index 08ce7c8d1..11e6e8e75 100644 --- a/crates/ra_hir/src/module/mod.rs +++ b/crates/ra_hir/src/module/mod.rs | |||
@@ -8,7 +8,7 @@ use ra_editor::find_node_at_offset; | |||
8 | use ra_syntax::{ | 8 | use ra_syntax::{ |
9 | algo::generate, | 9 | algo::generate, |
10 | ast::{self, AstNode, NameOwner}, | 10 | ast::{self, AstNode, NameOwner}, |
11 | SmolStr, SyntaxNode, | 11 | SmolStr, SyntaxNode, SyntaxNodeRef, |
12 | }; | 12 | }; |
13 | use ra_db::{SourceRootId, FileId, FilePosition, Cancelable}; | 13 | use ra_db::{SourceRootId, FileId, FilePosition, Cancelable}; |
14 | use relative_path::RelativePathBuf; | 14 | use relative_path::RelativePathBuf; |
@@ -25,8 +25,8 @@ pub use self::nameres::ModuleScope; | |||
25 | #[derive(Debug, Clone)] | 25 | #[derive(Debug, Clone)] |
26 | pub struct Module { | 26 | pub struct Module { |
27 | tree: Arc<ModuleTree>, | 27 | tree: Arc<ModuleTree>, |
28 | source_root_id: SourceRootId, | 28 | pub(crate) source_root_id: SourceRootId, |
29 | module_id: ModuleId, | 29 | pub(crate) module_id: ModuleId, |
30 | } | 30 | } |
31 | 31 | ||
32 | impl Module { | 32 | impl Module { |
@@ -57,6 +57,23 @@ impl Module { | |||
57 | Module::guess_from_source(db, module_source) | 57 | Module::guess_from_source(db, module_source) |
58 | } | 58 | } |
59 | 59 | ||
60 | pub fn guess_from_child_node( | ||
61 | db: &impl HirDatabase, | ||
62 | file_id: FileId, | ||
63 | node: SyntaxNodeRef, | ||
64 | ) -> Cancelable<Option<Module>> { | ||
65 | let module_source = if let Some(m) = node | ||
66 | .ancestors() | ||
67 | .filter_map(ast::Module::cast) | ||
68 | .find(|it| !it.has_semi()) | ||
69 | { | ||
70 | ModuleSource::new_inline(db, file_id, m) | ||
71 | } else { | ||
72 | ModuleSource::new_file(db, file_id) | ||
73 | }; | ||
74 | Module::guess_from_source(db, module_source) | ||
75 | } | ||
76 | |||
60 | fn guess_from_source( | 77 | fn guess_from_source( |
61 | db: &impl HirDatabase, | 78 | db: &impl HirDatabase, |
62 | module_source: ModuleSource, | 79 | module_source: ModuleSource, |
diff --git a/crates/ra_hir/src/query_definitions.rs b/crates/ra_hir/src/query_definitions.rs index 59318f307..e4d721601 100644 --- a/crates/ra_hir/src/query_definitions.rs +++ b/crates/ra_hir/src/query_definitions.rs | |||
@@ -11,21 +11,21 @@ use ra_syntax::{ | |||
11 | use ra_db::{SourceRootId, FileId, Cancelable,}; | 11 | use ra_db::{SourceRootId, FileId, Cancelable,}; |
12 | 12 | ||
13 | use crate::{ | 13 | use crate::{ |
14 | FnId, | 14 | SourceFileItems, SourceItemId, DefKind, |
15 | SourceFileItems, SourceItemId, | 15 | db::HirDatabase, |
16 | db::HirDatabase, | 16 | function::{FnScopes, FnId}, |
17 | function::FnScopes, | 17 | module::{ |
18 | module::{ | 18 | ModuleSource, ModuleSourceNode, ModuleId, |
19 | ModuleSource, ModuleSourceNode, ModuleId, | 19 | imp::Submodule, |
20 | imp::Submodule, | 20 | nameres::{InputModuleItems, ItemMap, Resolver}, |
21 | nameres::{InputModuleItems, ItemMap, Resolver}, | 21 | }, |
22 | }, | ||
23 | }; | 22 | }; |
24 | 23 | ||
25 | /// Resolve `FnId` to the corresponding `SyntaxNode` | 24 | /// Resolve `FnId` to the corresponding `SyntaxNode` |
26 | pub(super) fn fn_syntax(db: &impl HirDatabase, fn_id: FnId) -> FnDefNode { | 25 | pub(super) fn fn_syntax(db: &impl HirDatabase, fn_id: FnId) -> FnDefNode { |
27 | let item_id = fn_id.loc(db); | 26 | let def_loc = fn_id.0.loc(db); |
28 | let syntax = db.file_item(item_id); | 27 | assert!(def_loc.kind == DefKind::Function); |
28 | let syntax = db.file_item(def_loc.source_item_id); | ||
29 | FnDef::cast(syntax.borrowed()).unwrap().owned() | 29 | FnDef::cast(syntax.borrowed()).unwrap().owned() |
30 | } | 30 | } |
31 | 31 | ||