diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-15 17:41:57 +0100 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-15 17:41:57 +0100 |
commit | e031b65f93f73164a5729cf81ff60299708bc931 (patch) | |
tree | 1a891b75af3b436549381e8726c48ec5028a8341 /crates/ra_analysis/src/lib.rs | |
parent | 8cec1d986161298dbe9cc53f5477e87bfe5d0f47 (diff) | |
parent | c9909f42ba4adf55b1e73e7118b48f1b10c80ac6 (diff) |
Merge #110
110: Signature help r=matklad a=kjeremy
@matklad Once this is in shape I would like to add tests. I think a separate PR should be done for returning documentation information and markdown.
Fixes #102
Co-authored-by: Jeremy A. Kolb <[email protected]>
Diffstat (limited to 'crates/ra_analysis/src/lib.rs')
-rw-r--r-- | crates/ra_analysis/src/lib.rs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/crates/ra_analysis/src/lib.rs b/crates/ra_analysis/src/lib.rs index 849fd93e4..1aca72ae0 100644 --- a/crates/ra_analysis/src/lib.rs +++ b/crates/ra_analysis/src/lib.rs | |||
@@ -38,6 +38,7 @@ pub use ra_editor::{ | |||
38 | Fold, FoldKind | 38 | Fold, FoldKind |
39 | }; | 39 | }; |
40 | pub use job::{JobToken, JobHandle}; | 40 | pub use job::{JobToken, JobHandle}; |
41 | pub use descriptors::FnDescriptor; | ||
41 | 42 | ||
42 | #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] | 43 | #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] |
43 | pub struct FileId(pub u32); | 44 | pub struct FileId(pub u32); |
@@ -236,6 +237,11 @@ impl Analysis { | |||
236 | let file = self.imp.file_syntax(file_id); | 237 | let file = self.imp.file_syntax(file_id); |
237 | ra_editor::folding_ranges(&file) | 238 | ra_editor::folding_ranges(&file) |
238 | } | 239 | } |
240 | |||
241 | pub fn resolve_callable(&self, file_id: FileId, offset: TextUnit, token: &JobToken) | ||
242 | -> Option<(FnDescriptor, Option<usize>)> { | ||
243 | self.imp.resolve_callable(file_id, offset, token) | ||
244 | } | ||
239 | } | 245 | } |
240 | 246 | ||
241 | #[derive(Debug)] | 247 | #[derive(Debug)] |