language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 20:42:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

use with_db consistently

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-20 20:55:08 +03:00
parent 3508ba9bc2
commit c517696fab
1 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/ra_ide_api/src/lib.rs
View file

@ -388,8 +388,7 @@ impl Analysis {
&self, &self,
position: FilePosition, position: FilePosition,
) -> Cancelable<Option<RangeInfo<Vec<NavigationTarget>>>> { ) -> Cancelable<Option<RangeInfo<Vec<NavigationTarget>>>> {
self.db self.with_db(|db| goto_definition::goto_definition(db, position))
.catch_canceled(|db| goto_definition::goto_definition(db, position))
} }
/// Finds all usages of the reference at point. /// Finds all usages of the reference at point.
@ -404,8 +403,7 @@ impl Analysis {
/// Computes parameter information for the given call expression. /// Computes parameter information for the given call expression.
pub fn call_info(&self, position: FilePosition) -> Cancelable<Option<CallInfo>> { pub fn call_info(&self, position: FilePosition) -> Cancelable<Option<CallInfo>> {
self.db self.with_db(|db| call_info::call_info(db, position))
.catch_canceled(|db| call_info::call_info(db, position))
} }
/// Returns a `mod name;` declaration which created the current module. /// Returns a `mod name;` declaration which created the current module.
@ -420,33 +418,28 @@ impl Analysis {
/// Returns the root file of the given crate. /// Returns the root file of the given crate.
pub fn crate_root(&self, crate_id: CrateId) -> Cancelable<FileId> { pub fn crate_root(&self, crate_id: CrateId) -> Cancelable<FileId> {
Ok(self.db.crate_graph().crate_root(crate_id)) self.with_db(|db| db.crate_graph().crate_root(crate_id))
} }
/// Returns the set of possible targets to run for the current file. /// Returns the set of possible targets to run for the current file.
pub fn runnables(&self, file_id: FileId) -> Cancelable<Vec<Runnable>> { pub fn runnables(&self, file_id: FileId) -> Cancelable<Vec<Runnable>> {
self.db self.with_db(|db| runnables::runnables(db, file_id))
.catch_canceled(|db| runnables::runnables(db, file_id))
} }
/// Computes syntax highlighting for the given file. /// Computes syntax highlighting for the given file.
pub fn highlight(&self, file_id: FileId) -> Cancelable<Vec<HighlightedRange>> { pub fn highlight(&self, file_id: FileId) -> Cancelable<Vec<HighlightedRange>> {
self.db self.with_db(|db| syntax_highlighting::highlight(db, file_id))
.catch_canceled(|db| syntax_highlighting::highlight(db, file_id))
} }
/// Computes completions at the given position. /// Computes completions at the given position.
pub fn completions(&self, position: FilePosition) -> Cancelable<Option<Vec<CompletionItem>>> { pub fn completions(&self, position: FilePosition) -> Cancelable<Option<Vec<CompletionItem>>> {
let completions = self self.with_db(|db| completion::completions(db, position).map(Into::into))
.db
.catch_canceled(|db| completion::completions(db, position))?;
Ok(completions.map(|it| it.into()))
} }
/// Computes assists (aks code actons aka intentions) for the given /// Computes assists (aks code actons aka intentions) for the given
/// position. /// position.
pub fn assists(&self, frange: FileRange) -> Cancelable<Vec<SourceChange>> { pub fn assists(&self, frange: FileRange) -> Cancelable<Vec<SourceChange>> {
Ok(self.db.assists(frange)) self.with_db(|db| db.assists(frange))
} }
/// Computes the set of diagnostics for the given file. /// Computes the set of diagnostics for the given file.