Cmd+Enter keybinding for Send to Agent in code review #10295
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,7 +14,8 @@ use crate::notebooks::editor::view::{EditorViewEvent, RichTextEditorView}; | |
| use crate::send_telemetry_from_ctx; | ||
| use crate::settings::AISettings; | ||
| use crate::view_components::action_button::{ | ||
| ActionButton, ActionButtonTheme, ButtonSize, KeystrokeSource, NakedTheme, PrimaryTheme, | ||
| SecondaryTheme, | ||
| }; | ||
| use crate::{ | ||
| appearance::Appearance, code_review::code_review_view::CodeReviewView, | ||
|
|
@@ -49,8 +50,8 @@ use warpui::{ | |
| }, | ||
| platform::Cursor, | ||
| ui_components::{ | ||
| button::ButtonVariant, | ||
| components::UiComponent, | ||
| }, | ||
| units::Pixels, | ||
| AppContext, Entity, EntityId, ModelHandle, SingletonEntity, TypedActionView, View, ViewContext, | ||
|
|
@@ -131,7 +132,6 @@ struct ViewState { | |
| chevron_mouse_state: MouseStateHandle, | ||
| outdated_chevron_mouse_state: MouseStateHandle, | ||
| cancel_button_mouse_state: MouseStateHandle, | ||
| resizable_state: ResizableStateHandle, | ||
| } | ||
|
|
||
|
|
@@ -142,7 +142,6 @@ impl Default for ViewState { | |
| chevron_mouse_state: Default::default(), | ||
| outdated_chevron_mouse_state: Default::default(), | ||
| cancel_button_mouse_state: Default::default(), | ||
| resizable_state: resizable_state_handle(300.0), | ||
| } | ||
| } | ||
|
|
@@ -192,6 +191,7 @@ pub struct CommentListView { | |
| active_overflow_comment_id: Option<CommentId>, | ||
| pending_scroll_to_comment: Option<CommentId>, | ||
| comments_button: ViewHandle<ActionButton>, | ||
| send_button: ViewHandle<ActionButton>, | ||
| } | ||
|
|
||
| impl CommentListView { | ||
|
|
@@ -218,6 +218,22 @@ impl CommentListView { | |
| Event::ItemHovered => {} | ||
| }); | ||
|
|
||
| let send_button = ctx.add_typed_action_view(|ctx| { | ||
| ActionButton::new("Send to Agent", PrimaryTheme) | ||
| .with_keybinding( | ||
| KeystrokeSource::Binding("code_review:submit_comments"), | ||
| ctx, | ||
| ) | ||
| .on_click(|ctx| { | ||
| ctx.dispatch_typed_action(CommentListAction::Submit); | ||
| }) | ||
| .with_size(ButtonSize::Small) | ||
| }); | ||
|
|
||
| ctx.subscribe_to_model(&AIRequestUsageModel::handle(ctx), |me, _, _, ctx| { | ||
| me.update_send_button_state(ctx); | ||
| }); | ||
|
|
||
| Self { | ||
| parent, | ||
| comment_model: None, | ||
|
|
@@ -231,6 +247,7 @@ impl CommentListView { | |
| active_overflow_comment_id: None, | ||
| pending_scroll_to_comment: None, | ||
| comments_button, | ||
| send_button, | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -276,6 +293,7 @@ impl CommentListView { | |
| ) { | ||
| if self.review_destination != destination { | ||
| self.review_destination = destination; | ||
| self.update_send_button_state(ctx); | ||
| ctx.notify(); | ||
| } | ||
| } | ||
|
|
@@ -436,6 +454,7 @@ impl CommentListView { | |
| } | ||
|
|
||
| self.recompute_comment_button_label(ctx); | ||
| self.update_send_button_state(ctx); | ||
| ctx.notify(); | ||
| } | ||
|
|
||
|
|
@@ -550,6 +569,7 @@ impl CommentListView { | |
| self.comments_by_id.clear(); | ||
| self.is_collapsed = true; | ||
| self.pending_scroll_to_comment = None; | ||
| self.update_send_button_state(ctx); | ||
| ctx.notify(); | ||
| } | ||
|
|
||
|
|
@@ -929,16 +949,19 @@ impl CommentListView { | |
| } | ||
| } | ||
|
|
||
| fn render_send_button(&self, _appearance: &Appearance, _ctx: &AppContext) -> Box<dyn Element> { | ||
| ChildView::new(&self.send_button).finish() | ||
| } | ||
|
|
||
| fn update_send_button_state(&mut self, ctx: &mut ViewContext<Self>) { | ||
| let ai_available = AIRequestUsageModel::as_ref(ctx).has_any_ai_remaining(ctx); | ||
| let ai_enabled = AISettings::as_ref(ctx).is_any_ai_enabled(ctx); | ||
| let has_sendable_comments = self.has_non_outdated_comments(); | ||
|
|
||
| let enable_send = match &self.review_destination { | ||
| ReviewDestination::None => false, | ||
| ReviewDestination::Cli(_) => has_sendable_comments, | ||
| ReviewDestination::Warp => ai_available && ai_enabled && has_sendable_comments, | ||
| }; | ||
|
|
||
| let tooltip_text = Self::send_button_tooltip_text( | ||
|
|
@@ -948,47 +971,10 @@ impl CommentListView { | |
| ai_enabled, | ||
| ); | ||
|
|
||
| self.send_button.update(ctx, |button, ctx| { | ||
| button.set_disabled(!enable_send, ctx); | ||
| button.set_tooltip(Some(tooltip_text.into_owned()), ctx); | ||
| }); | ||
| } | ||
|
|
||
| fn render_comment( | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -78,6 +78,16 @@ pub fn init(app: &mut AppContext) { | |
| id!("CodeReviewView") & !id!("IMEOpen"), | ||
| )]); | ||
|
|
||
| app.register_editable_bindings([ | ||
| EditableBinding::new( | ||
| "code_review:submit_comments", | ||
| "Send review comments to Agent", | ||
| CodeReviewAction::SubmitComments, | ||
| ) | ||
| .with_context_predicate(id!("CodeReviewView")) | ||
| .with_key_binding("cmdorctrl-enter"), | ||
| ]); | ||
|
|
||
| diff_menu::init(app); | ||
| diff_selector::init(app); | ||
| git_dialog::init(app); | ||
|
|
@@ -145,7 +155,7 @@ fn is_file_autogenerated(file_path: &Path, content: Option<&str>) -> bool { | |
| /// A [`SingletonEntity`] that the tracks events for the code review model throughought the app. | ||
| /// We need this because toasts are emitted in the Workspace, and want a click handler that triggers | ||
| /// behavior in a _specific_ review pane. We use this model get around restrictions that make it hard | ||
| /// to emit a CodeReviewView typed action from the toast because it's not in the view reponder chain of the | ||
| /// Workspace. | ||
| pub struct GlobalCodeReviewModel; | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -363,12 +363,18 @@ pub fn init(app: &mut AppContext) { | |
| .with_key_binding("cmdorctrl-enter"), | ||
| ]); | ||
|
|
||
| // When shell command execution is disabled (e.g., inline comment editors), | ||
| // Cmd/Ctrl+Enter emits CmdEnter instead of running commands. | ||
| // The EditorIsEditable guard is required: without it, Selectable | ||
| // RichTextEditorViews (read-only comment cards, dormant CommentEditors) | ||
| // would match this binding and consume the keystroke before it can | ||
| // bubble up to CodeReviewView's SubmitComments handler. | ||
| app.register_fixed_bindings([FixedBinding::new( | ||
| "cmdorctrl-enter", | ||
| EditorViewAction::CmdEnter, | ||
| id!("RichTextEditorView") | ||
| & !id!("CanExecuteShellCommands") | ||
| & id!("EditorIsEditable"), | ||
| )]); | ||
|
|
||
| // When shell command execution is disabled (e.g., comment editors), | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is_pr_info_refreshinglets the primary button show Create PR while PR discovery is still in flight, so a branch with an existing PR can open the create dialog before refresh completes. Keep the refresh guard here and in the matching Create PR paths.