From 8196db6022b3a041b0b595ebc4130b8e029759f1 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Mon, 4 Nov 2024 14:25:44 -0500 Subject: [PATCH] settings: Include `null` in the type for optional settings (#20192) This PR updates all settings that are defined as `Option`s to include `null` in their type. This prevents warnings from being displayed when `null` is used a default value. Closes https://github.com/zed-industries/zed/issues/18006. Release Notes: - Updated the settings schema to allow `null` as a value for optional settings instead of showing a warning. --- crates/settings/src/settings_store.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs index 620055a9712d7731261b6fa23edaea6d13cdb97f..2e867a21280e18c68864b2287f96095816d08d74 100644 --- a/crates/settings/src/settings_store.rs +++ b/crates/settings/src/settings_store.rs @@ -746,7 +746,7 @@ impl SettingsStore { }; let settings = SchemaSettings::draft07().with(|settings| { - settings.option_add_null_type = false; + settings.option_add_null_type = true; }); let mut generator = SchemaGenerator::new(settings); let mut combined_schema = RootSchema::default();