feat: statusline rendering through lua and better lua api

Author: wllfaria

Cargo.lock

@@ -164,8 +164,6 @@ impl<'cfg> Config<'cfg> {
         let gutter = runtime.from_value::<GutterConfig>(config.get::<Value>("gutter")?)?;
         let statusline = StatuslineConfig::from_lua(config.get::<Value>("statusline")?, runtime)?;
 
-        println!("{statusline:#?}");
-
         Ok(Config {
             cursor,
             gutter,

glyph-config/src/lib.rs

@@ -9,7 +9,6 @@ thiserror.workspace = true
 parking_lot.workspace = true
 
 ropey = "1.6.1"
-slotmap = "1.0.7"
 tree-sitter = "0.24.4"
 tree-sitter-rust = "0.23.2"
 streaming-iterator = "0.1.9"

glyph-core/Cargo.toml

@@ -9,9 +9,9 @@ use crate::editor::Editor;
 use crate::window::WindowId;
 
 #[derive(Debug)]
-pub struct Context<'ctx> {
+pub struct Context {
     pub editor: Arc<RwLock<Editor>>,
-    pub cursors: &'ctx mut BTreeMap<WindowId, Cursor>,
+    pub cursors: Arc<RwLock<BTreeMap<WindowId, Cursor>>>,
 }
 
 pub enum MappableCommand {
@@ -68,15 +68,17 @@ fn move_left(ctx: &mut Context) {
         let tab = editor.focused_tab();
         let window = tab.tree.focus();
         let window = tab.tree.window(window);
-        let cursor = ctx.cursors.get_mut(&window.id).unwrap();
+        let mut cursors = ctx.cursors.write();
+        let cursor = cursors.get_mut(&window.id).unwrap();
         cursor.move_left();
     }
 
     let mut editor = ctx.editor.write();
     let tab = editor.focused_tab_mut();
     let window = tab.tree.focus();
     let window = tab.tree.window_mut(window);
-    let cursor = ctx.cursors.get_mut(&window.id).unwrap();
+    let mut cursors = ctx.cursors.write();
+    let cursor = cursors.get_mut(&window.id).unwrap();
 
     if cursor.x().checked_sub(window.scroll().0).is_none() {
         window.scroll_left();
@@ -90,15 +92,17 @@ fn move_down(ctx: &mut Context) {
         let window = tab.tree.focus();
         let window = tab.tree.window(window);
         let document = editor.document(&window.document);
-        let cursor = ctx.cursors.get_mut(&window.id).unwrap();
+        let mut cursors = ctx.cursors.write();
+        let cursor = cursors.get_mut(&window.id).unwrap();
         cursor.move_down(document);
     }
 
     let mut editor = ctx.editor.write();
     let tab = editor.focused_tab_mut();
     let window = tab.tree.focus();
     let window = tab.tree.window_mut(window);
-    let cursor = ctx.cursors.get_mut(&window.id).unwrap();
+    let mut cursors = ctx.cursors.write();
+    let cursor = cursors.get_mut(&window.id).unwrap();
 
     if cursor.y() - window.scroll().1 >= window.area.height.into() {
         window.scroll_down();
@@ -111,15 +115,17 @@ fn move_up(ctx: &mut Context) {
         let tab = editor.focused_tab();
         let window = tab.tree.focus();
         let window = tab.tree.window(window);
-        let cursor = ctx.cursors.get_mut(&window.id).unwrap();
+        let mut cursors = ctx.cursors.write();
+        let cursor = cursors.get_mut(&window.id).unwrap();
         cursor.move_up();
     }
 
     let mut editor = ctx.editor.write();
     let tab = editor.focused_tab_mut();
     let window = tab.tree.focus();
     let window = tab.tree.window_mut(window);
-    let cursor = ctx.cursors.get_mut(&window.id).unwrap();
+    let mut cursors = ctx.cursors.write();
+    let cursor = cursors.get_mut(&window.id).unwrap();
 
     if cursor.y().checked_sub(window.scroll().1).is_none() {
         window.scroll_up();
@@ -133,15 +139,17 @@ pub fn move_right(ctx: &mut Context) {
         let window = tab.tree.focus();
         let window = tab.tree.window(window);
         let document = editor.document(&window.document);
-        let cursor = ctx.cursors.get_mut(&window.id).unwrap();
+        let mut cursors = ctx.cursors.write();
+        let cursor = cursors.get_mut(&window.id).unwrap();
         cursor.move_right(document);
     }
 
     let mut editor = ctx.editor.write();
     let tab = editor.focused_tab_mut();
     let window = tab.tree.focus();
     let window = tab.tree.window_mut(window);
-    let cursor = ctx.cursors.get_mut(&window.id).unwrap();
+    let mut cursors = ctx.cursors.write();
+    let cursor = cursors.get_mut(&window.id).unwrap();
 
     if cursor.x() - window.scroll().0 >= window.area.width.into() {
         window.scroll_right();

glyph-core/src/command.rs

@@ -13,7 +13,17 @@ impl Default for DocumentId {
     }
 }
 
+impl From<DocumentId> for usize {
+    fn from(value: DocumentId) -> Self {
+        value.0.into()
+    }
+}
+
 impl DocumentId {
+    pub fn new(document: usize) -> Option<DocumentId> {
+        Some(DocumentId(NonZeroUsize::new(document)?))
+    }
+
     pub fn next(&self) -> DocumentId {
         // Safety: will always be non-zero and less than usize::max + 1
         DocumentId(unsafe { NonZeroUsize::new_unchecked(self.0.get().saturating_add(1)) })

glyph-core/src/document.rs

@@ -5,4 +5,5 @@ pub struct HighlightGroup {
     pub fg: Color,
     pub bg: Color,
     pub bold: bool,
+    pub italic: bool,
 }

glyph-core/src/highlights.rs

@@ -24,6 +24,18 @@ impl From<&Cursor> for Point {
     }
 }
 
+impl From<(u16, u16)> for Point {
+    fn from((x, y): (u16, u16)) -> Self {
+        Point { x, y }
+    }
+}
+
+impl From<Rect> for Point {
+    fn from(rect: Rect) -> Self {
+        Point { x: rect.x, y: rect.y }
+    }
+}
+
 #[derive(Debug, Default, Clone, Copy, Hash, PartialEq, Eq)]
 pub struct Rect {
     pub x: u16,
@@ -106,4 +118,12 @@ impl Rect {
 
         Rect::new(self.x, self.y, self.width, height)
     }
+
+    pub fn bottom(&self) -> u16 {
+        self.y + self.height
+    }
+
+    pub fn right(&self) -> u16 {
+        self.x + self.width
+    }
 }

glyph-core/src/rect.rs

@@ -1,4 +1,4 @@
-use slotmap::HopSlotMap;
+use std::collections::BTreeMap;
 
 use crate::rect::Rect;
 use crate::window::{Window, WindowId};
@@ -11,10 +11,11 @@ pub enum Layout {
 
 #[derive(Debug)]
 pub struct Tree {
+    area: Rect,
     root: WindowId,
     focus: WindowId,
-    area: Rect,
-    nodes: HopSlotMap<WindowId, Node>,
+    next_window: WindowId,
+    nodes: BTreeMap<WindowId, Node>,
 }
 
 #[derive(Debug)]
@@ -67,7 +68,8 @@ impl Tree {
         Tree {
             root: WindowId::default(),
             focus: WindowId::default(),
-            nodes: HopSlotMap::with_key(),
+            nodes: BTreeMap::default(),
+            next_window: WindowId::default(),
             area,
         }
     }
@@ -76,12 +78,16 @@ impl Tree {
         self.focus
     }
 
+    pub fn nodes(&self) -> &BTreeMap<WindowId, Node> {
+        &self.nodes
+    }
+
     pub fn windows(&self) -> impl Iterator<Item = (&Window, bool)> {
         self.nodes.iter().filter_map(|(key, node)| match node {
             Node {
                 value: NodeValue::Window(window),
                 ..
-            } => Some((window.as_ref(), self.focus == key)),
+            } => Some((window.as_ref(), &self.focus == key)),
             _ => None,
         })
     }
@@ -92,7 +98,7 @@ impl Tree {
     }
 
     pub fn get_window(&self, id: WindowId) -> Option<&Window> {
-        match self.nodes.get(id) {
+        match self.nodes.get(&id) {
             Some(Node {
                 value: NodeValue::Window(window),
                 ..
@@ -102,7 +108,7 @@ impl Tree {
     }
 
     pub fn get_window_mut(&mut self, id: WindowId) -> Option<&mut Window> {
-        match self.nodes.get_mut(id) {
+        match self.nodes.get_mut(&id) {
             Some(Node {
                 value: NodeValue::Window(window),
                 ..
@@ -124,14 +130,16 @@ impl Tree {
             window.area = self.area.with_height(self.area.height - 2);
 
             let node = Node::window(window);
-            let node = self.nodes.insert(node);
+            let id = self.next_window;
+            self.next_window = self.next_window.next();
+            self.nodes.insert(id, node);
 
-            self.window_mut(node).id = node;
+            self.window_mut(id).id = id;
             // root is its own parent
-            self.nodes[node].parent = node;
-            self.focus = node;
-            self.root = node;
-            return node;
+            self.nodes.get_mut(&id).unwrap().parent = id;
+            self.focus = id;
+            self.root = id;
+            return id;
         }
 
         todo!();

glyph-core/src/tree.rs

@@ -1,8 +1,35 @@
+use std::num::NonZeroUsize;
+
 use crate::document::DocumentId;
 use crate::rect::Rect;
 
-slotmap::new_key_type! {
-    pub struct WindowId;
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+pub struct WindowId(NonZeroUsize);
+
+impl WindowId {
+    pub fn new(window: usize) -> Option<WindowId> {
+        Some(WindowId(NonZeroUsize::new(window)?))
+    }
+}
+
+impl Default for WindowId {
+    fn default() -> Self {
+        // Safety: 1 is non-zero
+        WindowId(unsafe { NonZeroUsize::new_unchecked(1) })
+    }
+}
+
+impl WindowId {
+    pub fn next(&self) -> WindowId {
+        // Safety: will always be non-zero and less than usize::max + 1
+        WindowId(unsafe { NonZeroUsize::new_unchecked(self.0.get().saturating_add(1)) })
+    }
+}
+
+impl From<WindowId> for usize {
+    fn from(value: WindowId) -> Self {
+        value.0.into()
+    }
 }
 
 #[derive(Debug, Clone)]

glyph-core/src/window.rs

@@ -17,8 +17,9 @@ impl TryFrom<LuaHighlightGroup> for HighlightGroup {
         let fg = group.fg.try_into()?;
         let bg = group.bg.try_into()?;
         let bold = group.bold;
+        let italic = group.italic;
 
-        Ok(HighlightGroup { fg, bg, bold })
+        Ok(HighlightGroup { fg, bg, bold, italic })
     }
 }
 
@@ -30,6 +31,8 @@ pub struct LuaHighlightGroup {
     bg: String,
     #[serde(default)]
     bold: bool,
+    #[serde(default)]
+    italic: bool,
 }
 
 pub fn setup_colors_api(