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

Rework extension-related errors (#34620)

Browse source 
Before:
<img width="1728" height="1079" alt="before"
src="https://github.com/user-attachments/assets/4ab19211-8de4-458d-a835-52de859b7b20"
/>

After:
<img width="1728" height="1079" alt="after"
src="https://github.com/user-attachments/assets/231c9362-a0b0-47ae-b92e-de6742781d36"
/>

Makes clear which path is causing the FS error and removes backtraces
from logging.

Release Notes:

- N/A
This commit is contained in:
Kirill Bulatov 2025-07-17 15:20:47 +03:00 • committed by GitHub
parent 4df7f52bf3
commit ceab139f54
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 28 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

38
crates/extension_host/src/extension_host.rs
View file

@ -1313,10 +1313,17 @@ impl ExtensionStore {
}
for snippets_path in &snippets_to_add {
if let Some(snippets_contents) = fs.load(snippets_path).await.log_err() {
proxy
.register_snippet(snippets_path, &snippets_contents)
.log_err();
match fs
.load(snippets_path)
.await
.with_context(|| format!("Loading snippets from {snippets_path:?}"))
{
Ok(snippets_contents) => {
proxy
.register_snippet(snippets_path, &snippets_contents)
.log_err();
}
Err(e) => log::error!("Cannot load snippets: {e:#}"),
}
}
}
@ -1331,20 +1338,25 @@ impl ExtensionStore {
let extension_path = root_dir.join(extension.manifest.id.as_ref());
let wasm_extension = WasmExtension::load(
extension_path,
&extension_path,
&extension.manifest,
wasm_host.clone(),
&cx,
)
.await;
.await
.with_context(|| format!("Loading extension from {extension_path:?}"));
if let Some(wasm_extension) = wasm_extension.log_err() {
wasm_extensions.push((extension.manifest.clone(), wasm_extension));
} else {
this.update(cx, |_, cx| {
cx.emit(Event::ExtensionFailedToLoad(extension.manifest.id.clone()))
})
.ok();
match wasm_extension {
Ok(wasm_extension) => {
wasm_extensions.push((extension.manifest.clone(), wasm_extension))
}
Err(e) => {
log::error!("Failed to load extension: {e:#}");
this.update(cx, |_, cx| {
cx.emit(Event::ExtensionFailedToLoad(extension.manifest.id.clone()))
})
.ok();
}
}
}