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

Fix remote server crash with JSON files (#38678)

Browse Source 
Closes #38594

Release Notes:

- N/A
This commit is contained in:
Julia Ryan
2025-09-22 22:30:27 +00:00
committed by GitHub
parent e9fbcf5abf
commit 5e502a32fb
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/languages/src/json.rs
+10 -6
View File
@@ -157,12 +157,16 @@ impl JsonLspAdapter {
) -> Value {
let keymap_schema = KeymapFile::generate_json_schema_for_registered_actions(cx);
let font_names = &cx.text_system().all_font_names();
let theme_names = &ThemeRegistry::global(cx).list_names();
let icon_theme_names = &ThemeRegistry::global(cx)
.list_icon_themes()
.into_iter()
.map(|icon_theme| icon_theme.name)
.collect::<Vec<SharedString>>();
let themes = ThemeRegistry::try_global(cx);
let theme_names = &themes.clone().map(|t| t.list_names()).unwrap_or_default();
let icon_theme_names = &themes
.map(|t| {
t.list_icon_themes()
.into_iter()
.map(|icon_theme| icon_theme.name)
.collect::<Vec<SharedString>>()
})
.unwrap_or_default();
let settings_schema = cx
.global::<SettingsStore>()
.json_schema(&SettingsJsonSchemaParams {