zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-20 02:47:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Panic in debug if global settings can't be deserialized from defaults

Browse Source 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Julia Risley <julia@zed.dev>
This commit is contained in:
Nathan Sobo 2023-06-20 18:12:59 -06:00
parent bd7f8e8b38
commit 7a051a0dcb
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
crates/settings/src/settings_store.rs
View File

@ -147,25 +147,28 @@ impl SettingsStore {
local_values: Vec::new(),
}));
if let Some(default_settings) = setting_value
let default_settings = setting_value
.deserialize_setting(&self.raw_default_settings)
.expect("can't deserialize default settings");
let mut user_values_stack = Vec::new();
if let Some(user_settings) = setting_value
.deserialize_setting(&self.raw_user_settings)
.log_err()
{
let mut user_values_stack = Vec::new();
user_values_stack = vec![user_settings];
}
if let Some(user_settings) = setting_value
.deserialize_setting(&self.raw_user_settings)
.log_err()
{
user_values_stack = vec![user_settings];
}
#[cfg(debug_assertions)]
setting_value
.load_setting(&default_settings, &[], cx)
.expect("can't deserialize settings from defaults");
if let Some(setting) = setting_value
.load_setting(&default_settings, &user_values_stack, cx)
.log_err()
{
setting_value.set_global_value(setting);
}
if let Some(setting) = setting_value
.load_setting(&default_settings, &user_values_stack, cx)
.log_err()
{
setting_value.set_global_value(setting);
}
}