diff --git a/assets/settings/default.json b/assets/settings/default.json index 5aa605644a0a22e5496a42d064771e3c75047e0e..21d90f17dd89e59c58074d4b4b1d710be578957a 100644 --- a/assets/settings/default.json +++ b/assets/settings/default.json @@ -840,11 +840,11 @@ ], // When to show edit predictions previews in buffer. // This setting takes two possible values: - // 1. Display inline when there are no language server completions available. - // "mode": "eager_preview" - // 2. Display inline when holding modifier key (alt by default). - // "mode": "auto" - "mode": "eager_preview" + // 1. Display predictions inline when there are no language server completions available. + // "mode": "eager" + // 2. Display predictions inline only when holding a modifier key (alt by default). + // "mode": "subtle" + "mode": "eager" }, // Settings specific to journaling "journal": { diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs index 5d6f138a656a264588fed84d11862a2b155889e5..8f9ea78e0618699b45b6772d0d2fcc85486882bd 100644 --- a/crates/editor/src/editor.rs +++ b/crates/editor/src/editor.rs @@ -4959,7 +4959,7 @@ impl Editor { }); let preview_requires_modifier = - all_language_settings(file, cx).edit_predictions_mode() == EditPredictionsMode::Auto; + all_language_settings(file, cx).edit_predictions_mode() == EditPredictionsMode::Subtle; EditPredictionSettings::Enabled { show_in_menu, diff --git a/crates/inline_completion_button/src/inline_completion_button.rs b/crates/inline_completion_button/src/inline_completion_button.rs index 5458aed7f1b9f274753f2468e8687faeb33c6148..2ba279b8da48bbb17a3a085790dd5f0c8d12feb5 100644 --- a/crates/inline_completion_button/src/inline_completion_button.rs +++ b/crates/inline_completion_button/src/inline_completion_button.rs @@ -592,8 +592,8 @@ impl InlineCompletionButton { if cx.has_flag::() { let is_eager_preview_enabled = match settings.edit_predictions_mode() { - language::EditPredictionsMode::Auto => false, - language::EditPredictionsMode::EagerPreview => true, + language::EditPredictionsMode::Subtle => false, + language::EditPredictionsMode::Eager => true, }; menu = menu.separator().toggleable_entry( "Eager Preview Mode", @@ -608,8 +608,8 @@ impl InlineCompletionButton { cx, move |settings, _cx| { let new_mode = match is_eager_preview_enabled { - true => language::EditPredictionsMode::Auto, - false => language::EditPredictionsMode::EagerPreview, + true => language::EditPredictionsMode::Subtle, + false => language::EditPredictionsMode::Eager, }; if let Some(edit_predictions) = settings.edit_predictions.as_mut() { diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs index 58ede4e4bc2a16c0885e3fa5f20dbf61da1e7f39..ae68ff8f452c4358f5167ab01ea38ac5aa0d7220 100644 --- a/crates/language/src/language_settings.rs +++ b/crates/language/src/language_settings.rs @@ -244,10 +244,11 @@ pub struct EditPredictionSettings { pub enum EditPredictionsMode { /// If provider supports it, display inline when holding modifier key (e.g., alt). /// Otherwise, eager preview is used. - Auto, + Subtle, /// Display inline when there are no language server completions available. #[default] - EagerPreview, + #[serde(alias = "eager_preview")] + Eager, } #[derive(Clone, Debug, Default)]