Render discussion UI

We still need to match the cursor/selection colors to the avatar colors,which will require work on the Rust side. We also need to jump to theworkspace anchor when clicking messages.

Author: Nathan Sobo

xray_browser/static/index.html

@@ -9,6 +9,10 @@
         padding: 0;
         margin: 0;
       }
+      
+      * {
+        outline: none;
+      }
 
       #spinner {
         position: absolute;

xray_core/src/buffer.rs

@@ -21,6 +21,7 @@ type LocalTimestamp = usize;
 type LamportTimestamp = usize;
 pub type SelectionSetId = usize;
 type SelectionSetVersion = usize;
+pub type BufferId = usize;
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct Version(
@@ -36,6 +37,7 @@ pub enum Error {
 }
 
 pub struct Buffer {
+    id: BufferId,
     pub replica_id: ReplicaId,
     next_replica_id: Option<ReplicaId>,
     local_clock: LocalTimestamp,
@@ -213,8 +215,8 @@ impl Version {
 }
 
 pub mod rpc {
-    use super::{Buffer, EditId, FragmentId, Insertion, InsertionSplit, Operation, ReplicaId,
-                Selection, SelectionSetId, SelectionSetVersion, Version};
+    use super::{Buffer, BufferId, EditId, FragmentId, Insertion, InsertionSplit, Operation,
+                ReplicaId, Selection, SelectionSetId, SelectionSetVersion, Version};
     use futures::{Async, Future, Stream};
     use never::Never;
     use notify_cell::NotifyCellObserver;
@@ -227,6 +229,7 @@ pub mod rpc {
 
     #[derive(Serialize, Deserialize)]
     pub struct State {
+        pub(super) id: BufferId,
         pub(super) replica_id: ReplicaId,
         pub(super) fragments: Vec<Fragment>,
         pub(super) insertions: HashMap<EditId, Insertion>,
@@ -359,6 +362,7 @@ pub mod rpc {
         fn init(&mut self, _: &rpc::server::Connection) -> Self::State {
             let buffer = self.buffer.borrow_mut();
             let mut state = State {
+                id: buffer.id,
                 replica_id: self.replica_id,
                 fragments: Vec::new(),
                 insertions: HashMap::new(),
@@ -464,7 +468,7 @@ pub mod rpc {
 }
 
 impl Buffer {
-    pub fn new() -> Self {
+    pub fn new(id: BufferId) -> Self {
         let mut fragments = Tree::new();
 
         // Push start sentinel.
@@ -496,6 +500,7 @@ impl Buffer {
         );
 
         Self {
+            id,
             replica_id: 1,
             next_replica_id: Some(2),
             local_clock: 0,
@@ -553,6 +558,7 @@ impl Buffer {
         }
 
         let buffer = Buffer {
+            id: state.id,
             replica_id: state.replica_id,
             next_replica_id: None,
             local_clock: 0,
@@ -599,6 +605,10 @@ impl Buffer {
         Ok(buffer)
     }
 
+    pub fn id(&self) -> BufferId {
+        self.id
+    }
+
     pub fn next_replica_id(&mut self) -> Result<ReplicaId, ()> {
         let replica_id = self.next_replica_id.ok_or(())?;
         self.next_replica_id = Some(replica_id + 1);
@@ -1586,6 +1596,10 @@ impl Selection {
     pub fn is_empty(&self, buffer: &Buffer) -> bool {
         buffer.cmp_anchors(&self.start, &self.end).unwrap() == cmp::Ordering::Equal
     }
+
+    pub fn anchor_range(&self) -> Range<Anchor> {
+        self.start.clone()..self.end.clone()
+    }
 }
 
 impl Text {
@@ -1989,7 +2003,7 @@ mod tests {
 
     #[test]
     fn test_edit() {
-        let mut buffer = Buffer::new();
+        let mut buffer = Buffer::new(0);
         buffer.edit(0..0, "abc");
         assert_eq!(buffer.to_string(), "abc");
         buffer.edit(3..3, "def");
@@ -2010,7 +2024,7 @@ mod tests {
             println!("{:?}", seed);
             let mut rng = StdRng::from_seed(&[seed]);
 
-            let mut buffer = Buffer::new();
+            let mut buffer = Buffer::new(0);
             let mut reference_string = String::new();
 
             for _i in 0..30 {
@@ -2033,7 +2047,7 @@ mod tests {
 
     #[test]
     fn test_len_for_row() {
-        let mut buffer = Buffer::new();
+        let mut buffer = Buffer::new(0);
         buffer.edit(0..0, "abcd\nefg\nhij");
         buffer.edit(12..12, "kl\nmno");
         buffer.edit(18..18, "\npqrs\n");
@@ -2050,7 +2064,7 @@ mod tests {
 
     #[test]
     fn iter_starting_at_row() {
-        let mut buffer = Buffer::new();
+        let mut buffer = Buffer::new(0);
         buffer.edit(0..0, "abcd\nefgh\nij");
         buffer.edit(12..12, "kl\nmno");
         buffer.edit(18..18, "\npqrs");
@@ -2169,7 +2183,7 @@ mod tests {
 
     #[test]
     fn test_anchors() {
-        let mut buffer = Buffer::new();
+        let mut buffer = Buffer::new(0);
         buffer.edit(0..0, "abc");
         let left_anchor = buffer.anchor_before_offset(2).unwrap();
         let right_anchor = buffer.anchor_after_offset(2).unwrap();
@@ -2311,7 +2325,7 @@ mod tests {
 
     #[test]
     fn anchors_at_start_and_end() {
-        let mut buffer = Buffer::new();
+        let mut buffer = Buffer::new(0);
         let before_start_anchor = buffer.anchor_before_offset(0).unwrap();
         let after_end_anchor = buffer.anchor_after_offset(0).unwrap();
 
@@ -2342,7 +2356,7 @@ mod tests {
             let mut buffers = Vec::new();
             let mut queues = Vec::new();
             for i in site_range.clone() {
-                let mut buffer = Buffer::new();
+                let mut buffer = Buffer::new(0);
                 buffer.replica_id = i + 1;
                 buffers.push(buffer);
                 queues.push(Vec::new());
@@ -2387,7 +2401,7 @@ mod tests {
 
     #[test]
     fn test_edit_replication() {
-        let local_buffer = Buffer::new().into_shared();
+        let local_buffer = Buffer::new(0).into_shared();
         local_buffer.borrow_mut().edit(0..0, "abcdef");
         local_buffer.borrow_mut().edit(2..4, "ghi");
 
@@ -2439,7 +2453,7 @@ mod tests {
     fn test_selection_replication() {
         use stream_ext::StreamExt;
 
-        let mut buffer_1 = Buffer::new();
+        let mut buffer_1 = Buffer::new(0);
         buffer_1.edit(0..0, "abcdef");
         let sels = vec![empty_selection(&buffer_1, 1), empty_selection(&buffer_1, 3)];
         buffer_1.add_selection_set(sels);

xray_core/src/buffer_view.rs

@@ -1,4 +1,4 @@
-use buffer::{Buffer, Point, ReplicaId, Selection, SelectionSetId};
+use buffer::{Buffer, BufferId, Point, ReplicaId, Selection, SelectionSetId};
 use futures::{Poll, Stream};
 use movement;
 use notify_cell::NotifyCell;
@@ -480,6 +480,16 @@ impl<T: BufferViewDelegate> BufferView<T> {
             .unwrap();
     }
 
+    pub fn selections(&self) -> Ref<[Selection]> {
+        Ref::map(self.buffer.borrow(), |buffer| {
+            buffer.selections(self.selection_set_id).unwrap()
+        })
+    }
+
+    pub fn buffer_id(&self) -> BufferId {
+        self.buffer.borrow().id()
+    }
+
     fn render_selections(&self, range: Range<Point>) -> Vec<SelectionProps> {
         let buffer = self.buffer.borrow();
         let mut rendered_selections = Vec::new();
@@ -548,12 +558,6 @@ impl<T: BufferViewDelegate> BufferView<T> {
         }
     }
 
-    fn selections(&self) -> Ref<[Selection]> {
-        Ref::map(self.buffer.borrow(), |buffer| {
-            buffer.selections(self.selection_set_id).unwrap()
-        })
-    }
-
     fn updated(&mut self) {
         self.updates_tx.set(());
     }
@@ -665,10 +669,11 @@ impl<T: BufferViewDelegate> Drop for BufferView<T> {
 mod tests {
     use super::*;
     use IntoShared;
+    use workspace::WorkspaceView;
 
     #[test]
     fn test_cursor_movement() {
-        let mut editor = BufferView::new(Rc::new(RefCell::new(Buffer::new())));
+        let mut editor = BufferView::<WorkspaceView>::new(Rc::new(RefCell::new(Buffer::new(0))), None);
         editor.buffer.borrow_mut().edit(0..0, "abc");
         editor.buffer.borrow_mut().edit(3..3, "\n");
         editor.buffer.borrow_mut().edit(4..4, "\ndef");
@@ -749,7 +754,7 @@ mod tests {
 
     #[test]
     fn test_selection_movement() {
-        let mut editor = BufferView::new(Rc::new(RefCell::new(Buffer::new())));
+        let mut editor = BufferView::<WorkspaceView>::new(Rc::new(RefCell::new(Buffer::new(0))), None);
         editor.buffer.borrow_mut().edit(0..0, "abc");
         editor.buffer.borrow_mut().edit(3..3, "\n");
         editor.buffer.borrow_mut().edit(4..4, "\ndef");
@@ -840,7 +845,7 @@ mod tests {
 
     #[test]
     fn test_backspace() {
-        let mut editor = BufferView::new(Rc::new(RefCell::new(Buffer::new())));
+        let mut editor = BufferView::<WorkspaceView>::new(Rc::new(RefCell::new(Buffer::new(0))), None);
         editor.buffer.borrow_mut().edit(0..0, "abcdefghi");
         editor.add_selection(Point::new(0, 3), Point::new(0, 4));
         editor.add_selection(Point::new(0, 9), Point::new(0, 9));
@@ -852,7 +857,7 @@ mod tests {
 
     #[test]
     fn test_delete() {
-        let mut editor = BufferView::new(Rc::new(RefCell::new(Buffer::new())));
+        let mut editor = BufferView::<WorkspaceView>::new(Rc::new(RefCell::new(Buffer::new(0))), None);
         editor.buffer.borrow_mut().edit(0..0, "abcdefghi");
         editor.add_selection(Point::new(0, 3), Point::new(0, 4));
         editor.add_selection(Point::new(0, 9), Point::new(0, 9));
@@ -864,7 +869,7 @@ mod tests {
 
     #[test]
     fn test_add_selection() {
-        let mut editor = BufferView::new(Rc::new(RefCell::new(Buffer::new())));
+        let mut editor = BufferView::<WorkspaceView>::new(Rc::new(RefCell::new(Buffer::new(0))), None);
         editor
             .buffer
             .borrow_mut()
@@ -918,7 +923,7 @@ mod tests {
 
     #[test]
     fn test_add_selection_above() {
-        let mut editor = BufferView::new(Rc::new(RefCell::new(Buffer::new())));
+        let mut editor = BufferView::<WorkspaceView>::new(Rc::new(RefCell::new(Buffer::new(0))), None);
         editor.buffer.borrow_mut().edit(
             0..0,
             "\
@@ -987,7 +992,7 @@ mod tests {
 
     #[test]
     fn test_add_selection_below() {
-        let mut editor = BufferView::new(Rc::new(RefCell::new(Buffer::new())));
+        let mut editor = BufferView::<WorkspaceView>::new(Rc::new(RefCell::new(Buffer::new(0))), None);
         editor.buffer.borrow_mut().edit(
             0..0,
             "\
@@ -1047,7 +1052,7 @@ mod tests {
 
     #[test]
     fn test_edit() {
-        let mut editor = BufferView::new(Rc::new(RefCell::new(Buffer::new())));
+        let mut editor = BufferView::<WorkspaceView>::new(Rc::new(RefCell::new(Buffer::new(0))), None);
 
         editor.buffer.borrow_mut().edit(0..0, "abcdefgh\nhijklmno");
 
@@ -1070,14 +1075,14 @@ mod tests {
 
     #[test]
     fn test_render() {
-        let buffer = Rc::new(RefCell::new(Buffer::new()));
+        let buffer = Rc::new(RefCell::new(Buffer::new(0)));
         buffer
             .borrow_mut()
             .edit(0..0, "abc\ndef\nghi\njkl\nmno\npqr\nstu\nvwx\nyz");
         let line_height = 6.0;
 
         {
-            let mut editor = BufferView::new(buffer.clone());
+            let mut editor = BufferView::<WorkspaceView>::new(buffer.clone(), None);
             editor
                 .set_height(3.0 * line_height)
                 .set_line_height(line_height)
@@ -1108,7 +1113,7 @@ mod tests {
 
         // Selection starting at the end of buffer
         {
-            let mut editor = BufferView::new(buffer.clone());
+            let mut editor = BufferView::<WorkspaceView>::new(buffer.clone(), None);
             editor
                 .set_height(8.0 * line_height)
                 .set_line_height(line_height)
@@ -1126,7 +1131,7 @@ mod tests {
 
         // Selection ending exactly at first visible row
         {
-            let mut editor = BufferView::new(buffer.clone());
+            let mut editor = BufferView::<WorkspaceView>::new(buffer.clone(), None);
             editor
                 .set_height(3.0 * line_height)
                 .set_line_height(line_height)
@@ -1143,7 +1148,7 @@ mod tests {
     #[test]
     fn test_render_past_last_line() {
         let line_height = 4.0;
-        let mut editor = BufferView::new(Rc::new(RefCell::new(Buffer::new())));
+        let mut editor = BufferView::<WorkspaceView>::new(Rc::new(RefCell::new(Buffer::new(0))), None);
 
         editor
             .set_height(3.0 * line_height)
@@ -1166,8 +1171,8 @@ mod tests {
 
     #[test]
     fn test_dropping_view_removes_selection_set() {
-        let buffer = Buffer::new().into_shared();
-        let editor = BufferView::new(buffer.clone());
+        let buffer = Buffer::new(0).into_shared();
+        let editor = BufferView::<WorkspaceView>::new(buffer.clone(), None);
         let selection_set_id = editor.selection_set_id;
         assert!(buffer.borrow_mut().selections(selection_set_id).is_ok());
 
@@ -1184,7 +1189,7 @@ mod tests {
             .collect()
     }
 
-    fn render_selections(editor: &BufferView) -> Vec<SelectionProps> {
+    fn render_selections(editor: &BufferView<WorkspaceView>) -> Vec<SelectionProps> {
         let buffer = editor.buffer.borrow();
         editor
             .selections()