compiles

Author: tkr-sh

Cargo.lock

@@ -51,6 +51,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",

Cargo.toml

@@ -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),
@@ -458,6 +462,7 @@ impl App {
 			|| self.fetch_popup.any_work_pending()
 			|| self.revision_files_popup.any_work_pending()
 			|| self.tags_popup.any_work_pending()
+			|| self.conventional_commit_popup.any_work_pending()
 	}
 
 	///
@@ -481,6 +486,7 @@ impl App {
 			msg_popup,
 			confirm_popup,
 			commit_popup,
+			conventional_commit_popup,
 			blame_file_popup,
 			file_revlog_popup,
 			stashmsg_popup,
@@ -520,6 +526,7 @@ impl App {
 			stashmsg_popup,
 			help_popup,
 			inspect_commit_popup,
+			conventional_commit_popup,
 			compare_commits_popup,
 			blame_file_popup,
 			file_revlog_popup,
@@ -738,6 +745,9 @@ impl App {
 			}
 			InternalEvent::Update(u) => flags.insert(u),
 			InternalEvent::OpenCommit => self.commit_popup.show()?,
+			InternalEvent::OpenConventionalCommit => {
+				self.conventional_commit_popup.show()?
+			}
 			InternalEvent::RewordCommit(id) => {
 				self.commit_popup.open(Some(id))?;
 			}

src/app.rs

@@ -49,6 +49,7 @@ 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 open_help: GituiKeyEvent,
 	pub open_options: GituiKeyEvent,
@@ -128,6 +129,7 @@ pub struct KeysList {
 	pub commit_history_next: GituiKeyEvent,
 	pub commit: GituiKeyEvent,
 	pub newline: GituiKeyEvent,
+	pub insert: GituiKeyEvent,
 }
 
 #[rustfmt::skip]
@@ -146,6 +148,7 @@ 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::empty()),
 			open_commit_editor: GituiKeyEvent::new(KeyCode::Char('e'), KeyModifiers::CONTROL),
 			open_help: GituiKeyEvent::new(KeyCode::Char('h'),  KeyModifiers::empty()),
 			open_options: GituiKeyEvent::new(KeyCode::Char('o'),  KeyModifiers::empty()),
@@ -175,6 +178,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),