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

WIP

Browse source
This commit is contained in:
Mikayla 2023-11-09 00:18:00 -08:00
parent 43eb7f28d1
commit 656eb9d455
No known key found for this signature in database
9 changed files with 451 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

358
crates/editor2/src/editor_tests.rs
View file

@ -10,8 +10,9 @@ use crate::{
use drag_and_drop::DragAndDrop; use drag_and_drop::DragAndDrop;
use futures::StreamExt; use futures::StreamExt;
use gpui::{ use gpui::{
div,
serde_json::{self, json}, serde_json::{self, json},
TestAppContext, WindowOptions, Div, TestAppContext, VisualTestContext, WindowBounds, WindowOptions,
}; };
use indoc::indoc; use indoc::indoc;
use language::{ use language::{
@ -31,7 +32,7 @@ use util::{
test::{marked_text_ranges, marked_text_ranges_by, sample_text, TextRangeMarker}, test::{marked_text_ranges, marked_text_ranges_by, sample_text, TextRangeMarker},
}; };
use workspace::{ use workspace::{
item::{FollowableEvents, FollowableItem, Item, ItemHandle}, item::{FollowEvent, FollowableEvents, FollowableItem, Item, ItemHandle},
NavigationEntry, ViewId, NavigationEntry, ViewId,
}; };
@ -470,16 +471,22 @@ fn test_clone(cx: &mut TestAppContext) {
); );
}); });
let cloned_editor = editor.update(cx, |editor, cx| { let cloned_editor = editor
cx.add_window(Default::default(), |cx| editor.clone(cx)) .update(cx, |editor, cx| {
}); cx.open_window(Default::default(), |cx| {
cx.build_view(|cx| editor.clone(cx))
})
})
.unwrap();
let snapshot = editor.update(cx, |e, cx| e.snapshot(cx)); let snapshot = editor.update(cx, |e, cx| e.snapshot(cx)).unwrap();
let cloned_snapshot = cloned_editor.update(cx, |e, cx| e.snapshot(cx)); let cloned_snapshot = cloned_editor.update(cx, |e, cx| e.snapshot(cx)).unwrap();
assert_eq!( assert_eq!(
cloned_editor.update(cx, |e, cx| e.display_text(cx)), cloned_editor
editor.update(cx, |e, cx| e.display_text(cx)) .update(cx, |e, cx| e.display_text(cx))
.unwrap(),
editor.update(cx, |e, cx| e.display_text(cx)).unwrap()
); );
assert_eq!( assert_eq!(
cloned_snapshot cloned_snapshot
@ -488,12 +495,20 @@ fn test_clone(cx: &mut TestAppContext) {
snapshot.folds_in_range(0..text.len()).collect::<Vec<_>>(), snapshot.folds_in_range(0..text.len()).collect::<Vec<_>>(),
); );
assert_set_eq!( assert_set_eq!(
cloned_editor.read_with(cx, |editor, cx| editor.selections.ranges::<Point>(cx)), cloned_editor
editor.read_with(cx, |editor, cx| editor.selections.ranges(cx)) .read_with(cx, |editor, cx| editor.selections.ranges::<Point>(cx))
.unwrap(),
editor
.read_with(cx, |editor, cx| editor.selections.ranges(cx))
.unwrap()
); );
assert_set_eq!( assert_set_eq!(
cloned_editor.update(cx, |e, cx| e.selections.display_ranges(cx)), cloned_editor
editor.update(cx, |e, cx| e.selections.display_ranges(cx)) .update(cx, |e, cx| e.selections.display_ranges(cx))
.unwrap(),
editor
.update(cx, |e, cx| e.selections.display_ranges(cx))
.unwrap()
); );
} }
@ -506,14 +521,16 @@ async fn test_navigation_history(cx: &mut TestAppContext) {
let fs = FakeFs::new(cx.executor()); let fs = FakeFs::new(cx.executor());
let project = Project::test(fs, [], cx).await; let project = Project::test(fs, [], cx).await;
let window = cx.add_window(|cx| Workspace::test_new(project, cx)); let workspace = cx.add_window(|cx| Workspace::test_new(project, cx));
let workspace = window; let pane = workspace
let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone()); .read_with(cx, |workspace, _| workspace.active_pane().clone())
.unwrap();
window.add_view(cx, |cx| { workspace.update(cx, |v, cx| {
cx.build_view(|cx| {
let buffer = MultiBuffer::build_simple(&sample_text(300, 5, 'a'), cx); let buffer = MultiBuffer::build_simple(&sample_text(300, 5, 'a'), cx);
let mut editor = build_editor(buffer.clone(), cx); let mut editor = build_editor(buffer.clone(), cx);
let handle = cx.handle(); let handle = cx.view();
editor.set_nav_history(Some(pane.read(cx).nav_history_for_item(&handle))); editor.set_nav_history(Some(pane.read(cx).nav_history_for_item(&handle)));
fn pop_history(editor: &mut Editor, cx: &mut WindowContext) -> Option<NavigationEntry> { fn pop_history(editor: &mut Editor, cx: &mut WindowContext) -> Option<NavigationEntry> {
@ -537,7 +554,7 @@ async fn test_navigation_history(cx: &mut TestAppContext) {
}); });
let nav_entry = pop_history(&mut editor, cx).unwrap(); let nav_entry = pop_history(&mut editor, cx).unwrap();
editor.navigate(nav_entry.data.unwrap(), cx); editor.navigate(nav_entry.data.unwrap(), cx);
assert_eq!(nav_entry.item.id(), cx.view_id()); assert_eq!(nav_entry.item.id(), cx.entity_id());
assert_eq!( assert_eq!(
editor.selections.display_ranges(cx), editor.selections.display_ranges(cx),
&[DisplayPoint::new(3, 0)..DisplayPoint::new(3, 0)] &[DisplayPoint::new(3, 0)..DisplayPoint::new(3, 0)]
@ -564,7 +581,7 @@ async fn test_navigation_history(cx: &mut TestAppContext) {
); );
let nav_entry = pop_history(&mut editor, cx).unwrap(); let nav_entry = pop_history(&mut editor, cx).unwrap();
editor.navigate(nav_entry.data.unwrap(), cx); editor.navigate(nav_entry.data.unwrap(), cx);
assert_eq!(nav_entry.item.id(), cx.view_id()); assert_eq!(nav_entry.item.id(), cx.entity_id());
assert_eq!( assert_eq!(
editor.selections.display_ranges(cx), editor.selections.display_ranges(cx),
&[DisplayPoint::new(5, 0)..DisplayPoint::new(5, 0)] &[DisplayPoint::new(5, 0)..DisplayPoint::new(5, 0)]
@ -572,12 +589,12 @@ async fn test_navigation_history(cx: &mut TestAppContext) {
assert!(pop_history(&mut editor, cx).is_none()); assert!(pop_history(&mut editor, cx).is_none());
// Set scroll position to check later // Set scroll position to check later
editor.set_scroll_position(Point::<Pixels>::new(5.5, 5.5), cx); editor.set_scroll_position(gpui::Point::<f32>::new(5.5, 5.5), cx);
let original_scroll_position = editor.scroll_manager.anchor(); let original_scroll_position = editor.scroll_manager.anchor();
// Jump to the end of the document and adjust scroll // Jump to the end of the document and adjust scroll
editor.move_to_end(&MoveToEnd, cx); editor.move_to_end(&MoveToEnd, cx);
editor.set_scroll_position(Point::<Pixels>::new(-2.5, -0.5), cx); editor.set_scroll_position(gpui::Point::<f32>::new(-2.5, -0.5), cx);
assert_ne!(editor.scroll_manager.anchor(), original_scroll_position); assert_ne!(editor.scroll_manager.anchor(), original_scroll_position);
let nav_entry = pop_history(&mut editor, cx).unwrap(); let nav_entry = pop_history(&mut editor, cx).unwrap();
@ -606,10 +623,11 @@ async fn test_navigation_history(cx: &mut TestAppContext) {
); );
assert_eq!( assert_eq!(
editor.scroll_position(cx), editor.scroll_position(cx),
Point::new(0., editor.max_point(cx).row() as f32) gpui::Point::new(0., editor.max_point(cx).row() as f32)
); );
editor editor
})
}); });
} }
@ -624,21 +642,11 @@ fn test_cancel(cx: &mut TestAppContext) {
view.update(cx, |view, cx| { view.update(cx, |view, cx| {
view.begin_selection(DisplayPoint::new(3, 4), false, 1, cx); view.begin_selection(DisplayPoint::new(3, 4), false, 1, cx);
view.update_selection( view.update_selection(DisplayPoint::new(1, 1), 0, gpui::Point::<f32>::zero(), cx);
DisplayPoint::new(1, 1),
0,
gpui::Point::<Pixels>::zero(),
cx,
);
view.end_selection(cx); view.end_selection(cx);
view.begin_selection(DisplayPoint::new(0, 1), true, 1, cx); view.begin_selection(DisplayPoint::new(0, 1), true, 1, cx);
view.update_selection( view.update_selection(DisplayPoint::new(0, 3), 0, gpui::Point::<f32>::zero(), cx);
DisplayPoint::new(0, 3),
0,
gpui::Point::<Pixels>::zero(),
cx,
);
view.end_selection(cx); view.end_selection(cx);
assert_eq!( assert_eq!(
view.selections.display_ranges(cx), view.selections.display_ranges(cx),
@ -1223,7 +1231,7 @@ fn test_prev_next_word_bounds_with_soft_wrap(cx: &mut TestAppContext) {
}); });
view.update(cx, |view, cx| { view.update(cx, |view, cx| {
view.set_wrap_width(Some(140.), cx); view.set_wrap_width(Some(140.0.into()), cx);
assert_eq!( assert_eq!(
view.display_text(cx), view.display_text(cx),
"use one::{\n two::three::\n four::five\n};" "use one::{\n two::three::\n four::five\n};"
@ -1278,7 +1286,7 @@ async fn test_move_start_of_paragraph_end_of_paragraph(cx: &mut gpui::TestAppCon
let line_height = cx.editor(|editor, cx| editor.style(cx).text.line_height(cx.font_cache())); let line_height = cx.editor(|editor, cx| editor.style(cx).text.line_height(cx.font_cache()));
let window = cx.window; let window = cx.window;
window.simulate_resize(Point::new(100., 4. * line_height), &mut cx); window.simulate_resize(gpui::Point::new(100., 4. * line_height), &mut cx);
cx.set_state( cx.set_state(
&r#"ˇone &r#"ˇone
@ -1394,18 +1402,36 @@ async fn test_scroll_page_up_page_down(cx: &mut gpui::TestAppContext) {
); );
cx.update_editor(|editor, cx| { cx.update_editor(|editor, cx| {
assert_eq!(editor.snapshot(cx).scroll_position(), Point::new(0., 0.)); assert_eq!(
editor.snapshot(cx).scroll_position(),
gpui::Point::new(0., 0.)
);
editor.scroll_screen(&ScrollAmount::Page(1.), cx); editor.scroll_screen(&ScrollAmount::Page(1.), cx);
assert_eq!(editor.snapshot(cx).scroll_position(), Point::new(0., 3.)); assert_eq!(
editor.snapshot(cx).scroll_position(),
gpui::Point::new(0., 3.)
);
editor.scroll_screen(&ScrollAmount::Page(1.), cx); editor.scroll_screen(&ScrollAmount::Page(1.), cx);
assert_eq!(editor.snapshot(cx).scroll_position(), Point::new(0., 6.)); assert_eq!(
editor.snapshot(cx).scroll_position(),
gpui::Point::new(0., 6.)
);
editor.scroll_screen(&ScrollAmount::Page(-1.), cx); editor.scroll_screen(&ScrollAmount::Page(-1.), cx);
assert_eq!(editor.snapshot(cx).scroll_position(), Point::new(0., 3.)); assert_eq!(
editor.snapshot(cx).scroll_position(),
gpui::Point::new(0., 3.)
);
editor.scroll_screen(&ScrollAmount::Page(-0.5), cx); editor.scroll_screen(&ScrollAmount::Page(-0.5), cx);
assert_eq!(editor.snapshot(cx).scroll_position(), Point::new(0., 1.)); assert_eq!(
editor.snapshot(cx).scroll_position(),
gpui::Point::new(0., 1.)
);
editor.scroll_screen(&ScrollAmount::Page(0.5), cx); editor.scroll_screen(&ScrollAmount::Page(0.5), cx);
assert_eq!(editor.snapshot(cx).scroll_position(), Point::new(0., 3.)); assert_eq!(
editor.snapshot(cx).scroll_position(),
gpui::Point::new(0., 3.)
);
}); });
} }
@ -1420,7 +1446,7 @@ async fn test_autoscroll(cx: &mut gpui::TestAppContext) {
}); });
let window = cx.window; let window = cx.window;
window.simulate_resize(Point::new(1000., 6.0 * line_height), &mut cx); window.simulate_resize(gpui::Point::new(1000., 6.0 * line_height), &mut cx);
cx.set_state( cx.set_state(
&r#"ˇone &r#"ˇone
@ -1436,7 +1462,10 @@ async fn test_autoscroll(cx: &mut gpui::TestAppContext) {
"#, "#,
); );
cx.update_editor(|editor, cx| { cx.update_editor(|editor, cx| {
assert_eq!(editor.snapshot(cx).scroll_position(), Point::new(0., 0.0)); assert_eq!(
editor.snapshot(cx).scroll_position(),
gpui::Point::new(0., 0.0)
);
}); });
// Add a cursor below the visible area. Since both cursors cannot fit // Add a cursor below the visible area. Since both cursors cannot fit
@ -1451,7 +1480,10 @@ async fn test_autoscroll(cx: &mut gpui::TestAppContext) {
}) })
}); });
cx.update_editor(|editor, cx| { cx.update_editor(|editor, cx| {
assert_eq!(editor.snapshot(cx).scroll_position(), Point::new(0., 3.0)); assert_eq!(
editor.snapshot(cx).scroll_position(),
gpui::Point::new(0., 3.0)
);
}); });
// Move down. The editor cursor scrolls down to track the newest cursor. // Move down. The editor cursor scrolls down to track the newest cursor.
@ -1459,7 +1491,10 @@ async fn test_autoscroll(cx: &mut gpui::TestAppContext) {
editor.move_down(&Default::default(), cx); editor.move_down(&Default::default(), cx);
}); });
cx.update_editor(|editor, cx| { cx.update_editor(|editor, cx| {
assert_eq!(editor.snapshot(cx).scroll_position(), Point::new(0., 4.0)); assert_eq!(
editor.snapshot(cx).scroll_position(),
gpui::Point::new(0., 4.0)
);
}); });
// Add a cursor above the visible area. Since both cursors fit on screen, // Add a cursor above the visible area. Since both cursors fit on screen,
@ -1473,7 +1508,10 @@ async fn test_autoscroll(cx: &mut gpui::TestAppContext) {
}) })
}); });
cx.update_editor(|editor, cx| { cx.update_editor(|editor, cx| {
assert_eq!(editor.snapshot(cx).scroll_position(), Point::new(0., 1.0)); assert_eq!(
editor.snapshot(cx).scroll_position(),
gpui::Point::new(0., 1.0)
);
}); });
} }
@ -1484,7 +1522,7 @@ async fn test_move_page_up_page_down(cx: &mut gpui::TestAppContext) {
let line_height = cx.editor(|editor, cx| editor.style(cx).text.line_height(cx.font_cache())); let line_height = cx.editor(|editor, cx| editor.style(cx).text.line_height(cx.font_cache()));
let window = cx.window; let window = cx.window;
window.simulate_resize(Point::new(100., 4. * line_height), &mut cx); window.simulate_resize(gpui::Point::new(100., 4. * line_height), &mut cx);
cx.set_state( cx.set_state(
&r#" &r#"
@ -3762,7 +3800,8 @@ async fn test_select_larger_smaller_syntax_node(cx: &mut gpui::TestAppContext) {
view.select_larger_syntax_node(&SelectLargerSyntaxNode, cx); view.select_larger_syntax_node(&SelectLargerSyntaxNode, cx);
}); });
assert_eq!( assert_eq!(
view.update(cx, |view, cx| { view.selections.display_ranges(cx) }), view.update(cx, |view, cx| { view.selections.display_ranges(cx) })
.unwrap(),
&[ &[
DisplayPoint::new(0, 23)..DisplayPoint::new(0, 27), DisplayPoint::new(0, 23)..DisplayPoint::new(0, 27),
DisplayPoint::new(2, 35)..DisplayPoint::new(2, 7), DisplayPoint::new(2, 35)..DisplayPoint::new(2, 7),
@ -3774,7 +3813,8 @@ async fn test_select_larger_smaller_syntax_node(cx: &mut gpui::TestAppContext) {
view.select_larger_syntax_node(&SelectLargerSyntaxNode, cx); view.select_larger_syntax_node(&SelectLargerSyntaxNode, cx);
}); });
assert_eq!( assert_eq!(
view.update(cx, |view, cx| view.selections.display_ranges(cx)), view.update(cx, |view, cx| view.selections.display_ranges(cx))
.unwrap(),
&[ &[
DisplayPoint::new(0, 16)..DisplayPoint::new(0, 28), DisplayPoint::new(0, 16)..DisplayPoint::new(0, 28),
DisplayPoint::new(4, 1)..DisplayPoint::new(2, 0), DisplayPoint::new(4, 1)..DisplayPoint::new(2, 0),
@ -3785,7 +3825,8 @@ async fn test_select_larger_smaller_syntax_node(cx: &mut gpui::TestAppContext) {
view.select_larger_syntax_node(&SelectLargerSyntaxNode, cx); view.select_larger_syntax_node(&SelectLargerSyntaxNode, cx);
}); });
assert_eq!( assert_eq!(
view.update(cx, |view, cx| view.selections.display_ranges(cx)), view.update(cx, |view, cx| view.selections.display_ranges(cx))
.unwrap(),
&[DisplayPoint::new(5, 0)..DisplayPoint::new(0, 0)] &[DisplayPoint::new(5, 0)..DisplayPoint::new(0, 0)]
); );
@ -3794,7 +3835,8 @@ async fn test_select_larger_smaller_syntax_node(cx: &mut gpui::TestAppContext) {
view.select_larger_syntax_node(&SelectLargerSyntaxNode, cx); view.select_larger_syntax_node(&SelectLargerSyntaxNode, cx);
}); });
assert_eq!( assert_eq!(
view.update(cx, |view, cx| view.selections.display_ranges(cx)), view.update(cx, |view, cx| view.selections.display_ranges(cx))
.unwrap(),
&[DisplayPoint::new(5, 0)..DisplayPoint::new(0, 0)] &[DisplayPoint::new(5, 0)..DisplayPoint::new(0, 0)]
); );
@ -3802,7 +3844,8 @@ async fn test_select_larger_smaller_syntax_node(cx: &mut gpui::TestAppContext) {
view.select_smaller_syntax_node(&SelectSmallerSyntaxNode, cx); view.select_smaller_syntax_node(&SelectSmallerSyntaxNode, cx);
}); });
assert_eq!( assert_eq!(
view.update(cx, |view, cx| view.selections.display_ranges(cx)), view.update(cx, |view, cx| view.selections.display_ranges(cx))
.unwrap(),
&[ &[
DisplayPoint::new(0, 16)..DisplayPoint::new(0, 28), DisplayPoint::new(0, 16)..DisplayPoint::new(0, 28),
DisplayPoint::new(4, 1)..DisplayPoint::new(2, 0), DisplayPoint::new(4, 1)..DisplayPoint::new(2, 0),
@ -3813,7 +3856,8 @@ async fn test_select_larger_smaller_syntax_node(cx: &mut gpui::TestAppContext) {
view.select_smaller_syntax_node(&SelectSmallerSyntaxNode, cx); view.select_smaller_syntax_node(&SelectSmallerSyntaxNode, cx);
}); });
assert_eq!( assert_eq!(
view.update(cx, |view, cx| view.selections.display_ranges(cx)), view.update(cx, |view, cx| view.selections.display_ranges(cx))
.unwrap(),
&[ &[
DisplayPoint::new(0, 23)..DisplayPoint::new(0, 27), DisplayPoint::new(0, 23)..DisplayPoint::new(0, 27),
DisplayPoint::new(2, 35)..DisplayPoint::new(2, 7), DisplayPoint::new(2, 35)..DisplayPoint::new(2, 7),
@ -3825,7 +3869,8 @@ async fn test_select_larger_smaller_syntax_node(cx: &mut gpui::TestAppContext) {
view.select_smaller_syntax_node(&SelectSmallerSyntaxNode, cx); view.select_smaller_syntax_node(&SelectSmallerSyntaxNode, cx);
}); });
assert_eq!( assert_eq!(
view.update(cx, |view, cx| view.selections.display_ranges(cx)), view.update(cx, |view, cx| view.selections.display_ranges(cx))
.unwrap(),
&[ &[
DisplayPoint::new(0, 25)..DisplayPoint::new(0, 25), DisplayPoint::new(0, 25)..DisplayPoint::new(0, 25),
DisplayPoint::new(2, 24)..DisplayPoint::new(2, 12), DisplayPoint::new(2, 24)..DisplayPoint::new(2, 12),
@ -3838,7 +3883,8 @@ async fn test_select_larger_smaller_syntax_node(cx: &mut gpui::TestAppContext) {
view.select_smaller_syntax_node(&SelectSmallerSyntaxNode, cx); view.select_smaller_syntax_node(&SelectSmallerSyntaxNode, cx);
}); });
assert_eq!( assert_eq!(
view.update(cx, |view, cx| view.selections.display_ranges(cx)), view.update(cx, |view, cx| view.selections.display_ranges(cx))
.unwrap(),
&[ &[
DisplayPoint::new(0, 25)..DisplayPoint::new(0, 25), DisplayPoint::new(0, 25)..DisplayPoint::new(0, 25),
DisplayPoint::new(2, 24)..DisplayPoint::new(2, 12), DisplayPoint::new(2, 24)..DisplayPoint::new(2, 12),
@ -3860,7 +3906,8 @@ async fn test_select_larger_smaller_syntax_node(cx: &mut gpui::TestAppContext) {
view.select_larger_syntax_node(&SelectLargerSyntaxNode, cx); view.select_larger_syntax_node(&SelectLargerSyntaxNode, cx);
}); });
assert_eq!( assert_eq!(
view.update(cx, |view, cx| view.selections.display_ranges(cx)), view.update(cx, |view, cx| view.selections.display_ranges(cx))
.unwrap(),
&[ &[
DisplayPoint::new(0, 16)..DisplayPoint::new(0, 28), DisplayPoint::new(0, 16)..DisplayPoint::new(0, 28),
DisplayPoint::new(2, 35)..DisplayPoint::new(2, 7), DisplayPoint::new(2, 35)..DisplayPoint::new(2, 7),
@ -4843,7 +4890,7 @@ async fn test_document_format_during_save(cx: &mut gpui::TestAppContext) {
.await .await
.unwrap(); .unwrap();
cx.foreground().start_waiting(); cx.executor().start_waiting();
let fake_server = fake_servers.next().await.unwrap(); let fake_server = fake_servers.next().await.unwrap();
let buffer = cx.build_model(|cx| MultiBuffer::singleton(buffer, cx)); let buffer = cx.build_model(|cx| MultiBuffer::singleton(buffer, cx));
@ -4851,7 +4898,9 @@ async fn test_document_format_during_save(cx: &mut gpui::TestAppContext) {
editor.update(cx, |editor, cx| editor.set_text("one\ntwo\nthree\n", cx)); editor.update(cx, |editor, cx| editor.set_text("one\ntwo\nthree\n", cx));
assert!(cx.read(|cx| editor.is_dirty(cx))); assert!(cx.read(|cx| editor.is_dirty(cx)));
let save = editor.update(cx, |editor, cx| editor.save(project.clone(), cx)); let save = editor
.update(cx, |editor, cx| editor.save(project.clone(), cx))
.unwrap();
fake_server fake_server
.handle_request::<lsp::request::Formatting, _, _>(move |params, _| async move { .handle_request::<lsp::request::Formatting, _, _>(move |params, _| async move {
assert_eq!( assert_eq!(
@ -4866,10 +4915,10 @@ async fn test_document_format_during_save(cx: &mut gpui::TestAppContext) {
}) })
.next() .next()
.await; .await;
cx.foreground().start_waiting(); cx.executor().start_waiting();
save.await.unwrap(); save.await.unwrap();
assert_eq!( assert_eq!(
editor.read_with(cx, |editor, cx| editor.text(cx)), editor.read_with(cx, |editor, cx| editor.text(cx)).unwrap(),
"one, two\nthree\n" "one, two\nthree\n"
); );
assert!(!cx.read(|cx| editor.is_dirty(cx))); assert!(!cx.read(|cx| editor.is_dirty(cx)));
@ -4886,12 +4935,14 @@ async fn test_document_format_during_save(cx: &mut gpui::TestAppContext) {
futures::future::pending::<()>().await; futures::future::pending::<()>().await;
unreachable!() unreachable!()
}); });
let save = editor.update(cx, |editor, cx| editor.save(project.clone(), cx)); let save = editor
cx.foreground().advance_clock(super::FORMAT_TIMEOUT); .update(cx, |editor, cx| editor.save(project.clone(), cx))
cx.foreground().start_waiting(); .unwrap();
cx.executor().advance_clock(super::FORMAT_TIMEOUT);
cx.executor().start_waiting();
save.await.unwrap(); save.await.unwrap();
assert_eq!( assert_eq!(
editor.read_with(cx, |editor, cx| editor.text(cx)), editor.read_with(cx, |editor, cx| editor.text(cx)).unwrap(),
"one\ntwo\nthree\n" "one\ntwo\nthree\n"
); );
assert!(!cx.read(|cx| editor.is_dirty(cx))); assert!(!cx.read(|cx| editor.is_dirty(cx)));
@ -4907,7 +4958,9 @@ async fn test_document_format_during_save(cx: &mut gpui::TestAppContext) {
); );
}); });
let save = editor.update(cx, |editor, cx| editor.save(project.clone(), cx)); let save = editor
.update(cx, |editor, cx| editor.save(project.clone(), cx))
.unwrap();
fake_server fake_server
.handle_request::<lsp::request::Formatting, _, _>(move |params, _| async move { .handle_request::<lsp::request::Formatting, _, _>(move |params, _| async move {
assert_eq!( assert_eq!(
@ -4919,7 +4972,7 @@ async fn test_document_format_during_save(cx: &mut gpui::TestAppContext) {
}) })
.next() .next()
.await; .await;
cx.foreground().start_waiting(); cx.executor().start_waiting();
save.await.unwrap(); save.await.unwrap();
} }
@ -4955,7 +5008,7 @@ async fn test_range_format_during_save(cx: &mut gpui::TestAppContext) {
.await .await
.unwrap(); .unwrap();
cx.foreground().start_waiting(); cx.executor().start_waiting();
let fake_server = fake_servers.next().await.unwrap(); let fake_server = fake_servers.next().await.unwrap();
let buffer = cx.build_model(|cx| MultiBuffer::singleton(buffer, cx)); let buffer = cx.build_model(|cx| MultiBuffer::singleton(buffer, cx));
@ -4963,7 +5016,9 @@ async fn test_range_format_during_save(cx: &mut gpui::TestAppContext) {
editor.update(cx, |editor, cx| editor.set_text("one\ntwo\nthree\n", cx)); editor.update(cx, |editor, cx| editor.set_text("one\ntwo\nthree\n", cx));
assert!(cx.read(|cx| editor.is_dirty(cx))); assert!(cx.read(|cx| editor.is_dirty(cx)));
let save = editor.update(cx, |editor, cx| editor.save(project.clone(), cx)); let save = editor
.update(cx, |editor, cx| editor.save(project.clone(), cx))
.unwrap();
fake_server fake_server
.handle_request::<lsp::request::RangeFormatting, _, _>(move |params, _| async move { .handle_request::<lsp::request::RangeFormatting, _, _>(move |params, _| async move {
assert_eq!( assert_eq!(
@ -4978,10 +5033,10 @@ async fn test_range_format_during_save(cx: &mut gpui::TestAppContext) {
}) })
.next() .next()
.await; .await;
cx.foreground().start_waiting(); cx.executor().start_waiting();
save.await.unwrap(); save.await.unwrap();
assert_eq!( assert_eq!(
editor.read_with(cx, |editor, cx| editor.text(cx)), editor.read_with(cx, |editor, cx| editor.text(cx)).unwrap(),
"one, two\nthree\n" "one, two\nthree\n"
); );
assert!(!cx.read(|cx| editor.is_dirty(cx))); assert!(!cx.read(|cx| editor.is_dirty(cx)));
@ -5000,12 +5055,14 @@ async fn test_range_format_during_save(cx: &mut gpui::TestAppContext) {
unreachable!() unreachable!()
}, },
); );
let save = editor.update(cx, |editor, cx| editor.save(project.clone(), cx)); let save = editor
cx.foreground().advance_clock(super::FORMAT_TIMEOUT); .update(cx, |editor, cx| editor.save(project.clone(), cx))
cx.foreground().start_waiting(); .unwrap();
cx.executor().advance_clock(super::FORMAT_TIMEOUT);
cx.executor().start_waiting();
save.await.unwrap(); save.await.unwrap();
assert_eq!( assert_eq!(
editor.read_with(cx, |editor, cx| editor.text(cx)), editor.read_with(cx, |editor, cx| editor.text(cx)).unwrap(),
"one\ntwo\nthree\n" "one\ntwo\nthree\n"
); );
assert!(!cx.read(|cx| editor.is_dirty(cx))); assert!(!cx.read(|cx| editor.is_dirty(cx)));
@ -5021,7 +5078,9 @@ async fn test_range_format_during_save(cx: &mut gpui::TestAppContext) {
); );
}); });
let save = editor.update(cx, |editor, cx| editor.save(project.clone(), cx)); let save = editor
.update(cx, |editor, cx| editor.save(project.clone(), cx))
.unwrap();
fake_server fake_server
.handle_request::<lsp::request::RangeFormatting, _, _>(move |params, _| async move { .handle_request::<lsp::request::RangeFormatting, _, _>(move |params, _| async move {
assert_eq!( assert_eq!(
@ -5033,7 +5092,7 @@ async fn test_range_format_during_save(cx: &mut gpui::TestAppContext) {
}) })
.next() .next()
.await; .await;
cx.foreground().start_waiting(); cx.executor().start_waiting();
save.await.unwrap(); save.await.unwrap();
} }
@ -5076,16 +5135,18 @@ async fn test_document_format_manual_trigger(cx: &mut gpui::TestAppContext) {
.await .await
.unwrap(); .unwrap();
cx.foreground().start_waiting(); cx.executor().start_waiting();
let fake_server = fake_servers.next().await.unwrap(); let fake_server = fake_servers.next().await.unwrap();
let buffer = cx.build_model(|cx| MultiBuffer::singleton(buffer, cx)); let buffer = cx.build_model(|cx| MultiBuffer::singleton(buffer, cx));
let editor = cx.add_window(|cx| build_editor(buffer, cx)); let editor = cx.add_window(|cx| build_editor(buffer, cx));
editor.update(cx, |editor, cx| editor.set_text("one\ntwo\nthree\n", cx)); editor.update(cx, |editor, cx| editor.set_text("one\ntwo\nthree\n", cx));
let format = editor.update(cx, |editor, cx| { let format = editor
.update(cx, |editor, cx| {
editor.perform_format(project.clone(), FormatTrigger::Manual, cx) editor.perform_format(project.clone(), FormatTrigger::Manual, cx)
}); })
.unwrap();
fake_server fake_server
.handle_request::<lsp::request::Formatting, _, _>(move |params, _| async move { .handle_request::<lsp::request::Formatting, _, _>(move |params, _| async move {
assert_eq!( assert_eq!(
@ -5100,10 +5161,10 @@ async fn test_document_format_manual_trigger(cx: &mut gpui::TestAppContext) {
}) })
.next() .next()
.await; .await;
cx.foreground().start_waiting(); cx.executor().start_waiting();
format.await.unwrap(); format.await.unwrap();
assert_eq!( assert_eq!(
editor.read_with(cx, |editor, cx| editor.text(cx)), editor.read_with(cx, |editor, cx| editor.text(cx)).unwrap(),
"one, two\nthree\n" "one, two\nthree\n"
); );
@ -5117,14 +5178,16 @@ async fn test_document_format_manual_trigger(cx: &mut gpui::TestAppContext) {
futures::future::pending::<()>().await; futures::future::pending::<()>().await;
unreachable!() unreachable!()
}); });
let format = editor.update(cx, |editor, cx| { let format = editor
.update(cx, |editor, cx| {
editor.perform_format(project, FormatTrigger::Manual, cx) editor.perform_format(project, FormatTrigger::Manual, cx)
}); })
cx.foreground().advance_clock(super::FORMAT_TIMEOUT); .unwrap();
cx.foreground().start_waiting(); cx.executor().advance_clock(super::FORMAT_TIMEOUT);
cx.executor().start_waiting();
format.await.unwrap(); format.await.unwrap();
assert_eq!( assert_eq!(
editor.read_with(cx, |editor, cx| editor.text(cx)), editor.read_with(cx, |editor, cx| editor.text(cx)).unwrap(),
"one\ntwo\nthree\n" "one\ntwo\nthree\n"
); );
} }
@ -5150,7 +5213,7 @@ async fn test_concurrent_format_requests(cx: &mut gpui::TestAppContext) {
// a newline and an indent before the `.` // a newline and an indent before the `.`
cx.lsp cx.lsp
.handle_request::<lsp::request::Formatting, _, _>(move |_, cx| { .handle_request::<lsp::request::Formatting, _, _>(move |_, cx| {
let executor = cx.background(); let executor = cx.background_executor();
async move { async move {
executor.timer(Duration::from_millis(100)).await; executor.timer(Duration::from_millis(100)).await;
Ok(Some(vec![lsp::TextEdit { Ok(Some(vec![lsp::TextEdit {
@ -5164,19 +5227,19 @@ async fn test_concurrent_format_requests(cx: &mut gpui::TestAppContext) {
let format_1 = cx let format_1 = cx
.update_editor(|editor, cx| editor.format(&Format, cx)) .update_editor(|editor, cx| editor.format(&Format, cx))
.unwrap(); .unwrap();
cx.foreground().run_until_parked(); cx.executor().run_until_parked();
// Submit a second format request. // Submit a second format request.
let format_2 = cx let format_2 = cx
.update_editor(|editor, cx| editor.format(&Format, cx)) .update_editor(|editor, cx| editor.format(&Format, cx))
.unwrap(); .unwrap();
cx.foreground().run_until_parked(); cx.executor().run_until_parked();
// Wait for both format requests to complete // Wait for both format requests to complete
cx.foreground().advance_clock(Duration::from_millis(200)); cx.executor().advance_clock(Duration::from_millis(200));
cx.foreground().start_waiting(); cx.executor().start_waiting();
format_1.await.unwrap(); format_1.await.unwrap();
cx.foreground().start_waiting(); cx.executor().start_waiting();
format_2.await.unwrap(); format_2.await.unwrap();
// The formatting edits only happens once. // The formatting edits only happens once.
@ -5824,7 +5887,7 @@ async fn test_toggle_block_comment(cx: &mut gpui::TestAppContext) {
"# "#
.unindent(), .unindent(),
); );
cx.foreground().run_until_parked(); cx.executor().run_until_parked();
cx.update_editor(|editor, cx| editor.toggle_comments(&ToggleComments::default(), cx)); cx.update_editor(|editor, cx| editor.toggle_comments(&ToggleComments::default(), cx));
cx.assert_editor_state( cx.assert_editor_state(
&r#" &r#"
@ -6299,15 +6362,15 @@ async fn test_following(cx: &mut gpui::TestAppContext) {
}); });
let leader = cx.add_window(|cx| build_editor(buffer.clone(), cx)); let leader = cx.add_window(|cx| build_editor(buffer.clone(), cx));
let follower = cx.update(|cx| { let follower = cx.update(|cx| {
cx.add_window( cx.open_window(
WindowOptions { WindowOptions {
bounds: WindowBounds::Fixed(RectF::from_points( bounds: WindowBounds::Fixed(Bounds::from_corners(
Point::new(0., 0.), gpui::Point::new((0. as f64).into(), (0. as f64).into()),
Point::new(10., 80.), gpui::Point::new((10. as f64).into(), (80. as f64).into()),
)), )),
..Default::default() ..Default::default()
}, },
|cx| build_editor(buffer.clone(), cx), |cx| cx.build_view(|cx| build_editor(buffer.clone(), cx)),
) )
}); });
@ -6319,14 +6382,19 @@ async fn test_following(cx: &mut gpui::TestAppContext) {
let is_still_following = is_still_following.clone(); let is_still_following = is_still_following.clone();
let follower_edit_event_count = follower_edit_event_count.clone(); let follower_edit_event_count = follower_edit_event_count.clone();
|_, cx| { |_, cx| {
cx.subscribe(&leader, move |_, leader, event, cx| { cx.subscribe(
&leader.root_view(cx).unwrap(),
move |_, leader, event, cx| {
leader leader
.read(cx) .read(cx)
.add_event_to_update_proto(event, &mut *update.borrow_mut(), cx); .add_event_to_update_proto(event, &mut *update.borrow_mut(), cx);
}) },
)
.detach(); .detach();
cx.subscribe(&follower, move |_, _, event, cx| { cx.subscribe(
&follower.root_view(cx).unwrap(),
move |_, _, event: &Event, cx| {
if matches!(event.to_follow_event(), Some(FollowEvent::Unfollow)) { if matches!(event.to_follow_event(), Some(FollowEvent::Unfollow)) {
*is_still_following.borrow_mut() = false; *is_still_following.borrow_mut() = false;
} }
@ -6334,7 +6402,8 @@ async fn test_following(cx: &mut gpui::TestAppContext) {
if let Event::BufferEdited = event { if let Event::BufferEdited = event {
*follower_edit_event_count.borrow_mut() += 1; *follower_edit_event_count.borrow_mut() += 1;
} }
}) },
)
.detach(); .detach();
} }
}); });
@ -6347,6 +6416,7 @@ async fn test_following(cx: &mut gpui::TestAppContext) {
.update(cx, |follower, cx| { .update(cx, |follower, cx| {
follower.apply_update_proto(&project, pending_update.borrow_mut().take().unwrap(), cx) follower.apply_update_proto(&project, pending_update.borrow_mut().take().unwrap(), cx)
}) })
.unwrap()
.await .await
.unwrap(); .unwrap();
follower.read_with(cx, |follower, cx| { follower.read_with(cx, |follower, cx| {
@ -6357,17 +6427,20 @@ async fn test_following(cx: &mut gpui::TestAppContext) {
// Update the scroll position only // Update the scroll position only
leader.update(cx, |leader, cx| { leader.update(cx, |leader, cx| {
leader.set_scroll_position(Point::new(1.5, 3.5), cx); leader.set_scroll_position(gpui::Point::new(1.5, 3.5), cx);
}); });
follower follower
.update(cx, |follower, cx| { .update(cx, |follower, cx| {
follower.apply_update_proto(&project, pending_update.borrow_mut().take().unwrap(), cx) follower.apply_update_proto(&project, pending_update.borrow_mut().take().unwrap(), cx)
}) })
.unwrap()
.await .await
.unwrap(); .unwrap();
assert_eq!( assert_eq!(
follower.update(cx, |follower, cx| follower.scroll_position(cx)), follower
Point::new(1.5, 3.5) .update(cx, |follower, cx| follower.scroll_position(cx))
.unwrap(),
gpui::Point::new(1.5, 3.5)
); );
assert_eq!(*is_still_following.borrow(), true); assert_eq!(*is_still_following.borrow(), true);
assert_eq!(*follower_edit_event_count.borrow(), 0); assert_eq!(*follower_edit_event_count.borrow(), 0);
@ -6377,16 +6450,17 @@ async fn test_following(cx: &mut gpui::TestAppContext) {
leader.update(cx, |leader, cx| { leader.update(cx, |leader, cx| {
leader.change_selections(None, cx, |s| s.select_ranges([0..0])); leader.change_selections(None, cx, |s| s.select_ranges([0..0]));
leader.request_autoscroll(Autoscroll::newest(), cx); leader.request_autoscroll(Autoscroll::newest(), cx);
leader.set_scroll_position(Point::new(1.5, 3.5), cx); leader.set_scroll_position(gpui::Point::new(1.5, 3.5), cx);
}); });
follower follower
.update(cx, |follower, cx| { .update(cx, |follower, cx| {
follower.apply_update_proto(&project, pending_update.borrow_mut().take().unwrap(), cx) follower.apply_update_proto(&project, pending_update.borrow_mut().take().unwrap(), cx)
}) })
.unwrap()
.await .await
.unwrap(); .unwrap();
follower.update(cx, |follower, cx| { follower.update(cx, |follower, cx| {
assert_eq!(follower.scroll_position(cx), Point::new(1.5, 0.0)); assert_eq!(follower.scroll_position(cx), gpui::Point::new(1.5, 0.0));
assert_eq!(follower.selections.ranges(cx), vec![0..0]); assert_eq!(follower.selections.ranges(cx), vec![0..0]);
}); });
assert_eq!(*is_still_following.borrow(), true); assert_eq!(*is_still_following.borrow(), true);
@ -6400,6 +6474,7 @@ async fn test_following(cx: &mut gpui::TestAppContext) {
.update(cx, |follower, cx| { .update(cx, |follower, cx| {
follower.apply_update_proto(&project, pending_update.borrow_mut().take().unwrap(), cx) follower.apply_update_proto(&project, pending_update.borrow_mut().take().unwrap(), cx)
}) })
.unwrap()
.await .await
.unwrap(); .unwrap();
follower.read_with(cx, |follower, cx| { follower.read_with(cx, |follower, cx| {
@ -6415,6 +6490,7 @@ async fn test_following(cx: &mut gpui::TestAppContext) {
.update(cx, |follower, cx| { .update(cx, |follower, cx| {
follower.apply_update_proto(&project, pending_update.borrow_mut().take().unwrap(), cx) follower.apply_update_proto(&project, pending_update.borrow_mut().take().unwrap(), cx)
}) })
.unwrap()
.await .await
.unwrap(); .unwrap();
follower.read_with(cx, |follower, cx| { follower.read_with(cx, |follower, cx| {
@ -6427,7 +6503,7 @@ async fn test_following(cx: &mut gpui::TestAppContext) {
follower.set_scroll_anchor( follower.set_scroll_anchor(
ScrollAnchor { ScrollAnchor {
anchor: top_anchor, anchor: top_anchor,
offset: Point::new(0.0, 0.5), offset: gpui::Point::new(0.0, 0.5),
}, },
cx, cx,
); );
@ -6442,11 +6518,15 @@ async fn test_following_with_multiple_excerpts(cx: &mut gpui::TestAppContext) {
let fs = FakeFs::new(cx.executor()); let fs = FakeFs::new(cx.executor());
let project = Project::test(fs, ["/file.rs".as_ref()], cx).await; let project = Project::test(fs, ["/file.rs".as_ref()], cx).await;
let workspace = cx.add_window(|cx| Workspace::test_new(project.clone(), cx)); let workspace = cx.add_window(|cx| Workspace::test_new(project.clone(), cx));
let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone()); let pane = workspace
.read_with(cx, |workspace, _| workspace.active_pane().clone())
.unwrap();
let cx = &mut VisualTestContext::from_window(*workspace.deref(), cx);
let leader = pane.update(cx, |_, cx| { let leader = pane.update(cx, |_, cx| {
let multibuffer = cx.build_model(|_| MultiBuffer::new(0)); let multibuffer = cx.build_model(|_| MultiBuffer::new(0));
cx.add_view(|cx| build_editor(multibuffer.clone(), cx)) cx.build_view(|cx| build_editor(multibuffer.clone(), cx))
}); });
// Start following the editor when it has no excerpts. // Start following the editor when it has no excerpts.
@ -6455,7 +6535,7 @@ async fn test_following_with_multiple_excerpts(cx: &mut gpui::TestAppContext) {
.update(|cx| { .update(|cx| {
Editor::from_state_proto( Editor::from_state_proto(
pane.clone(), pane.clone(),
workspace.clone(), workspace.root_view(cx).unwrap(),
ViewId { ViewId {
creator: Default::default(), creator: Default::default(),
id: 0, id: 0,
@ -6539,8 +6619,8 @@ async fn test_following_with_multiple_excerpts(cx: &mut gpui::TestAppContext) {
.await .await
.unwrap(); .unwrap();
assert_eq!( assert_eq!(
follower_1.read_with(cx, |editor, cx| editor.text(cx)), follower_1.update(cx, |editor, cx| editor.text(cx)),
leader.read_with(cx, |editor, cx| editor.text(cx)) leader.update(cx, |editor, cx| editor.text(cx))
); );
update_message.borrow_mut().take(); update_message.borrow_mut().take();
@ -6563,8 +6643,8 @@ async fn test_following_with_multiple_excerpts(cx: &mut gpui::TestAppContext) {
.await .await
.unwrap(); .unwrap();
assert_eq!( assert_eq!(
follower_2.read_with(cx, |editor, cx| editor.text(cx)), follower_2.update(cx, |editor, cx| editor.text(cx)),
leader.read_with(cx, |editor, cx| editor.text(cx)) leader.update(cx, |editor, cx| editor.text(cx))
); );
// Remove some excerpts. // Remove some excerpts.
@ -6591,8 +6671,8 @@ async fn test_following_with_multiple_excerpts(cx: &mut gpui::TestAppContext) {
.unwrap(); .unwrap();
update_message.borrow_mut().take(); update_message.borrow_mut().take();
assert_eq!( assert_eq!(
follower_1.read_with(cx, |editor, cx| editor.text(cx)), follower_1.update(cx, |editor, cx| editor.text(cx)),
leader.read_with(cx, |editor, cx| editor.text(cx)) leader.update(cx, |editor, cx| editor.text(cx))
); );
} }
@ -7521,11 +7601,16 @@ async fn test_on_type_formatting_not_triggered(cx: &mut gpui::TestAppContext) {
let project = Project::test(fs, ["/a".as_ref()], cx).await; let project = Project::test(fs, ["/a".as_ref()], cx).await;
project.update(cx, |project, _| project.languages().add(Arc::new(language))); project.update(cx, |project, _| project.languages().add(Arc::new(language)));
let workspace = cx.add_window(|cx| Workspace::test_new(project.clone(), cx)); let workspace = cx.add_window(|cx| Workspace::test_new(project.clone(), cx));
let worktree_id = workspace.update(cx, |workspace, cx| {
let cx = &mut VisualTestContext::from_window(*workspace, cx);
let worktree_id = workspace
.update(cx, |workspace, cx| {
workspace.project().read_with(cx, |project, cx| { workspace.project().read_with(cx, |project, cx| {
project.worktrees(cx).next().unwrap().read(cx).id() project.worktrees().next().unwrap().read(cx).id()
}) })
}); })
.unwrap();
let buffer = project let buffer = project
.update(cx, |project, cx| { .update(cx, |project, cx| {
@ -7533,13 +7618,14 @@ async fn test_on_type_formatting_not_triggered(cx: &mut gpui::TestAppContext) {
}) })
.await .await
.unwrap(); .unwrap();
cx.foreground().run_until_parked(); cx.executor().run_until_parked();
cx.foreground().start_waiting(); cx.executor().start_waiting();
let fake_server = fake_servers.next().await.unwrap(); let fake_server = fake_servers.next().await.unwrap();
let editor_handle = workspace let editor_handle = workspace
.update(cx, |workspace, cx| { .update(cx, |workspace, cx| {
workspace.open_path((worktree_id, "main.rs"), None, true, cx) workspace.open_path((worktree_id, "main.rs"), None, true, cx)
}) })
.unwrap()
.await .await
.unwrap() .unwrap()
.downcast::<Editor>() .downcast::<Editor>()
@ -7569,7 +7655,7 @@ async fn test_on_type_formatting_not_triggered(cx: &mut gpui::TestAppContext) {
editor.handle_input("{", cx); editor.handle_input("{", cx);
}); });
cx.foreground().run_until_parked(); cx.executor().run_until_parked();
buffer.read_with(cx, |buffer, _| { buffer.read_with(cx, |buffer, _| {
assert_eq!( assert_eq!(
@ -7642,7 +7728,7 @@ async fn test_language_server_restart_due_to_settings_change(cx: &mut gpui::Test
}, },
); );
}); });
cx.foreground().run_until_parked(); cx.executor().run_until_parked();
assert_eq!( assert_eq!(
server_restarts.load(atomic::Ordering::Acquire), server_restarts.load(atomic::Ordering::Acquire),
0, 0,
@ -7659,7 +7745,7 @@ async fn test_language_server_restart_due_to_settings_change(cx: &mut gpui::Test
}, },
); );
}); });
cx.foreground().run_until_parked(); cx.executor().run_until_parked();
assert_eq!( assert_eq!(
server_restarts.load(atomic::Ordering::Acquire), server_restarts.load(atomic::Ordering::Acquire),
0, 0,
@ -7676,7 +7762,7 @@ async fn test_language_server_restart_due_to_settings_change(cx: &mut gpui::Test
}, },
); );
}); });
cx.foreground().run_until_parked(); cx.executor().run_until_parked();
assert_eq!( assert_eq!(
server_restarts.load(atomic::Ordering::Acquire), server_restarts.load(atomic::Ordering::Acquire),
1, 1,
@ -7693,7 +7779,7 @@ async fn test_language_server_restart_due_to_settings_change(cx: &mut gpui::Test
}, },
); );
}); });
cx.foreground().run_until_parked(); cx.executor().run_until_parked();
assert_eq!( assert_eq!(
server_restarts.load(atomic::Ordering::Acquire), server_restarts.load(atomic::Ordering::Acquire),
1, 1,
@ -7708,7 +7794,7 @@ async fn test_language_server_restart_due_to_settings_change(cx: &mut gpui::Test
}, },
); );
}); });
cx.foreground().run_until_parked(); cx.executor().run_until_parked();
assert_eq!( assert_eq!(
server_restarts.load(atomic::Ordering::Acquire), server_restarts.load(atomic::Ordering::Acquire),
2, 2,
@ -7865,7 +7951,7 @@ async fn test_completions_in_languages_with_extra_word_characters(cx: &mut gpui:
// Trigger completion when typing a dash, because the dash is an extra // Trigger completion when typing a dash, because the dash is an extra
// word character in the 'element' scope, which contains the cursor. // word character in the 'element' scope, which contains the cursor.
cx.simulate_keystroke("-"); cx.simulate_keystroke("-");
cx.foreground().run_until_parked(); cx.executor().run_until_parked();
cx.update_editor(|editor, _| { cx.update_editor(|editor, _| {
if let Some(ContextMenu::Completions(menu)) = editor.context_menu.read().as_ref() { if let Some(ContextMenu::Completions(menu)) = editor.context_menu.read().as_ref() {
assert_eq!( assert_eq!(
@ -7878,7 +7964,7 @@ async fn test_completions_in_languages_with_extra_word_characters(cx: &mut gpui:
}); });
cx.simulate_keystroke("l"); cx.simulate_keystroke("l");
cx.foreground().run_until_parked(); cx.executor().run_until_parked();
cx.update_editor(|editor, _| { cx.update_editor(|editor, _| {
if let Some(ContextMenu::Completions(menu)) = editor.context_menu.read().as_ref() { if let Some(ContextMenu::Completions(menu)) = editor.context_menu.read().as_ref() {
assert_eq!( assert_eq!(
@ -7894,7 +7980,7 @@ async fn test_completions_in_languages_with_extra_word_characters(cx: &mut gpui:
// be the start of a subword. // be the start of a subword.
cx.set_state(r#"<p class="yelˇ" />"#); cx.set_state(r#"<p class="yelˇ" />"#);
cx.simulate_keystroke("l"); cx.simulate_keystroke("l");
cx.foreground().run_until_parked(); cx.executor().run_until_parked();
cx.update_editor(|editor, _| { cx.update_editor(|editor, _| {
if let Some(ContextMenu::Completions(menu)) = editor.context_menu.read().as_ref() { if let Some(ContextMenu::Completions(menu)) = editor.context_menu.read().as_ref() {
assert_eq!( assert_eq!(
@ -7949,9 +8035,11 @@ async fn test_document_format_with_prettier(cx: &mut gpui::TestAppContext) {
let editor = cx.add_window(|cx| build_editor(buffer, cx)); let editor = cx.add_window(|cx| build_editor(buffer, cx));
editor.update(cx, |editor, cx| editor.set_text(buffer_text, cx)); editor.update(cx, |editor, cx| editor.set_text(buffer_text, cx));
let format = editor.update(cx, |editor, cx| { let format = editor
.update(cx, |editor, cx| {
editor.perform_format(project.clone(), FormatTrigger::Manual, cx) editor.perform_format(project.clone(), FormatTrigger::Manual, cx)
}); })
.unwrap();
format.await.unwrap(); format.await.unwrap();
assert_eq!( assert_eq!(
editor.read_with(cx, |editor, cx| editor.text(cx)), editor.read_with(cx, |editor, cx| editor.text(cx)),

1
crates/editor2/src/test/editor_lsp_test_context.rs
View file

@ -5,6 +5,7 @@ use std::{
}; };
use anyhow::Result; use anyhow::Result;
use serde_json::json;
use crate::{Editor, ToPoint}; use crate::{Editor, ToPoint};
use collections::HashSet; use collections::HashSet;

4
crates/gpui2/src/app.rs
View file

@ -1011,7 +1011,7 @@ impl Context for AppContext {
fn read_window<T, R>( fn read_window<T, R>(
&self, &self,
window: &WindowHandle<T>, window: &WindowHandle<T>,
read: impl FnOnce(&T, &AppContext) -> R, read: impl FnOnce(View<T>, &AppContext) -> R,
) -> Result<R> ) -> Result<R>
where where
T: 'static, T: 'static,
@ -1028,7 +1028,7 @@ impl Context for AppContext {
.downcast::<T>() .downcast::<T>()
.map_err(|_| anyhow!("root view's type has changed"))?; .map_err(|_| anyhow!("root view's type has changed"))?;
Ok(read(view.read(self), self)) Ok(read(view, self))
} }
} }

4
crates/gpui2/src/app/async_context.rs
View file

@ -70,7 +70,7 @@ impl Context for AsyncAppContext {
fn read_window<T, R>( fn read_window<T, R>(
&self, &self,
window: &WindowHandle<T>, window: &WindowHandle<T>,
read: impl FnOnce(&T, &AppContext) -> R, read: impl FnOnce(View<T>, &AppContext) -> R,
) -> Result<R> ) -> Result<R>
where where
T: 'static, T: 'static,
@ -267,7 +267,7 @@ impl Context for AsyncWindowContext {
fn read_window<T, R>( fn read_window<T, R>(
&self, &self,
window: &WindowHandle<T>, window: &WindowHandle<T>,
read: impl FnOnce(&T, &AppContext) -> R, read: impl FnOnce(View<T>, &AppContext) -> R,
) -> Result<R> ) -> Result<R>
where where
T: 'static, T: 'static,

4
crates/gpui2/src/app/model_context.rs
View file

@ -1,6 +1,6 @@
use crate::{ use crate::{
AnyView, AnyWindowHandle, AppContext, AsyncAppContext, Context, Effect, Entity, EntityId, AnyView, AnyWindowHandle, AppContext, AsyncAppContext, Context, Effect, Entity, EntityId,
EventEmitter, Model, Subscription, Task, WeakModel, WindowContext, WindowHandle, EventEmitter, Model, Subscription, Task, View, WeakModel, WindowContext, WindowHandle,
}; };
use anyhow::Result; use anyhow::Result;
use derive_more::{Deref, DerefMut}; use derive_more::{Deref, DerefMut};
@ -243,7 +243,7 @@ impl<'a, T> Context for ModelContext<'a, T> {
fn read_window<U, R>( fn read_window<U, R>(
&self, &self,
window: &WindowHandle<U>, window: &WindowHandle<U>,
read: impl FnOnce(&U, &AppContext) -> R, read: impl FnOnce(View<U>, &AppContext) -> R,
) -> Result<R> ) -> Result<R>
where where
U: 'static, U: 'static,

108
crates/gpui2/src/app/test_context.rs
View file

@ -1,8 +1,8 @@
use crate::{ use crate::{
AnyView, AnyWindowHandle, AppCell, AppContext, AsyncAppContext, BackgroundExecutor, Context, AnyView, AnyWindowHandle, AppCell, AppContext, AsyncAppContext, BackgroundExecutor, Context,
EventEmitter, ForegroundExecutor, InputEvent, KeyDownEvent, Keystroke, Model, ModelContext, EventEmitter, ForegroundExecutor, InputEvent, KeyDownEvent, Keystroke, Model, ModelContext,
Render, Result, Task, TestDispatcher, TestPlatform, ViewContext, VisualContext, WindowContext, Render, Result, Task, TestDispatcher, TestPlatform, View, ViewContext, VisualContext,
WindowHandle, WindowOptions, WindowContext, WindowHandle, WindowOptions,
}; };
use anyhow::{anyhow, bail}; use anyhow::{anyhow, bail};
use futures::{Stream, StreamExt}; use futures::{Stream, StreamExt};
@ -62,7 +62,7 @@ impl Context for TestAppContext {
fn read_window<T, R>( fn read_window<T, R>(
&self, &self,
window: &WindowHandle<T>, window: &WindowHandle<T>,
read: impl FnOnce(&T, &AppContext) -> R, read: impl FnOnce(View<T>, &AppContext) -> R,
) -> Result<R> ) -> Result<R>
where where
T: 'static, T: 'static,
@ -276,3 +276,105 @@ impl<T: Send> Model<T> {
.expect("model was dropped") .expect("model was dropped")
} }
} }
use derive_more::{Deref, DerefMut};
#[derive(Deref, DerefMut)]
pub struct VisualTestContext<'a> {
#[deref]
#[deref_mut]
cx: &'a mut TestAppContext,
window: AnyWindowHandle,
}
impl<'a> VisualTestContext<'a> {
pub fn from_window(window: AnyWindowHandle, cx: &'a mut TestAppContext) -> Self {
Self { cx, window }
}
}
impl<'a> Context for VisualTestContext<'a> {
type Result<T> = <TestAppContext as Context>::Result<T>;
fn build_model<T: 'static>(
&mut self,
build_model: impl FnOnce(&mut ModelContext<'_, T>) -> T,
) -> Self::Result<Model<T>> {
self.cx.build_model(build_model)
}
fn update_model<T, R>(
&mut self,
handle: &Model<T>,
update: impl FnOnce(&mut T, &mut ModelContext<'_, T>) -> R,
) -> Self::Result<R>
where
T: 'static,
{
self.cx.update_model(handle, update)
}
fn read_model<T, R>(
&self,
handle: &Model<T>,
read: impl FnOnce(&T, &AppContext) -> R,
) -> Self::Result<R>
where
T: 'static,
{
self.cx.read_model(handle, read)
}
fn update_window<T, F>(&mut self, window: AnyWindowHandle, f: F) -> Result<T>
where
F: FnOnce(AnyView, &mut WindowContext<'_>) -> T,
{
self.cx.update_window(window, f)
}
fn read_window<T, R>(
&self,
window: &WindowHandle<T>,
read: impl FnOnce(View<T>, &AppContext) -> R,
) -> Result<R>
where
T: 'static,
{
self.cx.read_window(window, read)
}
}
impl<'a> VisualContext for VisualTestContext<'a> {
fn build_view<V>(
&mut self,
build_view: impl FnOnce(&mut ViewContext<'_, V>) -> V,
) -> Self::Result<View<V>>
where
V: 'static + Render,
{
self.window
.update(self.cx, |_, cx| cx.build_view(build_view))
.unwrap()
}
fn update_view<V: 'static, R>(
&mut self,
view: &View<V>,
update: impl FnOnce(&mut V, &mut ViewContext<'_, V>) -> R,
) -> Self::Result<R> {
self.window
.update(self.cx, |_, cx| cx.update_view(view, update))
.unwrap()
}
fn replace_root_view<V>(
&mut self,
build_view: impl FnOnce(&mut ViewContext<'_, V>) -> V,
) -> Self::Result<View<V>>
where
V: Render,
{
self.window
.update(self.cx, |_, cx| cx.replace_root_view(build_view))
.unwrap()
}
}

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

@ -141,7 +141,7 @@ impl TryFrom<&'_ str> for Rgba {
} }
} }
#[derive(Default, Copy, Clone, Debug, PartialEq)] #[derive(Default, Copy, Clone, Debug, PartialEq, PartialOrd)]
#[repr(C)] #[repr(C)]
pub struct Hsla { pub struct Hsla {
pub h: f32, pub h: f32,

2
crates/gpui2/src/gpui2.rs
View file

@ -108,7 +108,7 @@ pub trait Context {
fn read_window<T, R>( fn read_window<T, R>(
&self, &self,
window: &WindowHandle<T>, window: &WindowHandle<T>,
read: impl FnOnce(&T, &AppContext) -> R, read: impl FnOnce(View<T>, &AppContext) -> R,
) -> Result<R> ) -> Result<R>
where where
T: 'static; T: 'static;

25
crates/gpui2/src/window.rs
View file

@ -1432,7 +1432,7 @@ impl Context for WindowContext<'_> {
fn read_window<T, R>( fn read_window<T, R>(
&self, &self,
window: &WindowHandle<T>, window: &WindowHandle<T>,
read: impl FnOnce(&T, &AppContext) -> R, read: impl FnOnce(View<T>, &AppContext) -> R,
) -> Result<R> ) -> Result<R>
where where
T: 'static, T: 'static,
@ -1445,7 +1445,7 @@ impl Context for WindowContext<'_> {
.unwrap() .unwrap()
.downcast::<T>() .downcast::<T>()
.map_err(|_| anyhow!("the type of the window's root view has changed"))?; .map_err(|_| anyhow!("the type of the window's root view has changed"))?;
Ok(read(root_view.read(self), self)) Ok(read(root_view, self))
} else { } else {
self.app.read_window(window, read) self.app.read_window(window, read)
} }
@ -1769,6 +1769,10 @@ impl<'a, V: 'static> ViewContext<'a, V> {
} }
} }
pub fn entity_id(&self) -> EntityId {
self.view.entity_id()
}
pub fn view(&self) -> &View<V> { pub fn view(&self) -> &View<V> {
self.view self.view
} }
@ -2269,7 +2273,7 @@ impl<V> Context for ViewContext<'_, V> {
fn read_window<T, R>( fn read_window<T, R>(
&self, &self,
window: &WindowHandle<T>, window: &WindowHandle<T>,
read: impl FnOnce(&T, &AppContext) -> R, read: impl FnOnce(View<T>, &AppContext) -> R,
) -> Result<R> ) -> Result<R>
where where
T: 'static, T: 'static,
@ -2348,7 +2352,7 @@ impl<V: 'static + Render> WindowHandle<V> {
} }
pub fn update<C, R>( pub fn update<C, R>(
self, &self,
cx: &mut C, cx: &mut C,
update: impl FnOnce(&mut V, &mut ViewContext<'_, V>) -> R, update: impl FnOnce(&mut V, &mut ViewContext<'_, V>) -> R,
) -> Result<R> ) -> Result<R>
@ -2379,11 +2383,18 @@ impl<V: 'static + Render> WindowHandle<V> {
Ok(x.read(cx)) Ok(x.read(cx))
} }
pub fn read_with<C, R>(self, cx: &C, read_with: impl FnOnce(&V, &AppContext) -> R) -> Result<R> pub fn read_with<C, R>(&self, cx: &C, read_with: impl FnOnce(&V, &AppContext) -> R) -> Result<R>
where where
C: Context, C: Context,
{ {
cx.read_window(&self, |root_view: &V, cx| read_with(root_view, cx)) cx.read_window(self, |root_view, cx| read_with(root_view.read(cx), cx))
}
pub fn root_view<C>(&self, cx: &C) -> Result<View<V>>
where
C: Context,
{
cx.read_window(self, |root_view, _cx| root_view.clone())
} }
} }
@ -2451,7 +2462,7 @@ impl AnyWindowHandle {
cx.update_window(self, update) cx.update_window(self, update)
} }
pub fn read<T, C, R>(self, cx: &C, read: impl FnOnce(&T, &AppContext) -> R) -> Result<R> pub fn read<T, C, R>(self, cx: &C, read: impl FnOnce(View<T>, &AppContext) -> R) -> Result<R>
where where
C: Context, C: Context,
T: 'static, T: 'static,