From e1ad3f3e4b453046a3c793271598397cf23c832e Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Fri, 23 Jan 2026 17:02:48 +0100 Subject: [PATCH] copilot: Rename enabled_next_edit_suggestions setting to enable_next_edit_suggestions (#47484) Co-authored-by: Marshall Bowers Closes #ISSUE Release Notes: - N/A Co-authored-by: Marshall Bowers --- assets/settings/default.json | 4 ++-- crates/copilot/src/copilot.rs | 2 +- crates/edit_prediction_ui/src/edit_prediction_button.rs | 4 ++-- crates/language/src/language_settings.rs | 4 ++-- crates/settings_content/src/language.rs | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/assets/settings/default.json b/assets/settings/default.json index 2f2cbdd28a..b30eee9621 100644 --- a/assets/settings/default.json +++ b/assets/settings/default.json @@ -1522,13 +1522,13 @@ // "enterprise_uri": "", // "proxy": "", // "proxy_no_verify": false - // "enabled_next_edit_suggestions": true + // "enable_next_edit_suggestions": true // }, "copilot": { "enterprise_uri": null, "proxy": null, "proxy_no_verify": null, - "enabled_next_edit_suggestions": true, + "enable_next_edit_suggestions": true, }, "codestral": { "api_url": "https://codestral.mistral.ai", diff --git a/crates/copilot/src/copilot.rs b/crates/copilot/src/copilot.rs index 37c7739509..c35546b5a9 100644 --- a/crates/copilot/src/copilot.rs +++ b/crates/copilot/src/copilot.rs @@ -932,7 +932,7 @@ impl Copilot { let nes_enabled = AllLanguageSettings::get_global(cx) .edit_predictions .copilot - .enabled_next_edit_suggestions + .enable_next_edit_suggestions .unwrap_or(true); cx.background_spawn(async move { diff --git a/crates/edit_prediction_ui/src/edit_prediction_button.rs b/crates/edit_prediction_ui/src/edit_prediction_button.rs index d4e6605e6e..dde6cc7192 100644 --- a/crates/edit_prediction_ui/src/edit_prediction_button.rs +++ b/crates/edit_prediction_ui/src/edit_prediction_button.rs @@ -944,7 +944,7 @@ impl EditPredictionButton { let next_edit_suggestions = all_language_settings .edit_predictions .copilot - .enabled_next_edit_suggestions + .enable_next_edit_suggestions .unwrap_or(true); let copilot_config = copilot_chat::CopilotChatConfiguration { enterprise_uri: all_language_settings @@ -975,7 +975,7 @@ impl EditPredictionButton { .get_or_insert_default() .copilot .get_or_insert_default() - .enabled_next_edit_suggestions = + .enable_next_edit_suggestions = Some(!next_edit_suggestions); }); } diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs index 86e3568045..74d78a74a8 100644 --- a/crates/language/src/language_settings.rs +++ b/crates/language/src/language_settings.rs @@ -426,7 +426,7 @@ pub struct CopilotSettings { /// Enterprise URI for Copilot. pub enterprise_uri: Option, /// Whether the Copilot Next Edit Suggestions feature is enabled. - pub enabled_next_edit_suggestions: Option, + pub enable_next_edit_suggestions: Option, } #[derive(Clone, Debug, Default)] @@ -660,7 +660,7 @@ impl settings::Settings for AllLanguageSettings { proxy: copilot.proxy, proxy_no_verify: copilot.proxy_no_verify, enterprise_uri: copilot.enterprise_uri, - enabled_next_edit_suggestions: copilot.enabled_next_edit_suggestions, + enable_next_edit_suggestions: copilot.enable_next_edit_suggestions, }; let codestral = edit_predictions.codestral.unwrap(); diff --git a/crates/settings_content/src/language.rs b/crates/settings_content/src/language.rs index d3135396eb..82aff8ec6e 100644 --- a/crates/settings_content/src/language.rs +++ b/crates/settings_content/src/language.rs @@ -213,7 +213,7 @@ pub struct CopilotSettingsContent { /// Whether the Copilot Next Edit Suggestions feature is enabled. /// /// Default: true - pub enabled_next_edit_suggestions: Option, + pub enable_next_edit_suggestions: Option, } #[with_fallible_options]