diff options
Diffstat (limited to 'crates/ra_analysis/src/lib.rs')
-rw-r--r-- | crates/ra_analysis/src/lib.rs | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/crates/ra_analysis/src/lib.rs b/crates/ra_analysis/src/lib.rs index e56168510..e6cfaecc3 100644 --- a/crates/ra_analysis/src/lib.rs +++ b/crates/ra_analysis/src/lib.rs | |||
@@ -15,6 +15,7 @@ mod imp; | |||
15 | mod completion; | 15 | mod completion; |
16 | mod symbol_index; | 16 | mod symbol_index; |
17 | pub mod mock_analysis; | 17 | pub mod mock_analysis; |
18 | mod runnables; | ||
18 | 19 | ||
19 | mod extend_selection; | 20 | mod extend_selection; |
20 | mod syntax_highlighting; | 21 | mod syntax_highlighting; |
@@ -33,10 +34,12 @@ use crate::{ | |||
33 | symbol_index::SymbolIndex, | 34 | symbol_index::SymbolIndex, |
34 | }; | 35 | }; |
35 | 36 | ||
36 | pub use crate::completion::{CompletionItem, CompletionItemKind, InsertText}; | 37 | pub use crate::{ |
38 | completion::{CompletionItem, CompletionItemKind, InsertText}, | ||
39 | runnables::{Runnable, RunnableKind} | ||
40 | }; | ||
37 | pub use ra_editor::{ | 41 | pub use ra_editor::{ |
38 | FileSymbol, Fold, FoldKind, HighlightedRange, LineIndex, Runnable, RunnableKind, StructureNode, | 42 | FileSymbol, Fold, FoldKind, HighlightedRange, LineIndex, StructureNode, Severity |
39 | Severity | ||
40 | }; | 43 | }; |
41 | pub use hir::FnSignatureInfo; | 44 | pub use hir::FnSignatureInfo; |
42 | 45 | ||
@@ -336,6 +339,9 @@ impl Analysis { | |||
336 | pub fn parent_module(&self, position: FilePosition) -> Cancelable<Vec<(FileId, FileSymbol)>> { | 339 | pub fn parent_module(&self, position: FilePosition) -> Cancelable<Vec<(FileId, FileSymbol)>> { |
337 | self.imp.parent_module(position) | 340 | self.imp.parent_module(position) |
338 | } | 341 | } |
342 | pub fn module_path(&self, position: FilePosition) -> Cancelable<Option<String>> { | ||
343 | self.imp.module_path(position) | ||
344 | } | ||
339 | pub fn crate_for(&self, file_id: FileId) -> Cancelable<Vec<CrateId>> { | 345 | pub fn crate_for(&self, file_id: FileId) -> Cancelable<Vec<CrateId>> { |
340 | self.imp.crate_for(file_id) | 346 | self.imp.crate_for(file_id) |
341 | } | 347 | } |
@@ -344,7 +350,7 @@ impl Analysis { | |||
344 | } | 350 | } |
345 | pub fn runnables(&self, file_id: FileId) -> Cancelable<Vec<Runnable>> { | 351 | pub fn runnables(&self, file_id: FileId) -> Cancelable<Vec<Runnable>> { |
346 | let file = self.imp.file_syntax(file_id); | 352 | let file = self.imp.file_syntax(file_id); |
347 | Ok(ra_editor::runnables(&file)) | 353 | Ok(runnables::runnables(self, &file, file_id)) |
348 | } | 354 | } |
349 | pub fn highlight(&self, file_id: FileId) -> Cancelable<Vec<HighlightedRange>> { | 355 | pub fn highlight(&self, file_id: FileId) -> Cancelable<Vec<HighlightedRange>> { |
350 | syntax_highlighting::highlight(&*self.imp.db, file_id) | 356 | syntax_highlighting::highlight(&*self.imp.db, file_id) |