From 40104c06e2caefa3b777d7056ebb06c6be50c06a Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Thu, 19 Oct 2023 11:05:47 +0300 Subject: [PATCH] Sort hint request ranges before asserting to avoid flackiness --- crates/editor/src/inlay_hint_cache.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/crates/editor/src/inlay_hint_cache.rs b/crates/editor/src/inlay_hint_cache.rs index dd75d2bab6..6b2712e7bf 100644 --- a/crates/editor/src/inlay_hint_cache.rs +++ b/crates/editor/src/inlay_hint_cache.rs @@ -2138,7 +2138,7 @@ pub mod tests { }); } - #[gpui::test] + #[gpui::test(iterations = 10)] async fn test_large_buffer_inlay_requests_split(cx: &mut gpui::TestAppContext) { init_test(cx, |settings| { settings.defaults.inlay_hints = Some(InlayHintSettings { @@ -2400,11 +2400,13 @@ pub mod tests { )); cx.foreground().run_until_parked(); editor.update(cx, |editor, cx| { - let ranges = lsp_request_ranges.lock().drain(..).collect::>(); + let mut ranges = lsp_request_ranges.lock().drain(..).collect::>(); + ranges.sort_by_key(|r| r.start); + assert_eq!(ranges.len(), 3, "On edit, should scroll to selection and query a range around it: visible + same range above and below. Instead, got query ranges {ranges:?}"); - let visible_query_range = &ranges[0]; - let above_query_range = &ranges[1]; + let above_query_range = &ranges[0]; + let visible_query_range = &ranges[1]; let below_query_range = &ranges[2]; assert!(above_query_range.end.character < visible_query_range.start.character || above_query_range.end.line + 1 == visible_query_range.start.line, "Above range {above_query_range:?} should be before visible range {visible_query_range:?}");