mirror of
https://github.com/zed-industries/zed.git
synced 2026-11-21 16:10:19 +01:00
c771663c8f
Closes https://github.com/zed-industries/zed/issues/53466 Release Notes: - Fixed the sidebar opening when a new project in a new window was opened
236 lines
7.3 KiB
Rust
236 lines
7.3 KiB
Rust
use std::path::PathBuf;
|
|
|
|
use super::*;
|
|
use fs::FakeFs;
|
|
use gpui::TestAppContext;
|
|
use project::{DisableAiSettings, ProjectGroupKey};
|
|
use serde_json::json;
|
|
use settings::SettingsStore;
|
|
use util::path;
|
|
|
|
fn init_test(cx: &mut TestAppContext) {
|
|
cx.update(|cx| {
|
|
let settings_store = SettingsStore::test(cx);
|
|
cx.set_global(settings_store);
|
|
theme_settings::init(theme::LoadThemes::JustBase, cx);
|
|
DisableAiSettings::register(cx);
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_sidebar_disabled_when_disable_ai_is_enabled(cx: &mut TestAppContext) {
|
|
init_test(cx);
|
|
let fs = FakeFs::new(cx.executor());
|
|
let project = Project::test(fs, [], cx).await;
|
|
|
|
let (multi_workspace, cx) =
|
|
cx.add_window_view(|window, cx| MultiWorkspace::test_new(project, window, cx));
|
|
|
|
multi_workspace.read_with(cx, |mw, cx| {
|
|
assert!(mw.multi_workspace_enabled(cx));
|
|
});
|
|
|
|
multi_workspace.update_in(cx, |mw, _window, cx| {
|
|
mw.open_sidebar(cx);
|
|
assert!(mw.sidebar_open());
|
|
});
|
|
|
|
cx.update(|_window, cx| {
|
|
DisableAiSettings::override_global(DisableAiSettings { disable_ai: true }, cx);
|
|
});
|
|
cx.run_until_parked();
|
|
|
|
multi_workspace.read_with(cx, |mw, cx| {
|
|
assert!(
|
|
!mw.sidebar_open(),
|
|
"Sidebar should be closed when disable_ai is true"
|
|
);
|
|
assert!(
|
|
!mw.multi_workspace_enabled(cx),
|
|
"Multi-workspace should be disabled when disable_ai is true"
|
|
);
|
|
});
|
|
|
|
multi_workspace.update_in(cx, |mw, window, cx| {
|
|
mw.toggle_sidebar(window, cx);
|
|
});
|
|
multi_workspace.read_with(cx, |mw, _cx| {
|
|
assert!(
|
|
!mw.sidebar_open(),
|
|
"Sidebar should remain closed when toggled with disable_ai true"
|
|
);
|
|
});
|
|
|
|
cx.update(|_window, cx| {
|
|
DisableAiSettings::override_global(DisableAiSettings { disable_ai: false }, cx);
|
|
});
|
|
cx.run_until_parked();
|
|
|
|
multi_workspace.read_with(cx, |mw, cx| {
|
|
assert!(
|
|
mw.multi_workspace_enabled(cx),
|
|
"Multi-workspace should be enabled after re-enabling AI"
|
|
);
|
|
assert!(
|
|
!mw.sidebar_open(),
|
|
"Sidebar should still be closed after re-enabling AI (not auto-opened)"
|
|
);
|
|
});
|
|
|
|
multi_workspace.update_in(cx, |mw, window, cx| {
|
|
mw.toggle_sidebar(window, cx);
|
|
});
|
|
multi_workspace.read_with(cx, |mw, _cx| {
|
|
assert!(
|
|
mw.sidebar_open(),
|
|
"Sidebar should open when toggled after re-enabling AI"
|
|
);
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_project_group_keys_initial(cx: &mut TestAppContext) {
|
|
init_test(cx);
|
|
let fs = FakeFs::new(cx.executor());
|
|
fs.insert_tree("/root_a", json!({ "file.txt": "" })).await;
|
|
let project = Project::test(fs, ["/root_a".as_ref()], cx).await;
|
|
|
|
let expected_key = project.read_with(cx, |project, cx| project.project_group_key(cx));
|
|
|
|
let (multi_workspace, cx) =
|
|
cx.add_window_view(|window, cx| MultiWorkspace::test_new(project, window, cx));
|
|
|
|
multi_workspace.update(cx, |mw, cx| {
|
|
mw.open_sidebar(cx);
|
|
});
|
|
|
|
multi_workspace.read_with(cx, |mw, _cx| {
|
|
let keys: Vec<&ProjectGroupKey> = mw.project_group_keys().collect();
|
|
assert_eq!(keys.len(), 1, "should have exactly one key on creation");
|
|
assert_eq!(*keys[0], expected_key);
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_project_group_keys_add_workspace(cx: &mut TestAppContext) {
|
|
init_test(cx);
|
|
let fs = FakeFs::new(cx.executor());
|
|
fs.insert_tree("/root_a", json!({ "file.txt": "" })).await;
|
|
fs.insert_tree("/root_b", json!({ "file.txt": "" })).await;
|
|
let project_a = Project::test(fs.clone(), ["/root_a".as_ref()], cx).await;
|
|
let project_b = Project::test(fs.clone(), ["/root_b".as_ref()], cx).await;
|
|
|
|
let key_a = project_a.read_with(cx, |p, cx| p.project_group_key(cx));
|
|
let key_b = project_b.read_with(cx, |p, cx| p.project_group_key(cx));
|
|
assert_ne!(
|
|
key_a, key_b,
|
|
"different roots should produce different keys"
|
|
);
|
|
|
|
let (multi_workspace, cx) =
|
|
cx.add_window_view(|window, cx| MultiWorkspace::test_new(project_a, window, cx));
|
|
|
|
multi_workspace.update(cx, |mw, cx| {
|
|
mw.open_sidebar(cx);
|
|
});
|
|
|
|
multi_workspace.read_with(cx, |mw, _cx| {
|
|
assert_eq!(mw.project_group_keys().count(), 1);
|
|
});
|
|
|
|
// Adding a workspace with a different project root adds a new key.
|
|
multi_workspace.update_in(cx, |mw, window, cx| {
|
|
mw.test_add_workspace(project_b, window, cx);
|
|
});
|
|
|
|
multi_workspace.read_with(cx, |mw, _cx| {
|
|
let keys: Vec<&ProjectGroupKey> = mw.project_group_keys().collect();
|
|
assert_eq!(
|
|
keys.len(),
|
|
2,
|
|
"should have two keys after adding a second workspace"
|
|
);
|
|
assert_eq!(*keys[0], key_b);
|
|
assert_eq!(*keys[1], key_a);
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_open_new_window_does_not_open_sidebar_on_existing_window(cx: &mut TestAppContext) {
|
|
init_test(cx);
|
|
|
|
let app_state = cx.update(AppState::test);
|
|
let fs = app_state.fs.as_fake();
|
|
fs.insert_tree(path!("/project_a"), json!({ "file.txt": "" }))
|
|
.await;
|
|
fs.insert_tree(path!("/project_b"), json!({ "file.txt": "" }))
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), [path!("/project_a").as_ref()], cx).await;
|
|
|
|
let window = cx.add_window(|window, cx| MultiWorkspace::test_new(project, window, cx));
|
|
|
|
window
|
|
.read_with(cx, |mw, _cx| {
|
|
assert!(!mw.sidebar_open(), "sidebar should start closed",);
|
|
})
|
|
.unwrap();
|
|
|
|
cx.update(|cx| {
|
|
open_paths(
|
|
&[PathBuf::from(path!("/project_b"))],
|
|
app_state,
|
|
OpenOptions {
|
|
open_mode: OpenMode::NewWindow,
|
|
..OpenOptions::default()
|
|
},
|
|
cx,
|
|
)
|
|
})
|
|
.await
|
|
.unwrap();
|
|
|
|
window
|
|
.read_with(cx, |mw, _cx| {
|
|
assert!(
|
|
!mw.sidebar_open(),
|
|
"opening a project in a new window must not open the sidebar on the original window",
|
|
);
|
|
})
|
|
.unwrap();
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_project_group_keys_duplicate_not_added(cx: &mut TestAppContext) {
|
|
init_test(cx);
|
|
let fs = FakeFs::new(cx.executor());
|
|
fs.insert_tree("/root_a", json!({ "file.txt": "" })).await;
|
|
let project_a = Project::test(fs.clone(), ["/root_a".as_ref()], cx).await;
|
|
// A second project entity pointing at the same path produces the same key.
|
|
let project_a2 = Project::test(fs.clone(), ["/root_a".as_ref()], cx).await;
|
|
|
|
let key_a = project_a.read_with(cx, |p, cx| p.project_group_key(cx));
|
|
let key_a2 = project_a2.read_with(cx, |p, cx| p.project_group_key(cx));
|
|
assert_eq!(key_a, key_a2, "same root path should produce the same key");
|
|
|
|
let (multi_workspace, cx) =
|
|
cx.add_window_view(|window, cx| MultiWorkspace::test_new(project_a, window, cx));
|
|
|
|
multi_workspace.update(cx, |mw, cx| {
|
|
mw.open_sidebar(cx);
|
|
});
|
|
|
|
multi_workspace.update_in(cx, |mw, window, cx| {
|
|
mw.test_add_workspace(project_a2, window, cx);
|
|
});
|
|
|
|
multi_workspace.read_with(cx, |mw, _cx| {
|
|
let keys: Vec<&ProjectGroupKey> = mw.project_group_keys().collect();
|
|
assert_eq!(
|
|
keys.len(),
|
|
1,
|
|
"duplicate key should not be added when a workspace with the same root is inserted"
|
|
);
|
|
});
|
|
}
|