Aaaand, it working (almost)

src/buffer.rs

@@ -121,7 +121,7 @@ impl<'a> Buffer<'a> for SplitBuffer {
         if n < self.before.len() {
             Some(&self.before[n])
         } else if n < self.len() {
-            let n = self.after.len() - (n - self.before.len()) - 1;
+            let n = self.len() + 1 - n;
             Some(&self.after[n])
         } else {
             None
@@ -133,7 +133,7 @@ impl<'a> Buffer<'a> for SplitBuffer {
         if n < self.before.len() {
             Some(&mut self.before[n])
         } else if n < self.len() {
-            let n = self.after.len() - (n - self.before.len()) - 1;
+            let n = self.len() + 1 - n;
             Some(&mut self.after[n])
         } else {
             None
@@ -145,7 +145,7 @@ impl<'a> Buffer<'a> for SplitBuffer {
         if n < self.before.len() {
             self.before.remove(n)
         } else if n < self.len() {
-            let n = self.after.len() - (n - self.before.len()) - 1;
+            let n = self.len() + 1 - n;
             self.after.remove(n)
         } else {
             panic!("Out of bound");
@@ -157,7 +157,7 @@ impl<'a> Buffer<'a> for SplitBuffer {
         if n < self.before.len() {
             self.before.insert(n, line);
         } else if n < self.len() {
-            let n = self.after.len() - (n - self.before.len()) - 1;
+            let n = self.len() + 1 - n;
             self.after.insert(n, line);
         } else {
             panic!("Out of bound");
@@ -210,19 +210,18 @@ impl<'a> Buffer<'a> for SplitBuffer {
 
     /// Get the leading whitespaces of the nth line. Used for autoindenting.
     fn get_indent(&self, n: usize) -> &str {
-        let ln = if let Some(s) = self.get_line(n) {
-            s
-        } else {
-            return "";
-        };
-        let mut len = 0;
-        for c in ln.chars() {
-            match c {
-                '\t' | ' ' => len += 1,
-                _          => break,
+        if let Some(ln) = self.get_line(n) {
+            let mut len = 0;
+            for c in ln.chars() {
+                match c {
+                    '\t' | ' ' => len += 1,
+                    _          => break,
+                }
             }
+            &ln[..len]
+        } else {
+            ""
         }
-        &ln[..len]
     }
 }
 
@@ -265,13 +264,12 @@ impl<'a> Iterator for SplitBufIter<'a> {
     type Item = &'a String;
 
     fn next(&mut self) -> Option<&'a String> {
-        let ln = self.line;
-        self.nth(ln)
+        self.nth(1)
     }
 
     fn nth(&mut self, n: usize) -> Option<&'a String> {
-        self.line = n;
-        self.buffer.get_line(n)
+        self.line += n;
+        self.buffer.get_line(self.line)
     }
 
     fn count(self) -> usize {

src/editor.rs

@@ -41,7 +41,6 @@ impl Editor {
     /// Create new default state editor
     pub fn init() {
 
-
         #[cfg(feature = "orbital")]
         let window = Window::new(-1, -1, 700, 500, &"Sodium").unwrap();
 
@@ -74,11 +73,16 @@ impl Editor {
             redraw_task: RedrawTask::Null,
         };
 
+        debugln!(editor, "Starting Sodium");
+
         editor.redraw();
 
+        debugln!(editor, "First redraw of the screen");
+
         loop {
             let inp = editor.get_inst();
             if let Inst(_, Cmd { key: Key::Quit }) = inp {
+                debugln!(editor, "C'ya");
                 break;
             }
             editor.exec(inp);

src/main.rs

@@ -3,6 +3,9 @@
 #[cfg(feature = "orbital")]
 extern crate orbital;
 
+#[macro_use]
+pub mod debug;
+
 pub mod editor;
 pub mod buffer;
 pub mod parse;

src/mode.rs

@@ -25,8 +25,7 @@ impl Mode {
             Command(Normal) => "Normal",
             Primitive(Insert(_)) => "Insert",
             Primitive(Prompt) => "Prompt",
-        }
-        .to_string()
+        }.to_string()
     }
 }
 

src/options.rs

@@ -2,6 +2,7 @@ pub struct Options {
     pub highlight: bool,
     pub autoindent: bool,
     pub line_marker: bool,
+    pub debug: bool,
 }
 
 impl Options {
@@ -11,6 +12,7 @@ impl Options {
             highlight: true,
             autoindent: true,
             line_marker: true,
+            debug: true, // TODO: Let this be `true` only in debug compilation cfg
         }
     }
 
@@ -20,6 +22,7 @@ impl Options {
             "hightlight" | "hl" => Some(&mut self.highlight),
             "autoindent" | "ai" => Some(&mut self.autoindent),
             "line_marker" | "linemarker" | "linemark" | "lm" => Some(&mut self.line_marker),
+            "debug" | "debug_mode" => Some(&mut self.debug),
             _ => None,
         }
     }
@@ -30,6 +33,7 @@ impl Options {
             "hightlight" | "hl" => Some(self.highlight),
             "autoindent" | "ai" => Some(self.autoindent),
             "line_marker" | "linemarker" | "linemark" | "lm" => Some(self.line_marker),
+            "debug" | "debug_mode" => Some(self.debug),
             _ => None,
         }
     }