Simplify LastIndex, only requires checked fn for rest to work.

Author: nullstalgia

src/app.rs

@@ -1321,7 +1321,7 @@ impl App {
 
             Some(PopupMenu::Macros) => {
                 if self.popup_table_state.selected()
-                    >= Some(self.macros.visible_len().saturating_sub(1))
+                    >= self.macros.last_index_checked()
                 {
                     self.popup_table_state.select(None);
                     self.popup_single_line_state.active = true;

src/keybinds.rs

@@ -50,6 +50,7 @@ ctrl-d = "toggle-indices"
 ctrl-f = "reload-colors"
 F20 = "esp-hard-reset"
 F21 = "esp-bootloader"
+shift-F21 = "esp-bootloader-unchecked"
 ctrl-z = "esp-bootloader-unchecked"
 
 [macros]
@@ -66,8 +67,6 @@ F18 = "PIO Core v2"
 
 use crate::macros::MacroNameTag;
 
-// TODO use ; to chain macros
-
 #[derive(Serialize, Deserialize)]
 pub struct Keybinds {
     pub keybindings: IndexMap<KeyCombination, String>,

src/macros/mod.rs

@@ -24,7 +24,9 @@ use tracing::{error, info};
 use tui_input::Input;
 
 use crate::{
-    keybinds::Keybinds, traits::HasEscapedBytes, tui::single_line_selector::SingleLineSelectorState,
+    keybinds::Keybinds,
+    traits::{HasEscapedBytes, LastIndex},
+    tui::single_line_selector::SingleLineSelectorState,
 };
 
 mod macro_nametag;
@@ -343,6 +345,18 @@ impl Macros {
         Ok(())
     }
 }
+
+impl LastIndex for Macros {
+    fn last_index_checked(&self) -> Option<usize> {
+        let visible = self.visible_len();
+        if visible == 0 {
+            None
+        } else {
+            Some(visible - 1)
+        }
+    }
+}
+
 #[derive(Debug, serde::Deserialize)]
 struct MacroFile {
     #[serde(default)]

src/traits.rs

@@ -13,45 +13,41 @@ use crate::tui::buffer::LineEnding;
 
 /// Trait that provides simple methods to get the last valid index of a collection or slice.
 pub trait LastIndex {
+    /// Returns the index of the last element in the collection.
+    ///
+    /// Returns `None` if the collection is empty.
+    ///
+    /// Under most cirumstances, this should be the only trait function you need to define.
+    fn last_index_checked(&self) -> Option<usize>;
     /// Returns `true` if the given index matches the index of the last element in the collection.
     ///
     /// Returns `false` if the index doesn't match, or if the collection is empty.
-    fn last_index_eq(&self, index: usize) -> bool;
+    fn last_index_eq(&self, index: usize) -> bool {
+        if let Some(last_index) = self.last_index_checked() {
+            last_index == index
+        } else {
+            false
+        }
+    }
     /// Returns `true` if the given index matches or is greater than the index of the last element in the collection.
     ///
     /// Returns `false` if the index doesn't fit either condition, or if the collection is empty.
-    fn last_index_eq_or_greater(&self, index: usize) -> bool;
+    fn last_index_eq_or_under(&self, index: usize) -> bool {
+        if let Some(last_index) = self.last_index_checked() {
+            index >= last_index
+        } else {
+            false
+        }
+    }
     /// Returns the index of the last element in the collection.
     ///
     /// **Panics** if the collection is empty.
     fn last_index(&self) -> usize {
         self.last_index_checked()
             .expect("empty collection; no final element exists")
     }
-    /// Returns the index of the last element in the collection.
-    ///
-    /// Returns `None` if the collection is empty.
-    fn last_index_checked(&self) -> Option<usize>;
 }
 impl<T> LastIndex for [T] {
-    fn last_index_eq(&self, index: usize) -> bool {
-        if self.is_empty() {
-            false
-        } else if index == self.len() - 1 {
-            true
-        } else {
-            false
-        }
-    }
-    fn last_index_eq_or_greater(&self, index: usize) -> bool {
-        if self.is_empty() {
-            false
-        } else if index >= self.len() - 1 {
-            true
-        } else {
-            false
-        }
-    }
     fn last_index_checked(&self) -> Option<usize> {
         if self.is_empty() {
             None

src/tui/esp.rs

@@ -496,24 +496,6 @@ impl LastIndex for EspFlashState {
             Some((self.elfs.len() + self.bins.len()) - 1)
         }
     }
-    fn last_index_eq(&self, index: usize) -> bool {
-        if self.is_empty() {
-            false
-        } else if index == (self.elfs.len() + self.bins.len()) - 1 {
-            true
-        } else {
-            false
-        }
-    }
-    fn last_index_eq_or_greater(&self, index: usize) -> bool {
-        if self.is_empty() {
-            false
-        } else if index >= (self.elfs.len() + self.bins.len()) - 1 {
-            true
-        } else {
-            false
-        }
-    }
 }
 
 pub const ESPFLASH_BUTTON_COUNT: usize = 4;

src/tui/single_line_selector.rs

@@ -102,7 +102,7 @@ impl StatefulWidget for &SingleLineSelector<'_> {
     type State = SingleLineSelectorState;
 
     fn render(self, area: Rect, buf: &mut Buffer, state: &mut Self::State) {
-        if self.items.last_index_eq_or_greater(state.current_index) {
+        if self.items.last_index_eq_or_under(state.current_index) {
             state.current_index = self.items.last_index();
         }