Danilo Leal , Bennet Bo Fenner , and Bennet Bo Fenner created
This PR allows expanding the message editor textarea to fit almost the
total height of the Agent Panel. Stylistically, I'm also changing the
font family we use in the textarea to use the buffer font; want to
experiment with this for a bit.
Release Notes:
- agent: The Agent Panel textarea can now be expanded to fill almost the
total height of the panel.
---------
Co-authored-by: Bennet Bo Fenner <bennet@zed.dev>
Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>assets/keymaps/default-linux.json | 1
assets/keymaps/default-macos.json | 1
crates/agent/src/assistant.rs | 1
crates/agent/src/assistant_panel.rs | 1
crates/agent/src/context_picker.rs | 3
crates/agent/src/message_editor.rs | 130 +++++++++++++++++++++++++-----
crates/editor/src/editor.rs | 20 +++
crates/editor/src/element.rs | 16 +++
8 files changed, 142 insertions(+), 31 deletions(-)
@@ -631,6 +631,7 @@
"ctrl-i": "agent::ToggleProfileSelector",
"ctrl-alt-/": "assistant::ToggleModelSelector",
"ctrl-shift-a": "agent::ToggleContextPicker",
+ "shift-escape": "agent::ExpandMessageEditor",
"ctrl-e": "agent::ChatMode",
"ctrl-alt-e": "agent::RemoveAllContext"
}
@@ -287,6 +287,7 @@
"cmd-i": "agent::ToggleProfileSelector",
"cmd-alt-/": "assistant::ToggleModelSelector",
"cmd-shift-a": "agent::ToggleContextPicker",
+ "shift-escape": "agent::ExpandMessageEditor",
"cmd-e": "agent::ChatMode",
"cmd-alt-e": "agent::RemoveAllContext"
}
@@ -50,6 +50,7 @@ actions!(
ToggleContextPicker,
ToggleProfileSelector,
RemoveAllContext,
+ ExpandMessageEditor,
OpenHistory,
AddContextServer,
RemoveSelectedThread,
@@ -1298,6 +1298,7 @@ impl AssistantPanel {
let configuration_error_ref = &configuration_error;
parent
+ .overflow_hidden()
.p_1p5()
.justify_end()
.gap_1()
@@ -606,12 +606,13 @@ fn render_fold_icon_button(
.gap_1()
.child(
Icon::from_path(icon_path.clone())
- .size(IconSize::Small)
+ .size(IconSize::XSmall)
.color(Color::Muted),
)
.child(
Label::new(label.clone())
.size(LabelSize::Small)
+ .buffer_font(cx)
.single_line(),
),
)
@@ -4,7 +4,8 @@ use crate::assistant_model_selector::ModelType;
use collections::HashSet;
use editor::actions::MoveUp;
use editor::{
- ContextMenuOptions, ContextMenuPlacement, Editor, EditorElement, EditorStyle, MultiBuffer,
+ ContextMenuOptions, ContextMenuPlacement, Editor, EditorElement, EditorMode, EditorStyle,
+ MultiBuffer,
};
use file_icons::FileIcons;
use fs::Fs;
@@ -32,8 +33,8 @@ use crate::profile_selector::ProfileSelector;
use crate::thread::{RequestKind, Thread, TokenUsageRatio};
use crate::thread_store::ThreadStore;
use crate::{
- AgentDiff, Chat, ChatMode, NewThread, OpenAgentDiff, RemoveAllContext, ToggleContextPicker,
- ToggleProfileSelector,
+ AgentDiff, Chat, ChatMode, ExpandMessageEditor, NewThread, OpenAgentDiff, RemoveAllContext,
+ ToggleContextPicker, ToggleProfileSelector,
};
pub struct MessageEditor {
@@ -50,10 +51,13 @@ pub struct MessageEditor {
model_selector: Entity<AssistantModelSelector>,
profile_selector: Entity<ProfileSelector>,
edits_expanded: bool,
+ editor_is_expanded: bool,
waiting_for_summaries_to_send: bool,
_subscriptions: Vec<Subscription>,
}
+const MAX_EDITOR_LINES: usize = 10;
+
impl MessageEditor {
pub fn new(
fs: Arc<dyn Fs>,
@@ -80,7 +84,9 @@ impl MessageEditor {
let buffer = cx.new(|cx| Buffer::local("", cx).with_language(Arc::new(language), cx));
let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
let mut editor = Editor::new(
- editor::EditorMode::AutoHeight { max_lines: 10 },
+ editor::EditorMode::AutoHeight {
+ max_lines: MAX_EDITOR_LINES,
+ },
buffer,
None,
window,
@@ -159,6 +165,7 @@ impl MessageEditor {
)
}),
edits_expanded: false,
+ editor_is_expanded: false,
waiting_for_summaries_to_send: false,
profile_selector: cx
.new(|cx| ProfileSelector::new(fs, thread_store, editor.focus_handle(cx), cx)),
@@ -170,6 +177,32 @@ impl MessageEditor {
cx.notify();
}
+ fn expand_message_editor(
+ &mut self,
+ _: &ExpandMessageEditor,
+ _window: &mut Window,
+ cx: &mut Context<Self>,
+ ) {
+ self.set_editor_is_expanded(!self.editor_is_expanded, cx);
+ }
+
+ fn set_editor_is_expanded(&mut self, is_expanded: bool, cx: &mut Context<Self>) {
+ self.editor_is_expanded = is_expanded;
+ self.editor.update(cx, |editor, _| {
+ if self.editor_is_expanded {
+ editor.set_mode(EditorMode::Full {
+ scale_ui_elements_with_buffer_font_size: false,
+ show_active_line_background: false,
+ })
+ } else {
+ editor.set_mode(EditorMode::AutoHeight {
+ max_lines: MAX_EDITOR_LINES,
+ })
+ }
+ });
+ cx.notify();
+ }
+
fn toggle_context_picker(
&mut self,
_: &ToggleContextPicker,
@@ -197,7 +230,10 @@ impl MessageEditor {
return;
}
+ self.set_editor_is_expanded(false, cx);
self.send_to_model(RequestKind::Chat, window, cx);
+
+ cx.notify();
}
fn is_editor_empty(&self, cx: &App) -> bool {
@@ -345,12 +381,20 @@ impl Focusable for MessageEditor {
impl Render for MessageEditor {
fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
- let font_size = TextSize::Default.rems(cx);
+ let font_size = TextSize::Small.rems(cx);
let line_height = font_size.to_pixels(window.rem_size()) * 1.5;
let focus_handle = self.editor.focus_handle(cx);
+ let focus_handle_clone = focus_handle.clone();
let inline_context_picker = self.inline_context_picker.clone();
+ let is_editor_expanded = self.editor_is_expanded;
+ let expand_icon = if is_editor_expanded {
+ IconName::Minimize
+ } else {
+ IconName::Maximize
+ };
+
let thread = self.thread.read(cx);
let is_generating = thread.is_generating();
let total_token_usage = thread.total_token_usage(cx);
@@ -657,24 +701,56 @@ impl Render for MessageEditor {
.on_action(cx.listener(Self::remove_all_context))
.on_action(cx.listener(Self::move_up))
.on_action(cx.listener(Self::toggle_chat_mode))
+ .on_action(cx.listener(Self::expand_message_editor))
.gap_2()
.p_2()
.bg(editor_bg_color)
.border_t_1()
.border_color(cx.theme().colors().border)
- .child(h_flex().justify_between().child(self.context_strip.clone()))
+ .child(
+ h_flex()
+ .items_start()
+ .justify_between()
+ .child(self.context_strip.clone())
+ .child(
+ IconButton::new("toggle-height", expand_icon)
+ .icon_size(IconSize::XSmall)
+ .icon_color(Color::Muted)
+ .tooltip(move |window, cx| {
+ let focus_handle = focus_handle.clone();
+ let expand_label = if is_editor_expanded {
+ "Minimize Message Editor".to_string()
+ } else {
+ "Expand Message Editor".to_string()
+ };
+
+ Tooltip::for_action_in(
+ expand_label,
+ &ExpandMessageEditor,
+ &focus_handle,
+ window,
+ cx,
+ )
+ })
+ .on_click(cx.listener(|_, _, window, cx| {
+ window.dispatch_action(Box::new(ExpandMessageEditor), cx);
+ }))
+ )
+ )
.child(
v_flex()
- .gap_5()
- .child({
+ .size_full()
+ .gap_4()
+ .when(is_editor_expanded, |this| this.h(vh(0.8, window)).justify_between())
+ .child(div().when(is_editor_expanded, |this| this.h_full()).child({
let settings = ThemeSettings::get_global(cx);
+
let text_style = TextStyle {
color: cx.theme().colors().text,
- font_family: settings.ui_font.family.clone(),
- font_fallbacks: settings.ui_font.fallbacks.clone(),
- font_features: settings.ui_font.features.clone(),
+ font_family: settings.buffer_font.family.clone(),
+ font_fallbacks: settings.buffer_font.fallbacks.clone(),
+ font_features: settings.buffer_font.features.clone(),
font_size: font_size.into(),
- font_weight: settings.ui_font.weight,
line_height: line_height.into(),
..Default::default()
};
@@ -689,7 +765,7 @@ impl Render for MessageEditor {
..Default::default()
},
).into_any()
- })
+ }))
.child(
PopoverMenu::new("inline-context-picker")
.menu(move |window, cx| {
@@ -709,11 +785,13 @@ impl Render for MessageEditor {
)
.child(
h_flex()
+ .flex_none()
.justify_between()
.child(h_flex().gap_2().child(self.profile_selector.clone()))
.child(
- h_flex().gap_1().child(self.model_selector.clone())
- .map(|parent| {
+ h_flex().gap_1()
+ .child(self.model_selector.clone())
+ .map(move |parent| {
if is_generating {
parent.child(
IconButton::new("stop-generation", IconName::StopFilled)
@@ -727,12 +805,15 @@ impl Render for MessageEditor {
cx,
)
})
- .on_click(move |_event, window, cx| {
- focus_handle.dispatch_action(
- &editor::actions::Cancel,
- window,
- cx,
- );
+ .on_click({
+ let focus_handle = focus_handle_clone.clone();
+ move |_event, window, cx| {
+ focus_handle.dispatch_action(
+ &editor::actions::Cancel,
+ window,
+ cx,
+ );
+ }
})
.with_animation(
"pulsating-label",
@@ -752,8 +833,11 @@ impl Render for MessageEditor {
|| !is_model_selected
|| self.waiting_for_summaries_to_send
)
- .on_click(move |_event, window, cx| {
- focus_handle.dispatch_action(&Chat, window, cx);
+ .on_click({
+ let focus_handle = focus_handle_clone.clone();
+ move |_event, window, cx| {
+ focus_handle.dispatch_action(&Chat, window, cx);
+ }
})
.when(!is_editor_empty && is_model_selected, |button| {
button.tooltip(move |window, cx| {
@@ -396,14 +396,26 @@ pub enum SelectMode {
#[derive(Copy, Clone, PartialEq, Eq, Debug)]
pub enum EditorMode {
- SingleLine { auto_width: bool },
- AutoHeight { max_lines: usize },
- Full,
+ SingleLine {
+ auto_width: bool,
+ },
+ AutoHeight {
+ max_lines: usize,
+ },
+ Full {
+ /// When set to `true`, the editor will scale its UI elements with the buffer font size.
+ scale_ui_elements_with_buffer_font_size: bool,
+ /// When set to `true`, the editor will render a background for the active line.
+ show_active_line_background: bool,
+ },
}
impl EditorMode {
pub fn full() -> Self {
- Self::Full
+ Self::Full {
+ scale_ui_elements_with_buffer_font_size: true,
+ show_active_line_background: true,
+ }
}
pub fn is_full(&self) -> bool {
@@ -4176,7 +4176,11 @@ impl EditorElement {
self.style.background,
));
- if let EditorMode::Full { .. } = layout.mode {
+ if let EditorMode::Full {
+ show_active_line_background,
+ ..
+ } = layout.mode
+ {
let mut active_rows = layout.active_rows.iter().peekable();
while let Some((start_row, contains_non_empty_selection)) = active_rows.next() {
let mut end_row = start_row.0;
@@ -4191,7 +4195,7 @@ impl EditorElement {
end_row += 1;
}
- if !contains_non_empty_selection.selection {
+ if show_active_line_background && !contains_non_empty_selection.selection {
let highlight_h_range =
match layout.position_map.snapshot.current_line_highlight {
CurrentLineHighlight::Gutter => Some(Range {
@@ -6414,7 +6418,13 @@ impl EditorElement {
/// This allows UI elements to scale based on the `buffer_font_size`.
fn rem_size(&self, cx: &mut App) -> Option<Pixels> {
match self.editor.read(cx).mode {
- EditorMode::Full { .. } => {
+ EditorMode::Full {
+ scale_ui_elements_with_buffer_font_size,
+ ..
+ } => {
+ if !scale_ui_elements_with_buffer_font_size {
+ return None;
+ }
let buffer_font_size = self.style.text.font_size;
match buffer_font_size {
AbsoluteLength::Pixels(pixels) => {