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

Use background task for settings migrations + notify about errors (#30009)

Browse source 
Release Notes:

- N/A
This commit is contained in:
Michael Sloan 2025-06-24 17:54:03 -06:00 • committed by GitHub
parent be95716e94
commit aa330fcf2c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

41
crates/zed/src/zed/migrate.rs
View file

@ -4,6 +4,7 @@ use fs::Fs;
use migrator::{migrate_keymap, migrate_settings}; use migrator::{migrate_keymap, migrate_settings};
use settings::{KeymapFile, Settings, SettingsStore}; use settings::{KeymapFile, Settings, SettingsStore};
use util::ResultExt; use util::ResultExt;
use workspace::notifications::NotifyTaskExt;
use std::sync::Arc; use std::sync::Arc;
@ -153,7 +154,7 @@ impl ToolbarItemView for MigrationBanner {
if &target == paths::keymap_file() { if &target == paths::keymap_file() {
self.migration_type = Some(MigrationType::Keymap); self.migration_type = Some(MigrationType::Keymap);
let fs = <dyn Fs>::global(cx); let fs = <dyn Fs>::global(cx);
let should_migrate = should_migrate_keymap(fs); let should_migrate = cx.background_spawn(should_migrate_keymap(fs));
self.should_migrate_task = Some(cx.spawn_in(window, async move |this, cx| { self.should_migrate_task = Some(cx.spawn_in(window, async move |this, cx| {
if let Ok(true) = should_migrate.await { if let Ok(true) = should_migrate.await {
this.update(cx, |this, cx| { this.update(cx, |this, cx| {
@ -165,7 +166,7 @@ impl ToolbarItemView for MigrationBanner {
} else if &target == paths::settings_file() { } else if &target == paths::settings_file() {
self.migration_type = Some(MigrationType::Settings); self.migration_type = Some(MigrationType::Settings);
let fs = <dyn Fs>::global(cx); let fs = <dyn Fs>::global(cx);
let should_migrate = should_migrate_settings(fs); let should_migrate = cx.background_spawn(should_migrate_settings(fs));
self.should_migrate_task = Some(cx.spawn_in(window, async move |this, cx| { self.should_migrate_task = Some(cx.spawn_in(window, async move |this, cx| {
if let Ok(true) = should_migrate.await { if let Ok(true) = should_migrate.await {
this.update(cx, |this, cx| { this.update(cx, |this, cx| {
@ -234,20 +235,22 @@ impl Render for MigrationBanner {
), ),
) )
.child( .child(
Button::new("backup-and-migrate", "Backup and Update").on_click(move |_, _, cx| { Button::new("backup-and-migrate", "Backup and Update").on_click(
let fs = <dyn Fs>::global(cx); move |_, window, cx| {
match migration_type { let fs = <dyn Fs>::global(cx);
Some(MigrationType::Keymap) => { match migration_type {
cx.spawn(async move |_| write_keymap_migration(&fs).await.ok()) Some(MigrationType::Keymap) => {
.detach(); cx.background_spawn(write_keymap_migration(fs.clone()))
.detach_and_notify_err(window, cx);
}
Some(MigrationType::Settings) => {
cx.background_spawn(write_settings_migration(fs.clone()))
.detach_and_notify_err(window, cx);
}
None => unreachable!(),
} }
Some(MigrationType::Settings) => { },
cx.spawn(async move |_| write_settings_migration(&fs).await.ok()) ),
.detach();
}
None => unreachable!(),
}
}),
) )
.into_any_element() .into_any_element()
} }
@ -269,8 +272,8 @@ async fn should_migrate_settings(fs: Arc<dyn Fs>) -> Result<bool> {
Ok(false) Ok(false)
} }
async fn write_keymap_migration(fs: &Arc<dyn Fs>) -> Result<()> { async fn write_keymap_migration(fs: Arc<dyn Fs>) -> Result<()> {
let old_text = KeymapFile::load_keymap_file(fs).await?; let old_text = KeymapFile::load_keymap_file(&fs).await?;
let Ok(Some(new_text)) = migrate_keymap(&old_text) else { let Ok(Some(new_text)) = migrate_keymap(&old_text) else {
return Ok(()); return Ok(());
}; };
@ -294,8 +297,8 @@ async fn write_keymap_migration(fs: &Arc<dyn Fs>) -> Result<()> {
Ok(()) Ok(())
} }
async fn write_settings_migration(fs: &Arc<dyn Fs>) -> Result<()> { async fn write_settings_migration(fs: Arc<dyn Fs>) -> Result<()> {
let old_text = SettingsStore::load_settings(fs).await?; let old_text = SettingsStore::load_settings(&fs).await?;
let Ok(Some(new_text)) = migrate_settings(&old_text) else { let Ok(Some(new_text)) = migrate_settings(&old_text) else {
return Ok(()); return Ok(());
}; };