Adding a marker/color for staged/typechanged files. Adding a match arm for these Statuses in the Git status module. Updating the preview module to include these settings

Author: JosephLai241

nomad.toml

@@ -100,12 +100,14 @@
 #deleted_marker = "D"
 #modified_marker = "M"
 #renamed_marker = "R"
+#typechanged_marker = "TC"
 #untracked_marker = "U"
 
 #staged_added_marker = "SA"
 #staged_deleted_marker = "SD"
 #staged_modified_marker = "SM"
 #staged_renamed_marker = "SR"
+#staged_typechanged_marker = "STC"
 
 
 #
@@ -127,12 +129,14 @@
 #deleted_color = "red"
 #modified_color = "d78700"          # A shade of orange.
 #renamed_color = "red"
+#typechanged_color = "purple"
 #untracked_color = "767676"         # A shade of gray.
 
 #staged_added_color = "green"
 #staged_deleted_color = "red"
 #staged_modified_color = "d78700"   # A shade of orange.
 #staged_renamed_color = "red"
+#staged_typechanged_color = "purple"
 
 
 #

src/config/models.rs

@@ -130,6 +130,10 @@ pub struct Markers {
     pub staged_modified_marker: Option<String>,
     /// The string that marks a staged renamed file.
     pub staged_renamed_marker: Option<String>,
+    /// The string that marks a staged typechanged file.
+    pub staged_typechanged_marker: Option<String>,
+    /// The string that marks a typechanged file.
+    pub typechanged_marker: Option<String>,
     /// The string that marks an untracked file.
     pub untracked_marker: Option<String>,
 }
@@ -153,6 +157,10 @@ pub struct Colors {
     pub staged_modified_color: Option<String>,
     /// The color associated with staged renamed files.
     pub staged_renamed_color: Option<String>,
+    /// The color associated with staged typechanged files.
+    pub staged_typechanged_color: Option<String>,
+    /// The color associated with typechanged files.
+    pub typechanged_marker: Option<String>,
     /// The color associated with untracked files.
     pub untracked_color: Option<String>,
 }

src/config/preview.rs

@@ -57,6 +57,13 @@ pub fn display_preview_tree(nomad_style: &NomadStyle) -> Result<(), NomadError>
             .renamed_color
             .paint(nomad_style.git.renamed_marker.to_string())
     ));
+    tree.add_empty_child(format!(
+        "{} \u{f17a} typechanged file", // ""
+        nomad_style
+            .git
+            .typechanged_color
+            .paint(nomad_style.git.typechanged_marker.to_string())
+    ));
 
     // Staged (index) Git changes.
     tree.add_empty_child(format!(
@@ -104,6 +111,17 @@ pub fn display_preview_tree(nomad_style: &NomadStyle) -> Result<(), NomadError>
             .staged_renamed_color
             .paint("staged renamed file")
     ));
+    tree.add_empty_child(format!(
+        "{} \u{f17a} {}", // ""
+        nomad_style
+            .git
+            .staged_typechanged_color
+            .paint(nomad_style.git.staged_typechanged_marker.to_string()),
+        nomad_style
+            .git
+            .staged_typechanged_color
+            .paint("staged typechanged file")
+    ));
 
     // Last working directory Git change.
     tree.add_empty_child(format!(

src/git/markers.rs

@@ -92,6 +92,17 @@ pub fn get_status_markers(
                             .to_string()
                     }
                 }
+                s if s.contains(Status::INDEX_TYPECHANGE) => {
+                    if args.no_colors {
+                        nomad_style.git.staged_typechanged_marker.clone()
+                    } else {
+                        nomad_style
+                            .git
+                            .staged_typechanged_color
+                            .paint(&nomad_style.git.staged_typechanged_marker)
+                            .to_string()
+                    }
+                }
                 s if s.contains(Status::WT_DELETED) => {
                     if args.no_colors {
                         nomad_style.git.deleted_marker.clone()
@@ -136,6 +147,17 @@ pub fn get_status_markers(
                             .to_string()
                     }
                 }
+                s if s.contains(Status::WT_TYPECHANGE) => {
+                    if args.no_colors {
+                        nomad_style.git.typechanged_marker.clone()
+                    } else {
+                        nomad_style
+                            .git
+                            .typechanged_color
+                            .paint(&nomad_style.git.typechanged_marker)
+                            .to_string()
+                    }
+                }
                 s if s.contains(Status::CONFLICTED) => {
                     if args.no_colors {
                         nomad_style.git.conflicted_marker.clone()

src/style/models.rs

@@ -50,6 +50,14 @@ pub struct GitStyle {
     pub staged_renamed_color: Style,
     /// The string that marks a staged renamed file.
     pub staged_renamed_marker: String,
+    /// The color that marks a staged typechanged file.
+    pub staged_typechanged_color: Style,
+    /// The string that marks a staged typechanged file.
+    pub staged_typechanged_marker: String,
+    /// The color that marks a typechanged file.
+    pub typechanged_color: Style,
+    /// The string that marks a typechanged file.
+    pub typechanged_marker: String,
     /// The color of the untracked file's marker.
     pub untracked_color: Style,
     /// The string that marks an untracked file.
@@ -175,6 +183,10 @@ impl Default for NomadStyle {
                 staged_modified_marker: "SM".to_string(),
                 staged_renamed_color: Colour::Fixed(172).bold(),
                 staged_renamed_marker: "SR".to_string(),
+                staged_typechanged_color: Colour::Purple.bold(),
+                staged_typechanged_marker: "STC".to_string(),
+                typechanged_color: Colour::Purple.bold(),
+                typechanged_marker: "TC".to_string(),
                 untracked_color: Colour::Fixed(243).bold(),
                 untracked_marker: "U".to_string(),
             },