diff options
author | Aleksey Kladov <[email protected]> | 2018-10-20 20:02:41 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2018-10-20 20:02:41 +0100 |
commit | 998f2ae7627053a9363a05a1ab79359882dce39f (patch) | |
tree | 6be2e60ebae8c03d117edec200aa942d810b3e31 /crates/ra_analysis/src/lib.rs | |
parent | c4b0d3cd56ab68f4fa23f7c1f6c76f7f6148153e (diff) |
remove job tokens
Diffstat (limited to 'crates/ra_analysis/src/lib.rs')
-rw-r--r-- | crates/ra_analysis/src/lib.rs | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/crates/ra_analysis/src/lib.rs b/crates/ra_analysis/src/lib.rs index 988a45b46..7e9798c29 100644 --- a/crates/ra_analysis/src/lib.rs +++ b/crates/ra_analysis/src/lib.rs | |||
@@ -219,47 +219,46 @@ impl Analysis { | |||
219 | let file = self.imp.file_syntax(file_id); | 219 | let file = self.imp.file_syntax(file_id); |
220 | ra_editor::file_structure(&file) | 220 | ra_editor::file_structure(&file) |
221 | } | 221 | } |
222 | pub fn symbol_search(&self, query: Query, token: &JobToken) -> Vec<(FileId, FileSymbol)> { | 222 | pub fn symbol_search(&self, query: Query) -> Vec<(FileId, FileSymbol)> { |
223 | self.imp.world_symbols(query, token) | 223 | self.imp.world_symbols(query) |
224 | } | 224 | } |
225 | pub fn approximately_resolve_symbol( | 225 | pub fn approximately_resolve_symbol( |
226 | &self, | 226 | &self, |
227 | file_id: FileId, | 227 | file_id: FileId, |
228 | offset: TextUnit, | 228 | offset: TextUnit |
229 | token: &JobToken, | ||
230 | ) -> Vec<(FileId, FileSymbol)> { | 229 | ) -> Vec<(FileId, FileSymbol)> { |
231 | self.imp | 230 | self.imp |
232 | .approximately_resolve_symbol(file_id, offset, token) | 231 | .approximately_resolve_symbol(file_id, offset) |
233 | } | 232 | } |
234 | pub fn find_all_refs(&self, file_id: FileId, offset: TextUnit, token: &JobToken) -> Vec<(FileId, TextRange)> { | 233 | pub fn find_all_refs(&self, file_id: FileId, offset: TextUnit, ) -> Vec<(FileId, TextRange)> { |
235 | self.imp.find_all_refs(file_id, offset, token) | 234 | self.imp.find_all_refs(file_id, offset) |
236 | } | 235 | } |
237 | pub fn parent_module(&self, file_id: FileId) -> Cancelable<Vec<(FileId, FileSymbol)>> { | 236 | pub fn parent_module(&self, file_id: FileId) -> Cancelable<Vec<(FileId, FileSymbol)>> { |
238 | self.imp.parent_module(file_id) | 237 | self.imp.parent_module(file_id) |
239 | } | 238 | } |
240 | pub fn crate_for(&self, file_id: FileId) -> Vec<CrateId> { | 239 | pub fn crate_for(&self, file_id: FileId) -> Cancelable<Vec<CrateId>> { |
241 | self.imp.crate_for(file_id) | 240 | Ok(self.imp.crate_for(file_id)) |
242 | } | 241 | } |
243 | pub fn crate_root(&self, crate_id: CrateId) -> FileId { | 242 | pub fn crate_root(&self, crate_id: CrateId) -> Cancelable<FileId> { |
244 | self.imp.crate_root(crate_id) | 243 | Ok(self.imp.crate_root(crate_id)) |
245 | } | 244 | } |
246 | pub fn runnables(&self, file_id: FileId) -> Vec<Runnable> { | 245 | pub fn runnables(&self, file_id: FileId) -> Cancelable<Vec<Runnable>> { |
247 | let file = self.imp.file_syntax(file_id); | 246 | let file = self.imp.file_syntax(file_id); |
248 | ra_editor::runnables(&file) | 247 | Ok(ra_editor::runnables(&file)) |
249 | } | 248 | } |
250 | pub fn highlight(&self, file_id: FileId) -> Vec<HighlightedRange> { | 249 | pub fn highlight(&self, file_id: FileId) -> Cancelable<Vec<HighlightedRange>> { |
251 | let file = self.imp.file_syntax(file_id); | 250 | let file = self.imp.file_syntax(file_id); |
252 | ra_editor::highlight(&file) | 251 | Ok(ra_editor::highlight(&file)) |
253 | } | 252 | } |
254 | pub fn completions(&self, file_id: FileId, offset: TextUnit) -> Option<Vec<CompletionItem>> { | 253 | pub fn completions(&self, file_id: FileId, offset: TextUnit) -> Cancelable<Option<Vec<CompletionItem>>> { |
255 | let file = self.imp.file_syntax(file_id); | 254 | let file = self.imp.file_syntax(file_id); |
256 | ra_editor::scope_completion(&file, offset) | 255 | Ok(ra_editor::scope_completion(&file, offset)) |
257 | } | 256 | } |
258 | pub fn assists(&self, file_id: FileId, range: TextRange) -> Vec<SourceChange> { | 257 | pub fn assists(&self, file_id: FileId, range: TextRange) -> Cancelable<Vec<SourceChange>> { |
259 | self.imp.assists(file_id, range) | 258 | Ok(self.imp.assists(file_id, range)) |
260 | } | 259 | } |
261 | pub fn diagnostics(&self, file_id: FileId) -> Vec<Diagnostic> { | 260 | pub fn diagnostics(&self, file_id: FileId) -> Cancelable<Vec<Diagnostic>> { |
262 | self.imp.diagnostics(file_id) | 261 | Ok(self.imp.diagnostics(file_id)) |
263 | } | 262 | } |
264 | pub fn folding_ranges(&self, file_id: FileId) -> Vec<Fold> { | 263 | pub fn folding_ranges(&self, file_id: FileId) -> Vec<Fold> { |
265 | let file = self.imp.file_syntax(file_id); | 264 | let file = self.imp.file_syntax(file_id); |
@@ -270,9 +269,8 @@ impl Analysis { | |||
270 | &self, | 269 | &self, |
271 | file_id: FileId, | 270 | file_id: FileId, |
272 | offset: TextUnit, | 271 | offset: TextUnit, |
273 | token: &JobToken, | ||
274 | ) -> Option<(FnDescriptor, Option<usize>)> { | 272 | ) -> Option<(FnDescriptor, Option<usize>)> { |
275 | self.imp.resolve_callable(file_id, offset, token) | 273 | self.imp.resolve_callable(file_id, offset) |
276 | } | 274 | } |
277 | } | 275 | } |
278 | 276 | ||