From ca809617b2fb38e70910d30feefabbb21ec0ad7f Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Mon, 14 Dec 2020 15:58:03 +0900
Subject: Take prompt length into account.

---
 helix-term/src/ui/prompt.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'helix-term/src/ui')

diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index d1d92975..3ca1a941 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -137,9 +137,10 @@ impl Prompt {
                 }
             }
         }
+        let line = area.height - 1;
         // render buffer text
-        surface.set_string(1, area.height - 1, &self.prompt, text_color);
-        surface.set_string(2, area.height - 1, &self.line, text_color);
+        surface.set_string(0, line, &self.prompt, text_color);
+        surface.set_string(self.prompt.len() as u16, line, &self.line, text_color);
     }
 }
 
@@ -206,8 +207,8 @@ impl Component for Prompt {
 
     fn cursor_position(&self, area: Rect, ctx: &mut Context) -> Option<Position> {
         Some(Position::new(
-            area.height as usize - 1,
-            area.x as usize + 2 + self.cursor,
+            area.height as usize,
+            area.x as usize + self.prompt.len() + self.cursor,
         ))
     }
 }
-- 
cgit v1.2.3-70-g09d2