Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make suggested commits placeholders and allow them to be committed (#26006)

Browse source 
This does not fix the bug where, when the commit editor modal is open,
changing the staged file does not update the suggested message in the
commit editor. Conrad mentioned he thought we shouldn't be allowed to
change those when the modal is open, so I'm not attempting to fix that.

Release Notes:

- Made suggested commits placeholders and allow them to be committed.
This commit is contained in:
Joseph T. Lyons 2025-03-04 02:01:52 -05:00 • committed by GitHub
parent 563baf682e
commit 33af6bce55
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 29 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/git_ui/src/commit_modal.rs
View file

@ -163,7 +163,7 @@ impl CommitModal {
cx: &mut Context<Self>,
) -> Self {
let panel = git_panel.read(cx);
let suggested_message = panel.suggest_commit_message();
let suggested_commit_message = panel.suggest_commit_message();
let commit_editor = git_panel.update(cx, |git_panel, cx| {
git_panel.set_modal_open(true, cx);
@ -174,19 +174,11 @@ impl CommitModal {
let commit_message = commit_editor.read(cx).text(cx);
if let Some(suggested_message) = suggested_message {
if let Some(suggested_commit_message) = suggested_commit_message {
if commit_message.is_empty() {
commit_editor.update(cx, |editor, cx| {
editor.set_text(suggested_message, window, cx);
editor.select_all(&Default::default(), window, cx);
editor.set_placeholder_text(suggested_commit_message, cx);
});
} else {
if commit_message.as_str().trim() == suggested_message.trim() {
commit_editor.update(cx, |editor, cx| {
// select the message to make it easy to delete
editor.select_all(&Default::default(), window, cx);
});
}
}
}

35
crates/git_ui/src/git_panel.rs
View file

@ -1173,6 +1173,18 @@ impl GitPanel {
}
}
fn custom_or_suggested_commit_message(&self, cx: &mut Context<Self>) -> Option<String> {
let message = self.commit_editor.read(cx).text(cx);
if !message.is_empty() {
return Some(message);
}
self.suggested_commit_message
.clone()
.filter(|message| !message.is_empty())
}
pub(crate) fn commit_changes(&mut self, window: &mut Window, cx: &mut Context<Self>) {
let Some(active_repository) = self.active_repository.clone() else {
return;
@ -1194,11 +1206,13 @@ impl GitPanel {
return;
}
let mut message = self.commit_editor.read(cx).text(cx);
if message.trim().is_empty() {
let commit_message = self.custom_or_suggested_commit_message(cx);
let Some(mut message) = commit_message else {
self.commit_editor.read(cx).focus_handle(cx).focus(window);
return;
}
};
if self.add_coauthors {
self.fill_co_authors(&mut message, cx);
}
@ -1329,7 +1343,7 @@ impl GitPanel {
Some("Update")
} else {
None
};
}?;
let file_name = git_status_entry
.repo_path
@ -1337,17 +1351,18 @@ impl GitPanel {
.unwrap_or_default()
.to_string_lossy();
Some(format!("{} {}", action_text?, file_name))
Some(format!("{} {}", action_text, file_name))
}
fn update_editor_placeholder(&mut self, cx: &mut Context<Self>) {
let suggested_commit_message = self.suggest_commit_message();
let suggested_commit_message = suggested_commit_message
self.suggested_commit_message = self.suggest_commit_message();
let placeholder_text = self
.suggested_commit_message
.as_deref()
.unwrap_or("Enter commit message");
self.commit_editor.update(cx, |editor, cx| {
editor.set_placeholder_text(Arc::from(suggested_commit_message), cx)
editor.set_placeholder_text(Arc::from(placeholder_text), cx)
});
cx.notify();
@ -1973,7 +1988,9 @@ impl GitPanel {
)
} else if self.pending_commit.is_some() {
(false, "Commit in progress")
} else if self.commit_editor.read(cx).is_empty(cx) {
} else if self.suggested_commit_message.is_none()
&& self.commit_editor.read(cx).is_empty(cx)
{
(false, "No commit message")
} else if !self.has_write_access(cx) {
(false, "You do not have write access to this project")