
Use `Fs` instead of `std::fs` and do entry existence checks better: * first, check the worktree entry existence without any FS checks * then, only for local cases, use `Fs` to check for abs_path existence of items, in case those came from single-filed worktrees that got closed and removed. Remote entries do not get file existence checks, so might try opening previously removed buffers for now. Release Notes: - N/A
1236 lines
44 KiB
Rust
1236 lines
44 KiB
Rust
#[cfg(test)]
|
|
mod file_finder_tests;
|
|
|
|
mod file_finder_settings;
|
|
mod new_path_prompt;
|
|
mod open_path_prompt;
|
|
|
|
use futures::future::join_all;
|
|
pub use open_path_prompt::OpenPathDelegate;
|
|
|
|
use collections::HashMap;
|
|
use editor::{scroll::Autoscroll, Bias, Editor};
|
|
use file_finder_settings::FileFinderSettings;
|
|
use file_icons::FileIcons;
|
|
use fuzzy::{CharBag, PathMatch, PathMatchCandidate};
|
|
use gpui::{
|
|
actions, rems, Action, AnyElement, AppContext, DismissEvent, EventEmitter, FocusHandle,
|
|
FocusableView, Model, Modifiers, ModifiersChangedEvent, ParentElement, Render, Styled, Task,
|
|
View, ViewContext, VisualContext, WeakView,
|
|
};
|
|
use new_path_prompt::NewPathPrompt;
|
|
use open_path_prompt::OpenPathPrompt;
|
|
use picker::{Picker, PickerDelegate};
|
|
use project::{PathMatchCandidateSet, Project, ProjectPath, WorktreeId};
|
|
use settings::Settings;
|
|
use std::{
|
|
cmp,
|
|
path::{Path, PathBuf},
|
|
sync::{
|
|
atomic::{self, AtomicBool},
|
|
Arc,
|
|
},
|
|
};
|
|
use text::Point;
|
|
use ui::{prelude::*, HighlightedLabel, ListItem, ListItemSpacing};
|
|
use util::{paths::PathWithPosition, post_inc, ResultExt};
|
|
use workspace::{item::PreviewTabsSettings, notifications::NotifyResultExt, ModalView, Workspace};
|
|
|
|
actions!(file_finder, [SelectPrev]);
|
|
|
|
impl ModalView for FileFinder {}
|
|
|
|
pub struct FileFinder {
|
|
picker: View<Picker<FileFinderDelegate>>,
|
|
init_modifiers: Option<Modifiers>,
|
|
}
|
|
|
|
pub fn init_settings(cx: &mut AppContext) {
|
|
FileFinderSettings::register(cx);
|
|
}
|
|
|
|
pub fn init(cx: &mut AppContext) {
|
|
init_settings(cx);
|
|
cx.observe_new_views(FileFinder::register).detach();
|
|
cx.observe_new_views(NewPathPrompt::register).detach();
|
|
cx.observe_new_views(OpenPathPrompt::register).detach();
|
|
}
|
|
|
|
impl FileFinder {
|
|
fn register(workspace: &mut Workspace, _: &mut ViewContext<Workspace>) {
|
|
workspace.register_action(|workspace, action: &workspace::ToggleFileFinder, cx| {
|
|
let Some(file_finder) = workspace.active_modal::<Self>(cx) else {
|
|
Self::open(workspace, action.separate_history, cx).detach();
|
|
return;
|
|
};
|
|
|
|
file_finder.update(cx, |file_finder, cx| {
|
|
file_finder.init_modifiers = Some(cx.modifiers());
|
|
file_finder.picker.update(cx, |picker, cx| {
|
|
picker.cycle_selection(cx);
|
|
});
|
|
});
|
|
});
|
|
}
|
|
|
|
fn open(
|
|
workspace: &mut Workspace,
|
|
separate_history: bool,
|
|
cx: &mut ViewContext<Workspace>,
|
|
) -> Task<()> {
|
|
let project = workspace.project().read(cx);
|
|
let fs = project.fs();
|
|
|
|
let currently_opened_path = workspace
|
|
.active_item(cx)
|
|
.and_then(|item| item.project_path(cx))
|
|
.map(|project_path| {
|
|
let abs_path = project
|
|
.worktree_for_id(project_path.worktree_id, cx)
|
|
.map(|worktree| worktree.read(cx).abs_path().join(&project_path.path));
|
|
FoundPath::new(project_path, abs_path)
|
|
});
|
|
|
|
let history_items = workspace
|
|
.recent_navigation_history(Some(MAX_RECENT_SELECTIONS), cx)
|
|
.into_iter()
|
|
.filter_map(|(project_path, abs_path)| {
|
|
if project.entry_for_path(&project_path, cx).is_some() {
|
|
return Some(Task::ready(Some(FoundPath::new(project_path, abs_path))));
|
|
}
|
|
let abs_path = abs_path?;
|
|
if project.is_local() {
|
|
let fs = fs.clone();
|
|
Some(cx.background_executor().spawn(async move {
|
|
if fs.is_file(&abs_path).await {
|
|
Some(FoundPath::new(project_path, Some(abs_path)))
|
|
} else {
|
|
None
|
|
}
|
|
}))
|
|
} else {
|
|
Some(Task::ready(Some(FoundPath::new(
|
|
project_path,
|
|
Some(abs_path),
|
|
))))
|
|
}
|
|
})
|
|
.collect::<Vec<_>>();
|
|
cx.spawn(move |workspace, mut cx| async move {
|
|
let history_items = join_all(history_items).await.into_iter().flatten();
|
|
|
|
workspace
|
|
.update(&mut cx, |workspace, cx| {
|
|
let project = workspace.project().clone();
|
|
let weak_workspace = cx.view().downgrade();
|
|
workspace.toggle_modal(cx, |cx| {
|
|
let delegate = FileFinderDelegate::new(
|
|
cx.view().downgrade(),
|
|
weak_workspace,
|
|
project,
|
|
currently_opened_path,
|
|
history_items.collect(),
|
|
separate_history,
|
|
cx,
|
|
);
|
|
|
|
FileFinder::new(delegate, cx)
|
|
});
|
|
})
|
|
.ok();
|
|
})
|
|
}
|
|
|
|
fn new(delegate: FileFinderDelegate, cx: &mut ViewContext<Self>) -> Self {
|
|
Self {
|
|
picker: cx.new_view(|cx| Picker::uniform_list(delegate, cx)),
|
|
init_modifiers: cx.modifiers().modified().then_some(cx.modifiers()),
|
|
}
|
|
}
|
|
|
|
fn handle_modifiers_changed(
|
|
&mut self,
|
|
event: &ModifiersChangedEvent,
|
|
cx: &mut ViewContext<Self>,
|
|
) {
|
|
let Some(init_modifiers) = self.init_modifiers.take() else {
|
|
return;
|
|
};
|
|
if self.picker.read(cx).delegate.has_changed_selected_index {
|
|
if !event.modified() || !init_modifiers.is_subset_of(&event) {
|
|
self.init_modifiers = None;
|
|
cx.dispatch_action(menu::Confirm.boxed_clone());
|
|
}
|
|
}
|
|
}
|
|
|
|
fn handle_select_prev(&mut self, _: &SelectPrev, cx: &mut ViewContext<Self>) {
|
|
self.init_modifiers = Some(cx.modifiers());
|
|
cx.dispatch_action(Box::new(menu::SelectPrev));
|
|
}
|
|
}
|
|
|
|
impl EventEmitter<DismissEvent> for FileFinder {}
|
|
|
|
impl FocusableView for FileFinder {
|
|
fn focus_handle(&self, cx: &AppContext) -> FocusHandle {
|
|
self.picker.focus_handle(cx)
|
|
}
|
|
}
|
|
|
|
impl Render for FileFinder {
|
|
fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
|
|
v_flex()
|
|
.key_context("FileFinder")
|
|
.w(rems(34.))
|
|
.on_modifiers_changed(cx.listener(Self::handle_modifiers_changed))
|
|
.on_action(cx.listener(Self::handle_select_prev))
|
|
.child(self.picker.clone())
|
|
}
|
|
}
|
|
|
|
pub struct FileFinderDelegate {
|
|
file_finder: WeakView<FileFinder>,
|
|
workspace: WeakView<Workspace>,
|
|
project: Model<Project>,
|
|
search_count: usize,
|
|
latest_search_id: usize,
|
|
latest_search_did_cancel: bool,
|
|
latest_search_query: Option<FileSearchQuery>,
|
|
currently_opened_path: Option<FoundPath>,
|
|
matches: Matches,
|
|
selected_index: usize,
|
|
has_changed_selected_index: bool,
|
|
cancel_flag: Arc<AtomicBool>,
|
|
history_items: Vec<FoundPath>,
|
|
separate_history: bool,
|
|
first_update: bool,
|
|
}
|
|
|
|
/// Use a custom ordering for file finder: the regular one
|
|
/// defines max element with the highest score and the latest alphanumerical path (in case of a tie on other params), e.g:
|
|
/// `[{score: 0.5, path = "c/d" }, { score: 0.5, path = "/a/b" }]`
|
|
///
|
|
/// In the file finder, we would prefer to have the max element with the highest score and the earliest alphanumerical path, e.g:
|
|
/// `[{ score: 0.5, path = "/a/b" }, {score: 0.5, path = "c/d" }]`
|
|
/// as the files are shown in the project panel lists.
|
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
struct ProjectPanelOrdMatch(PathMatch);
|
|
|
|
impl Ord for ProjectPanelOrdMatch {
|
|
fn cmp(&self, other: &Self) -> cmp::Ordering {
|
|
self.0
|
|
.score
|
|
.partial_cmp(&other.0.score)
|
|
.unwrap_or(cmp::Ordering::Equal)
|
|
.then_with(|| self.0.worktree_id.cmp(&other.0.worktree_id))
|
|
.then_with(|| {
|
|
other
|
|
.0
|
|
.distance_to_relative_ancestor
|
|
.cmp(&self.0.distance_to_relative_ancestor)
|
|
})
|
|
.then_with(|| self.0.path.cmp(&other.0.path).reverse())
|
|
}
|
|
}
|
|
|
|
impl PartialOrd for ProjectPanelOrdMatch {
|
|
fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> {
|
|
Some(self.cmp(other))
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Default)]
|
|
struct Matches {
|
|
separate_history: bool,
|
|
matches: Vec<Match>,
|
|
}
|
|
|
|
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone)]
|
|
enum Match {
|
|
History {
|
|
path: FoundPath,
|
|
panel_match: Option<ProjectPanelOrdMatch>,
|
|
},
|
|
Search(ProjectPanelOrdMatch),
|
|
}
|
|
|
|
impl Match {
|
|
fn path(&self) -> &Arc<Path> {
|
|
match self {
|
|
Match::History { path, .. } => &path.project.path,
|
|
Match::Search(panel_match) => &panel_match.0.path,
|
|
}
|
|
}
|
|
|
|
fn panel_match(&self) -> Option<&ProjectPanelOrdMatch> {
|
|
match self {
|
|
Match::History { panel_match, .. } => panel_match.as_ref(),
|
|
Match::Search(panel_match) => Some(&panel_match),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Matches {
|
|
fn len(&self) -> usize {
|
|
self.matches.len()
|
|
}
|
|
|
|
fn get(&self, index: usize) -> Option<&Match> {
|
|
self.matches.get(index)
|
|
}
|
|
|
|
fn position(
|
|
&self,
|
|
entry: &Match,
|
|
currently_opened: Option<&FoundPath>,
|
|
) -> Result<usize, usize> {
|
|
if let Match::History {
|
|
path,
|
|
panel_match: None,
|
|
} = entry
|
|
{
|
|
// Slow case: linear search by path. Should not happen actually,
|
|
// since we call `position` only if matches set changed, but the query has not changed.
|
|
// And History entries do not have panel_match if query is empty, so there's no
|
|
// reason for the matches set to change.
|
|
self.matches
|
|
.iter()
|
|
.position(|m| path.project.path == *m.path())
|
|
.ok_or(0)
|
|
} else {
|
|
self.matches.binary_search_by(|m| {
|
|
// `reverse()` since if cmp_matches(a, b) == Ordering::Greater, then a is better than b.
|
|
// And we want the better entries go first.
|
|
Self::cmp_matches(self.separate_history, currently_opened, &m, &entry).reverse()
|
|
})
|
|
}
|
|
}
|
|
|
|
fn push_new_matches<'a>(
|
|
&'a mut self,
|
|
history_items: impl IntoIterator<Item = &'a FoundPath> + Clone,
|
|
currently_opened: Option<&'a FoundPath>,
|
|
query: Option<&FileSearchQuery>,
|
|
new_search_matches: impl Iterator<Item = ProjectPanelOrdMatch>,
|
|
extend_old_matches: bool,
|
|
) {
|
|
let Some(query) = query else {
|
|
// assuming that if there's no query, then there's no search matches.
|
|
self.matches.clear();
|
|
let path_to_entry = |found_path: &FoundPath| Match::History {
|
|
path: found_path.clone(),
|
|
panel_match: None,
|
|
};
|
|
self.matches
|
|
.extend(currently_opened.into_iter().map(path_to_entry));
|
|
|
|
self.matches.extend(
|
|
history_items
|
|
.into_iter()
|
|
.filter(|found_path| Some(*found_path) != currently_opened)
|
|
.map(path_to_entry),
|
|
);
|
|
return;
|
|
};
|
|
|
|
let new_history_matches = matching_history_items(history_items, currently_opened, query);
|
|
let new_search_matches: Vec<Match> = new_search_matches
|
|
.filter(|path_match| !new_history_matches.contains_key(&path_match.0.path))
|
|
.map(Match::Search)
|
|
.collect();
|
|
|
|
if extend_old_matches {
|
|
// since we take history matches instead of new search matches
|
|
// and history matches has not changed(since the query has not changed and we do not extend old matches otherwise),
|
|
// old matches can't contain paths present in history_matches as well.
|
|
self.matches.retain(|m| matches!(m, Match::Search(_)));
|
|
} else {
|
|
self.matches.clear();
|
|
}
|
|
|
|
// At this point we have an unsorted set of new history matches, an unsorted set of new search matches
|
|
// and a sorted set of old search matches.
|
|
// It is possible that the new search matches' paths contain some of the old search matches' paths.
|
|
// History matches' paths are unique, since store in a HashMap by path.
|
|
// We build a sorted Vec<Match>, eliminating duplicate search matches.
|
|
// Search matches with the same paths should have equal `ProjectPanelOrdMatch`, so we should
|
|
// not have any duplicates after building the final list.
|
|
for new_match in new_history_matches
|
|
.into_values()
|
|
.chain(new_search_matches.into_iter())
|
|
{
|
|
match self.position(&new_match, currently_opened) {
|
|
Ok(_duplicate) => continue,
|
|
Err(i) => {
|
|
self.matches.insert(i, new_match);
|
|
if self.matches.len() == 100 {
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// If a < b, then a is a worse match, aligning with the `ProjectPanelOrdMatch` ordering.
|
|
fn cmp_matches(
|
|
separate_history: bool,
|
|
currently_opened: Option<&FoundPath>,
|
|
a: &Match,
|
|
b: &Match,
|
|
) -> cmp::Ordering {
|
|
debug_assert!(a.panel_match().is_some() && b.panel_match().is_some());
|
|
|
|
match (&a, &b) {
|
|
// bubble currently opened files to the top
|
|
(Match::History { path, .. }, _) if Some(path) == currently_opened => {
|
|
cmp::Ordering::Greater
|
|
}
|
|
(_, Match::History { path, .. }) if Some(path) == currently_opened => {
|
|
cmp::Ordering::Less
|
|
}
|
|
|
|
(Match::History { .. }, Match::Search(_)) if separate_history => cmp::Ordering::Greater,
|
|
(Match::Search(_), Match::History { .. }) if separate_history => cmp::Ordering::Less,
|
|
|
|
_ => a.panel_match().cmp(&b.panel_match()),
|
|
}
|
|
}
|
|
}
|
|
|
|
fn matching_history_items<'a>(
|
|
history_items: impl IntoIterator<Item = &'a FoundPath>,
|
|
currently_opened: Option<&'a FoundPath>,
|
|
query: &FileSearchQuery,
|
|
) -> HashMap<Arc<Path>, Match> {
|
|
let mut candidates_paths = HashMap::default();
|
|
|
|
let history_items_by_worktrees = history_items
|
|
.into_iter()
|
|
.chain(currently_opened)
|
|
.filter_map(|found_path| {
|
|
let candidate = PathMatchCandidate {
|
|
is_dir: false, // You can't open directories as project items
|
|
path: &found_path.project.path,
|
|
// Only match history items names, otherwise their paths may match too many queries, producing false positives.
|
|
// E.g. `foo` would match both `something/foo/bar.rs` and `something/foo/foo.rs` and if the former is a history item,
|
|
// it would be shown first always, despite the latter being a better match.
|
|
char_bag: CharBag::from_iter(
|
|
found_path
|
|
.project
|
|
.path
|
|
.file_name()?
|
|
.to_string_lossy()
|
|
.to_lowercase()
|
|
.chars(),
|
|
),
|
|
};
|
|
candidates_paths.insert(&found_path.project, found_path);
|
|
Some((found_path.project.worktree_id, candidate))
|
|
})
|
|
.fold(
|
|
HashMap::default(),
|
|
|mut candidates, (worktree_id, new_candidate)| {
|
|
candidates
|
|
.entry(worktree_id)
|
|
.or_insert_with(Vec::new)
|
|
.push(new_candidate);
|
|
candidates
|
|
},
|
|
);
|
|
let mut matching_history_paths = HashMap::default();
|
|
for (worktree, candidates) in history_items_by_worktrees {
|
|
let max_results = candidates.len() + 1;
|
|
matching_history_paths.extend(
|
|
fuzzy::match_fixed_path_set(
|
|
candidates,
|
|
worktree.to_usize(),
|
|
query.path_query(),
|
|
false,
|
|
max_results,
|
|
)
|
|
.into_iter()
|
|
.filter_map(|path_match| {
|
|
candidates_paths
|
|
.remove_entry(&ProjectPath {
|
|
worktree_id: WorktreeId::from_usize(path_match.worktree_id),
|
|
path: Arc::clone(&path_match.path),
|
|
})
|
|
.map(|(_, found_path)| {
|
|
(
|
|
Arc::clone(&path_match.path),
|
|
Match::History {
|
|
path: found_path.clone(),
|
|
panel_match: Some(ProjectPanelOrdMatch(path_match)),
|
|
},
|
|
)
|
|
})
|
|
}),
|
|
);
|
|
}
|
|
matching_history_paths
|
|
}
|
|
|
|
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
|
struct FoundPath {
|
|
project: ProjectPath,
|
|
absolute: Option<PathBuf>,
|
|
}
|
|
|
|
impl FoundPath {
|
|
fn new(project: ProjectPath, absolute: Option<PathBuf>) -> Self {
|
|
Self { project, absolute }
|
|
}
|
|
}
|
|
|
|
const MAX_RECENT_SELECTIONS: usize = 20;
|
|
|
|
pub enum Event {
|
|
Selected(ProjectPath),
|
|
Dismissed,
|
|
}
|
|
|
|
#[derive(Debug, Clone)]
|
|
struct FileSearchQuery {
|
|
raw_query: String,
|
|
file_query_end: Option<usize>,
|
|
path_position: PathWithPosition,
|
|
}
|
|
|
|
impl FileSearchQuery {
|
|
fn path_query(&self) -> &str {
|
|
match self.file_query_end {
|
|
Some(file_path_end) => &self.raw_query[..file_path_end],
|
|
None => &self.raw_query,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl FileFinderDelegate {
|
|
fn new(
|
|
file_finder: WeakView<FileFinder>,
|
|
workspace: WeakView<Workspace>,
|
|
project: Model<Project>,
|
|
currently_opened_path: Option<FoundPath>,
|
|
history_items: Vec<FoundPath>,
|
|
separate_history: bool,
|
|
cx: &mut ViewContext<FileFinder>,
|
|
) -> Self {
|
|
Self::subscribe_to_updates(&project, cx);
|
|
Self {
|
|
file_finder,
|
|
workspace,
|
|
project,
|
|
search_count: 0,
|
|
latest_search_id: 0,
|
|
latest_search_did_cancel: false,
|
|
latest_search_query: None,
|
|
currently_opened_path,
|
|
matches: Matches::default(),
|
|
has_changed_selected_index: false,
|
|
selected_index: 0,
|
|
cancel_flag: Arc::new(AtomicBool::new(false)),
|
|
history_items,
|
|
separate_history,
|
|
first_update: true,
|
|
}
|
|
}
|
|
|
|
fn subscribe_to_updates(project: &Model<Project>, cx: &mut ViewContext<FileFinder>) {
|
|
cx.subscribe(project, |file_finder, _, event, cx| {
|
|
match event {
|
|
project::Event::WorktreeUpdatedEntries(_, _)
|
|
| project::Event::WorktreeAdded
|
|
| project::Event::WorktreeRemoved(_) => file_finder
|
|
.picker
|
|
.update(cx, |picker, cx| picker.refresh(cx)),
|
|
_ => {}
|
|
};
|
|
})
|
|
.detach();
|
|
}
|
|
|
|
fn spawn_search(
|
|
&mut self,
|
|
query: FileSearchQuery,
|
|
cx: &mut ViewContext<Picker<Self>>,
|
|
) -> Task<()> {
|
|
let relative_to = self
|
|
.currently_opened_path
|
|
.as_ref()
|
|
.map(|found_path| Arc::clone(&found_path.project.path));
|
|
let worktrees = self
|
|
.project
|
|
.read(cx)
|
|
.visible_worktrees(cx)
|
|
.collect::<Vec<_>>();
|
|
let include_root_name = worktrees.len() > 1;
|
|
let candidate_sets = worktrees
|
|
.into_iter()
|
|
.map(|worktree| {
|
|
let worktree = worktree.read(cx);
|
|
PathMatchCandidateSet {
|
|
snapshot: worktree.snapshot(),
|
|
include_ignored: worktree
|
|
.root_entry()
|
|
.map_or(false, |entry| entry.is_ignored),
|
|
include_root_name,
|
|
candidates: project::Candidates::Files,
|
|
}
|
|
})
|
|
.collect::<Vec<_>>();
|
|
|
|
let search_id = util::post_inc(&mut self.search_count);
|
|
self.cancel_flag.store(true, atomic::Ordering::Relaxed);
|
|
self.cancel_flag = Arc::new(AtomicBool::new(false));
|
|
let cancel_flag = self.cancel_flag.clone();
|
|
cx.spawn(|picker, mut cx| async move {
|
|
let matches = fuzzy::match_path_sets(
|
|
candidate_sets.as_slice(),
|
|
query.path_query(),
|
|
relative_to,
|
|
false,
|
|
100,
|
|
&cancel_flag,
|
|
cx.background_executor().clone(),
|
|
)
|
|
.await
|
|
.into_iter()
|
|
.map(ProjectPanelOrdMatch);
|
|
let did_cancel = cancel_flag.load(atomic::Ordering::Relaxed);
|
|
picker
|
|
.update(&mut cx, |picker, cx| {
|
|
picker
|
|
.delegate
|
|
.set_search_matches(search_id, did_cancel, query, matches, cx)
|
|
})
|
|
.log_err();
|
|
})
|
|
}
|
|
|
|
fn set_search_matches(
|
|
&mut self,
|
|
search_id: usize,
|
|
did_cancel: bool,
|
|
query: FileSearchQuery,
|
|
matches: impl IntoIterator<Item = ProjectPanelOrdMatch>,
|
|
cx: &mut ViewContext<Picker<Self>>,
|
|
) {
|
|
if search_id >= self.latest_search_id {
|
|
self.latest_search_id = search_id;
|
|
let query_changed = Some(query.path_query())
|
|
!= self
|
|
.latest_search_query
|
|
.as_ref()
|
|
.map(|query| query.path_query());
|
|
let extend_old_matches = self.latest_search_did_cancel && !query_changed;
|
|
|
|
let selected_match = if query_changed {
|
|
None
|
|
} else {
|
|
self.matches.get(self.selected_index).cloned()
|
|
};
|
|
|
|
self.matches.push_new_matches(
|
|
&self.history_items,
|
|
self.currently_opened_path.as_ref(),
|
|
Some(&query),
|
|
matches.into_iter(),
|
|
extend_old_matches,
|
|
);
|
|
|
|
self.selected_index = selected_match.map_or_else(
|
|
|| self.calculate_selected_index(),
|
|
|m| {
|
|
self.matches
|
|
.position(&m, self.currently_opened_path.as_ref())
|
|
.unwrap_or(0)
|
|
},
|
|
);
|
|
|
|
self.latest_search_query = Some(query);
|
|
self.latest_search_did_cancel = did_cancel;
|
|
|
|
cx.notify();
|
|
}
|
|
}
|
|
|
|
fn labels_for_match(
|
|
&self,
|
|
path_match: &Match,
|
|
cx: &AppContext,
|
|
ix: usize,
|
|
) -> (String, Vec<usize>, String, Vec<usize>) {
|
|
let (file_name, file_name_positions, full_path, full_path_positions) = match &path_match {
|
|
Match::History {
|
|
path: entry_path,
|
|
panel_match,
|
|
} => {
|
|
let worktree_id = entry_path.project.worktree_id;
|
|
let project_relative_path = &entry_path.project.path;
|
|
let has_worktree = self
|
|
.project
|
|
.read(cx)
|
|
.worktree_for_id(worktree_id, cx)
|
|
.is_some();
|
|
|
|
if !has_worktree {
|
|
if let Some(absolute_path) = &entry_path.absolute {
|
|
return (
|
|
absolute_path
|
|
.file_name()
|
|
.map_or_else(
|
|
|| project_relative_path.to_string_lossy(),
|
|
|file_name| file_name.to_string_lossy(),
|
|
)
|
|
.to_string(),
|
|
Vec::new(),
|
|
absolute_path.to_string_lossy().to_string(),
|
|
Vec::new(),
|
|
);
|
|
}
|
|
}
|
|
|
|
let mut path = Arc::clone(project_relative_path);
|
|
if project_relative_path.as_ref() == Path::new("") {
|
|
if let Some(absolute_path) = &entry_path.absolute {
|
|
path = Arc::from(absolute_path.as_path());
|
|
}
|
|
}
|
|
|
|
let mut path_match = PathMatch {
|
|
score: ix as f64,
|
|
positions: Vec::new(),
|
|
worktree_id: worktree_id.to_usize(),
|
|
path,
|
|
is_dir: false, // File finder doesn't support directories
|
|
path_prefix: "".into(),
|
|
distance_to_relative_ancestor: usize::MAX,
|
|
};
|
|
if let Some(found_path_match) = &panel_match {
|
|
path_match
|
|
.positions
|
|
.extend(found_path_match.0.positions.iter())
|
|
}
|
|
|
|
self.labels_for_path_match(&path_match)
|
|
}
|
|
Match::Search(path_match) => self.labels_for_path_match(&path_match.0),
|
|
};
|
|
|
|
if file_name_positions.is_empty() {
|
|
if let Some(user_home_path) = std::env::var("HOME").ok() {
|
|
let user_home_path = user_home_path.trim();
|
|
if !user_home_path.is_empty() {
|
|
if (&full_path).starts_with(user_home_path) {
|
|
return (
|
|
file_name,
|
|
file_name_positions,
|
|
full_path.replace(user_home_path, "~"),
|
|
full_path_positions,
|
|
);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
(
|
|
file_name,
|
|
file_name_positions,
|
|
full_path,
|
|
full_path_positions,
|
|
)
|
|
}
|
|
|
|
fn labels_for_path_match(
|
|
&self,
|
|
path_match: &PathMatch,
|
|
) -> (String, Vec<usize>, String, Vec<usize>) {
|
|
let path = &path_match.path;
|
|
let path_string = path.to_string_lossy();
|
|
let full_path = [path_match.path_prefix.as_ref(), path_string.as_ref()].join("");
|
|
let mut path_positions = path_match.positions.clone();
|
|
|
|
let file_name = path.file_name().map_or_else(
|
|
|| path_match.path_prefix.to_string(),
|
|
|file_name| file_name.to_string_lossy().to_string(),
|
|
);
|
|
let file_name_start = path_match.path_prefix.len() + path_string.len() - file_name.len();
|
|
let file_name_positions = path_positions
|
|
.iter()
|
|
.filter_map(|pos| {
|
|
if pos >= &file_name_start {
|
|
Some(pos - file_name_start)
|
|
} else {
|
|
None
|
|
}
|
|
})
|
|
.collect();
|
|
|
|
let full_path = full_path.trim_end_matches(&file_name).to_string();
|
|
path_positions.retain(|idx| *idx < full_path.len());
|
|
|
|
(file_name, file_name_positions, full_path, path_positions)
|
|
}
|
|
|
|
fn lookup_absolute_path(
|
|
&self,
|
|
query: FileSearchQuery,
|
|
cx: &mut ViewContext<'_, Picker<Self>>,
|
|
) -> Task<()> {
|
|
cx.spawn(|picker, mut cx| async move {
|
|
let Some(project) = picker
|
|
.update(&mut cx, |picker, _| picker.delegate.project.clone())
|
|
.log_err()
|
|
else {
|
|
return;
|
|
};
|
|
|
|
let query_path = Path::new(query.path_query());
|
|
let mut path_matches = Vec::new();
|
|
|
|
let abs_file_exists = if let Ok(task) = project.update(&mut cx, |this, cx| {
|
|
this.abs_file_path_exists(query.path_query(), cx)
|
|
}) {
|
|
task.await
|
|
} else {
|
|
false
|
|
};
|
|
|
|
if abs_file_exists {
|
|
let update_result = project
|
|
.update(&mut cx, |project, cx| {
|
|
if let Some((worktree, relative_path)) =
|
|
project.find_worktree(query_path, cx)
|
|
{
|
|
path_matches.push(ProjectPanelOrdMatch(PathMatch {
|
|
score: 1.0,
|
|
positions: Vec::new(),
|
|
worktree_id: worktree.read(cx).id().to_usize(),
|
|
path: Arc::from(relative_path),
|
|
path_prefix: "".into(),
|
|
is_dir: false, // File finder doesn't support directories
|
|
distance_to_relative_ancestor: usize::MAX,
|
|
}));
|
|
}
|
|
})
|
|
.log_err();
|
|
if update_result.is_none() {
|
|
return;
|
|
}
|
|
}
|
|
|
|
picker
|
|
.update(&mut cx, |picker, cx| {
|
|
let picker_delegate = &mut picker.delegate;
|
|
let search_id = util::post_inc(&mut picker_delegate.search_count);
|
|
picker_delegate.set_search_matches(search_id, false, query, path_matches, cx);
|
|
|
|
anyhow::Ok(())
|
|
})
|
|
.log_err();
|
|
})
|
|
}
|
|
|
|
/// Skips first history match (that is displayed topmost) if it's currently opened.
|
|
fn calculate_selected_index(&self) -> usize {
|
|
if let Some(Match::History { path, .. }) = self.matches.get(0) {
|
|
if Some(path) == self.currently_opened_path.as_ref() {
|
|
let elements_after_first = self.matches.len() - 1;
|
|
if elements_after_first > 0 {
|
|
return 1;
|
|
}
|
|
}
|
|
}
|
|
|
|
0
|
|
}
|
|
}
|
|
|
|
impl PickerDelegate for FileFinderDelegate {
|
|
type ListItem = ListItem;
|
|
|
|
fn placeholder_text(&self, _cx: &mut WindowContext) -> Arc<str> {
|
|
"Search project files...".into()
|
|
}
|
|
|
|
fn match_count(&self) -> usize {
|
|
self.matches.len()
|
|
}
|
|
|
|
fn selected_index(&self) -> usize {
|
|
self.selected_index
|
|
}
|
|
|
|
fn set_selected_index(&mut self, ix: usize, cx: &mut ViewContext<Picker<Self>>) {
|
|
self.has_changed_selected_index = true;
|
|
self.selected_index = ix;
|
|
cx.notify();
|
|
}
|
|
|
|
fn separators_after_indices(&self) -> Vec<usize> {
|
|
if self.separate_history {
|
|
let first_non_history_index = self
|
|
.matches
|
|
.matches
|
|
.iter()
|
|
.enumerate()
|
|
.find(|(_, m)| !matches!(m, Match::History { .. }))
|
|
.map(|(i, _)| i);
|
|
if let Some(first_non_history_index) = first_non_history_index {
|
|
if first_non_history_index > 0 {
|
|
return vec![first_non_history_index - 1];
|
|
}
|
|
}
|
|
}
|
|
Vec::new()
|
|
}
|
|
|
|
fn update_matches(
|
|
&mut self,
|
|
raw_query: String,
|
|
cx: &mut ViewContext<Picker<Self>>,
|
|
) -> Task<()> {
|
|
let raw_query = raw_query.replace(' ', "");
|
|
let raw_query = raw_query.trim();
|
|
if raw_query.is_empty() {
|
|
// if there was no query before, and we already have some (history) matches
|
|
// there's no need to update anything, since nothing has changed.
|
|
// We also want to populate matches set from history entries on the first update.
|
|
if self.latest_search_query.is_some() || self.first_update {
|
|
let project = self.project.read(cx);
|
|
|
|
self.latest_search_id = post_inc(&mut self.search_count);
|
|
self.latest_search_query = None;
|
|
self.matches = Matches {
|
|
separate_history: self.separate_history,
|
|
..Matches::default()
|
|
};
|
|
self.matches.push_new_matches(
|
|
self.history_items.iter().filter(|history_item| {
|
|
project
|
|
.worktree_for_id(history_item.project.worktree_id, cx)
|
|
.is_some()
|
|
|| ((project.is_local() || project.is_via_ssh())
|
|
&& history_item.absolute.is_some())
|
|
}),
|
|
self.currently_opened_path.as_ref(),
|
|
None,
|
|
None.into_iter(),
|
|
false,
|
|
);
|
|
|
|
self.first_update = false;
|
|
self.selected_index = 0;
|
|
}
|
|
cx.notify();
|
|
Task::ready(())
|
|
} else {
|
|
let path_position = PathWithPosition::parse_str(&raw_query);
|
|
|
|
let query = FileSearchQuery {
|
|
raw_query: raw_query.trim().to_owned(),
|
|
file_query_end: if path_position.path.to_str().unwrap_or(raw_query) == raw_query {
|
|
None
|
|
} else {
|
|
// Safe to unwrap as we won't get here when the unwrap in if fails
|
|
Some(path_position.path.to_str().unwrap().len())
|
|
},
|
|
path_position,
|
|
};
|
|
|
|
if Path::new(query.path_query()).is_absolute() {
|
|
self.lookup_absolute_path(query, cx)
|
|
} else {
|
|
self.spawn_search(query, cx)
|
|
}
|
|
}
|
|
}
|
|
|
|
fn confirm(&mut self, secondary: bool, cx: &mut ViewContext<Picker<FileFinderDelegate>>) {
|
|
if let Some(m) = self.matches.get(self.selected_index()) {
|
|
if let Some(workspace) = self.workspace.upgrade() {
|
|
let open_task = workspace.update(cx, move |workspace, cx| {
|
|
let split_or_open =
|
|
|workspace: &mut Workspace,
|
|
project_path,
|
|
cx: &mut ViewContext<Workspace>| {
|
|
let allow_preview =
|
|
PreviewTabsSettings::get_global(cx).enable_preview_from_file_finder;
|
|
if secondary {
|
|
workspace.split_path_preview(project_path, allow_preview, cx)
|
|
} else {
|
|
workspace.open_path_preview(
|
|
project_path,
|
|
None,
|
|
true,
|
|
allow_preview,
|
|
cx,
|
|
)
|
|
}
|
|
};
|
|
match &m {
|
|
Match::History { path, .. } => {
|
|
let worktree_id = path.project.worktree_id;
|
|
if workspace
|
|
.project()
|
|
.read(cx)
|
|
.worktree_for_id(worktree_id, cx)
|
|
.is_some()
|
|
{
|
|
split_or_open(
|
|
workspace,
|
|
ProjectPath {
|
|
worktree_id,
|
|
path: Arc::clone(&path.project.path),
|
|
},
|
|
cx,
|
|
)
|
|
} else {
|
|
match path.absolute.as_ref() {
|
|
Some(abs_path) => {
|
|
if secondary {
|
|
workspace.split_abs_path(
|
|
abs_path.to_path_buf(),
|
|
false,
|
|
cx,
|
|
)
|
|
} else {
|
|
workspace.open_abs_path(
|
|
abs_path.to_path_buf(),
|
|
false,
|
|
cx,
|
|
)
|
|
}
|
|
}
|
|
None => split_or_open(
|
|
workspace,
|
|
ProjectPath {
|
|
worktree_id,
|
|
path: Arc::clone(&path.project.path),
|
|
},
|
|
cx,
|
|
),
|
|
}
|
|
}
|
|
}
|
|
Match::Search(m) => split_or_open(
|
|
workspace,
|
|
ProjectPath {
|
|
worktree_id: WorktreeId::from_usize(m.0.worktree_id),
|
|
path: m.0.path.clone(),
|
|
},
|
|
cx,
|
|
),
|
|
}
|
|
});
|
|
|
|
let row = self
|
|
.latest_search_query
|
|
.as_ref()
|
|
.and_then(|query| query.path_position.row)
|
|
.map(|row| row.saturating_sub(1));
|
|
let col = self
|
|
.latest_search_query
|
|
.as_ref()
|
|
.and_then(|query| query.path_position.column)
|
|
.unwrap_or(0)
|
|
.saturating_sub(1);
|
|
let finder = self.file_finder.clone();
|
|
|
|
cx.spawn(|_, mut cx| async move {
|
|
let item = open_task.await.notify_async_err(&mut cx)?;
|
|
if let Some(row) = row {
|
|
if let Some(active_editor) = item.downcast::<Editor>() {
|
|
active_editor
|
|
.downgrade()
|
|
.update(&mut cx, |editor, cx| {
|
|
let snapshot = editor.snapshot(cx).display_snapshot;
|
|
let point = snapshot
|
|
.buffer_snapshot
|
|
.clip_point(Point::new(row, col), Bias::Left);
|
|
editor.change_selections(Some(Autoscroll::center()), cx, |s| {
|
|
s.select_ranges([point..point])
|
|
});
|
|
})
|
|
.log_err();
|
|
}
|
|
}
|
|
finder.update(&mut cx, |_, cx| cx.emit(DismissEvent)).ok()?;
|
|
|
|
Some(())
|
|
})
|
|
.detach();
|
|
}
|
|
}
|
|
}
|
|
|
|
fn dismissed(&mut self, cx: &mut ViewContext<Picker<FileFinderDelegate>>) {
|
|
self.file_finder
|
|
.update(cx, |_, cx| cx.emit(DismissEvent))
|
|
.log_err();
|
|
}
|
|
|
|
fn render_match(
|
|
&self,
|
|
ix: usize,
|
|
selected: bool,
|
|
cx: &mut ViewContext<Picker<Self>>,
|
|
) -> Option<Self::ListItem> {
|
|
let settings = FileFinderSettings::get_global(cx);
|
|
|
|
let path_match = self
|
|
.matches
|
|
.get(ix)
|
|
.expect("Invalid matches state: no element for index {ix}");
|
|
|
|
let history_icon = match &path_match {
|
|
Match::History { .. } => Icon::new(IconName::HistoryRerun)
|
|
.color(Color::Muted)
|
|
.size(IconSize::Small)
|
|
.into_any_element(),
|
|
Match::Search(_) => v_flex()
|
|
.flex_none()
|
|
.size(IconSize::Small.rems())
|
|
.into_any_element(),
|
|
};
|
|
let (file_name, file_name_positions, full_path, full_path_positions) =
|
|
self.labels_for_match(path_match, cx, ix);
|
|
|
|
let file_icon = if settings.file_icons {
|
|
FileIcons::get_icon(Path::new(&file_name), cx)
|
|
.map(Icon::from_path)
|
|
.map(|icon| icon.color(Color::Muted))
|
|
} else {
|
|
None
|
|
};
|
|
|
|
Some(
|
|
ListItem::new(ix)
|
|
.spacing(ListItemSpacing::Sparse)
|
|
.start_slot::<Icon>(file_icon)
|
|
.end_slot::<AnyElement>(history_icon)
|
|
.inset(true)
|
|
.selected(selected)
|
|
.child(
|
|
h_flex()
|
|
.gap_2()
|
|
.py_px()
|
|
.child(HighlightedLabel::new(file_name, file_name_positions))
|
|
.child(
|
|
HighlightedLabel::new(full_path, full_path_positions)
|
|
.size(LabelSize::Small)
|
|
.color(Color::Muted),
|
|
),
|
|
),
|
|
)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_custom_project_search_ordering_in_file_finder() {
|
|
let mut file_finder_sorted_output = vec![
|
|
ProjectPanelOrdMatch(PathMatch {
|
|
score: 0.5,
|
|
positions: Vec::new(),
|
|
worktree_id: 0,
|
|
path: Arc::from(Path::new("b0.5")),
|
|
path_prefix: Arc::default(),
|
|
distance_to_relative_ancestor: 0,
|
|
is_dir: false,
|
|
}),
|
|
ProjectPanelOrdMatch(PathMatch {
|
|
score: 1.0,
|
|
positions: Vec::new(),
|
|
worktree_id: 0,
|
|
path: Arc::from(Path::new("c1.0")),
|
|
path_prefix: Arc::default(),
|
|
distance_to_relative_ancestor: 0,
|
|
is_dir: false,
|
|
}),
|
|
ProjectPanelOrdMatch(PathMatch {
|
|
score: 1.0,
|
|
positions: Vec::new(),
|
|
worktree_id: 0,
|
|
path: Arc::from(Path::new("a1.0")),
|
|
path_prefix: Arc::default(),
|
|
distance_to_relative_ancestor: 0,
|
|
is_dir: false,
|
|
}),
|
|
ProjectPanelOrdMatch(PathMatch {
|
|
score: 0.5,
|
|
positions: Vec::new(),
|
|
worktree_id: 0,
|
|
path: Arc::from(Path::new("a0.5")),
|
|
path_prefix: Arc::default(),
|
|
distance_to_relative_ancestor: 0,
|
|
is_dir: false,
|
|
}),
|
|
ProjectPanelOrdMatch(PathMatch {
|
|
score: 1.0,
|
|
positions: Vec::new(),
|
|
worktree_id: 0,
|
|
path: Arc::from(Path::new("b1.0")),
|
|
path_prefix: Arc::default(),
|
|
distance_to_relative_ancestor: 0,
|
|
is_dir: false,
|
|
}),
|
|
];
|
|
file_finder_sorted_output.sort_by(|a, b| b.cmp(a));
|
|
|
|
assert_eq!(
|
|
file_finder_sorted_output,
|
|
vec![
|
|
ProjectPanelOrdMatch(PathMatch {
|
|
score: 1.0,
|
|
positions: Vec::new(),
|
|
worktree_id: 0,
|
|
path: Arc::from(Path::new("a1.0")),
|
|
path_prefix: Arc::default(),
|
|
distance_to_relative_ancestor: 0,
|
|
is_dir: false,
|
|
}),
|
|
ProjectPanelOrdMatch(PathMatch {
|
|
score: 1.0,
|
|
positions: Vec::new(),
|
|
worktree_id: 0,
|
|
path: Arc::from(Path::new("b1.0")),
|
|
path_prefix: Arc::default(),
|
|
distance_to_relative_ancestor: 0,
|
|
is_dir: false,
|
|
}),
|
|
ProjectPanelOrdMatch(PathMatch {
|
|
score: 1.0,
|
|
positions: Vec::new(),
|
|
worktree_id: 0,
|
|
path: Arc::from(Path::new("c1.0")),
|
|
path_prefix: Arc::default(),
|
|
distance_to_relative_ancestor: 0,
|
|
is_dir: false,
|
|
}),
|
|
ProjectPanelOrdMatch(PathMatch {
|
|
score: 0.5,
|
|
positions: Vec::new(),
|
|
worktree_id: 0,
|
|
path: Arc::from(Path::new("a0.5")),
|
|
path_prefix: Arc::default(),
|
|
distance_to_relative_ancestor: 0,
|
|
is_dir: false,
|
|
}),
|
|
ProjectPanelOrdMatch(PathMatch {
|
|
score: 0.5,
|
|
positions: Vec::new(),
|
|
worktree_id: 0,
|
|
path: Arc::from(Path::new("b0.5")),
|
|
path_prefix: Arc::default(),
|
|
distance_to_relative_ancestor: 0,
|
|
is_dir: false,
|
|
}),
|
|
]
|
|
);
|
|
}
|
|
}
|