Refactor and write tests

Author: Antonio Scandurra

README.md

@@ -183,10 +183,10 @@ Once we get the basic collaboration experience down, we'll be looking to expand
 * [x] Horizontal scrolling
 * [ ] Word- and line-based cursor movements
   * [ ] Move To Beginning Of Line
-  * [ ] Move To Beginning Of Word
+  * [x] Move To Beginning Of Word
   * [ ] Move To Bottom
   * [ ] Move To End Of Line
-  * [ ] Move To End Of Word
+  * [x] Move To End Of Word
   * [ ] Move To Top
   * [ ] Select To Beginning Of Line
   * [ ] Select To Beginning Of Word

xray_core/src/buffer_view.rs

@@ -4,7 +4,6 @@ use movement;
 use notify_cell::NotifyCell;
 use serde_json;
 use std::cell::{Cell, Ref, RefCell};
-use std::char::decode_utf16;
 use std::cmp::{self, Ordering};
 use std::ops::Range;
 use std::rc::Rc;
@@ -547,21 +546,9 @@ impl BufferView {
             .borrow_mut()
             .mutate_selections(self.selection_set_id, |buffer, selections| {
                 for selection in selections.iter_mut() {
-                    let mut head = buffer.point_for_anchor(selection.head()).unwrap();
-                    // TODO: remove this once the iterator returns char instances.
-                    let mut char_iter = decode_utf16(buffer.backward_iter_starting_at_point(head))
-                        .map(|c| c.unwrap());
-                    let skip_alphanumeric = char_iter.next().map_or(false, |c| c.is_alphanumeric());
-                    head = movement::left(buffer, head);
-                    for character in char_iter {
-                        if skip_alphanumeric == character.is_alphanumeric() {
-                            head = movement::left(buffer, head);
-                        } else {
-                            break;
-                        }
-                    }
-
-                    let anchor = buffer.anchor_before_point(head).unwrap();
+                    let old_head = buffer.point_for_anchor(selection.head()).unwrap();
+                    let new_head = movement::beginning_of_word(buffer, old_head);
+                    let anchor = buffer.anchor_before_point(new_head).unwrap();
                     selection.start = anchor.clone();
                     selection.end = anchor;
                     selection.goal_column = None;
@@ -577,21 +564,9 @@ impl BufferView {
             .borrow_mut()
             .mutate_selections(self.selection_set_id, |buffer, selections| {
                 for selection in selections.iter_mut() {
-                    let mut head = buffer.point_for_anchor(selection.head()).unwrap();
-                    // TODO: remove this once the iterator returns char instances.
-                    let mut char_iter =
-                        decode_utf16(buffer.iter_starting_at_point(head)).map(|c| c.unwrap());
-                    let skip_alphanumeric = char_iter.next().map_or(false, |c| c.is_alphanumeric());
-                    head = movement::right(buffer, head);
-                    for character in char_iter {
-                        if skip_alphanumeric == character.is_alphanumeric() {
-                            head = movement::right(buffer, head);
-                        } else {
-                            break;
-                        }
-                    }
-
-                    let anchor = buffer.anchor_before_point(head).unwrap();
+                    let old_head = buffer.point_for_anchor(selection.head()).unwrap();
+                    let new_head = movement::end_of_word(buffer, old_head);
+                    let anchor = buffer.anchor_before_point(new_head).unwrap();
                     selection.start = anchor.clone();
                     selection.end = anchor;
                     selection.goal_column = None;
@@ -1071,6 +1046,47 @@ mod tests {
         assert_eq!(render_selections(&editor), vec![empty_selection(0, 1)]);
     }
 
+    #[test]
+    fn test_move_to_beginning_or_end_of_word() {
+        let mut editor = BufferView::new(Rc::new(RefCell::new(Buffer::new(0))), 0, None);
+        editor.buffer.borrow_mut().edit(&[0..0], "abc def\nghi.jkl");
+        assert_eq!(render_selections(&editor), vec![empty_selection(0, 0)]);
+
+        editor.move_to_end_of_word();
+        assert_eq!(render_selections(&editor), vec![empty_selection(0, 3)]);
+        editor.move_to_end_of_word();
+        assert_eq!(render_selections(&editor), vec![empty_selection(0, 4)]);
+        editor.move_to_end_of_word();
+        assert_eq!(render_selections(&editor), vec![empty_selection(0, 7)]);
+        editor.move_to_end_of_word();
+        assert_eq!(render_selections(&editor), vec![empty_selection(1, 0)]);
+        editor.move_to_end_of_word();
+        assert_eq!(render_selections(&editor), vec![empty_selection(1, 3)]);
+        editor.move_to_end_of_word();
+        assert_eq!(render_selections(&editor), vec![empty_selection(1, 4)]);
+        editor.move_to_end_of_word();
+        assert_eq!(render_selections(&editor), vec![empty_selection(1, 7)]);
+        editor.move_to_end_of_word();
+        assert_eq!(render_selections(&editor), vec![empty_selection(1, 7)]);
+
+        editor.move_to_beginning_of_word();
+        assert_eq!(render_selections(&editor), vec![empty_selection(1, 4)]);
+        editor.move_to_beginning_of_word();
+        assert_eq!(render_selections(&editor), vec![empty_selection(1, 3)]);
+        editor.move_to_beginning_of_word();
+        assert_eq!(render_selections(&editor), vec![empty_selection(1, 0)]);
+        editor.move_to_beginning_of_word();
+        assert_eq!(render_selections(&editor), vec![empty_selection(0, 7)]);
+        editor.move_to_beginning_of_word();
+        assert_eq!(render_selections(&editor), vec![empty_selection(0, 4)]);
+        editor.move_to_beginning_of_word();
+        assert_eq!(render_selections(&editor), vec![empty_selection(0, 3)]);
+        editor.move_to_beginning_of_word();
+        assert_eq!(render_selections(&editor), vec![empty_selection(0, 0)]);
+        editor.move_to_beginning_of_word();
+        assert_eq!(render_selections(&editor), vec![empty_selection(0, 0)]);
+    }
+
     #[test]
     fn test_backspace() {
         let mut editor = BufferView::new(Rc::new(RefCell::new(Buffer::new(0))), 0, None);

xray_core/src/movement.rs

@@ -1,5 +1,6 @@
-use std::cmp;
 use buffer::{Buffer, Point};
+use std::char::decode_utf16;
+use std::cmp;
 
 pub fn left(buffer: &Buffer, mut point: Point) -> Point {
     if point.column > 0 {
@@ -46,3 +47,33 @@ pub fn down(buffer: &Buffer, mut point: Point, goal_column: Option<u32>) -> (Poi
 
     (point, goal_column)
 }
+
+pub fn beginning_of_word(buffer: &Buffer, mut point: Point) -> Point {
+    // TODO: remove this once the iterator returns char instances.
+    let mut iter = decode_utf16(buffer.backward_iter_starting_at_point(point)).map(|c| c.unwrap());
+    let skip_alphanumeric = iter.next().map_or(false, |c| c.is_alphanumeric());
+    point = left(buffer, point);
+    for character in iter {
+        if skip_alphanumeric == character.is_alphanumeric() {
+            point = left(buffer, point);
+        } else {
+            break;
+        }
+    }
+    point
+}
+
+pub fn end_of_word(buffer: &Buffer, mut point: Point) -> Point {
+    // TODO: remove this once the iterator returns char instances.
+    let mut iter = decode_utf16(buffer.iter_starting_at_point(point)).map(|c| c.unwrap());
+    let skip_alphanumeric = iter.next().map_or(false, |c| c.is_alphanumeric());
+    point = right(buffer, point);
+    for character in iter {
+        if skip_alphanumeric == character.is_alphanumeric() {
+            point = right(buffer, point);
+        } else {
+            break;
+        }
+    }
+    point
+}