Remove AppState from workspace actions
This allows those actions to be bound to keystrokes in the keymap. Also, remove the WorkspaceParams struct, simplify how Workspaces are constructed.
This commit is contained in:
@@ -7,11 +7,12 @@ use editor::{display_map::ToDisplayPoint, Autoscroll};
|
||||
use gpui::{json::json, keymap::Keystroke, ViewHandle};
|
||||
use indoc::indoc;
|
||||
use language::Selection;
|
||||
use project::Project;
|
||||
use util::{
|
||||
set_eq,
|
||||
test::{marked_text, marked_text_ranges_by, SetEqError},
|
||||
};
|
||||
use workspace::{WorkspaceHandle, WorkspaceParams};
|
||||
use workspace::{AppState, WorkspaceHandle};
|
||||
|
||||
use crate::{state::Operator, *};
|
||||
|
||||
@@ -30,7 +31,8 @@ impl<'a> VimTestContext<'a> {
|
||||
settings::KeymapFileContent::load("keymaps/vim.json", cx).unwrap();
|
||||
});
|
||||
|
||||
let params = cx.update(WorkspaceParams::test);
|
||||
let params = cx.update(AppState::test);
|
||||
let project = Project::test(params.fs.clone(), [], cx).await;
|
||||
|
||||
cx.update(|cx| {
|
||||
cx.update_global(|settings: &mut Settings, _| {
|
||||
@@ -44,9 +46,8 @@ impl<'a> VimTestContext<'a> {
|
||||
.insert_tree("/root", json!({ "dir": { "test.txt": "" } }))
|
||||
.await;
|
||||
|
||||
let (window_id, workspace) = cx.add_window(|cx| Workspace::new(¶ms, cx));
|
||||
params
|
||||
.project
|
||||
let (window_id, workspace) = cx.add_window(|cx| Workspace::new(project.clone(), cx));
|
||||
project
|
||||
.update(cx, |project, cx| {
|
||||
project.find_or_create_local_worktree("/root", true, cx)
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user