oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix randomized test failures on BlockMap with excerpt headers

Browse Source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra
2022-02-09 15:17:40 +01:00
co-authored by Nathan Sobo
parent 0e1318dfe4
commit f1e3d5285b
3 changed files with 150 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/editor/src/editor.rs
+9 -3
View File
@@ -10,7 +10,7 @@ mod test;
use aho_corasick::AhoCorasick;
use anyhow::Result;
use clock::ReplicaId;
use collections::{BTreeMap, HashMap, HashSet};
use collections::{BTreeMap, Bound, HashMap, HashSet};
pub use display_map::DisplayPoint;
use display_map::*;
pub use element::*;
@@ -2605,7 +2605,10 @@ impl Editor {
// Don't move lines across excerpts
if buffer
.excerpt_boundaries_in_range(insertion_point..range_to_move.end)
.excerpt_boundaries_in_range((
Bound::Excluded(insertion_point),
Bound::Included(range_to_move.end),
))
.next()
.is_none()
{
@@ -2709,7 +2712,10 @@ impl Editor {
// Don't move lines across excerpt boundaries
if buffer
.excerpt_boundaries_in_range(range_to_move.start..insertion_point)
.excerpt_boundaries_in_range((
Bound::Excluded(range_to_move.start),
Bound::Included(insertion_point),
))
.next()
.is_none()
{