mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-28 11:29:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix flaky test_highlighted_ranges due to random TypeId ordering

Browse source
This commit is contained in:
Antonio Scandurra 2022-02-02 10:09:12 +01:00
parent 74e5c5b89a
commit ae5aebf405
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
crates/editor/src/editor.rs
View file

@ -7279,20 +7279,16 @@ mod tests {
);
let snapshot = editor.snapshot(cx);
let mut highlighted_ranges = editor.highlighted_ranges_in_range(
anchor_range(Point::new(3, 4)..Point::new(7, 4)),
&snapshot,
);
// Enforce a consistent ordering based on color without relying on the ordering of the
// highlight's `TypeId` which is non-deterministic.
highlighted_ranges.sort_unstable_by_key(|(_, color)| *color);
assert_eq!(
editor.highlighted_ranges_in_range(
anchor_range(Point::new(3, 4)..Point::new(7, 4)),
&snapshot,
),
highlighted_ranges,
&[
(
DisplayPoint::new(4, 2)..DisplayPoint::new(4, 4),
Color::red(),
),
(
DisplayPoint::new(6, 3)..DisplayPoint::new(6, 5),
Color::red(),
),
(
DisplayPoint::new(3, 2)..DisplayPoint::new(3, 5),
Color::green(),
@ -7301,6 +7297,14 @@ mod tests {
DisplayPoint::new(5, 3)..DisplayPoint::new(5, 6),
Color::green(),
),
(
DisplayPoint::new(4, 2)..DisplayPoint::new(4, 4),
Color::red(),
),
(
DisplayPoint::new(6, 3)..DisplayPoint::new(6, 5),
Color::red(),
),
]
);
assert_eq!(

2
crates/gpui/src/color.rs
View file

@ -12,7 +12,7 @@ use serde::{
};
use serde_json::json;
#[derive(Clone, Copy, Default, PartialEq, Eq, Hash)]
#[derive(Clone, Copy, Default, PartialEq, Eq, Hash, PartialOrd, Ord)]
#[repr(transparent)]
pub struct Color(ColorU);