:memo:

Antonio Scandurra created

Change summary

zed/src/editor/buffer/mod.rs  | 1 +
zed/src/editor/buffer_view.rs | 1 +
2 files changed, 2 insertions(+)

Detailed changes

zed/src/editor/buffer/mod.rs 🔗

@@ -2290,6 +2290,7 @@ impl ToPoint for usize {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use cmp::Ordering;
     use gpui::App;
     use std::collections::BTreeMap;
     use std::{cell::RefCell, rc::Rc};

zed/src/editor/buffer_view.rs 🔗

@@ -722,6 +722,7 @@ impl BufferView {
     }
 
     fn update_selections(&self, mut selections: Vec<Selection>, ctx: &mut ViewContext<Self>) {
+        // Merge overlapping selections.
         let buffer = self.buffer.as_ref(ctx);
         let mut i = 1;
         while i < selections.len() {