agent_ui: Fix mention and slash command menu not appearing with show_completions_on_input set to false (#44222)
Addresses a regression introduced by https://github.com/zed-industries/zed/pull/44021 that caused @mentions and slash commands to stop working if you set `show_completions_on_input: false` in your settings. In this case, we should always show these menus, otherwise the features won't work at all. Release Notes: - N/A
This commit is contained in:
@@ -124,6 +124,7 @@ impl MessageEditor {
|
||||
let mut editor = Editor::new(mode, buffer, None, window, cx);
|
||||
editor.set_placeholder_text(placeholder, window, cx);
|
||||
editor.set_show_indent_guides(false, cx);
|
||||
editor.set_show_completions_on_input(Some(true));
|
||||
editor.set_soft_wrap();
|
||||
editor.set_use_modal_editing(true);
|
||||
editor.set_context_menu_options(ContextMenuOptions {
|
||||
|
||||
@@ -1128,6 +1128,7 @@ pub struct Editor {
|
||||
edit_prediction_settings: EditPredictionSettings,
|
||||
edit_predictions_hidden_for_vim_mode: bool,
|
||||
show_edit_predictions_override: Option<bool>,
|
||||
show_completions_on_input_override: Option<bool>,
|
||||
menu_edit_predictions_policy: MenuEditPredictionsPolicy,
|
||||
edit_prediction_preview: EditPredictionPreview,
|
||||
edit_prediction_indent_conflict: bool,
|
||||
@@ -2275,6 +2276,7 @@ impl Editor {
|
||||
editor_actions: Rc::default(),
|
||||
edit_predictions_hidden_for_vim_mode: false,
|
||||
show_edit_predictions_override: None,
|
||||
show_completions_on_input_override: None,
|
||||
menu_edit_predictions_policy: MenuEditPredictionsPolicy::ByProvider,
|
||||
edit_prediction_settings: EditPredictionSettings::Disabled,
|
||||
edit_prediction_indent_conflict: false,
|
||||
@@ -3157,6 +3159,10 @@ impl Editor {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn set_show_completions_on_input(&mut self, show_completions_on_input: Option<bool>) {
|
||||
self.show_completions_on_input_override = show_completions_on_input;
|
||||
}
|
||||
|
||||
pub fn set_show_edit_predictions(
|
||||
&mut self,
|
||||
show_edit_predictions: Option<bool>,
|
||||
@@ -5533,7 +5539,10 @@ impl Editor {
|
||||
let language_settings = language_settings(language.clone(), buffer_snapshot.file(), cx);
|
||||
let completion_settings = language_settings.completions.clone();
|
||||
|
||||
if !menu_is_open && trigger.is_some() && !language_settings.show_completions_on_input {
|
||||
let show_completions_on_input = self
|
||||
.show_completions_on_input_override
|
||||
.unwrap_or(language_settings.show_completions_on_input);
|
||||
if !menu_is_open && trigger.is_some() && !show_completions_on_input {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user