Final little fix

Author: heiskane

src/components/textinput.rs

@@ -302,6 +302,7 @@ impl TextInputComponent {
 
 		let mut dist =
 			self.get_real_distance(line_start, self.cursor_position);
+
 		self.cursor_position = line_end;
 
 		if line_start != 0 {
@@ -314,25 +315,20 @@ impl TextInputComponent {
 	fn get_real_distance(&self, start: usize, end: usize) -> usize {
 		let mut index = start;
 		let mut dist = 0;
-		while index < end {
+		while index <= end {
 			if self.msg.is_char_boundary(index) {
 				dist += 1;
 			}
 			index += 1;
 		}
-		dist + 1
+		dist
 	}
 
-	/// Move forward `distance` amount of charachters stopping at a newline
+	/// Move forward `distance` amount of characters stopping at a newline
 	fn cursor_forward(&mut self, distance: usize) {
 		let mut travelled = 0;
 		let mut index = self.cursor_position;
 		while index < self.msg.len() + 1 {
-			if index == self.msg.len() - 1 {
-				self.cursor_position = index + 1;
-				break;
-			}
-
 			if self.msg.is_char_boundary(index) {
 				travelled += 1;
 			}
@@ -342,6 +338,11 @@ impl TextInputComponent {
 				break;
 			}
 
+			if index == self.msg.len() - 1 {
+				self.cursor_position = index + 1;
+				break;
+			}
+
 			index += 1;
 
 			if index != self.msg.len() - 1
@@ -897,7 +898,7 @@ mod tests {
 			false,
 		);
 
-		comp.set_text(String::from("aaaaa\näaa\naaa"));
+		comp.set_text(String::from("aaaaa\näaa\naaa\naaa"));
 
 		comp.cursor_position = 0;
 		comp.cursor_down();
@@ -915,6 +916,10 @@ mod tests {
 		comp.cursor_down();
 		assert_eq!(comp.cursor_position, 12);
 
+		comp.cursor_position = 13;
+		comp.cursor_down();
+		assert_eq!(comp.cursor_position, 17);
+
 		comp.cursor_position = 6;
 		comp.cursor_up();
 		assert_eq!(comp.cursor_position, 0);