fixed edit command

- edit command is supposed to swap current window buffer and it was
  creating a new window which would make the `ls` command not return
  the correct output
- also deleted more old files

Author: cowboy8625

.gitignore

@@ -3,3 +3,4 @@
 *.txt
 *.vim
 todo.md
+error_revi

crates/revi-core/src/buffer.rs

@@ -42,6 +42,9 @@ impl Buffer {
         // self.rope.slice(start..end)
     }
 
+    pub fn len_lines(&self) -> usize {
+        self.rope.len_lines()
+    }
     pub fn line_len(&self, line_idx: usize) -> usize {
         self.rope.line(line_idx).len_chars()
     }

crates/revi-core/src/commands.rs

@@ -2,7 +2,7 @@ use revi_ui::tui::layout::{Pos, Size};
 
 use crate::context::Context;
 use crate::mode::Mode;
-use crate::{Buffer, Event, MessageBox};
+use crate::{panes::MessageBox, Buffer, Event};
 use std::any::Any;
 use std::cell::RefCell;
 use std::fmt;
@@ -16,7 +16,8 @@ pub trait Command: fmt::Debug {
 }
 
 macro_rules! build_command {
-    ($name:ident$(($($ty:ty $(,)?)*))?; $caller:expr) => {
+    ($([doc:  $doc:expr])? $name:ident$(($($ty:ty $(,)?)*))?; $caller:expr) => {
+        $(#[doc=$doc])?
         #[derive(Debug, PartialEq)]
         pub struct $name $(($(pub $ty, )*))?;
         impl Command for $name {
@@ -342,29 +343,23 @@ build_command!(
 );
 
 build_command!(
+    [doc: "loads a file from disk if it exsists and if not just create a empty file
+    and place it in buffer list and put the current file buffer into the current window."]
     EditFile(String);
     |Self(command): &EditFile, ctx: Context| {
         let Some((_, name)) = command.split_once(' ') else {
             let msg = "edit command requires a file path";
             Message(msg.into(), command.into()).call(ctx);
             return;
         };
-        let settings = ctx.settings.borrow();
-        let line_numbers = settings.line_numbers;
-        let id = ctx.panes.borrow().len();
-        *ctx.focused_pane.borrow_mut() = id;
         let text = std::fs::read_to_string(name).unwrap_or("\n".into());
         let rope = ropey::Rope::from_str(&text);
-        let buf = Rc::new(RefCell::new(Buffer::new(name, rope)));
-        let pos = revi_ui::tui::layout::Pos::default();
-        // HACK: sheppereds hook
-        // size needs to be dynamicly dispatched
-        let size = ctx.window_size();
-        let window = crate::Window::new(pos, size, buf)
-            .with_status_bar(true)
-            .with_status_bar(line_numbers);
-        let mut panes = ctx.panes.borrow_mut();
-        panes.push(Rc::new(RefCell::new(window)));
+        let new_buf = Rc::new(RefCell::new(Buffer::new(name, rope)));
+        let mut buf_list = ctx.buffers.borrow_mut();
+        buf_list.push(new_buf.clone());
+        let pane = ctx.focused_pane();
+        let mut pane = pane.borrow_mut();
+        pane.set_buffer(new_buf);
     }
 );
 

crates/revi-core/src/context.rs

@@ -1,7 +1,10 @@
 use crate::{api::Rhai, Settings};
 use rhai::FnPtr;
 
-use super::{Buffer, CommandBar, Event, Mapper, Mode, Pane};
+use super::{
+    panes::{CommandBar, Pane},
+    Buffer, Event, Mapper, Mode,
+};
 
 use revi_ui::tui::layout::Size;
 

crates/revi-core/src/lib.rs

@@ -1,25 +1,18 @@
 pub mod api;
 pub mod buffer;
-mod command_bar;
 pub mod commands;
 mod context;
 pub mod event;
 pub mod map_keys;
-mod message_box;
 pub mod mode;
-mod pane;
+pub mod panes;
 mod parse_keys;
 mod settings;
-mod window;
 
 pub use buffer::Buffer;
-pub use command_bar::CommandBar;
 pub use context::{Context, ContextBuilder};
 pub use event::Event;
 pub use map_keys::Mapper;
-pub use message_box::MessageBox;
 pub use mode::Mode;
-pub use pane::Pane;
 pub use parse_keys::KeyParser;
 pub use settings::Settings;
-pub use window::Window;

crates/revi-core/src/mode.rs

@@ -6,15 +6,6 @@ pub enum Mode {
     Command,
     Insert,
 }
-// impl Mode {
-//     #[must_use]
-//     pub fn shape(self) -> revi_ui::CursorShape {
-//         match self {
-//             Self::Normal | Self::Command => Block,
-//             Self::Insert => Line,
-//         }
-//     }
-// }
 
 impl fmt::Display for Mode {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

crates/revi-core/src/command_bar.rs crates/revi-core/src/panes/command_bar.rs

@@ -3,11 +3,12 @@ use revi_ui::tui::{
     layout::{Pos, Rect, Size, Stack},
     text::Text,
 };
+use std::{cell::RefCell, rc::Rc};
 
-use crate::{
-    pane::{BufferBounds, BufferMut, Cursor, CursorMovement, CursorPos, PaneBounds, Scrollable},
-    Mode, Pane,
+use super::{
+    BufferBounds, BufferMut, Cursor, CursorMovement, CursorPos, Pane, PaneBounds, Scrollable,
 };
+use crate::{Buffer, Mode};
 
 #[derive(Debug, Clone, Default)]
 pub struct CommandBar {
@@ -96,6 +97,9 @@ impl BufferBounds for CommandBar {
 }
 
 impl BufferMut for CommandBar {
+    fn set_buffer(&mut self, _buf: Rc<RefCell<Buffer>>) {
+        todo!("set buffer for command bar")
+    }
     fn insert_char(&mut self, c: char) {
         let idx = self.cursor.pos.x as usize;
         if idx < self.content.len() {

crates/revi-core/src/message_box.rs crates/revi-core/src/panes/message_box.rs

@@ -9,10 +9,10 @@ use revi_ui::{
     Attribute,
 };
 
-use crate::{
-    pane::{BufferBounds, BufferMut, Cursor, CursorMovement, CursorPos, PaneBounds, Scrollable},
-    Buffer, Mode, Pane,
+use super::{
+    BufferBounds, BufferMut, Cursor, CursorMovement, CursorPos, Pane, PaneBounds, Scrollable,
 };
+use crate::{Buffer, Mode};
 
 #[derive(Debug)]
 pub struct MessageBox {
@@ -171,6 +171,9 @@ impl BufferBounds for MessageBox {
 }
 
 impl BufferMut for MessageBox {
+    fn set_buffer(&mut self, buf: Rc<RefCell<Buffer>>) {
+        self.buffer = buf;
+    }
     fn insert_char(&mut self, _: char) {}
     fn clear_buffer(&mut self) {}
     fn get_buffer_contents(&self) -> String {

crates/revi-core/src/panes/mod.rs

@@ -0,0 +1,11 @@
+mod command_bar;
+mod message_box;
+mod pane;
+mod window;
+
+pub use command_bar::CommandBar;
+pub use message_box::MessageBox;
+pub use pane::{
+    BufferBounds, BufferMut, Cursor, CursorMovement, CursorPos, Pane, PaneBounds, Scrollable,
+};
+pub use window::Window;

crates/revi-core/src/pane.rs crates/revi-core/src/panes/pane.rs

@@ -1,4 +1,4 @@
-use std::fmt::Debug;
+use std::{cell::RefCell, fmt::Debug, rc::Rc};
 
 use revi_ui::{
     tui::{
@@ -8,6 +8,7 @@ use revi_ui::{
     Keys,
 };
 
+use crate::Buffer;
 use crate::Mode;
 
 #[derive(Debug, Clone, Copy, Default)]
@@ -139,6 +140,7 @@ pub trait Scrollable: BufferBounds + CursorPos {
 }
 
 pub trait BufferMut {
+    fn set_buffer(&mut self, buf: Rc<RefCell<Buffer>>);
     fn get_buffer_contents(&self) -> String;
     fn insert_char(&mut self, c: char);
     fn clear_buffer(&mut self);

crates/revi-core/src/window.rs crates/revi-core/src/panes/window.rs

@@ -9,10 +9,10 @@ use revi_ui::{
     Attribute, Color,
 };
 
-use crate::{
-    pane::{BufferBounds, BufferMut, Cursor, CursorMovement, CursorPos, PaneBounds, Scrollable},
-    Buffer, Mode, Pane,
+use super::{
+    BufferBounds, BufferMut, Cursor, CursorMovement, CursorPos, Pane, PaneBounds, Scrollable,
 };
+use crate::{Buffer, Mode};
 
 #[derive(Debug)]
 pub struct Window {
@@ -93,9 +93,12 @@ impl Window {
             .on_screen(top, bottom)
             .iter()
             .map(ToString::to_string)
+            .chain(std::iter::repeat("\n".into()))
+            .take(height as usize)
             .collect::<String>();
         Text::new(&contents)
             .max_width(width)
+            .max_height(height)
             .with_comment("text file")
     }
 
@@ -132,13 +135,15 @@ impl Window {
         let height = height - (self.has_status_bar as u16);
         let start = self.cursor.scroll.y;
         let end = height + self.cursor.scroll.y;
-        Text::new(
-            &(start..=end)
-                .map(|n| format!(" {} \n", n))
-                .collect::<String>(),
-        )
-        .max_width(4)
-        .with_comment("numbers")
+        let content_rows = (self.buffer.borrow().len_lines() - 2) as u16;
+        let text = &(start..=end.min(content_rows))
+            .map(|n| format!(" {} \n", n))
+            .chain(std::iter::repeat("~\n".into()))
+            .take(end as usize)
+            .collect::<String>();
+        Text::new(text)
+            .max_width(Self::NUMBER_LINE_WIDTH)
+            .with_comment("numbers")
     }
 }
 
@@ -235,6 +240,9 @@ impl BufferBounds for Window {
 }
 
 impl BufferMut for Window {
+    fn set_buffer(&mut self, buf: Rc<RefCell<Buffer>>) {
+        self.buffer = buf;
+    }
     fn insert_char(&mut self, ch: char) {
         let col = (self.cursor.pos.x as usize)
             - (self.has_line_numbers as u16 * Self::NUMBER_LINE_WIDTH) as usize;