From c1bcdf7d4e63d759f66bb9a35543319b8d54355e Mon Sep 17 00:00:00 2001 From: Anthony Date: Thu, 18 Sep 2025 10:47:46 -0400 Subject: [PATCH] Finish the rest of the todos Co-authored-by: Ben Kunkle Co-authored-by: Conrad Irwin --- crates/agent_settings/src/agent_settings.rs | 1 - crates/language_models/src/provider/vercel.rs | 1 - crates/project/src/project_settings.rs | 5 ++++- crates/settings/src/settings_store.rs | 1 - crates/terminal/src/terminal_settings.rs | 1 - 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/crates/agent_settings/src/agent_settings.rs b/crates/agent_settings/src/agent_settings.rs index e0389a47ce015f0644f7ebfe0025b8c0d74fdcd0..3913bfb808b86b7d28ff75440d76c6d42f4c6866 100644 --- a/crates/agent_settings/src/agent_settings.rs +++ b/crates/agent_settings/src/agent_settings.rs @@ -147,7 +147,6 @@ impl Default for AgentProfileId { } impl Settings for AgentSettings { - // todo!() test preserved keys logic fn from_defaults(content: &settings::SettingsContent, _cx: &mut App) -> Self { let agent = content.agent.clone().unwrap(); Self { diff --git a/crates/language_models/src/provider/vercel.rs b/crates/language_models/src/provider/vercel.rs index 5f6fa23c642afbf57acb88d6429c07721dd74acc..4b2ebb8a165e4edd6f10908e85a04538b5f3a92c 100644 --- a/crates/language_models/src/provider/vercel.rs +++ b/crates/language_models/src/provider/vercel.rs @@ -25,7 +25,6 @@ use crate::{api_key::ApiKeyState, ui::InstructionListItem}; const PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId::new("vercel"); const PROVIDER_NAME: LanguageModelProviderName = LanguageModelProviderName::new("Vercel"); -// todo!() -> Remove default implementation const API_KEY_ENV_VAR_NAME: &str = "VERCEL_API_KEY"; static API_KEY_ENV_VAR: LazyLock = env_var!(API_KEY_ENV_VAR_NAME); diff --git a/crates/project/src/project_settings.rs b/crates/project/src/project_settings.rs index 8cba826ca95c48aa34064086fca8c267704f3923..466173b5f4023e3c59810a8591a3d0057756e208 100644 --- a/crates/project/src/project_settings.rs +++ b/crates/project/src/project_settings.rs @@ -47,7 +47,10 @@ pub struct ProjectSettings { /// To override settings for a language, add an entry for that language server's /// name to the lsp value. /// Default: null - // todo! should these hash map types be Map or Map + // todo(settings-follow-up) + // We should change to use a non content type (settings::LspSettings is a content type) + // Note: Will either require merging with defaults, which also requires deciding where the defaults come from, + // or case by case deciding which fields are optional and which are actually required. pub lsp: HashMap, /// Common language server settings. diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs index 81cc47982b9d085297fc4ce4accfb87b8a3c8d3c..3d3a88c154fb67de8ef6a0615e0f67f96e674c97 100644 --- a/crates/settings/src/settings_store.rs +++ b/crates/settings/src/settings_store.rs @@ -1203,7 +1203,6 @@ mod tests { TitleBarVisibility::Never ); - // todo!() store .set_local_settings( WorktreeId::from_usize(1), diff --git a/crates/terminal/src/terminal_settings.rs b/crates/terminal/src/terminal_settings.rs index e39ded2dc4145e7d68edea0c54311216598ebc3e..9aa88c65a79032e96c9fe2951b2b37434be6927b 100644 --- a/crates/terminal/src/terminal_settings.rs +++ b/crates/terminal/src/terminal_settings.rs @@ -250,7 +250,6 @@ impl settings::Settings for TerminalSettings { } } } - // todo!() test that this works. if content.terminal.is_none() && default != TerminalSettingsContent::default() { content.terminal = Some(default) }