mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-12 05:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

re-add spaces removed by new setting

Browse source
This commit is contained in:
Mikayla Maki 2023-03-09 00:45:05 -08:00
parent f626920af1
commit 9187863d0e
4 changed files with 22 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/collab/src/tests.rs
View file

@ -197,8 +197,8 @@ impl TestServer {
fs: fs.clone(), fs: fs.clone(),
build_window_options: |_, _, _| Default::default(), build_window_options: |_, _, _| Default::default(),
initialize_workspace: |_, _, _| unimplemented!(), initialize_workspace: |_, _, _| unimplemented!(),
dock_default_item_factory: |_, _| unimplemented!(), dock_default_item_factory: |_, _| None,
background_actions: || unimplemented!(), background_actions: || &[],
}); });
Project::init(&client); Project::init(&client);

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

@ -484,9 +484,7 @@ fn test_navigation_history(cx: &mut gpui::MutableAppContext) {
cx.set_global(Settings::test(cx)); cx.set_global(Settings::test(cx));
cx.set_global(DragAndDrop::<Workspace>::default()); cx.set_global(DragAndDrop::<Workspace>::default());
use workspace::item::Item; use workspace::item::Item;
let (_, pane) = cx.add_window(Default::default(), |cx| { let (_, pane) = cx.add_window(Default::default(), |cx| Pane::new(0, None, || &[], cx));
Pane::new(0, None, || unimplemented!(), cx)
});
let buffer = MultiBuffer::build_simple(&sample_text(300, 5, 'a'), cx); let buffer = MultiBuffer::build_simple(&sample_text(300, 5, 'a'), cx);
cx.add_view(&pane, |cx| { cx.add_view(&pane, |cx| {
@ -2356,10 +2354,10 @@ async fn test_clipboard(cx: &mut gpui::TestAppContext) {
e.handle_input(") ", cx); e.handle_input(") ", cx);
}); });
cx.assert_editor_state(indoc! {" cx.assert_editor_state(indoc! {"
( one✅ ( one✅
three three
five ) ˇtwo one✅ four three six five ( one✅ five ) ˇtwo one✅ four three six five ( one✅
three three
five ) ˇ"}); five ) ˇ"});
// Cut with three selections, one of which is full-line. // Cut with three selections, one of which is full-line.
@ -5564,7 +5562,7 @@ async fn test_following_with_multiple_excerpts(cx: &mut gpui::TestAppContext) {
Settings::test_async(cx); Settings::test_async(cx);
let fs = FakeFs::new(cx.background()); let fs = FakeFs::new(cx.background());
let project = Project::test(fs, ["/file.rs".as_ref()], cx).await; let project = Project::test(fs, ["/file.rs".as_ref()], cx).await;
let (_, pane) = cx.add_window(|cx| Pane::new(0, None, || unimplemented!(), cx)); let (_, pane) = cx.add_window(|cx| Pane::new(0, None, || &[], cx));
let leader = pane.update(cx, |_, cx| { let leader = pane.update(cx, |_, cx| {
let multibuffer = cx.add_model(|_| MultiBuffer::new(0)); let multibuffer = cx.add_model(|_| MultiBuffer::new(0));

4
crates/workspace/src/dock.rs
View file

@ -500,7 +500,7 @@ mod tests {
0, 0,
project.clone(), project.clone(),
default_item_factory, default_item_factory,
|| unimplemented!(), || &[],
cx, cx,
) )
}); });
@ -634,7 +634,7 @@ mod tests {
0, 0,
project, project,
default_item_factory, default_item_factory,
|| unimplemented!(), || &[],
cx, cx,
) )
}); });

52
crates/workspace/src/workspace.rs
View file

@ -455,8 +455,8 @@ impl AppState {
user_store, user_store,
initialize_workspace: |_, _, _| {}, initialize_workspace: |_, _, _| {},
build_window_options: |_, _, _| Default::default(), build_window_options: |_, _, _| Default::default(),
dock_default_item_factory: |_, _| unimplemented!(), dock_default_item_factory: |_, _| None,
background_actions: || unimplemented!(), background_actions: || &[],
}) })
} }
} }
@ -3017,8 +3017,8 @@ mod tests {
Default::default(), Default::default(),
0, 0,
project.clone(), project.clone(),
|_, _| unimplemented!(), |_, _| None,
|| unimplemented!(), || &[],
cx, cx,
) )
}); });
@ -3090,8 +3090,8 @@ mod tests {
Default::default(), Default::default(),
0, 0,
project.clone(), project.clone(),
|_, _| unimplemented!(), |_, _| None,
|| unimplemented!(), || &[],
cx, cx,
) )
}); });
@ -3191,8 +3191,8 @@ mod tests {
Default::default(), Default::default(),
0, 0,
project.clone(), project.clone(),
|_, _| unimplemented!(), |_, _| None,
|| unimplemented!(), || &[],
cx, cx,
) )
}); });
@ -3231,14 +3231,7 @@ mod tests {
let project = Project::test(fs, None, cx).await; let project = Project::test(fs, None, cx).await;
let (window_id, workspace) = cx.add_window(|cx| { let (window_id, workspace) = cx.add_window(|cx| {
Workspace::new( Workspace::new(Default::default(), 0, project, |_, _| None, || &[], cx)
Default::default(),
0,
project,
|_, _| unimplemented!(),
|| unimplemented!(),
cx,
)
}); });
let item1 = cx.add_view(&workspace, |cx| { let item1 = cx.add_view(&workspace, |cx| {
@ -3347,14 +3340,7 @@ mod tests {
let project = Project::test(fs, [], cx).await; let project = Project::test(fs, [], cx).await;
let (window_id, workspace) = cx.add_window(|cx| { let (window_id, workspace) = cx.add_window(|cx| {
Workspace::new( Workspace::new(Default::default(), 0, project, |_, _| None, || &[], cx)
Default::default(),
0,
project,
|_, _| unimplemented!(),
|| unimplemented!(),
cx,
)
}); });
// Create several workspace items with single project entries, and two // Create several workspace items with single project entries, and two
@ -3463,14 +3449,7 @@ mod tests {
let project = Project::test(fs, [], cx).await; let project = Project::test(fs, [], cx).await;
let (window_id, workspace) = cx.add_window(|cx| { let (window_id, workspace) = cx.add_window(|cx| {
Workspace::new( Workspace::new(Default::default(), 0, project, |_, _| None, || &[], cx)
Default::default(),
0,
project,
|_, _| unimplemented!(),
|| unimplemented!(),
cx,
)
}); });
let item = cx.add_view(&workspace, |cx| { let item = cx.add_view(&workspace, |cx| {
@ -3589,14 +3568,7 @@ mod tests {
let project = Project::test(fs, [], cx).await; let project = Project::test(fs, [], cx).await;
let (_, workspace) = cx.add_window(|cx| { let (_, workspace) = cx.add_window(|cx| {
Workspace::new( Workspace::new(Default::default(), 0, project, |_, _| None, || &[], cx)
Default::default(),
0,
project,
|_, _| unimplemented!(),
|| unimplemented!(),
cx,
)
}); });
let item = cx.add_view(&workspace, |cx| { let item = cx.add_view(&workspace, |cx| {