Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
feat: config to toggle edit prediction button in the status bar (#66450)
Ahmed Tajelsir504abf602a09
diff --git a/assets/settings/default.json b/assets/settings/default.jsonindex 4687e9ac3e9..b57ed30f8ec 100644--- a/assets/settings/default.json+++ b/assets/settings/default.json@@ -1932,6 +1932,8 @@// "load_direnv": "disabled""load_direnv": "direct","edit_predictions": {+ // Whether to show the edit prediction button in the status bar.+ "button": true,// Which edit prediction provider to use."provider": "zed",// Disable edit predictions for files matching these glob patterns.diff --git a/crates/edit_prediction_ui/src/edit_prediction_button.rs b/crates/edit_prediction_ui/src/edit_prediction_button.rsindex bab6962eafe..af0fbf029be 100644--- a/crates/edit_prediction_ui/src/edit_prediction_button.rs+++ b/crates/edit_prediction_ui/src/edit_prediction_button.rs@@ -78,6 +78,10 @@ impl Render for EditPredictionButton {let language_settings = all_language_settings(None, cx);+ if !language_settings.edit_predictions.button {+ return div().hidden();+ }+match language_settings.edit_predictions.provider {EditPredictionProvider::Copilot => {let Some(copilot) = EditPredictionStore::try_global(cx)@@ -1480,10 +1484,14 @@ impl StatusItemView for EditPredictionButton {}fn hide_setting(&self, _: &App) -> Option<HideStatusItem> {- // This button is already gated on having a non-disabled edit- // prediction provider, which the user manages through provider/AI- // settings.- None+ Some(HideStatusItem::new(|settings| {+ settings+ .project+ .all_languages+ .edit_predictions+ .get_or_insert_default()+ .button = Some(false);+ }))}}diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rsindex 08db052239d..541d7011914 100644--- a/crates/language/src/language_settings.rs+++ b/crates/language/src/language_settings.rs@@ -497,6 +497,8 @@ impl InlayHintSettings {/// The settings for edit predictions, such as [GitHub Copilot](https://github.com/features/copilot).#[derive(Clone, Debug, Default)]pub struct EditPredictionSettings {+ /// Whether to show the edit prediction button in the status bar.+ pub button: bool,/// The provider that supplies edit predictions.pub provider: settings::EditPredictionProvider,/// Disable edit predictions for files matching these glob patterns.@@ -1030,6 +1032,7 @@ impl settings::Settings for AllLanguageSettings {Self {edit_predictions: EditPredictionSettings {+ button: edit_predictions.button.unwrap(),provider: if let Some(provider) = edit_prediction_provider {provider} else {diff --git a/crates/settings_content/src/language.rs b/crates/settings_content/src/language.rsindex cc0258a269e..e7a504f7f9b 100644--- a/crates/settings_content/src/language.rs+++ b/crates/settings_content/src/language.rs@@ -131,6 +131,10 @@ impl EditPredictionProvider {#[with_fallible_options]#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq)]pub struct EditPredictionSettingsContent {+ /// Whether to show the edit prediction button in the status bar.+ ///+ /// Default: true+ pub button: Option<bool>,/// Determines which edit prediction provider to use.pub provider: Option<EditPredictionProvider>,/// Disable edit predictions for files matching these glob patterns.diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rsindex 3b9001d925e..2d886462363 100644--- a/crates/settings_ui/src/page_data.rs+++ b/crates/settings_ui/src/page_data.rs@@ -4171,7 +4171,7 @@ fn search_and_files_page() -> SettingsPage {}fn window_and_layout_page() -> SettingsPage {- fn status_bar_section() -> [SettingsPageItem; 12] {+ fn status_bar_section() -> [SettingsPageItem; 13] {[SettingsPageItem::SectionHeader("Status Bar"),SettingsPageItem::SettingItem(SettingItem {@@ -4336,6 +4336,33 @@ fn window_and_layout_page() -> SettingsPage {metadata: None,files: USER,}),+ SettingsPageItem::SettingItem(SettingItem {+ title: "Edit Prediction Button",+ description: "Show the edit prediction button in the status bar.",+ field: Box::new(SettingField {+ organization_override: None,+ json_path: Some("edit_predictions.button"),+ pick: |settings_content| {+ settings_content+ .project+ .all_languages+ .edit_predictions+ .as_ref()?+ .button+ .as_ref()+ },+ write: |settings_content, value, _| {+ settings_content+ .project+ .all_languages+ .edit_predictions+ .get_or_insert_default()+ .button = value;+ },+ }),+ metadata: None,+ files: USER,+ }),SettingsPageItem::SettingItem(SettingItem {title: "Project Search Button",description: "Show the project search button in the status bar.",diff --git a/docs/src/reference/all-settings.md b/docs/src/reference/all-settings.mdindex 22881530e6a..344b56f05b4 100644--- a/docs/src/reference/all-settings.md+++ b/docs/src/reference/all-settings.md@@ -938,6 +938,16 @@ Non-negative integer values representing milliseconds. Set this to `0` to disablSee [Configuring the Prediction Debounce](../ai/edit-prediction.md#configuring-the-prediction-debounce) for more information.+### Edit Prediction Button++- Description: Whether to show the edit prediction button in the status bar. Hiding the button does not disable edit predictions.+- Setting: `edit_predictions.button`+- Default: `true`++**Options**++`boolean` values+## Edit Predictions Disabled in- Setting: `edit_predictions_disabled_in`