editor: Fix flaky navigation test (#17087)

This test was flaky because both tasks were started at the same time and
the first one that would win, would navigate the editor.

Now the order is fixed, because the second task is only spawned after
the first one.

Release Notes:

- N/A

---------

Co-authored-by: Kirill <kirill@zed.dev>
This commit is contained in:
Thorsten Ball 2024-08-29 17:00:28 +02:00 committed by GitHub
parent 70018a167a
commit 376828e92f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -9111,18 +9111,16 @@ impl Editor {
cx: &mut ViewContext<Self>,
) -> Task<Result<Navigated>> {
let definition = self.go_to_definition_of_kind(GotoDefinitionKind::Symbol, false, cx);
let references = self.find_all_references(&FindAllReferences, cx);
cx.background_executor().spawn(async move {
cx.spawn(|editor, mut cx| async move {
if definition.await? == Navigated::Yes {
return Ok(Navigated::Yes);
}
if let Some(references) = references {
if references.await? == Navigated::Yes {
return Ok(Navigated::Yes);
}
match editor.update(&mut cx, |editor, cx| {
editor.find_all_references(&FindAllReferences, cx)
})? {
Some(references) => references.await,
None => Ok(Navigated::No),
}
Ok(Navigated::No)
})
}