Extract ExtensionIndexedDocsProvider to indexed_docs crate (#20607)

This PR extracts the `ExtensionIndexedDocsProvider` implementation to
the `indexed_docs` crate.

To achieve this, we introduce a new `Extension` trait that provides an
abstracted interface for calling an extension. This trait resides in the
`extension` crate, which has minimal dependencies and can be depended on
by other crates, like `indexed_docs`.

We're then able to implement the `ExtensionIndexedDocsProvider` without
having any knowledge of the Wasm-specific internals of the extension
system.

Release Notes:

- N/A

crates/extensions_ui/Cargo.toml

@@ -23,6 +23,7 @@ collections.workspace = true
 context_servers.workspace = true
 db.workspace = true
 editor.workspace = true
+extension.workspace = true
 extension_host.workspace = true
 fs.workspace = true
 futures.workspace = true

crates/extensions_ui/src/extension_indexed_docs_provider.rs

@@ -1,79 +0,0 @@
-use std::path::PathBuf;
-use std::sync::Arc;
-
-use anyhow::{anyhow, Result};
-use async_trait::async_trait;
-use futures::FutureExt;
-use indexed_docs::{IndexedDocsDatabase, IndexedDocsProvider, PackageName, ProviderId};
-use wasmtime_wasi::WasiView;
-
-use extension_host::wasm_host::{WasmExtension, WasmHost};
-
-pub struct ExtensionIndexedDocsProvider {
-    pub(crate) extension: WasmExtension,
-    pub(crate) host: Arc<WasmHost>,
-    pub(crate) id: ProviderId,
-}
-
-#[async_trait]
-impl IndexedDocsProvider for ExtensionIndexedDocsProvider {
-    fn id(&self) -> ProviderId {
-        self.id.clone()
-    }
-
-    fn database_path(&self) -> PathBuf {
-        let mut database_path = self.host.work_dir.clone();
-        database_path.push(self.extension.manifest.id.as_ref());
-        database_path.push("docs");
-        database_path.push(format!("{}.0.mdb", self.id));
-
-        database_path
-    }
-
-    async fn suggest_packages(&self) -> Result<Vec<PackageName>> {
-        self.extension
-            .call({
-                let id = self.id.clone();
-                |extension, store| {
-                    async move {
-                        let packages = extension
-                            .call_suggest_docs_packages(store, id.as_ref())
-                            .await?
-                            .map_err(|err| anyhow!("{err:?}"))?;
-
-                        Ok(packages
-                            .into_iter()
-                            .map(|package| PackageName::from(package.as_str()))
-                            .collect())
-                    }
-                    .boxed()
-                }
-            })
-            .await
-    }
-
-    async fn index(&self, package: PackageName, database: Arc<IndexedDocsDatabase>) -> Result<()> {
-        self.extension
-            .call({
-                let id = self.id.clone();
-                |extension, store| {
-                    async move {
-                        let database_resource = store.data_mut().table().push(database as _)?;
-                        extension
-                            .call_index_docs(
-                                store,
-                                id.as_ref(),
-                                package.as_ref(),
-                                database_resource,
-                            )
-                            .await?
-                            .map_err(|err| anyhow!("{err:?}"))?;
-
-                        anyhow::Ok(())
-                    }
-                    .boxed()
-                }
-            })
-            .await
-    }
-}

crates/extensions_ui/src/extension_registration_hooks.rs

@@ -3,17 +3,18 @@ use std::{path::PathBuf, sync::Arc};
 use anyhow::Result;
 use assistant_slash_command::SlashCommandRegistry;
 use context_servers::ContextServerFactoryRegistry;
+use extension::Extension;
 use extension_host::{extension_lsp_adapter::ExtensionLspAdapter, wasm_host};
 use fs::Fs;
 use gpui::{AppContext, BackgroundExecutor, Task};
-use indexed_docs::{IndexedDocsRegistry, ProviderId};
+use indexed_docs::{ExtensionIndexedDocsProvider, IndexedDocsRegistry, ProviderId};
 use language::{LanguageRegistry, LanguageServerBinaryStatus, LoadedLanguage};
 use snippet_provider::SnippetRegistry;
 use theme::{ThemeRegistry, ThemeSettings};
 use ui::SharedString;
 
 use crate::extension_context_server::ExtensionContextServer;
-use crate::{extension_indexed_docs_provider, extension_slash_command::ExtensionSlashCommand};
+use crate::extension_slash_command::ExtensionSlashCommand;
 
 pub struct ConcreteExtensionRegistrationHooks {
     slash_command_registry: Arc<SlashCommandRegistry>,
@@ -99,19 +100,12 @@ impl extension_host::ExtensionRegistrationHooks for ConcreteExtensionRegistratio
             );
     }
 
-    fn register_docs_provider(
-        &self,
-        extension: wasm_host::WasmExtension,
-        host: Arc<wasm_host::WasmHost>,
-        provider_id: Arc<str>,
-    ) {
-        self.indexed_docs_registry.register_provider(Box::new(
-            extension_indexed_docs_provider::ExtensionIndexedDocsProvider {
+    fn register_docs_provider(&self, extension: Arc<dyn Extension>, provider_id: Arc<str>) {
+        self.indexed_docs_registry
+            .register_provider(Box::new(ExtensionIndexedDocsProvider::new(
                 extension,
-                host,
-                id: ProviderId(provider_id),
-            },
-        ));
+                ProviderId(provider_id),
+            )));
     }
 
     fn register_snippets(&self, path: &PathBuf, snippet_contents: &str) -> Result<()> {

crates/extensions_ui/src/extensions_ui.rs

@@ -1,6 +1,5 @@
 mod components;
 mod extension_context_server;
-mod extension_indexed_docs_provider;
 mod extension_registration_hooks;
 mod extension_slash_command;
 mod extension_suggest;