oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

settings_ui: Soft fail on no default & fix language default loading (#39709)

Browse Source 
Closes #ISSUE

Release Notes:

- N/A *or* Added/Fixed/Improved ...
This commit is contained in:
Ben Kunkle
2025-10-07 20:27:42 +00:00
committed by GitHub
parent e60a61f7e7
commit 791ba9ce4c
3 changed files with 76 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/settings_ui/src/page_data.rs
+9 -7
View File
@@ -4314,14 +4314,16 @@ fn language_settings_data() -> Vec<SettingsPageItem> {
get: fn(&LanguageSettingsContent) -> &Option<T>,
) -> &Option<T> {
let all_languages = &settings_content.project.all_languages;
let mut language_content = None;
if let Some(current_language) = current_language() {
language_content = all_languages.languages.0.get(&current_language);
if let Some(current_language_name) = current_language() {
if let Some(current_language) = all_languages.languages.0.get(&current_language_name) {
let value = get(current_language);
if value.is_some() {
return value;
}
}
}
let value = language_content
.map(get)
.unwrap_or_else(|| get(&all_languages.defaults));
return value;
let default_value = get(&all_languages.defaults);
return default_value;
}
fn language_settings_field_mut<T>(