mirror of
https://github.com/zed-industries/zed.git
synced 2025-01-30 14:17:02 +00:00
13dcb42c1c
This simplifies `PathWithPosition` by making the common use case concrete and removing the manual, incomplete Windows path parsing. Windows paths also don't get '/'s replaced by '\\'s anymore to limit the responsibility of the code to just parsing out the suffix and creating `PathBuf` from the rest. `Path::file_name()` is now used to extract the filename and potential suffix instead of manual parsing from the full input. This way e.g. Windows paths that begin with a drive letter are handled correctly without platform-specific hacks. Release Notes: - N/A
2006 lines
65 KiB
Rust
2006 lines
65 KiB
Rust
use std::{assert_eq, future::IntoFuture, path::Path, time::Duration};
|
|
|
|
use super::*;
|
|
use editor::Editor;
|
|
use gpui::{Entity, TestAppContext, VisualTestContext};
|
|
use menu::{Confirm, SelectNext, SelectPrev};
|
|
use project::FS_WATCH_LATENCY;
|
|
use serde_json::json;
|
|
use workspace::{AppState, ToggleFileFinder, Workspace};
|
|
|
|
#[ctor::ctor]
|
|
fn init_logger() {
|
|
if std::env::var("RUST_LOG").is_ok() {
|
|
env_logger::init();
|
|
}
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_matching_paths(cx: &mut TestAppContext) {
|
|
let app_state = init_test(cx);
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/root",
|
|
json!({
|
|
"a": {
|
|
"banana": "",
|
|
"bandana": "",
|
|
}
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/root".as_ref()], cx).await;
|
|
|
|
let (picker, workspace, cx) = build_find_picker(project, cx);
|
|
|
|
cx.simulate_input("bna");
|
|
picker.update(cx, |picker, _| {
|
|
assert_eq!(picker.delegate.matches.len(), 2);
|
|
});
|
|
cx.dispatch_action(SelectNext);
|
|
cx.dispatch_action(Confirm);
|
|
cx.read(|cx| {
|
|
let active_editor = workspace.read(cx).active_item_as::<Editor>(cx).unwrap();
|
|
assert_eq!(active_editor.read(cx).title(cx), "bandana");
|
|
});
|
|
|
|
for bandana_query in [
|
|
"bandana",
|
|
" bandana",
|
|
"bandana ",
|
|
" bandana ",
|
|
" ndan ",
|
|
" band ",
|
|
"a bandana",
|
|
] {
|
|
picker
|
|
.update(cx, |picker, cx| {
|
|
picker
|
|
.delegate
|
|
.update_matches(bandana_query.to_string(), cx)
|
|
})
|
|
.await;
|
|
picker.update(cx, |picker, _| {
|
|
assert_eq!(
|
|
picker.delegate.matches.len(),
|
|
1,
|
|
"Wrong number of matches for bandana query '{bandana_query}'"
|
|
);
|
|
});
|
|
cx.dispatch_action(SelectNext);
|
|
cx.dispatch_action(Confirm);
|
|
cx.read(|cx| {
|
|
let active_editor = workspace.read(cx).active_item_as::<Editor>(cx).unwrap();
|
|
assert_eq!(
|
|
active_editor.read(cx).title(cx),
|
|
"bandana",
|
|
"Wrong match for bandana query '{bandana_query}'"
|
|
);
|
|
});
|
|
}
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_absolute_paths(cx: &mut TestAppContext) {
|
|
let app_state = init_test(cx);
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/root",
|
|
json!({
|
|
"a": {
|
|
"file1.txt": "",
|
|
"b": {
|
|
"file2.txt": "",
|
|
},
|
|
}
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/root".as_ref()], cx).await;
|
|
|
|
let (picker, workspace, cx) = build_find_picker(project, cx);
|
|
|
|
let matching_abs_path = "/root/a/b/file2.txt";
|
|
picker
|
|
.update(cx, |picker, cx| {
|
|
picker
|
|
.delegate
|
|
.update_matches(matching_abs_path.to_string(), cx)
|
|
})
|
|
.await;
|
|
picker.update(cx, |picker, _| {
|
|
assert_eq!(
|
|
collect_search_matches(picker).search_paths_only(),
|
|
vec![PathBuf::from("a/b/file2.txt")],
|
|
"Matching abs path should be the only match"
|
|
)
|
|
});
|
|
cx.dispatch_action(SelectNext);
|
|
cx.dispatch_action(Confirm);
|
|
cx.read(|cx| {
|
|
let active_editor = workspace.read(cx).active_item_as::<Editor>(cx).unwrap();
|
|
assert_eq!(active_editor.read(cx).title(cx), "file2.txt");
|
|
});
|
|
|
|
let mismatching_abs_path = "/root/a/b/file1.txt";
|
|
picker
|
|
.update(cx, |picker, cx| {
|
|
picker
|
|
.delegate
|
|
.update_matches(mismatching_abs_path.to_string(), cx)
|
|
})
|
|
.await;
|
|
picker.update(cx, |picker, _| {
|
|
assert_eq!(
|
|
collect_search_matches(picker).search_paths_only(),
|
|
Vec::<PathBuf>::new(),
|
|
"Mismatching abs path should produce no matches"
|
|
)
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_complex_path(cx: &mut TestAppContext) {
|
|
let app_state = init_test(cx);
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/root",
|
|
json!({
|
|
"其他": {
|
|
"S数据表格": {
|
|
"task.xlsx": "some content",
|
|
},
|
|
}
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/root".as_ref()], cx).await;
|
|
|
|
let (picker, workspace, cx) = build_find_picker(project, cx);
|
|
|
|
cx.simulate_input("t");
|
|
picker.update(cx, |picker, _| {
|
|
assert_eq!(picker.delegate.matches.len(), 1);
|
|
assert_eq!(
|
|
collect_search_matches(picker).search_paths_only(),
|
|
vec![PathBuf::from("其他/S数据表格/task.xlsx")],
|
|
)
|
|
});
|
|
cx.dispatch_action(SelectNext);
|
|
cx.dispatch_action(Confirm);
|
|
cx.read(|cx| {
|
|
let active_editor = workspace.read(cx).active_item_as::<Editor>(cx).unwrap();
|
|
assert_eq!(active_editor.read(cx).title(cx), "task.xlsx");
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_row_column_numbers_query_inside_file(cx: &mut TestAppContext) {
|
|
let app_state = init_test(cx);
|
|
|
|
let first_file_name = "first.rs";
|
|
let first_file_contents = "// First Rust file";
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/src",
|
|
json!({
|
|
"test": {
|
|
first_file_name: first_file_contents,
|
|
"second.rs": "// Second Rust file",
|
|
}
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/src".as_ref()], cx).await;
|
|
|
|
let (picker, workspace, cx) = build_find_picker(project, cx);
|
|
|
|
let file_query = &first_file_name[..3];
|
|
let file_row = 1;
|
|
let file_column = 3;
|
|
assert!(file_column <= first_file_contents.len());
|
|
let query_inside_file = format!("{file_query}:{file_row}:{file_column}");
|
|
picker
|
|
.update(cx, |finder, cx| {
|
|
finder
|
|
.delegate
|
|
.update_matches(query_inside_file.to_string(), cx)
|
|
})
|
|
.await;
|
|
picker.update(cx, |finder, _| {
|
|
let finder = &finder.delegate;
|
|
assert_eq!(finder.matches.len(), 1);
|
|
let latest_search_query = finder
|
|
.latest_search_query
|
|
.as_ref()
|
|
.expect("Finder should have a query after the update_matches call");
|
|
assert_eq!(latest_search_query.raw_query, query_inside_file);
|
|
assert_eq!(latest_search_query.file_query_end, Some(file_query.len()));
|
|
assert_eq!(latest_search_query.path_position.row, Some(file_row));
|
|
assert_eq!(
|
|
latest_search_query.path_position.column,
|
|
Some(file_column as u32)
|
|
);
|
|
});
|
|
|
|
cx.dispatch_action(SelectNext);
|
|
cx.dispatch_action(Confirm);
|
|
|
|
let editor = cx.update(|cx| workspace.read(cx).active_item_as::<Editor>(cx).unwrap());
|
|
cx.executor().advance_clock(Duration::from_secs(2));
|
|
|
|
editor.update(cx, |editor, cx| {
|
|
let all_selections = editor.selections.all_adjusted(cx);
|
|
assert_eq!(
|
|
all_selections.len(),
|
|
1,
|
|
"Expected to have 1 selection (caret) after file finder confirm, but got: {all_selections:?}"
|
|
);
|
|
let caret_selection = all_selections.into_iter().next().unwrap();
|
|
assert_eq!(caret_selection.start, caret_selection.end,
|
|
"Caret selection should have its start and end at the same position");
|
|
assert_eq!(file_row, caret_selection.start.row + 1,
|
|
"Query inside file should get caret with the same focus row");
|
|
assert_eq!(file_column, caret_selection.start.column as usize + 1,
|
|
"Query inside file should get caret with the same focus column");
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_row_column_numbers_query_outside_file(cx: &mut TestAppContext) {
|
|
let app_state = init_test(cx);
|
|
|
|
let first_file_name = "first.rs";
|
|
let first_file_contents = "// First Rust file";
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/src",
|
|
json!({
|
|
"test": {
|
|
first_file_name: first_file_contents,
|
|
"second.rs": "// Second Rust file",
|
|
}
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/src".as_ref()], cx).await;
|
|
|
|
let (picker, workspace, cx) = build_find_picker(project, cx);
|
|
|
|
let file_query = &first_file_name[..3];
|
|
let file_row = 200;
|
|
let file_column = 300;
|
|
assert!(file_column > first_file_contents.len());
|
|
let query_outside_file = format!("{file_query}:{file_row}:{file_column}");
|
|
picker
|
|
.update(cx, |picker, cx| {
|
|
picker
|
|
.delegate
|
|
.update_matches(query_outside_file.to_string(), cx)
|
|
})
|
|
.await;
|
|
picker.update(cx, |finder, _| {
|
|
let delegate = &finder.delegate;
|
|
assert_eq!(delegate.matches.len(), 1);
|
|
let latest_search_query = delegate
|
|
.latest_search_query
|
|
.as_ref()
|
|
.expect("Finder should have a query after the update_matches call");
|
|
assert_eq!(latest_search_query.raw_query, query_outside_file);
|
|
assert_eq!(latest_search_query.file_query_end, Some(file_query.len()));
|
|
assert_eq!(latest_search_query.path_position.row, Some(file_row));
|
|
assert_eq!(
|
|
latest_search_query.path_position.column,
|
|
Some(file_column as u32)
|
|
);
|
|
});
|
|
|
|
cx.dispatch_action(SelectNext);
|
|
cx.dispatch_action(Confirm);
|
|
|
|
let editor = cx.update(|cx| workspace.read(cx).active_item_as::<Editor>(cx).unwrap());
|
|
cx.executor().advance_clock(Duration::from_secs(2));
|
|
|
|
editor.update(cx, |editor, cx| {
|
|
let all_selections = editor.selections.all_adjusted(cx);
|
|
assert_eq!(
|
|
all_selections.len(),
|
|
1,
|
|
"Expected to have 1 selection (caret) after file finder confirm, but got: {all_selections:?}"
|
|
);
|
|
let caret_selection = all_selections.into_iter().next().unwrap();
|
|
assert_eq!(caret_selection.start, caret_selection.end,
|
|
"Caret selection should have its start and end at the same position");
|
|
assert_eq!(0, caret_selection.start.row,
|
|
"Excessive rows (as in query outside file borders) should get trimmed to last file row");
|
|
assert_eq!(first_file_contents.len(), caret_selection.start.column as usize,
|
|
"Excessive columns (as in query outside file borders) should get trimmed to selected row's last column");
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_matching_cancellation(cx: &mut TestAppContext) {
|
|
let app_state = init_test(cx);
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/dir",
|
|
json!({
|
|
"hello": "",
|
|
"goodbye": "",
|
|
"halogen-light": "",
|
|
"happiness": "",
|
|
"height": "",
|
|
"hi": "",
|
|
"hiccup": "",
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/dir".as_ref()], cx).await;
|
|
|
|
let (picker, _, cx) = build_find_picker(project, cx);
|
|
|
|
let query = test_path_position("hi");
|
|
picker
|
|
.update(cx, |picker, cx| {
|
|
picker.delegate.spawn_search(query.clone(), cx)
|
|
})
|
|
.await;
|
|
|
|
picker.update(cx, |picker, _cx| {
|
|
assert_eq!(picker.delegate.matches.len(), 5)
|
|
});
|
|
|
|
picker.update(cx, |picker, cx| {
|
|
let matches = collect_search_matches(picker).search_matches_only();
|
|
let delegate = &mut picker.delegate;
|
|
|
|
// Simulate a search being cancelled after the time limit,
|
|
// returning only a subset of the matches that would have been found.
|
|
drop(delegate.spawn_search(query.clone(), cx));
|
|
delegate.set_search_matches(
|
|
delegate.latest_search_id,
|
|
true, // did-cancel
|
|
query.clone(),
|
|
vec![
|
|
ProjectPanelOrdMatch(matches[1].clone()),
|
|
ProjectPanelOrdMatch(matches[3].clone()),
|
|
],
|
|
cx,
|
|
);
|
|
|
|
// Simulate another cancellation.
|
|
drop(delegate.spawn_search(query.clone(), cx));
|
|
delegate.set_search_matches(
|
|
delegate.latest_search_id,
|
|
true, // did-cancel
|
|
query.clone(),
|
|
vec![
|
|
ProjectPanelOrdMatch(matches[0].clone()),
|
|
ProjectPanelOrdMatch(matches[2].clone()),
|
|
ProjectPanelOrdMatch(matches[3].clone()),
|
|
],
|
|
cx,
|
|
);
|
|
|
|
assert_eq!(
|
|
collect_search_matches(picker)
|
|
.search_matches_only()
|
|
.as_slice(),
|
|
&matches[0..4]
|
|
);
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_ignored_root(cx: &mut TestAppContext) {
|
|
let app_state = init_test(cx);
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/ancestor",
|
|
json!({
|
|
".gitignore": "ignored-root",
|
|
"ignored-root": {
|
|
"happiness": "",
|
|
"height": "",
|
|
"hi": "",
|
|
"hiccup": "",
|
|
},
|
|
"tracked-root": {
|
|
".gitignore": "height",
|
|
"happiness": "",
|
|
"height": "",
|
|
"hi": "",
|
|
"hiccup": "",
|
|
},
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(
|
|
app_state.fs.clone(),
|
|
[
|
|
"/ancestor/tracked-root".as_ref(),
|
|
"/ancestor/ignored-root".as_ref(),
|
|
],
|
|
cx,
|
|
)
|
|
.await;
|
|
|
|
let (picker, _, cx) = build_find_picker(project, cx);
|
|
|
|
picker
|
|
.update(cx, |picker, cx| {
|
|
picker.delegate.spawn_search(test_path_position("hi"), cx)
|
|
})
|
|
.await;
|
|
picker.update(cx, |picker, _| assert_eq!(picker.delegate.matches.len(), 7));
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_single_file_worktrees(cx: &mut TestAppContext) {
|
|
let app_state = init_test(cx);
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree("/root", json!({ "the-parent-dir": { "the-file": "" } }))
|
|
.await;
|
|
|
|
let project = Project::test(
|
|
app_state.fs.clone(),
|
|
["/root/the-parent-dir/the-file".as_ref()],
|
|
cx,
|
|
)
|
|
.await;
|
|
|
|
let (picker, _, cx) = build_find_picker(project, cx);
|
|
|
|
// Even though there is only one worktree, that worktree's filename
|
|
// is included in the matching, because the worktree is a single file.
|
|
picker
|
|
.update(cx, |picker, cx| {
|
|
picker.delegate.spawn_search(test_path_position("thf"), cx)
|
|
})
|
|
.await;
|
|
cx.read(|cx| {
|
|
let picker = picker.read(cx);
|
|
let delegate = &picker.delegate;
|
|
let matches = collect_search_matches(picker).search_matches_only();
|
|
assert_eq!(matches.len(), 1);
|
|
|
|
let (file_name, file_name_positions, full_path, full_path_positions) =
|
|
delegate.labels_for_path_match(&matches[0]);
|
|
assert_eq!(file_name, "the-file");
|
|
assert_eq!(file_name_positions, &[0, 1, 4]);
|
|
assert_eq!(full_path, "");
|
|
assert_eq!(full_path_positions, &[0; 0]);
|
|
});
|
|
|
|
// Since the worktree root is a file, searching for its name followed by a slash does
|
|
// not match anything.
|
|
picker
|
|
.update(cx, |f, cx| {
|
|
f.delegate.spawn_search(test_path_position("thf/"), cx)
|
|
})
|
|
.await;
|
|
picker.update(cx, |f, _| assert_eq!(f.delegate.matches.len(), 0));
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_path_distance_ordering(cx: &mut TestAppContext) {
|
|
let app_state = init_test(cx);
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/root",
|
|
json!({
|
|
"dir1": { "a.txt": "" },
|
|
"dir2": {
|
|
"a.txt": "",
|
|
"b.txt": ""
|
|
}
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/root".as_ref()], cx).await;
|
|
let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx));
|
|
|
|
let worktree_id = cx.read(|cx| {
|
|
let worktrees = workspace.read(cx).worktrees(cx).collect::<Vec<_>>();
|
|
assert_eq!(worktrees.len(), 1);
|
|
WorktreeId::from_usize(worktrees[0].entity_id().as_u64() as usize)
|
|
});
|
|
|
|
// When workspace has an active item, sort items which are closer to that item
|
|
// first when they have the same name. In this case, b.txt is closer to dir2's a.txt
|
|
// so that one should be sorted earlier
|
|
let b_path = ProjectPath {
|
|
worktree_id,
|
|
path: Arc::from(Path::new("dir2/b.txt")),
|
|
};
|
|
workspace
|
|
.update(cx, |workspace, cx| {
|
|
workspace.open_path(b_path, None, true, cx)
|
|
})
|
|
.await
|
|
.unwrap();
|
|
let finder = open_file_picker(&workspace, cx);
|
|
finder
|
|
.update(cx, |f, cx| {
|
|
f.delegate.spawn_search(test_path_position("a.txt"), cx)
|
|
})
|
|
.await;
|
|
|
|
finder.update(cx, |picker, _| {
|
|
let matches = collect_search_matches(picker).search_paths_only();
|
|
assert_eq!(matches[0].as_path(), Path::new("dir2/a.txt"));
|
|
assert_eq!(matches[1].as_path(), Path::new("dir1/a.txt"));
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_search_worktree_without_files(cx: &mut TestAppContext) {
|
|
let app_state = init_test(cx);
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/root",
|
|
json!({
|
|
"dir1": {},
|
|
"dir2": {
|
|
"dir3": {}
|
|
}
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/root".as_ref()], cx).await;
|
|
let (picker, _workspace, cx) = build_find_picker(project, cx);
|
|
|
|
picker
|
|
.update(cx, |f, cx| {
|
|
f.delegate.spawn_search(test_path_position("dir"), cx)
|
|
})
|
|
.await;
|
|
cx.read(|cx| {
|
|
let finder = picker.read(cx);
|
|
assert_eq!(finder.delegate.matches.len(), 0);
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_query_history(cx: &mut gpui::TestAppContext) {
|
|
let app_state = init_test(cx);
|
|
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/src",
|
|
json!({
|
|
"test": {
|
|
"first.rs": "// First Rust file",
|
|
"second.rs": "// Second Rust file",
|
|
"third.rs": "// Third Rust file",
|
|
}
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/src".as_ref()], cx).await;
|
|
let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx));
|
|
let worktree_id = cx.read(|cx| {
|
|
let worktrees = workspace.read(cx).worktrees(cx).collect::<Vec<_>>();
|
|
assert_eq!(worktrees.len(), 1);
|
|
WorktreeId::from_usize(worktrees[0].entity_id().as_u64() as usize)
|
|
});
|
|
|
|
// Open and close panels, getting their history items afterwards.
|
|
// Ensure history items get populated with opened items, and items are kept in a certain order.
|
|
// The history lags one opened buffer behind, since it's updated in the search panel only on its reopen.
|
|
//
|
|
// TODO: without closing, the opened items do not propagate their history changes for some reason
|
|
// it does work in real app though, only tests do not propagate.
|
|
workspace.update(cx, |_, cx| cx.focused());
|
|
|
|
let initial_history = open_close_queried_buffer("fir", 1, "first.rs", &workspace, cx).await;
|
|
assert!(
|
|
initial_history.is_empty(),
|
|
"Should have no history before opening any files"
|
|
);
|
|
|
|
let history_after_first =
|
|
open_close_queried_buffer("sec", 1, "second.rs", &workspace, cx).await;
|
|
assert_eq!(
|
|
history_after_first,
|
|
vec![FoundPath::new(
|
|
ProjectPath {
|
|
worktree_id,
|
|
path: Arc::from(Path::new("test/first.rs")),
|
|
},
|
|
Some(PathBuf::from("/src/test/first.rs"))
|
|
)],
|
|
"Should show 1st opened item in the history when opening the 2nd item"
|
|
);
|
|
|
|
let history_after_second =
|
|
open_close_queried_buffer("thi", 1, "third.rs", &workspace, cx).await;
|
|
assert_eq!(
|
|
history_after_second,
|
|
vec![
|
|
FoundPath::new(
|
|
ProjectPath {
|
|
worktree_id,
|
|
path: Arc::from(Path::new("test/second.rs")),
|
|
},
|
|
Some(PathBuf::from("/src/test/second.rs"))
|
|
),
|
|
FoundPath::new(
|
|
ProjectPath {
|
|
worktree_id,
|
|
path: Arc::from(Path::new("test/first.rs")),
|
|
},
|
|
Some(PathBuf::from("/src/test/first.rs"))
|
|
),
|
|
],
|
|
"Should show 1st and 2nd opened items in the history when opening the 3rd item. \
|
|
2nd item should be the first in the history, as the last opened."
|
|
);
|
|
|
|
let history_after_third =
|
|
open_close_queried_buffer("sec", 1, "second.rs", &workspace, cx).await;
|
|
assert_eq!(
|
|
history_after_third,
|
|
vec![
|
|
FoundPath::new(
|
|
ProjectPath {
|
|
worktree_id,
|
|
path: Arc::from(Path::new("test/third.rs")),
|
|
},
|
|
Some(PathBuf::from("/src/test/third.rs"))
|
|
),
|
|
FoundPath::new(
|
|
ProjectPath {
|
|
worktree_id,
|
|
path: Arc::from(Path::new("test/second.rs")),
|
|
},
|
|
Some(PathBuf::from("/src/test/second.rs"))
|
|
),
|
|
FoundPath::new(
|
|
ProjectPath {
|
|
worktree_id,
|
|
path: Arc::from(Path::new("test/first.rs")),
|
|
},
|
|
Some(PathBuf::from("/src/test/first.rs"))
|
|
),
|
|
],
|
|
"Should show 1st, 2nd and 3rd opened items in the history when opening the 2nd item again. \
|
|
3rd item should be the first in the history, as the last opened."
|
|
);
|
|
|
|
let history_after_second_again =
|
|
open_close_queried_buffer("thi", 1, "third.rs", &workspace, cx).await;
|
|
assert_eq!(
|
|
history_after_second_again,
|
|
vec![
|
|
FoundPath::new(
|
|
ProjectPath {
|
|
worktree_id,
|
|
path: Arc::from(Path::new("test/second.rs")),
|
|
},
|
|
Some(PathBuf::from("/src/test/second.rs"))
|
|
),
|
|
FoundPath::new(
|
|
ProjectPath {
|
|
worktree_id,
|
|
path: Arc::from(Path::new("test/third.rs")),
|
|
},
|
|
Some(PathBuf::from("/src/test/third.rs"))
|
|
),
|
|
FoundPath::new(
|
|
ProjectPath {
|
|
worktree_id,
|
|
path: Arc::from(Path::new("test/first.rs")),
|
|
},
|
|
Some(PathBuf::from("/src/test/first.rs"))
|
|
),
|
|
],
|
|
"Should show 1st, 2nd and 3rd opened items in the history when opening the 3rd item again. \
|
|
2nd item, as the last opened, 3rd item should go next as it was opened right before."
|
|
);
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_external_files_history(cx: &mut gpui::TestAppContext) {
|
|
let app_state = init_test(cx);
|
|
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/src",
|
|
json!({
|
|
"test": {
|
|
"first.rs": "// First Rust file",
|
|
"second.rs": "// Second Rust file",
|
|
}
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/external-src",
|
|
json!({
|
|
"test": {
|
|
"third.rs": "// Third Rust file",
|
|
"fourth.rs": "// Fourth Rust file",
|
|
}
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/src".as_ref()], cx).await;
|
|
cx.update(|cx| {
|
|
project.update(cx, |project, cx| {
|
|
project.find_or_create_worktree("/external-src", false, cx)
|
|
})
|
|
})
|
|
.detach();
|
|
cx.background_executor.run_until_parked();
|
|
|
|
let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx));
|
|
let worktree_id = cx.read(|cx| {
|
|
let worktrees = workspace.read(cx).worktrees(cx).collect::<Vec<_>>();
|
|
assert_eq!(worktrees.len(), 1,);
|
|
|
|
WorktreeId::from_usize(worktrees[0].entity_id().as_u64() as usize)
|
|
});
|
|
workspace
|
|
.update(cx, |workspace, cx| {
|
|
workspace.open_abs_path(PathBuf::from("/external-src/test/third.rs"), false, cx)
|
|
})
|
|
.detach();
|
|
cx.background_executor.run_until_parked();
|
|
let external_worktree_id = cx.read(|cx| {
|
|
let worktrees = workspace.read(cx).worktrees(cx).collect::<Vec<_>>();
|
|
assert_eq!(
|
|
worktrees.len(),
|
|
2,
|
|
"External file should get opened in a new worktree"
|
|
);
|
|
|
|
WorktreeId::from_usize(
|
|
worktrees
|
|
.into_iter()
|
|
.find(|worktree| worktree.entity_id().as_u64() as usize != worktree_id.to_usize())
|
|
.expect("New worktree should have a different id")
|
|
.entity_id()
|
|
.as_u64() as usize,
|
|
)
|
|
});
|
|
cx.dispatch_action(workspace::CloseActiveItem { save_intent: None });
|
|
|
|
let initial_history_items =
|
|
open_close_queried_buffer("sec", 1, "second.rs", &workspace, cx).await;
|
|
assert_eq!(
|
|
initial_history_items,
|
|
vec![FoundPath::new(
|
|
ProjectPath {
|
|
worktree_id: external_worktree_id,
|
|
path: Arc::from(Path::new("")),
|
|
},
|
|
Some(PathBuf::from("/external-src/test/third.rs"))
|
|
)],
|
|
"Should show external file with its full path in the history after it was open"
|
|
);
|
|
|
|
let updated_history_items =
|
|
open_close_queried_buffer("fir", 1, "first.rs", &workspace, cx).await;
|
|
assert_eq!(
|
|
updated_history_items,
|
|
vec![
|
|
FoundPath::new(
|
|
ProjectPath {
|
|
worktree_id,
|
|
path: Arc::from(Path::new("test/second.rs")),
|
|
},
|
|
Some(PathBuf::from("/src/test/second.rs"))
|
|
),
|
|
FoundPath::new(
|
|
ProjectPath {
|
|
worktree_id: external_worktree_id,
|
|
path: Arc::from(Path::new("")),
|
|
},
|
|
Some(PathBuf::from("/external-src/test/third.rs"))
|
|
),
|
|
],
|
|
"Should keep external file with history updates",
|
|
);
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_toggle_panel_new_selections(cx: &mut gpui::TestAppContext) {
|
|
let app_state = init_test(cx);
|
|
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/src",
|
|
json!({
|
|
"test": {
|
|
"first.rs": "// First Rust file",
|
|
"second.rs": "// Second Rust file",
|
|
"third.rs": "// Third Rust file",
|
|
}
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/src".as_ref()], cx).await;
|
|
let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx));
|
|
|
|
// generate some history to select from
|
|
open_close_queried_buffer("fir", 1, "first.rs", &workspace, cx).await;
|
|
open_close_queried_buffer("sec", 1, "second.rs", &workspace, cx).await;
|
|
open_close_queried_buffer("thi", 1, "third.rs", &workspace, cx).await;
|
|
let current_history = open_close_queried_buffer("sec", 1, "second.rs", &workspace, cx).await;
|
|
|
|
for expected_selected_index in 0..current_history.len() {
|
|
cx.dispatch_action(ToggleFileFinder::default());
|
|
let picker = active_file_picker(&workspace, cx);
|
|
let selected_index = picker.update(cx, |picker, _| picker.delegate.selected_index());
|
|
assert_eq!(
|
|
selected_index, expected_selected_index,
|
|
"Should select the next item in the history"
|
|
);
|
|
}
|
|
|
|
cx.dispatch_action(ToggleFileFinder::default());
|
|
let selected_index = workspace.update(cx, |workspace, cx| {
|
|
workspace
|
|
.active_modal::<FileFinder>(cx)
|
|
.unwrap()
|
|
.read(cx)
|
|
.picker
|
|
.read(cx)
|
|
.delegate
|
|
.selected_index()
|
|
});
|
|
assert_eq!(
|
|
selected_index, 0,
|
|
"Should wrap around the history and start all over"
|
|
);
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_search_preserves_history_items(cx: &mut gpui::TestAppContext) {
|
|
let app_state = init_test(cx);
|
|
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/src",
|
|
json!({
|
|
"test": {
|
|
"first.rs": "// First Rust file",
|
|
"second.rs": "// Second Rust file",
|
|
"third.rs": "// Third Rust file",
|
|
"fourth.rs": "// Fourth Rust file",
|
|
}
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/src".as_ref()], cx).await;
|
|
let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx));
|
|
let worktree_id = cx.read(|cx| {
|
|
let worktrees = workspace.read(cx).worktrees(cx).collect::<Vec<_>>();
|
|
assert_eq!(worktrees.len(), 1,);
|
|
|
|
WorktreeId::from_usize(worktrees[0].entity_id().as_u64() as usize)
|
|
});
|
|
|
|
// generate some history to select from
|
|
open_close_queried_buffer("fir", 1, "first.rs", &workspace, cx).await;
|
|
open_close_queried_buffer("sec", 1, "second.rs", &workspace, cx).await;
|
|
open_close_queried_buffer("thi", 1, "third.rs", &workspace, cx).await;
|
|
open_close_queried_buffer("sec", 1, "second.rs", &workspace, cx).await;
|
|
|
|
let finder = open_file_picker(&workspace, cx);
|
|
let first_query = "f";
|
|
finder
|
|
.update(cx, |finder, cx| {
|
|
finder.delegate.update_matches(first_query.to_string(), cx)
|
|
})
|
|
.await;
|
|
finder.update(cx, |picker, _| {
|
|
let matches = collect_search_matches(picker);
|
|
assert_eq!(matches.history.len(), 1, "Only one history item contains {first_query}, it should be present and others should be filtered out");
|
|
let history_match = matches.history_found_paths.first().expect("Should have path matches for history items after querying");
|
|
assert_eq!(history_match, &FoundPath::new(
|
|
ProjectPath {
|
|
worktree_id,
|
|
path: Arc::from(Path::new("test/first.rs")),
|
|
},
|
|
Some(PathBuf::from("/src/test/first.rs"))
|
|
));
|
|
assert_eq!(matches.search.len(), 1, "Only one non-history item contains {first_query}, it should be present");
|
|
assert_eq!(matches.search.first().unwrap(), Path::new("test/fourth.rs"));
|
|
});
|
|
|
|
let second_query = "fsdasdsa";
|
|
let finder = active_file_picker(&workspace, cx);
|
|
finder
|
|
.update(cx, |finder, cx| {
|
|
finder.delegate.update_matches(second_query.to_string(), cx)
|
|
})
|
|
.await;
|
|
finder.update(cx, |picker, _| {
|
|
assert!(
|
|
collect_search_matches(picker)
|
|
.search_paths_only()
|
|
.is_empty(),
|
|
"No search entries should match {second_query}"
|
|
);
|
|
});
|
|
|
|
let first_query_again = first_query;
|
|
|
|
let finder = active_file_picker(&workspace, cx);
|
|
finder
|
|
.update(cx, |finder, cx| {
|
|
finder
|
|
.delegate
|
|
.update_matches(first_query_again.to_string(), cx)
|
|
})
|
|
.await;
|
|
finder.update(cx, |picker, _| {
|
|
let matches = collect_search_matches(picker);
|
|
assert_eq!(matches.history.len(), 1, "Only one history item contains {first_query_again}, it should be present and others should be filtered out, even after non-matching query");
|
|
let history_match = matches.history_found_paths.first().expect("Should have path matches for history items after querying");
|
|
assert_eq!(history_match, &FoundPath::new(
|
|
ProjectPath {
|
|
worktree_id,
|
|
path: Arc::from(Path::new("test/first.rs")),
|
|
},
|
|
Some(PathBuf::from("/src/test/first.rs"))
|
|
));
|
|
assert_eq!(matches.search.len(), 1, "Only one non-history item contains {first_query_again}, it should be present, even after non-matching query");
|
|
assert_eq!(matches.search.first().unwrap(), Path::new("test/fourth.rs"));
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_search_sorts_history_items(cx: &mut gpui::TestAppContext) {
|
|
let app_state = init_test(cx);
|
|
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/root",
|
|
json!({
|
|
"test": {
|
|
"1_qw": "// First file that matches the query",
|
|
"2_second": "// Second file",
|
|
"3_third": "// Third file",
|
|
"4_fourth": "// Fourth file",
|
|
"5_qwqwqw": "// A file with 3 more matches than the first one",
|
|
"6_qwqwqw": "// Same query matches as above, but closer to the end of the list due to the name",
|
|
"7_qwqwqw": "// One more, same amount of query matches as above",
|
|
}
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/root".as_ref()], cx).await;
|
|
let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx));
|
|
// generate some history to select from
|
|
open_close_queried_buffer("1", 1, "1_qw", &workspace, cx).await;
|
|
open_close_queried_buffer("2", 1, "2_second", &workspace, cx).await;
|
|
open_close_queried_buffer("3", 1, "3_third", &workspace, cx).await;
|
|
open_close_queried_buffer("2", 1, "2_second", &workspace, cx).await;
|
|
open_close_queried_buffer("6", 1, "6_qwqwqw", &workspace, cx).await;
|
|
|
|
let finder = open_file_picker(&workspace, cx);
|
|
let query = "qw";
|
|
finder
|
|
.update(cx, |finder, cx| {
|
|
finder.delegate.update_matches(query.to_string(), cx)
|
|
})
|
|
.await;
|
|
finder.update(cx, |finder, _| {
|
|
let search_matches = collect_search_matches(finder);
|
|
assert_eq!(
|
|
search_matches.history,
|
|
vec![PathBuf::from("test/1_qw"), PathBuf::from("test/6_qwqwqw"),],
|
|
);
|
|
assert_eq!(
|
|
search_matches.search,
|
|
vec![
|
|
PathBuf::from("test/5_qwqwqw"),
|
|
PathBuf::from("test/7_qwqwqw"),
|
|
],
|
|
);
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_select_current_open_file_when_no_history(cx: &mut gpui::TestAppContext) {
|
|
let app_state = init_test(cx);
|
|
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/root",
|
|
json!({
|
|
"test": {
|
|
"1_qw": "",
|
|
}
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/root".as_ref()], cx).await;
|
|
let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx));
|
|
// Open new buffer
|
|
open_queried_buffer("1", 1, "1_qw", &workspace, cx).await;
|
|
|
|
let picker = open_file_picker(&workspace, cx);
|
|
picker.update(cx, |finder, _| {
|
|
assert_match_selection(&finder, 0, "1_qw");
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_keep_opened_file_on_top_of_search_results_and_select_next_one(
|
|
cx: &mut TestAppContext,
|
|
) {
|
|
let app_state = init_test(cx);
|
|
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/src",
|
|
json!({
|
|
"test": {
|
|
"bar.rs": "// Bar file",
|
|
"lib.rs": "// Lib file",
|
|
"maaa.rs": "// Maaaaaaa",
|
|
"main.rs": "// Main file",
|
|
"moo.rs": "// Moooooo",
|
|
}
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/src".as_ref()], cx).await;
|
|
let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx));
|
|
|
|
open_close_queried_buffer("bar", 1, "bar.rs", &workspace, cx).await;
|
|
open_close_queried_buffer("lib", 1, "lib.rs", &workspace, cx).await;
|
|
open_queried_buffer("main", 1, "main.rs", &workspace, cx).await;
|
|
|
|
// main.rs is on top, previously used is selected
|
|
let picker = open_file_picker(&workspace, cx);
|
|
picker.update(cx, |finder, _| {
|
|
assert_eq!(finder.delegate.matches.len(), 3);
|
|
assert_match_selection(finder, 0, "main.rs");
|
|
assert_match_at_position(finder, 1, "lib.rs");
|
|
assert_match_at_position(finder, 2, "bar.rs");
|
|
});
|
|
|
|
// all files match, main.rs is still on top, but the second item is selected
|
|
picker
|
|
.update(cx, |finder, cx| {
|
|
finder.delegate.update_matches(".rs".to_string(), cx)
|
|
})
|
|
.await;
|
|
picker.update(cx, |finder, _| {
|
|
assert_eq!(finder.delegate.matches.len(), 5);
|
|
assert_match_at_position(finder, 0, "main.rs");
|
|
assert_match_selection(finder, 1, "bar.rs");
|
|
assert_match_at_position(finder, 2, "lib.rs");
|
|
assert_match_at_position(finder, 3, "moo.rs");
|
|
assert_match_at_position(finder, 4, "maaa.rs");
|
|
});
|
|
|
|
// main.rs is not among matches, select top item
|
|
picker
|
|
.update(cx, |finder, cx| {
|
|
finder.delegate.update_matches("b".to_string(), cx)
|
|
})
|
|
.await;
|
|
picker.update(cx, |finder, _| {
|
|
assert_eq!(finder.delegate.matches.len(), 2);
|
|
assert_match_at_position(finder, 0, "bar.rs");
|
|
assert_match_at_position(finder, 1, "lib.rs");
|
|
});
|
|
|
|
// main.rs is back, put it on top and select next item
|
|
picker
|
|
.update(cx, |finder, cx| {
|
|
finder.delegate.update_matches("m".to_string(), cx)
|
|
})
|
|
.await;
|
|
picker.update(cx, |finder, _| {
|
|
assert_eq!(finder.delegate.matches.len(), 3);
|
|
assert_match_at_position(finder, 0, "main.rs");
|
|
assert_match_selection(finder, 1, "moo.rs");
|
|
assert_match_at_position(finder, 2, "maaa.rs");
|
|
});
|
|
|
|
// get back to the initial state
|
|
picker
|
|
.update(cx, |finder, cx| {
|
|
finder.delegate.update_matches("".to_string(), cx)
|
|
})
|
|
.await;
|
|
picker.update(cx, |finder, _| {
|
|
assert_eq!(finder.delegate.matches.len(), 3);
|
|
assert_match_selection(finder, 0, "main.rs");
|
|
assert_match_at_position(finder, 1, "lib.rs");
|
|
assert_match_at_position(finder, 2, "bar.rs");
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_non_separate_history_items(cx: &mut TestAppContext) {
|
|
let app_state = init_test(cx);
|
|
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/src",
|
|
json!({
|
|
"test": {
|
|
"bar.rs": "// Bar file",
|
|
"lib.rs": "// Lib file",
|
|
"maaa.rs": "// Maaaaaaa",
|
|
"main.rs": "// Main file",
|
|
"moo.rs": "// Moooooo",
|
|
}
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/src".as_ref()], cx).await;
|
|
let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx));
|
|
|
|
open_close_queried_buffer("bar", 1, "bar.rs", &workspace, cx).await;
|
|
open_close_queried_buffer("lib", 1, "lib.rs", &workspace, cx).await;
|
|
open_queried_buffer("main", 1, "main.rs", &workspace, cx).await;
|
|
|
|
cx.dispatch_action(ToggleFileFinder::default());
|
|
let picker = active_file_picker(&workspace, cx);
|
|
// main.rs is on top, previously used is selected
|
|
picker.update(cx, |finder, _| {
|
|
assert_eq!(finder.delegate.matches.len(), 3);
|
|
assert_match_selection(finder, 0, "main.rs");
|
|
assert_match_at_position(finder, 1, "lib.rs");
|
|
assert_match_at_position(finder, 2, "bar.rs");
|
|
});
|
|
|
|
// all files match, main.rs is still on top, but the second item is selected
|
|
picker
|
|
.update(cx, |finder, cx| {
|
|
finder.delegate.update_matches(".rs".to_string(), cx)
|
|
})
|
|
.await;
|
|
picker.update(cx, |finder, _| {
|
|
assert_eq!(finder.delegate.matches.len(), 5);
|
|
assert_match_at_position(finder, 0, "main.rs");
|
|
assert_match_selection(finder, 1, "moo.rs");
|
|
assert_match_at_position(finder, 2, "bar.rs");
|
|
assert_match_at_position(finder, 3, "lib.rs");
|
|
assert_match_at_position(finder, 4, "maaa.rs");
|
|
});
|
|
|
|
// main.rs is not among matches, select top item
|
|
picker
|
|
.update(cx, |finder, cx| {
|
|
finder.delegate.update_matches("b".to_string(), cx)
|
|
})
|
|
.await;
|
|
picker.update(cx, |finder, _| {
|
|
assert_eq!(finder.delegate.matches.len(), 2);
|
|
assert_match_at_position(finder, 0, "bar.rs");
|
|
assert_match_at_position(finder, 1, "lib.rs");
|
|
});
|
|
|
|
// main.rs is back, put it on top and select next item
|
|
picker
|
|
.update(cx, |finder, cx| {
|
|
finder.delegate.update_matches("m".to_string(), cx)
|
|
})
|
|
.await;
|
|
picker.update(cx, |finder, _| {
|
|
assert_eq!(finder.delegate.matches.len(), 3);
|
|
assert_match_at_position(finder, 0, "main.rs");
|
|
assert_match_selection(finder, 1, "moo.rs");
|
|
assert_match_at_position(finder, 2, "maaa.rs");
|
|
});
|
|
|
|
// get back to the initial state
|
|
picker
|
|
.update(cx, |finder, cx| {
|
|
finder.delegate.update_matches("".to_string(), cx)
|
|
})
|
|
.await;
|
|
picker.update(cx, |finder, _| {
|
|
assert_eq!(finder.delegate.matches.len(), 3);
|
|
assert_match_selection(finder, 0, "main.rs");
|
|
assert_match_at_position(finder, 1, "lib.rs");
|
|
assert_match_at_position(finder, 2, "bar.rs");
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_history_items_shown_in_order_of_open(cx: &mut TestAppContext) {
|
|
let app_state = init_test(cx);
|
|
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/test",
|
|
json!({
|
|
"test": {
|
|
"1.txt": "// One",
|
|
"2.txt": "// Two",
|
|
"3.txt": "// Three",
|
|
}
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/test".as_ref()], cx).await;
|
|
let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx));
|
|
|
|
open_queried_buffer("1", 1, "1.txt", &workspace, cx).await;
|
|
open_queried_buffer("2", 1, "2.txt", &workspace, cx).await;
|
|
open_queried_buffer("3", 1, "3.txt", &workspace, cx).await;
|
|
|
|
let picker = open_file_picker(&workspace, cx);
|
|
picker.update(cx, |finder, _| {
|
|
assert_eq!(finder.delegate.matches.len(), 3);
|
|
assert_match_selection(finder, 0, "3.txt");
|
|
assert_match_at_position(finder, 1, "2.txt");
|
|
assert_match_at_position(finder, 2, "1.txt");
|
|
});
|
|
|
|
cx.dispatch_action(SelectNext);
|
|
cx.dispatch_action(Confirm); // Open 2.txt
|
|
|
|
let picker = open_file_picker(&workspace, cx);
|
|
picker.update(cx, |finder, _| {
|
|
assert_eq!(finder.delegate.matches.len(), 3);
|
|
assert_match_selection(finder, 0, "2.txt");
|
|
assert_match_at_position(finder, 1, "3.txt");
|
|
assert_match_at_position(finder, 2, "1.txt");
|
|
});
|
|
|
|
cx.dispatch_action(SelectNext);
|
|
cx.dispatch_action(SelectNext);
|
|
cx.dispatch_action(Confirm); // Open 1.txt
|
|
|
|
let picker = open_file_picker(&workspace, cx);
|
|
picker.update(cx, |finder, _| {
|
|
assert_eq!(finder.delegate.matches.len(), 3);
|
|
assert_match_selection(finder, 0, "1.txt");
|
|
assert_match_at_position(finder, 1, "2.txt");
|
|
assert_match_at_position(finder, 2, "3.txt");
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_history_items_vs_very_good_external_match(cx: &mut gpui::TestAppContext) {
|
|
let app_state = init_test(cx);
|
|
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/src",
|
|
json!({
|
|
"collab_ui": {
|
|
"first.rs": "// First Rust file",
|
|
"second.rs": "// Second Rust file",
|
|
"third.rs": "// Third Rust file",
|
|
"collab_ui.rs": "// Fourth Rust file",
|
|
}
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/src".as_ref()], cx).await;
|
|
let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx));
|
|
// generate some history to select from
|
|
open_close_queried_buffer("fir", 1, "first.rs", &workspace, cx).await;
|
|
open_close_queried_buffer("sec", 1, "second.rs", &workspace, cx).await;
|
|
open_close_queried_buffer("thi", 1, "third.rs", &workspace, cx).await;
|
|
open_close_queried_buffer("sec", 1, "second.rs", &workspace, cx).await;
|
|
|
|
let finder = open_file_picker(&workspace, cx);
|
|
let query = "collab_ui";
|
|
cx.simulate_input(query);
|
|
finder.update(cx, |picker, _| {
|
|
let search_entries = collect_search_matches(picker).search_paths_only();
|
|
assert_eq!(
|
|
search_entries,
|
|
vec![
|
|
PathBuf::from("collab_ui/collab_ui.rs"),
|
|
PathBuf::from("collab_ui/first.rs"),
|
|
PathBuf::from("collab_ui/third.rs"),
|
|
PathBuf::from("collab_ui/second.rs"),
|
|
],
|
|
"Despite all search results having the same directory name, the most matching one should be on top"
|
|
);
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_nonexistent_history_items_not_shown(cx: &mut gpui::TestAppContext) {
|
|
let app_state = init_test(cx);
|
|
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/src",
|
|
json!({
|
|
"test": {
|
|
"first.rs": "// First Rust file",
|
|
"nonexistent.rs": "// Second Rust file",
|
|
"third.rs": "// Third Rust file",
|
|
}
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/src".as_ref()], cx).await;
|
|
let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx)); // generate some history to select from
|
|
open_close_queried_buffer("fir", 1, "first.rs", &workspace, cx).await;
|
|
open_close_queried_buffer("non", 1, "nonexistent.rs", &workspace, cx).await;
|
|
open_close_queried_buffer("thi", 1, "third.rs", &workspace, cx).await;
|
|
open_close_queried_buffer("fir", 1, "first.rs", &workspace, cx).await;
|
|
|
|
let picker = open_file_picker(&workspace, cx);
|
|
cx.simulate_input("rs");
|
|
|
|
picker.update(cx, |picker, _| {
|
|
assert_eq!(
|
|
collect_search_matches(picker).history,
|
|
vec![
|
|
PathBuf::from("test/first.rs"),
|
|
PathBuf::from("test/third.rs"),
|
|
],
|
|
"Should have all opened files in the history, except the ones that do not exist on disk"
|
|
);
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_search_results_refreshed_on_worktree_updates(cx: &mut gpui::TestAppContext) {
|
|
let app_state = init_test(cx);
|
|
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/src",
|
|
json!({
|
|
"lib.rs": "// Lib file",
|
|
"main.rs": "// Bar file",
|
|
"read.me": "// Readme file",
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/src".as_ref()], cx).await;
|
|
let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project.clone(), cx));
|
|
|
|
// Initial state
|
|
let picker = open_file_picker(&workspace, cx);
|
|
cx.simulate_input("rs");
|
|
picker.update(cx, |finder, _| {
|
|
assert_eq!(finder.delegate.matches.len(), 2);
|
|
assert_match_at_position(finder, 0, "lib.rs");
|
|
assert_match_at_position(finder, 1, "main.rs");
|
|
});
|
|
|
|
// Delete main.rs
|
|
app_state
|
|
.fs
|
|
.remove_file("/src/main.rs".as_ref(), Default::default())
|
|
.await
|
|
.expect("unable to remove file");
|
|
cx.executor().advance_clock(FS_WATCH_LATENCY);
|
|
|
|
// main.rs is in not among search results anymore
|
|
picker.update(cx, |finder, _| {
|
|
assert_eq!(finder.delegate.matches.len(), 1);
|
|
assert_match_at_position(finder, 0, "lib.rs");
|
|
});
|
|
|
|
// Create util.rs
|
|
app_state
|
|
.fs
|
|
.create_file("/src/util.rs".as_ref(), Default::default())
|
|
.await
|
|
.expect("unable to create file");
|
|
cx.executor().advance_clock(FS_WATCH_LATENCY);
|
|
|
|
// util.rs is among search results
|
|
picker.update(cx, |finder, _| {
|
|
assert_eq!(finder.delegate.matches.len(), 2);
|
|
assert_match_at_position(finder, 0, "lib.rs");
|
|
assert_match_at_position(finder, 1, "util.rs");
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_search_results_refreshed_on_adding_and_removing_worktrees(
|
|
cx: &mut gpui::TestAppContext,
|
|
) {
|
|
let app_state = init_test(cx);
|
|
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/test",
|
|
json!({
|
|
"project_1": {
|
|
"bar.rs": "// Bar file",
|
|
"lib.rs": "// Lib file",
|
|
},
|
|
"project_2": {
|
|
"Cargo.toml": "// Cargo file",
|
|
"main.rs": "// Main file",
|
|
}
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/test/project_1".as_ref()], cx).await;
|
|
let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project.clone(), cx));
|
|
let worktree_1_id = project.update(cx, |project, cx| {
|
|
let worktree = project.worktrees(cx).last().expect("worktree not found");
|
|
worktree.read(cx).id()
|
|
});
|
|
|
|
// Initial state
|
|
let picker = open_file_picker(&workspace, cx);
|
|
cx.simulate_input("rs");
|
|
picker.update(cx, |finder, _| {
|
|
assert_eq!(finder.delegate.matches.len(), 2);
|
|
assert_match_at_position(finder, 0, "bar.rs");
|
|
assert_match_at_position(finder, 1, "lib.rs");
|
|
});
|
|
|
|
// Add new worktree
|
|
project
|
|
.update(cx, |project, cx| {
|
|
project
|
|
.find_or_create_worktree("/test/project_2", true, cx)
|
|
.into_future()
|
|
})
|
|
.await
|
|
.expect("unable to create workdir");
|
|
cx.executor().advance_clock(FS_WATCH_LATENCY);
|
|
|
|
// main.rs is among search results
|
|
picker.update(cx, |finder, _| {
|
|
assert_eq!(finder.delegate.matches.len(), 3);
|
|
assert_match_at_position(finder, 0, "bar.rs");
|
|
assert_match_at_position(finder, 1, "lib.rs");
|
|
assert_match_at_position(finder, 2, "main.rs");
|
|
});
|
|
|
|
// Remove the first worktree
|
|
project.update(cx, |project, cx| {
|
|
project.remove_worktree(worktree_1_id, cx);
|
|
});
|
|
cx.executor().advance_clock(FS_WATCH_LATENCY);
|
|
|
|
// Files from the first worktree are not in the search results anymore
|
|
picker.update(cx, |finder, _| {
|
|
assert_eq!(finder.delegate.matches.len(), 1);
|
|
assert_match_at_position(finder, 0, "main.rs");
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_keeps_file_finder_open_after_modifier_keys_release(cx: &mut gpui::TestAppContext) {
|
|
let app_state = init_test(cx);
|
|
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/test",
|
|
json!({
|
|
"1.txt": "// One",
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/test".as_ref()], cx).await;
|
|
let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx));
|
|
|
|
open_queried_buffer("1", 1, "1.txt", &workspace, cx).await;
|
|
|
|
cx.simulate_modifiers_change(Modifiers::secondary_key());
|
|
open_file_picker(&workspace, cx);
|
|
|
|
cx.simulate_modifiers_change(Modifiers::none());
|
|
active_file_picker(&workspace, cx);
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_opens_file_on_modifier_keys_release(cx: &mut gpui::TestAppContext) {
|
|
let app_state = init_test(cx);
|
|
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/test",
|
|
json!({
|
|
"1.txt": "// One",
|
|
"2.txt": "// Two",
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/test".as_ref()], cx).await;
|
|
let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx));
|
|
|
|
open_queried_buffer("1", 1, "1.txt", &workspace, cx).await;
|
|
open_queried_buffer("2", 1, "2.txt", &workspace, cx).await;
|
|
|
|
cx.simulate_modifiers_change(Modifiers::secondary_key());
|
|
let picker = open_file_picker(&workspace, cx);
|
|
picker.update(cx, |finder, _| {
|
|
assert_eq!(finder.delegate.matches.len(), 2);
|
|
assert_match_selection(finder, 0, "2.txt");
|
|
assert_match_at_position(finder, 1, "1.txt");
|
|
});
|
|
|
|
cx.dispatch_action(SelectNext);
|
|
cx.simulate_modifiers_change(Modifiers::none());
|
|
cx.read(|cx| {
|
|
let active_editor = workspace.read(cx).active_item_as::<Editor>(cx).unwrap();
|
|
assert_eq!(active_editor.read(cx).title(cx), "1.txt");
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_switches_between_release_norelease_modes_on_forward_nav(
|
|
cx: &mut gpui::TestAppContext,
|
|
) {
|
|
let app_state = init_test(cx);
|
|
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/test",
|
|
json!({
|
|
"1.txt": "// One",
|
|
"2.txt": "// Two",
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/test".as_ref()], cx).await;
|
|
let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx));
|
|
|
|
open_queried_buffer("1", 1, "1.txt", &workspace, cx).await;
|
|
open_queried_buffer("2", 1, "2.txt", &workspace, cx).await;
|
|
|
|
// Open with a shortcut
|
|
cx.simulate_modifiers_change(Modifiers::secondary_key());
|
|
let picker = open_file_picker(&workspace, cx);
|
|
picker.update(cx, |finder, _| {
|
|
assert_eq!(finder.delegate.matches.len(), 2);
|
|
assert_match_selection(finder, 0, "2.txt");
|
|
assert_match_at_position(finder, 1, "1.txt");
|
|
});
|
|
|
|
// Switch to navigating with other shortcuts
|
|
// Don't open file on modifiers release
|
|
cx.simulate_modifiers_change(Modifiers::control());
|
|
cx.dispatch_action(SelectNext);
|
|
cx.simulate_modifiers_change(Modifiers::none());
|
|
picker.update(cx, |finder, _| {
|
|
assert_eq!(finder.delegate.matches.len(), 2);
|
|
assert_match_at_position(finder, 0, "2.txt");
|
|
assert_match_selection(finder, 1, "1.txt");
|
|
});
|
|
|
|
// Back to navigation with initial shortcut
|
|
// Open file on modifiers release
|
|
cx.simulate_modifiers_change(Modifiers::secondary_key());
|
|
cx.dispatch_action(ToggleFileFinder::default());
|
|
cx.simulate_modifiers_change(Modifiers::none());
|
|
cx.read(|cx| {
|
|
let active_editor = workspace.read(cx).active_item_as::<Editor>(cx).unwrap();
|
|
assert_eq!(active_editor.read(cx).title(cx), "2.txt");
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_switches_between_release_norelease_modes_on_backward_nav(
|
|
cx: &mut gpui::TestAppContext,
|
|
) {
|
|
let app_state = init_test(cx);
|
|
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/test",
|
|
json!({
|
|
"1.txt": "// One",
|
|
"2.txt": "// Two",
|
|
"3.txt": "// Three"
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/test".as_ref()], cx).await;
|
|
let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx));
|
|
|
|
open_queried_buffer("1", 1, "1.txt", &workspace, cx).await;
|
|
open_queried_buffer("2", 1, "2.txt", &workspace, cx).await;
|
|
open_queried_buffer("3", 1, "3.txt", &workspace, cx).await;
|
|
|
|
// Open with a shortcut
|
|
cx.simulate_modifiers_change(Modifiers::secondary_key());
|
|
let picker = open_file_picker(&workspace, cx);
|
|
picker.update(cx, |finder, _| {
|
|
assert_eq!(finder.delegate.matches.len(), 3);
|
|
assert_match_selection(finder, 0, "3.txt");
|
|
assert_match_at_position(finder, 1, "2.txt");
|
|
assert_match_at_position(finder, 2, "1.txt");
|
|
});
|
|
|
|
// Switch to navigating with other shortcuts
|
|
// Don't open file on modifiers release
|
|
cx.simulate_modifiers_change(Modifiers::control());
|
|
cx.dispatch_action(menu::SelectPrev);
|
|
cx.simulate_modifiers_change(Modifiers::none());
|
|
picker.update(cx, |finder, _| {
|
|
assert_eq!(finder.delegate.matches.len(), 3);
|
|
assert_match_at_position(finder, 0, "3.txt");
|
|
assert_match_at_position(finder, 1, "2.txt");
|
|
assert_match_selection(finder, 2, "1.txt");
|
|
});
|
|
|
|
// Back to navigation with initial shortcut
|
|
// Open file on modifiers release
|
|
cx.simulate_modifiers_change(Modifiers::secondary_key());
|
|
cx.dispatch_action(SelectPrev); // <-- File Finder's SelectPrev, not menu's
|
|
cx.simulate_modifiers_change(Modifiers::none());
|
|
cx.read(|cx| {
|
|
let active_editor = workspace.read(cx).active_item_as::<Editor>(cx).unwrap();
|
|
assert_eq!(active_editor.read(cx).title(cx), "3.txt");
|
|
});
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_extending_modifiers_does_not_confirm_selection(cx: &mut gpui::TestAppContext) {
|
|
let app_state = init_test(cx);
|
|
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/test",
|
|
json!({
|
|
"1.txt": "// One",
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/test".as_ref()], cx).await;
|
|
let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx));
|
|
|
|
open_queried_buffer("1", 1, "1.txt", &workspace, cx).await;
|
|
|
|
cx.simulate_modifiers_change(Modifiers::secondary_key());
|
|
open_file_picker(&workspace, cx);
|
|
|
|
cx.simulate_modifiers_change(Modifiers::command_shift());
|
|
active_file_picker(&workspace, cx);
|
|
}
|
|
|
|
#[gpui::test]
|
|
async fn test_repeat_toggle_action(cx: &mut gpui::TestAppContext) {
|
|
let app_state = init_test(cx);
|
|
app_state
|
|
.fs
|
|
.as_fake()
|
|
.insert_tree(
|
|
"/test",
|
|
json!({
|
|
"00.txt": "",
|
|
"01.txt": "",
|
|
"02.txt": "",
|
|
"03.txt": "",
|
|
"04.txt": "",
|
|
"05.txt": "",
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let project = Project::test(app_state.fs.clone(), ["/test".as_ref()], cx).await;
|
|
let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx));
|
|
|
|
cx.dispatch_action(ToggleFileFinder::default());
|
|
let picker = active_file_picker(&workspace, cx);
|
|
picker.update(cx, |picker, _| {
|
|
assert_eq!(picker.delegate.selected_index, 0);
|
|
assert_eq!(picker.logical_scroll_top_index(), 0);
|
|
});
|
|
|
|
// When toggling repeatedly, the picker scrolls to reveal the selected item.
|
|
cx.dispatch_action(ToggleFileFinder::default());
|
|
cx.dispatch_action(ToggleFileFinder::default());
|
|
cx.dispatch_action(ToggleFileFinder::default());
|
|
picker.update(cx, |picker, _| {
|
|
assert_eq!(picker.delegate.selected_index, 3);
|
|
assert_eq!(picker.logical_scroll_top_index(), 3);
|
|
});
|
|
}
|
|
|
|
async fn open_close_queried_buffer(
|
|
input: &str,
|
|
expected_matches: usize,
|
|
expected_editor_title: &str,
|
|
workspace: &View<Workspace>,
|
|
cx: &mut gpui::VisualTestContext,
|
|
) -> Vec<FoundPath> {
|
|
let history_items = open_queried_buffer(
|
|
input,
|
|
expected_matches,
|
|
expected_editor_title,
|
|
workspace,
|
|
cx,
|
|
)
|
|
.await;
|
|
|
|
cx.dispatch_action(workspace::CloseActiveItem { save_intent: None });
|
|
|
|
history_items
|
|
}
|
|
|
|
async fn open_queried_buffer(
|
|
input: &str,
|
|
expected_matches: usize,
|
|
expected_editor_title: &str,
|
|
workspace: &View<Workspace>,
|
|
cx: &mut gpui::VisualTestContext,
|
|
) -> Vec<FoundPath> {
|
|
let picker = open_file_picker(&workspace, cx);
|
|
cx.simulate_input(input);
|
|
|
|
let history_items = picker.update(cx, |finder, _| {
|
|
assert_eq!(
|
|
finder.delegate.matches.len(),
|
|
expected_matches,
|
|
"Unexpected number of matches found for query `{input}`, matches: {:?}",
|
|
finder.delegate.matches
|
|
);
|
|
finder.delegate.history_items.clone()
|
|
});
|
|
|
|
cx.dispatch_action(Confirm);
|
|
|
|
cx.read(|cx| {
|
|
let active_editor = workspace.read(cx).active_item_as::<Editor>(cx).unwrap();
|
|
let active_editor_title = active_editor.read(cx).title(cx);
|
|
assert_eq!(
|
|
expected_editor_title, active_editor_title,
|
|
"Unexpected editor title for query `{input}`"
|
|
);
|
|
});
|
|
|
|
history_items
|
|
}
|
|
|
|
fn init_test(cx: &mut TestAppContext) -> Arc<AppState> {
|
|
cx.update(|cx| {
|
|
let state = AppState::test(cx);
|
|
theme::init(theme::LoadThemes::JustBase, cx);
|
|
language::init(cx);
|
|
super::init(cx);
|
|
editor::init(cx);
|
|
workspace::init_settings(cx);
|
|
Project::init_settings(cx);
|
|
state
|
|
})
|
|
}
|
|
|
|
fn test_path_position(test_str: &str) -> FileSearchQuery {
|
|
let path_position = PathWithPosition::parse_str(&test_str);
|
|
|
|
FileSearchQuery {
|
|
raw_query: test_str.to_owned(),
|
|
file_query_end: if path_position.path.to_str().unwrap() == test_str {
|
|
None
|
|
} else {
|
|
Some(path_position.path.to_str().unwrap().len())
|
|
},
|
|
path_position,
|
|
}
|
|
}
|
|
|
|
fn build_find_picker(
|
|
project: Model<Project>,
|
|
cx: &mut TestAppContext,
|
|
) -> (
|
|
View<Picker<FileFinderDelegate>>,
|
|
View<Workspace>,
|
|
&mut VisualTestContext,
|
|
) {
|
|
let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx));
|
|
let picker = open_file_picker(&workspace, cx);
|
|
(picker, workspace, cx)
|
|
}
|
|
|
|
#[track_caller]
|
|
fn open_file_picker(
|
|
workspace: &View<Workspace>,
|
|
cx: &mut VisualTestContext,
|
|
) -> View<Picker<FileFinderDelegate>> {
|
|
cx.dispatch_action(ToggleFileFinder {
|
|
separate_history: true,
|
|
});
|
|
active_file_picker(workspace, cx)
|
|
}
|
|
|
|
#[track_caller]
|
|
fn active_file_picker(
|
|
workspace: &View<Workspace>,
|
|
cx: &mut VisualTestContext,
|
|
) -> View<Picker<FileFinderDelegate>> {
|
|
workspace.update(cx, |workspace, cx| {
|
|
workspace
|
|
.active_modal::<FileFinder>(cx)
|
|
.expect("file finder is not open")
|
|
.read(cx)
|
|
.picker
|
|
.clone()
|
|
})
|
|
}
|
|
|
|
#[derive(Debug, Default)]
|
|
struct SearchEntries {
|
|
history: Vec<PathBuf>,
|
|
history_found_paths: Vec<FoundPath>,
|
|
search: Vec<PathBuf>,
|
|
search_matches: Vec<PathMatch>,
|
|
}
|
|
|
|
impl SearchEntries {
|
|
#[track_caller]
|
|
fn search_paths_only(self) -> Vec<PathBuf> {
|
|
assert!(
|
|
self.history.is_empty(),
|
|
"Should have no history matches, but got: {:?}",
|
|
self.history
|
|
);
|
|
self.search
|
|
}
|
|
|
|
#[track_caller]
|
|
fn search_matches_only(self) -> Vec<PathMatch> {
|
|
assert!(
|
|
self.history.is_empty(),
|
|
"Should have no history matches, but got: {:?}",
|
|
self.history
|
|
);
|
|
self.search_matches
|
|
}
|
|
}
|
|
|
|
fn collect_search_matches(picker: &Picker<FileFinderDelegate>) -> SearchEntries {
|
|
let mut search_entries = SearchEntries::default();
|
|
for m in &picker.delegate.matches.matches {
|
|
match m {
|
|
Match::History(history_path, path_match) => {
|
|
search_entries.history.push(
|
|
path_match
|
|
.as_ref()
|
|
.map(|path_match| {
|
|
Path::new(path_match.0.path_prefix.as_ref()).join(&path_match.0.path)
|
|
})
|
|
.unwrap_or_else(|| {
|
|
history_path
|
|
.absolute
|
|
.as_deref()
|
|
.unwrap_or_else(|| &history_path.project.path)
|
|
.to_path_buf()
|
|
}),
|
|
);
|
|
search_entries
|
|
.history_found_paths
|
|
.push(history_path.clone());
|
|
}
|
|
Match::Search(path_match) => {
|
|
search_entries
|
|
.search
|
|
.push(Path::new(path_match.0.path_prefix.as_ref()).join(&path_match.0.path));
|
|
search_entries.search_matches.push(path_match.0.clone());
|
|
}
|
|
}
|
|
}
|
|
search_entries
|
|
}
|
|
|
|
#[track_caller]
|
|
fn assert_match_selection(
|
|
finder: &Picker<FileFinderDelegate>,
|
|
expected_selection_index: usize,
|
|
expected_file_name: &str,
|
|
) {
|
|
assert_eq!(
|
|
finder.delegate.selected_index(),
|
|
expected_selection_index,
|
|
"Match is not selected"
|
|
);
|
|
assert_match_at_position(finder, expected_selection_index, expected_file_name);
|
|
}
|
|
|
|
#[track_caller]
|
|
fn assert_match_at_position(
|
|
finder: &Picker<FileFinderDelegate>,
|
|
match_index: usize,
|
|
expected_file_name: &str,
|
|
) {
|
|
let match_item = finder
|
|
.delegate
|
|
.matches
|
|
.get(match_index)
|
|
.unwrap_or_else(|| panic!("Finder has no match for index {match_index}"));
|
|
let match_file_name = match match_item {
|
|
Match::History(found_path, _) => found_path.absolute.as_deref().unwrap().file_name(),
|
|
Match::Search(path_match) => path_match.0.path.file_name(),
|
|
}
|
|
.unwrap()
|
|
.to_string_lossy();
|
|
assert_eq!(match_file_name, expected_file_name);
|
|
}
|