From 1e1eb95926f556e666bc20355327abd24d264858 Mon Sep 17 00:00:00 2001
From: Nathan Reiner <nathan@nathanreiner.xyz>
Date: Thu, 1 Aug 2024 22:07:04 +0200
Subject: minor cleanup

---
 src/widgets/luaeditor/mod.rs | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

(limited to 'src/widgets/luaeditor/mod.rs')

diff --git a/src/widgets/luaeditor/mod.rs b/src/widgets/luaeditor/mod.rs
index 98af9e5..939a65f 100644
--- a/src/widgets/luaeditor/mod.rs
+++ b/src/widgets/luaeditor/mod.rs
@@ -97,10 +97,10 @@ impl Widget for &mut LuaEditor {
         let highlights = treesitter::highlighter_split(text.as_bytes(), &self.highlight_config);
 
         let nr_width = (self.buffer.lines().len().to_string().len() + 1).max(4) as u16;
-        let mut text_area = inner_area.clone();
+        let mut text_area = inner_area;
         text_area.x += nr_width;
 
-        let mut span_area = text_area.clone();
+        let mut span_area = text_area;
         let mut current_line = 0;
 
         for (hl, group) in highlights.iter() {
@@ -112,7 +112,7 @@ impl Widget for &mut LuaEditor {
 
                 current_line += 1;
             } else if current_line >= self.scroll {
-                let group = group.replace("\t", "  ");
+                let group = group.replace('\t', "  ");
                 let span = group.to_span();
 
                 if inner_area.contains(span_area.into()) {
@@ -124,7 +124,7 @@ impl Widget for &mut LuaEditor {
         }
 
         for i in self.scroll..self.buffer.lines().len() {
-            let mut nr_area = span_area.clone();
+            let mut nr_area = span_area;
             nr_area.x = inner_area.x;
             nr_area.width = nr_width - 1;
             nr_area.y = inner_area.y + (i - self.scroll) as u16;
@@ -137,7 +137,7 @@ impl Widget for &mut LuaEditor {
             (i + 1).to_line().right_aligned().render(nr_area, buf);
         }
 
-        let mut cursor_area = text_area.clone();
+        let mut cursor_area = text_area;
         cursor_area.width = 1;
         cursor_area.height = 1;
         cursor_area.y += self.buffer.cursor().y() as u16;
@@ -146,7 +146,7 @@ impl Widget for &mut LuaEditor {
         let (first, _) = self
             .buffer
             .current_line()
-            .split_at(self.buffer.cursor().x() as usize);
+            .split_at(self.buffer.cursor().x());
 
         for c in first.chars() {
             if c == '\t' {
@@ -166,7 +166,7 @@ impl Widget for &mut LuaEditor {
             self.buffer
                 .current_line()
                 .chars()
-                .nth(self.buffer.cursor().x() as usize)
+                .nth(self.buffer.cursor().x())
                 .map(|c| if c == '\t' { ' ' } else { c })
                 .unwrap_or(' ')
                 .to_span()
@@ -175,3 +175,14 @@ impl Widget for &mut LuaEditor {
         }
     }
 }
+
+impl Default for LuaEditor {
+    fn default() -> Self {
+        Self {
+            highlight_config: treesitter::new_highlight_configuration(),
+            bar: StatusBar::default(),
+            scroll: 0,
+            buffer: Buffer::default(),
+        }
+    }
+}
-- 
cgit v1.2.3-70-g09d2