language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 22:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

check_canceled is a method

Browse source
This commit is contained in:
Aleksey Kladov 2018-11-28 01:38:39 +03:00
parent 806ea03b64
commit 4c9933c016
4 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/ra_analysis/src/db.rs
View file

@ -6,7 +6,6 @@ use ra_syntax::{SourceFileNode, SyntaxNode};
use salsa::{self, Database};
use crate::{
db,
hir,
symbol_index::SymbolIndex,
syntax_ptr::SyntaxPtr,
@ -59,14 +58,6 @@ impl Default for RootDatabase {
}
}
pub(crate) fn check_canceled(db: &impl salsa::Database) -> Cancelable<()> {
if db.salsa_runtime().is_current_revision_canceled() {
Err(Canceled)
} else {
Ok(())
}
}
impl salsa::ParallelDatabase for RootDatabase {
fn snapshot(&self) -> salsa::Snapshot<RootDatabase> {
salsa::Snapshot::new(RootDatabase {
@ -80,7 +71,11 @@ impl salsa::ParallelDatabase for RootDatabase {
pub(crate) trait BaseDatabase: salsa::Database {
fn id_maps(&self) -> &IdMaps;
fn check_canceled(&self) -> Cancelable<()> {
check_canceled(self)
if self.salsa_runtime().is_current_revision_canceled() {
Err(Canceled)
} else {
Ok(())
}
}
}
@ -171,7 +166,7 @@ fn file_lines(db: &impl SyntaxDatabase, file_id: FileId) -> Arc<LineIndex> {
Arc::new(LineIndex::new(&*text))
}
fn file_symbols(db: &impl SyntaxDatabase, file_id: FileId) -> Cancelable<Arc<SymbolIndex>> {
db::check_canceled(db)?;
db.check_canceled()?;
let syntax = db.file_syntax(file_id);
Ok(Arc::new(SymbolIndex::for_file(file_id, syntax)))
}