bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide/src/lib.rs')
-rw-r--r--crates/ide/src/lib.rs57
1 files changed, 38 insertions, 19 deletions
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs
index e491c9214b..874e04702e 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs
@@ -62,7 +62,7 @@ use std::panic::{AssertUnwindSafe, UnwindSafe};
use cfg::CfgOptions;
use fetch_crates::CrateInfo;
-use hir::{ChangeWithProcMacros, EditionedFileId, crate_def_map, sym};
+use hir::{ChangeWithProcMacros, EditionedFileId, crate_def_map, db::HirDatabase, sym};
use ide_db::{
FxHashMap, FxIndexSet, LineIndexDatabase,
base_db::{
@@ -478,10 +478,12 @@ impl Analysis {
/// Fuzzy searches for a symbol.
pub fn symbol_search(&self, query: Query, limit: usize) -> Cancellable<Vec<NavigationTarget>> {
- self.with_db(|db| {
- symbol_index::world_symbols(db, query)
- .into_iter() // xx: should we make this a par iter?
- .filter_map(|s| s.try_to_nav(db))
+ // `world_symbols` currently clones the database to run stuff in parallel, which will make any query panic
+ // if we were to attach it here.
+ Cancelled::catch(|| {
+ symbol_index::world_symbols(&self.db, query)
+ .into_iter()
+ .filter_map(|s| s.try_to_nav(&self.db))
.take(limit)
.map(UpmappingResult::call_site)
.collect::<Vec<_>>()
@@ -660,15 +662,6 @@ impl Analysis {
})
}
- /// Computes syntax highlighting for the given file
- pub fn highlight(
- &self,
- highlight_config: HighlightConfig,
- file_id: FileId,
- ) -> Cancellable<Vec<HlRange>> {
- self.with_db(|db| syntax_highlighting::highlight(db, highlight_config, file_id, None))
- }
-
/// Computes all ranges to highlight for a given item in a file.
pub fn highlight_related(
&self,
@@ -682,20 +675,42 @@ impl Analysis {
})
}
+ /// Computes syntax highlighting for the given file
+ pub fn highlight(
+ &self,
+ highlight_config: HighlightConfig,
+ file_id: FileId,
+ ) -> Cancellable<Vec<HlRange>> {
+ // highlighting may construct a new database for "speculative" execution, so we can't currently attach the database
+ // highlighting instead sets up the attach hook where neceesary for the trait solver
+ Cancelled::catch(|| {
+ syntax_highlighting::highlight(&self.db, highlight_config, file_id, None)
+ })
+ }
+
/// Computes syntax highlighting for the given file range.
pub fn highlight_range(
&self,
highlight_config: HighlightConfig,
frange: FileRange,
) -> Cancellable<Vec<HlRange>> {
- self.with_db(|db| {
- syntax_highlighting::highlight(db, highlight_config, frange.file_id, Some(frange.range))
+ // highlighting may construct a new database for "speculative" execution, so we can't currently attach the database
+ // highlighting instead sets up the attach hook where neceesary for the trait solver
+ Cancelled::catch(|| {
+ syntax_highlighting::highlight(
+ &self.db,
+ highlight_config,
+ frange.file_id,
+ Some(frange.range),
+ )
})
}
/// Computes syntax highlighting for the given file.
pub fn highlight_as_html(&self, file_id: FileId, rainbow: bool) -> Cancellable<String> {
- self.with_db(|db| syntax_highlighting::highlight_as_html(db, file_id, rainbow))
+ // highlighting may construct a new database for "speculative" execution, so we can't currently attach the database
+ // highlighting instead sets up the attach hook where neceesary for the trait solver
+ Cancelled::catch(|| syntax_highlighting::highlight_as_html(&self.db, file_id, rainbow))
}
/// Computes completions at the given position.
@@ -873,8 +888,12 @@ impl Analysis {
where
F: FnOnce(&RootDatabase) -> T + std::panic::UnwindSafe,
{
- let snap = self.db.clone();
- Cancelled::catch(|| f(&snap))
+ salsa::attach(&self.db, || {
+ // the trait solver code may invoke `as_view<HirDatabase>` outside of queries,
+ // so technically we might run into a panic in salsa if the downcaster has not yet been registered.
+ HirDatabase::zalsa_register_downcaster(&self.db);
+ Cancelled::catch(|| f(&self.db))
+ })
}
}