Conventional Commit Popup

Cargo.toml

@@ -52,6 +52,7 @@ serde = "1.0"
 shellexpand = "3.1"
 simplelog = { version = "0.12", default-features = false }
 struct-patch = "0.8"
+strum = "0.26.3"
 syntect = { version = "5.2", default-features = false, features = [
     "parsing",
     "default-syntaxes",
@@ -78,8 +79,9 @@ chrono = { version = "0.4", default-features = false, features = ["clock"] }
 maintenance = { status = "actively-developed" }
 
 [features]
-default = ["ghemoji", "regex-fancy", "trace-libgit", "vendor-openssl"]
+default = ["ghemoji", "regex-fancy", "trace-libgit", "vendor-openssl", "gitmoji"]
 ghemoji = ["gh-emoji"]
+gitmoji = []
 # regex-* features are mutually exclusive.
 regex-fancy = ["syntect/regex-fancy", "two-face/syntect-fancy"]
 regex-onig = ["syntect/regex-onig", "two-face/syntect-onig"]

src/app.rs

@@ -11,9 +11,9 @@ use crate::{
 	popup_stack::PopupStack,
 	popups::{
 		AppOption, BlameFilePopup, BranchListPopup, CommitPopup,
-		CompareCommitsPopup, ConfirmPopup, CreateBranchPopup,
-		CreateRemotePopup, ExternalEditorPopup, FetchPopup,
-		FileRevlogPopup, FuzzyFindPopup, HelpPopup,
+		CompareCommitsPopup, ConfirmPopup, ConventionalCommitPopup,
+		CreateBranchPopup, CreateRemotePopup, ExternalEditorPopup,
+		FetchPopup, FileRevlogPopup, FuzzyFindPopup, HelpPopup,
 		InspectCommitPopup, LogSearchPopupPopup, MsgPopup,
 		OptionsPopup, PullPopup, PushPopup, PushTagsPopup,
 		RemoteListPopup, RenameBranchPopup, RenameRemotePopup,
@@ -93,6 +93,7 @@ pub struct App {
 	update_remote_url_popup: UpdateRemoteUrlPopup,
 	remotes_popup: RemoteListPopup,
 	rename_branch_popup: RenameBranchPopup,
+	conventional_commit_popup: ConventionalCommitPopup,
 	select_branch_popup: BranchListPopup,
 	options_popup: OptionsPopup,
 	submodule_popup: SubmodulesListPopup,
@@ -200,6 +201,9 @@ impl App {
 			update_remote_url_popup: UpdateRemoteUrlPopup::new(&env),
 			remotes_popup: RemoteListPopup::new(&env),
 			rename_branch_popup: RenameBranchPopup::new(&env),
+			conventional_commit_popup: ConventionalCommitPopup::new(
+				&env,
+			),
 			select_branch_popup: BranchListPopup::new(&env),
 			tags_popup: TagListPopup::new(&env),
 			options_popup: OptionsPopup::new(&env),
@@ -481,6 +485,7 @@ impl App {
 			msg_popup,
 			confirm_popup,
 			commit_popup,
+			conventional_commit_popup,
 			blame_file_popup,
 			file_revlog_popup,
 			stashmsg_popup,
@@ -520,6 +525,7 @@ impl App {
 			stashmsg_popup,
 			help_popup,
 			inspect_commit_popup,
+			conventional_commit_popup,
 			compare_commits_popup,
 			blame_file_popup,
 			file_revlog_popup,
@@ -738,6 +744,12 @@ impl App {
 			}
 			InternalEvent::Update(u) => flags.insert(u),
 			InternalEvent::OpenCommit => self.commit_popup.show()?,
+			InternalEvent::AddCommitMessage(s) => {
+				self.commit_popup.set_msg(s);
+			}
+			InternalEvent::OpenConventionalCommit => {
+				self.conventional_commit_popup.show()?;
+			}
 			InternalEvent::RewordCommit(id) => {
 				self.commit_popup.open(Some(id))?;
 			}

src/components/textinput.rs

@@ -79,6 +79,12 @@ impl TextInputComponent {
 		}
 	}
 
+	pub fn move_cursor_to_end(&mut self) {
+		if let Some(ta) = &mut self.textarea {
+			ta.move_cursor(CursorMove::End);
+		}
+	}
+
 	///
 	pub const fn with_input_type(
 		mut self,

src/keys/key_list.rs

@@ -49,7 +49,9 @@ pub struct KeysList {
 	pub quit: GituiKeyEvent,
 	pub exit_popup: GituiKeyEvent,
 	pub open_commit: GituiKeyEvent,
+	pub open_conventional_commit: GituiKeyEvent,
 	pub open_commit_editor: GituiKeyEvent,
+	pub breaking: GituiKeyEvent,
 	pub open_help: GituiKeyEvent,
 	pub open_options: GituiKeyEvent,
 	pub move_left: GituiKeyEvent,
@@ -128,6 +130,7 @@ pub struct KeysList {
 	pub commit_history_next: GituiKeyEvent,
 	pub commit: GituiKeyEvent,
 	pub newline: GituiKeyEvent,
+	pub insert: GituiKeyEvent,
 }
 
 #[rustfmt::skip]
@@ -146,7 +149,9 @@ impl Default for KeysList {
 			quit: GituiKeyEvent::new(KeyCode::Char('q'),  KeyModifiers::empty()),
 			exit_popup: GituiKeyEvent::new(KeyCode::Esc,  KeyModifiers::empty()),
 			open_commit: GituiKeyEvent::new(KeyCode::Char('c'),  KeyModifiers::empty()),
+			open_conventional_commit: GituiKeyEvent::new(KeyCode::Char('C'),  KeyModifiers::SHIFT),
 			open_commit_editor: GituiKeyEvent::new(KeyCode::Char('e'), KeyModifiers::CONTROL),
+            breaking: GituiKeyEvent::new(KeyCode::Char('b'),  KeyModifiers::empty()),
 			open_help: GituiKeyEvent::new(KeyCode::Char('h'),  KeyModifiers::empty()),
 			open_options: GituiKeyEvent::new(KeyCode::Char('o'),  KeyModifiers::empty()),
 			move_left: GituiKeyEvent::new(KeyCode::Left,  KeyModifiers::empty()),
@@ -175,6 +180,7 @@ impl Default for KeysList {
 			stashing_save: GituiKeyEvent::new(KeyCode::Char('s'),  KeyModifiers::empty()),
 			stashing_toggle_untracked: GituiKeyEvent::new(KeyCode::Char('u'),  KeyModifiers::empty()),
 			stashing_toggle_index: GituiKeyEvent::new(KeyCode::Char('i'),  KeyModifiers::empty()),
+			insert: GituiKeyEvent::new(KeyCode::Char('i'),  KeyModifiers::empty()),
 			stash_apply: GituiKeyEvent::new(KeyCode::Char('a'),  KeyModifiers::empty()),
 			stash_open: GituiKeyEvent::new(KeyCode::Right,  KeyModifiers::empty()),
 			stash_drop: GituiKeyEvent::new(KeyCode::Char('D'),  KeyModifiers::SHIFT),

src/popups/commit.rs

@@ -90,6 +90,11 @@ impl CommitPopup {
 		}
 	}
 
+	pub fn set_msg(&mut self, msg: String) {
+		self.input.set_text(msg);
+		self.input.move_cursor_to_end();
+	}
+
 	///
 	pub fn update(&mut self) {
 		self.git_branch_name.lookup().ok();