less broken multiline editing

1 files changed, 13 insertions, 32 deletions

diff --git a/src/line/mod.rs b/src/line/mod.rs
index c6c2f34..510c480 100644
--- a/src/line/mod.rs
+++ b/src/line/mod.rs
@@ -36,15 +36,15 @@ impl Line {
     }
 
     pub fn highlight_syntax(&mut self, h: &mut Highlighter) -> std::io::Result<()> {
-        if !self.is_dirty() {
+        if !self.dirty {
             return Ok(());
         }
+        self.dirty = false;
 
-        self.mark_clean();
-
-        if !h.enabled {
-            return Ok(());
-        }
+        // TODO this is currently needed to reprint the prompt upon modification so we can't skip it.
+        // if !h.enabled {
+        //     return Ok(());
+        // }
 
         use crate::parse::{self, Parse};
 
@@ -53,7 +53,7 @@ impl Line {
         let _ = parse::Ast::parse(&mut parser);
         let mut stdout = io::stdout().lock();
         self.line_start.f_go_to(&mut stdout)?;
-        h.pretty_print(&buf, parser.highlights, &mut stdout)?;
+        h.pretty_print(&buf, self.left_len(), parser.highlights, &mut stdout)?;
         stdout.flush()?;
 
         Ok(())
@@ -159,8 +159,9 @@ macro_rules! mutating_impls {
     ($(pub fn $fun:ident(&mut $self:ident $($arg:tt)*) -> $ty:ty $body:block )*) => {
         impl Line {$(
             pub fn $fun(&mut $self $($arg)*) -> $ty {
+                let result = $body;
                 $self.dirty = true;
-                $body
+                result
             }
         )*}
     };
@@ -168,25 +169,14 @@ macro_rules! mutating_impls {
 
 mutating_impls! {
     pub fn clear_prompt(&mut self) -> io::Result<()> {
-        let mut stdout = io::stdout().lock();
-        cursor::fmove_cursor(
-            Direction::Right,
-            self.buf.distance_from_right_end(),
-            &mut stdout,
-        )?;
-        for _ in 0..self.buf.len() {
-            stdout.write_all(b"\x08 \x08")?;
-        }
         self.buf.clear();
-        stdout.flush()
+        Ok(())
     }
 
     pub fn type_bytes(&mut self, bs: &[u8]) -> io::Result<()> {
         for b in bs.iter() {
             self.buf.add(*b);
         }
-        io::stdout().lock().write_all(&bs)?;
-        self.buf.display_post(b"");
         Ok(())
     }
 
@@ -196,52 +186,43 @@ mutating_impls! {
 
     pub fn del_left(&mut self) -> io::Result<()> {
         if self.buf.del_left().is_some() {
-            cursor::fmove_cursor(Direction::Left, 1, &mut io::stdout())?;
-            self.buf.display_post(b" ");
+            let mut stdout = io::stdout().lock();
+            cursor::fmove_cursor(Direction::Left, 1, &mut stdout)?;
+            stdout.flush()?;
         }
         Ok(())
     }
 
     pub fn del_right(&mut self) -> io::Result<()> {
         self.buf.del_right();
-        self.buf.display_post(b" ");
         Ok(())
     }
 
     pub fn del_left_word(&mut self) -> io::Result<()> {
-        let mut del = 0;
         while let Some(x) = self.buf.get_left()
             && x == b' '
         {
             self.buf.del_left();
-            del += 1;
         }
         while let Some(x) = self.buf.get_left()
             && x != b' '
         {
             self.buf.del_left();
-            del += 1;
         }
-        cursor::fmove_cursor(Direction::Left, del, &mut io::stdout())?;
-        self.buf.display_post(&vec![b' '; del]);
         Ok(())
     }
 
     pub fn del_right_word(&mut self) -> io::Result<()> {
-        let mut del = 0;
         while let Some(x) = self.buf.get_right()
             && x == b' '
         {
             self.buf.del_right();
-            del += 1;
         }
         while let Some(x) = self.buf.get_right()
             && x != b' '
         {
             self.buf.del_right();
-            del += 1;
         }
-        self.buf.display_post(&vec![b' '; del]);
         Ok(())
     }