Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

editor: Fix compile errors after bad merge (#25374)

Browse source 
This PR fixes the compile errors after
https://github.com/zed-industries/zed/pull/25367 was merged without
passing CI.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2025-02-21 21:31:20 -05:00 • committed by GitHub
parent 5d751cd407
commit b9ca240242
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/editor/src/editor_tests.rs
View file

@ -14843,7 +14843,7 @@ async fn test_adjacent_diff_hunks(executor: BackgroundExecutor, cx: &mut TestApp
); );
cx.set_diff_base(&diff_base); cx.set_diff_base(&diff_base);
cx.update_editor(|editor, window, cx| { cx.update_editor(|editor, window, cx| {
editor.expand_all_diff_hunks(&ExpandAllHunkDiffs, window, cx); editor.expand_all_diff_hunks(&ExpandAllDiffHunks, window, cx);
}); });
executor.run_until_parked(); executor.run_until_parked();
@ -14936,7 +14936,7 @@ async fn test_adjacent_diff_hunks(executor: BackgroundExecutor, cx: &mut TestApp
); );
cx.update_editor(|editor, window, cx| { cx.update_editor(|editor, window, cx| {
editor.expand_all_diff_hunks(&ExpandAllHunkDiffs, window, cx); editor.expand_all_diff_hunks(&ExpandAllDiffHunks, window, cx);
}); });
cx.assert_state_with_diff( cx.assert_state_with_diff(