c6603e4fba
Fixes an issue that caused Windows to fail when removing extension's directories, as Zed had never stop any related processes. Now: * Zed shuts down and waits until the end when the language servers are shut down * Adds `impl Drop for WasmExtension` where does `self.tx.close_channel();` to stop a receiver loop that holds the "lock" on the extension's work dir. The extension was dropped, but the channel was not closed for some reason. * Does more unregistration to ensure `Arc<WasmExtension>` with the `tx` does not leak further * Tidies up the related errors which had never reported a problematic path before Release Notes: - N/A --------- Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com> Co-authored-by: Smit <smit@zed.dev>
81 lines
2.3 KiB
Rust
81 lines
2.3 KiB
Rust
use std::path::PathBuf;
|
|
use std::sync::Arc;
|
|
|
|
use anyhow::Result;
|
|
use async_trait::async_trait;
|
|
use extension::{Extension, ExtensionHostProxy, ExtensionIndexedDocsProviderProxy};
|
|
use gpui::App;
|
|
|
|
use crate::{
|
|
IndexedDocsDatabase, IndexedDocsProvider, IndexedDocsRegistry, PackageName, ProviderId,
|
|
};
|
|
|
|
pub fn init(cx: &mut App) {
|
|
let proxy = ExtensionHostProxy::default_global(cx);
|
|
proxy.register_indexed_docs_provider_proxy(IndexedDocsRegistryProxy {
|
|
indexed_docs_registry: IndexedDocsRegistry::global(cx),
|
|
});
|
|
}
|
|
|
|
struct IndexedDocsRegistryProxy {
|
|
indexed_docs_registry: Arc<IndexedDocsRegistry>,
|
|
}
|
|
|
|
impl ExtensionIndexedDocsProviderProxy for IndexedDocsRegistryProxy {
|
|
fn register_indexed_docs_provider(&self, extension: Arc<dyn Extension>, provider_id: Arc<str>) {
|
|
self.indexed_docs_registry
|
|
.register_provider(Box::new(ExtensionIndexedDocsProvider::new(
|
|
extension,
|
|
ProviderId(provider_id),
|
|
)));
|
|
}
|
|
|
|
fn unregister_indexed_docs_provider(&self, provider_id: Arc<str>) {
|
|
self.indexed_docs_registry
|
|
.unregister_provider(&ProviderId(provider_id));
|
|
}
|
|
}
|
|
|
|
pub struct ExtensionIndexedDocsProvider {
|
|
extension: Arc<dyn Extension>,
|
|
id: ProviderId,
|
|
}
|
|
|
|
impl ExtensionIndexedDocsProvider {
|
|
pub fn new(extension: Arc<dyn Extension>, id: ProviderId) -> Self {
|
|
Self { extension, id }
|
|
}
|
|
}
|
|
|
|
#[async_trait]
|
|
impl IndexedDocsProvider for ExtensionIndexedDocsProvider {
|
|
fn id(&self) -> ProviderId {
|
|
self.id.clone()
|
|
}
|
|
|
|
fn database_path(&self) -> PathBuf {
|
|
let mut database_path = PathBuf::from(self.extension.work_dir().as_ref());
|
|
database_path.push("docs");
|
|
database_path.push(format!("{}.0.mdb", self.id));
|
|
|
|
database_path
|
|
}
|
|
|
|
async fn suggest_packages(&self) -> Result<Vec<PackageName>> {
|
|
let packages = self
|
|
.extension
|
|
.suggest_docs_packages(self.id.0.clone())
|
|
.await?;
|
|
|
|
Ok(packages
|
|
.into_iter()
|
|
.map(|package| PackageName::from(package.as_str()))
|
|
.collect())
|
|
}
|
|
|
|
async fn index(&self, package: PackageName, database: Arc<IndexedDocsDatabase>) -> Result<()> {
|
|
self.extension
|
|
.index_docs(self.id.0.clone(), package.as_ref().into(), database)
|
|
.await
|
|
}
|
|
}
|