diff --git a/assets/settings/default.json b/assets/settings/default.json index c509a1657fd4c7988a0effbcde5a27a60c713c5c..32eb8fa3668375c9914eed65c512b1d23e7b0045 100644 --- a/assets/settings/default.json +++ b/assets/settings/default.json @@ -1520,13 +1520,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 37c77395090b8910ede421e698c0a7346eee672d..c35546b5a9c24816dcb36a86bd73b977aa3f5d29 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 a642f3fe03faa3df896c92307dba102c55d62d89..b32159773233926775fd42fc6ae2bd8e01eb0c1f 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 64e281827796da68b9d6736fbe675479ed0d8c74..750487452301014226eee8bb6ffe45b79f378d0d 100644 --- a/crates/language/src/language_settings.rs +++ b/crates/language/src/language_settings.rs @@ -425,7 +425,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)] @@ -655,7 +655,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/src/settings_content/language.rs b/crates/settings/src/settings_content/language.rs index 9208675932456619f00665e4702cc32b5ea070f4..fb0502c4aa8dc1c332bf60adb1c29e8535fcf406 100644 --- a/crates/settings/src/settings_content/language.rs +++ b/crates/settings/src/settings_content/language.rs @@ -191,7 +191,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]