Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't name ExtensionLspAdapter in ExtensionRegistrationHooks (#21064)

Browse source 
This PR updates the `ExtensionRegistrationHooks` trait to not name the
`ExtensionLspAdapter` type.

This helps decouple the two.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-11-22 10:58:11 -05:00 • committed by GitHub
parent b4659bb44e
commit d489f96aef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 73 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

29
crates/extension_host/src/headless_host.rs
View file

@ -177,20 +177,17 @@ impl HeadlessExtensionStore {
let wasm_extension: Arc<dyn Extension> =
Arc::new(WasmExtension::load(extension_dir, &manifest, wasm_host.clone(), &cx).await?);
for (language_server_name, language_server_config) in &manifest.language_servers {
for (language_server_id, language_server_config) in &manifest.language_servers {
for language in language_server_config.languages() {
this.update(cx, |this, _cx| {
this.loaded_language_servers
.entry(manifest.id.clone())
.or_default()
.push((language_server_name.clone(), language.clone()));
.push((language_server_id.clone(), language.clone()));
this.registration_hooks.register_lsp_adapter(
wasm_extension.clone(),
language_server_id.clone(),
language.clone(),
ExtensionLspAdapter {
extension: wasm_extension.clone(),
language_server_id: language_server_name.clone(),
language_name: language,
},
);
})?;
}
@ -344,10 +341,22 @@ impl ExtensionRegistrationHooks for HeadlessRegistrationHooks {
self.language_registry
.register_language(language, None, matcher, load)
}
fn register_lsp_adapter(&self, language: LanguageName, adapter: ExtensionLspAdapter) {
fn register_lsp_adapter(
&self,
extension: Arc<dyn Extension>,
language_server_id: LanguageServerName,
language: LanguageName,
) {
log::info!("registering lsp adapter {:?}", language);
self.language_registry
.register_lsp_adapter(language, Arc::new(adapter) as _);
self.language_registry.register_lsp_adapter(
language.clone(),
Arc::new(ExtensionLspAdapter::new(
extension,
language_server_id,
language,
)),
);
}
fn register_wasm_grammars(&self, grammars: Vec<(Arc<str>, PathBuf)>) {