1#[cfg(test)]
2mod file_finder_tests;
3#[cfg(test)]
4mod open_path_prompt_tests;
5
6pub mod file_finder_settings;
7mod new_path_prompt;
8mod open_path_prompt;
9
10use futures::future::join_all;
11pub use open_path_prompt::OpenPathDelegate;
12
13use collections::HashMap;
14use editor::Editor;
15use file_finder_settings::{FileFinderSettings, FileFinderWidth};
16use file_icons::FileIcons;
17use fuzzy::{CharBag, PathMatch, PathMatchCandidate};
18use gpui::{
19 actions, Action, AnyElement, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle,
20 Focusable, KeyContext, Modifiers, ModifiersChangedEvent, ParentElement, Render, Styled, Task,
21 WeakEntity, Window,
22};
23use new_path_prompt::NewPathPrompt;
24use open_path_prompt::OpenPathPrompt;
25use picker::{Picker, PickerDelegate};
26use project::{PathMatchCandidateSet, Project, ProjectPath, WorktreeId};
27use settings::Settings;
28use std::{
29 borrow::Cow,
30 cmp,
31 ops::Range,
32 path::{Component, Path, PathBuf},
33 sync::{
34 atomic::{self, AtomicBool},
35 Arc,
36 },
37};
38use text::Point;
39use ui::{
40 prelude::*, ContextMenu, HighlightedLabel, ListItem, ListItemSpacing, PopoverMenu,
41 PopoverMenuHandle,
42};
43use util::{maybe, paths::PathWithPosition, post_inc, ResultExt};
44use workspace::{
45 item::PreviewTabsSettings, notifications::NotifyResultExt, pane, ModalView, OpenOptions,
46 OpenVisible, SplitDirection, Workspace,
47};
48
49actions!(file_finder, [SelectPrevious, ToggleMenu]);
50
51impl ModalView for FileFinder {
52 fn on_before_dismiss(
53 &mut self,
54 window: &mut Window,
55 cx: &mut Context<Self>,
56 ) -> workspace::DismissDecision {
57 let submenu_focused = self.picker.update(cx, |picker, cx| {
58 picker.delegate.popover_menu_handle.is_focused(window, cx)
59 });
60 workspace::DismissDecision::Dismiss(!submenu_focused)
61 }
62}
63
64pub struct FileFinder {
65 picker: Entity<Picker<FileFinderDelegate>>,
66 picker_focus_handle: FocusHandle,
67 init_modifiers: Option<Modifiers>,
68}
69
70pub fn init_settings(cx: &mut App) {
71 FileFinderSettings::register(cx);
72}
73
74pub fn init(cx: &mut App) {
75 init_settings(cx);
76 cx.observe_new(FileFinder::register).detach();
77 cx.observe_new(NewPathPrompt::register).detach();
78 cx.observe_new(OpenPathPrompt::register).detach();
79}
80
81impl FileFinder {
82 fn register(
83 workspace: &mut Workspace,
84 _window: Option<&mut Window>,
85 _: &mut Context<Workspace>,
86 ) {
87 workspace.register_action(
88 |workspace, action: &workspace::ToggleFileFinder, window, cx| {
89 let Some(file_finder) = workspace.active_modal::<Self>(cx) else {
90 Self::open(workspace, action.separate_history, window, cx).detach();
91 return;
92 };
93
94 file_finder.update(cx, |file_finder, cx| {
95 file_finder.init_modifiers = Some(window.modifiers());
96 file_finder.picker.update(cx, |picker, cx| {
97 picker.cycle_selection(window, cx);
98 });
99 });
100 },
101 );
102 }
103
104 fn open(
105 workspace: &mut Workspace,
106 separate_history: bool,
107 window: &mut Window,
108 cx: &mut Context<Workspace>,
109 ) -> Task<()> {
110 let project = workspace.project().read(cx);
111 let fs = project.fs();
112
113 let currently_opened_path = workspace
114 .active_item(cx)
115 .and_then(|item| item.project_path(cx))
116 .map(|project_path| {
117 let abs_path = project
118 .worktree_for_id(project_path.worktree_id, cx)
119 .map(|worktree| worktree.read(cx).abs_path().join(&project_path.path));
120 FoundPath::new(project_path, abs_path)
121 });
122
123 let history_items = workspace
124 .recent_navigation_history(Some(MAX_RECENT_SELECTIONS), cx)
125 .into_iter()
126 .filter_map(|(project_path, abs_path)| {
127 if project.entry_for_path(&project_path, cx).is_some() {
128 return Some(Task::ready(Some(FoundPath::new(project_path, abs_path))));
129 }
130 let abs_path = abs_path?;
131 if project.is_local() {
132 let fs = fs.clone();
133 Some(cx.background_spawn(async move {
134 if fs.is_file(&abs_path).await {
135 Some(FoundPath::new(project_path, Some(abs_path)))
136 } else {
137 None
138 }
139 }))
140 } else {
141 Some(Task::ready(Some(FoundPath::new(
142 project_path,
143 Some(abs_path),
144 ))))
145 }
146 })
147 .collect::<Vec<_>>();
148 cx.spawn_in(window, async move |workspace, cx| {
149 let history_items = join_all(history_items).await.into_iter().flatten();
150
151 workspace
152 .update_in(cx, |workspace, window, cx| {
153 let project = workspace.project().clone();
154 let weak_workspace = cx.entity().downgrade();
155 workspace.toggle_modal(window, cx, |window, cx| {
156 let delegate = FileFinderDelegate::new(
157 cx.entity().downgrade(),
158 weak_workspace,
159 project,
160 currently_opened_path,
161 history_items.collect(),
162 separate_history,
163 window,
164 cx,
165 );
166
167 FileFinder::new(delegate, window, cx)
168 });
169 })
170 .ok();
171 })
172 }
173
174 fn new(delegate: FileFinderDelegate, window: &mut Window, cx: &mut Context<Self>) -> Self {
175 let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
176 let picker_focus_handle = picker.focus_handle(cx);
177 picker.update(cx, |picker, _| {
178 picker.delegate.focus_handle = picker_focus_handle.clone();
179 });
180 Self {
181 picker,
182 picker_focus_handle,
183 init_modifiers: window.modifiers().modified().then_some(window.modifiers()),
184 }
185 }
186
187 fn handle_modifiers_changed(
188 &mut self,
189 event: &ModifiersChangedEvent,
190 window: &mut Window,
191 cx: &mut Context<Self>,
192 ) {
193 let Some(init_modifiers) = self.init_modifiers.take() else {
194 return;
195 };
196 if self.picker.read(cx).delegate.has_changed_selected_index {
197 if !event.modified() || !init_modifiers.is_subset_of(&event) {
198 self.init_modifiers = None;
199 window.dispatch_action(menu::Confirm.boxed_clone(), cx);
200 }
201 }
202 }
203
204 fn handle_select_prev(
205 &mut self,
206 _: &SelectPrevious,
207 window: &mut Window,
208 cx: &mut Context<Self>,
209 ) {
210 self.init_modifiers = Some(window.modifiers());
211 window.dispatch_action(Box::new(menu::SelectPrevious), cx);
212 }
213
214 fn handle_toggle_menu(&mut self, _: &ToggleMenu, window: &mut Window, cx: &mut Context<Self>) {
215 self.picker.update(cx, |picker, cx| {
216 let menu_handle = &picker.delegate.popover_menu_handle;
217 if menu_handle.is_deployed() {
218 menu_handle.hide(cx);
219 } else {
220 menu_handle.show(window, cx);
221 }
222 });
223 }
224
225 fn go_to_file_split_left(
226 &mut self,
227 _: &pane::SplitLeft,
228 window: &mut Window,
229 cx: &mut Context<Self>,
230 ) {
231 self.go_to_file_split_inner(SplitDirection::Left, window, cx)
232 }
233
234 fn go_to_file_split_right(
235 &mut self,
236 _: &pane::SplitRight,
237 window: &mut Window,
238 cx: &mut Context<Self>,
239 ) {
240 self.go_to_file_split_inner(SplitDirection::Right, window, cx)
241 }
242
243 fn go_to_file_split_up(
244 &mut self,
245 _: &pane::SplitUp,
246 window: &mut Window,
247 cx: &mut Context<Self>,
248 ) {
249 self.go_to_file_split_inner(SplitDirection::Up, window, cx)
250 }
251
252 fn go_to_file_split_down(
253 &mut self,
254 _: &pane::SplitDown,
255 window: &mut Window,
256 cx: &mut Context<Self>,
257 ) {
258 self.go_to_file_split_inner(SplitDirection::Down, window, cx)
259 }
260
261 fn go_to_file_split_inner(
262 &mut self,
263 split_direction: SplitDirection,
264 window: &mut Window,
265 cx: &mut Context<Self>,
266 ) {
267 self.picker.update(cx, |picker, cx| {
268 let delegate = &mut picker.delegate;
269 if let Some(workspace) = delegate.workspace.upgrade() {
270 if let Some(m) = delegate.matches.get(delegate.selected_index()) {
271 let path = match &m {
272 Match::History { path, .. } => {
273 let worktree_id = path.project.worktree_id;
274 ProjectPath {
275 worktree_id,
276 path: Arc::clone(&path.project.path),
277 }
278 }
279 Match::Search(m) => ProjectPath {
280 worktree_id: WorktreeId::from_usize(m.0.worktree_id),
281 path: m.0.path.clone(),
282 },
283 };
284 let open_task = workspace.update(cx, move |workspace, cx| {
285 workspace.split_path_preview(path, false, Some(split_direction), window, cx)
286 });
287 open_task.detach_and_log_err(cx);
288 }
289 }
290 })
291 }
292
293 pub fn modal_max_width(width_setting: Option<FileFinderWidth>, window: &mut Window) -> Pixels {
294 let window_width = window.viewport_size().width;
295 let small_width = Pixels(545.);
296
297 match width_setting {
298 None | Some(FileFinderWidth::Small) => small_width,
299 Some(FileFinderWidth::Full) => window_width,
300 Some(FileFinderWidth::XLarge) => (window_width - Pixels(512.)).max(small_width),
301 Some(FileFinderWidth::Large) => (window_width - Pixels(768.)).max(small_width),
302 Some(FileFinderWidth::Medium) => (window_width - Pixels(1024.)).max(small_width),
303 }
304 }
305}
306
307impl EventEmitter<DismissEvent> for FileFinder {}
308
309impl Focusable for FileFinder {
310 fn focus_handle(&self, _: &App) -> FocusHandle {
311 self.picker_focus_handle.clone()
312 }
313}
314
315impl Render for FileFinder {
316 fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
317 let key_context = self.picker.read(cx).delegate.key_context(window, cx);
318
319 let file_finder_settings = FileFinderSettings::get_global(cx);
320 let modal_max_width = Self::modal_max_width(file_finder_settings.modal_max_width, window);
321
322 v_flex()
323 .key_context(key_context)
324 .w(modal_max_width)
325 .on_modifiers_changed(cx.listener(Self::handle_modifiers_changed))
326 .on_action(cx.listener(Self::handle_select_prev))
327 .on_action(cx.listener(Self::handle_toggle_menu))
328 .on_action(cx.listener(Self::go_to_file_split_left))
329 .on_action(cx.listener(Self::go_to_file_split_right))
330 .on_action(cx.listener(Self::go_to_file_split_up))
331 .on_action(cx.listener(Self::go_to_file_split_down))
332 .child(self.picker.clone())
333 }
334}
335
336pub struct FileFinderDelegate {
337 file_finder: WeakEntity<FileFinder>,
338 workspace: WeakEntity<Workspace>,
339 project: Entity<Project>,
340 search_count: usize,
341 latest_search_id: usize,
342 latest_search_did_cancel: bool,
343 latest_search_query: Option<FileSearchQuery>,
344 currently_opened_path: Option<FoundPath>,
345 matches: Matches,
346 selected_index: usize,
347 has_changed_selected_index: bool,
348 cancel_flag: Arc<AtomicBool>,
349 history_items: Vec<FoundPath>,
350 separate_history: bool,
351 first_update: bool,
352 popover_menu_handle: PopoverMenuHandle<ContextMenu>,
353 focus_handle: FocusHandle,
354}
355
356/// Use a custom ordering for file finder: the regular one
357/// defines max element with the highest score and the latest alphanumerical path (in case of a tie on other params), e.g:
358/// `[{score: 0.5, path = "c/d" }, { score: 0.5, path = "/a/b" }]`
359///
360/// In the file finder, we would prefer to have the max element with the highest score and the earliest alphanumerical path, e.g:
361/// `[{ score: 0.5, path = "/a/b" }, {score: 0.5, path = "c/d" }]`
362/// as the files are shown in the project panel lists.
363#[derive(Debug, Clone, PartialEq, Eq)]
364struct ProjectPanelOrdMatch(PathMatch);
365
366impl Ord for ProjectPanelOrdMatch {
367 fn cmp(&self, other: &Self) -> cmp::Ordering {
368 self.0
369 .score
370 .partial_cmp(&other.0.score)
371 .unwrap_or(cmp::Ordering::Equal)
372 .then_with(|| self.0.worktree_id.cmp(&other.0.worktree_id))
373 .then_with(|| {
374 other
375 .0
376 .distance_to_relative_ancestor
377 .cmp(&self.0.distance_to_relative_ancestor)
378 })
379 .then_with(|| self.0.path.cmp(&other.0.path).reverse())
380 }
381}
382
383impl PartialOrd for ProjectPanelOrdMatch {
384 fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> {
385 Some(self.cmp(other))
386 }
387}
388
389#[derive(Debug, Default)]
390struct Matches {
391 separate_history: bool,
392 matches: Vec<Match>,
393}
394
395#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone)]
396enum Match {
397 History {
398 path: FoundPath,
399 panel_match: Option<ProjectPanelOrdMatch>,
400 },
401 Search(ProjectPanelOrdMatch),
402}
403
404impl Match {
405 fn path(&self) -> &Arc<Path> {
406 match self {
407 Match::History { path, .. } => &path.project.path,
408 Match::Search(panel_match) => &panel_match.0.path,
409 }
410 }
411
412 fn panel_match(&self) -> Option<&ProjectPanelOrdMatch> {
413 match self {
414 Match::History { panel_match, .. } => panel_match.as_ref(),
415 Match::Search(panel_match) => Some(&panel_match),
416 }
417 }
418}
419
420impl Matches {
421 fn len(&self) -> usize {
422 self.matches.len()
423 }
424
425 fn get(&self, index: usize) -> Option<&Match> {
426 self.matches.get(index)
427 }
428
429 fn position(
430 &self,
431 entry: &Match,
432 currently_opened: Option<&FoundPath>,
433 ) -> Result<usize, usize> {
434 if let Match::History {
435 path,
436 panel_match: None,
437 } = entry
438 {
439 // Slow case: linear search by path. Should not happen actually,
440 // since we call `position` only if matches set changed, but the query has not changed.
441 // And History entries do not have panel_match if query is empty, so there's no
442 // reason for the matches set to change.
443 self.matches
444 .iter()
445 .position(|m| path.project.path == *m.path())
446 .ok_or(0)
447 } else {
448 self.matches.binary_search_by(|m| {
449 // `reverse()` since if cmp_matches(a, b) == Ordering::Greater, then a is better than b.
450 // And we want the better entries go first.
451 Self::cmp_matches(self.separate_history, currently_opened, &m, &entry).reverse()
452 })
453 }
454 }
455
456 fn push_new_matches<'a>(
457 &'a mut self,
458 history_items: impl IntoIterator<Item = &'a FoundPath> + Clone,
459 currently_opened: Option<&'a FoundPath>,
460 query: Option<&FileSearchQuery>,
461 new_search_matches: impl Iterator<Item = ProjectPanelOrdMatch>,
462 extend_old_matches: bool,
463 ) {
464 let Some(query) = query else {
465 // assuming that if there's no query, then there's no search matches.
466 self.matches.clear();
467 let path_to_entry = |found_path: &FoundPath| Match::History {
468 path: found_path.clone(),
469 panel_match: None,
470 };
471 self.matches
472 .extend(currently_opened.into_iter().map(path_to_entry));
473
474 self.matches.extend(
475 history_items
476 .into_iter()
477 .filter(|found_path| Some(*found_path) != currently_opened)
478 .map(path_to_entry),
479 );
480 return;
481 };
482
483 let new_history_matches = matching_history_items(history_items, currently_opened, query);
484 let new_search_matches: Vec<Match> = new_search_matches
485 .filter(|path_match| !new_history_matches.contains_key(&path_match.0.path))
486 .map(Match::Search)
487 .collect();
488
489 if extend_old_matches {
490 // since we take history matches instead of new search matches
491 // and history matches has not changed(since the query has not changed and we do not extend old matches otherwise),
492 // old matches can't contain paths present in history_matches as well.
493 self.matches.retain(|m| matches!(m, Match::Search(_)));
494 } else {
495 self.matches.clear();
496 }
497
498 // At this point we have an unsorted set of new history matches, an unsorted set of new search matches
499 // and a sorted set of old search matches.
500 // It is possible that the new search matches' paths contain some of the old search matches' paths.
501 // History matches' paths are unique, since store in a HashMap by path.
502 // We build a sorted Vec<Match>, eliminating duplicate search matches.
503 // Search matches with the same paths should have equal `ProjectPanelOrdMatch`, so we should
504 // not have any duplicates after building the final list.
505 for new_match in new_history_matches
506 .into_values()
507 .chain(new_search_matches.into_iter())
508 {
509 match self.position(&new_match, currently_opened) {
510 Ok(_duplicate) => continue,
511 Err(i) => {
512 self.matches.insert(i, new_match);
513 if self.matches.len() == 100 {
514 break;
515 }
516 }
517 }
518 }
519 }
520
521 /// If a < b, then a is a worse match, aligning with the `ProjectPanelOrdMatch` ordering.
522 fn cmp_matches(
523 separate_history: bool,
524 currently_opened: Option<&FoundPath>,
525 a: &Match,
526 b: &Match,
527 ) -> cmp::Ordering {
528 debug_assert!(a.panel_match().is_some() && b.panel_match().is_some());
529
530 match (&a, &b) {
531 // bubble currently opened files to the top
532 (Match::History { path, .. }, _) if Some(path) == currently_opened => {
533 cmp::Ordering::Greater
534 }
535 (_, Match::History { path, .. }) if Some(path) == currently_opened => {
536 cmp::Ordering::Less
537 }
538
539 (Match::History { .. }, Match::Search(_)) if separate_history => cmp::Ordering::Greater,
540 (Match::Search(_), Match::History { .. }) if separate_history => cmp::Ordering::Less,
541
542 _ => a.panel_match().cmp(&b.panel_match()),
543 }
544 }
545}
546
547fn matching_history_items<'a>(
548 history_items: impl IntoIterator<Item = &'a FoundPath>,
549 currently_opened: Option<&'a FoundPath>,
550 query: &FileSearchQuery,
551) -> HashMap<Arc<Path>, Match> {
552 let mut candidates_paths = HashMap::default();
553
554 let history_items_by_worktrees = history_items
555 .into_iter()
556 .chain(currently_opened)
557 .filter_map(|found_path| {
558 let candidate = PathMatchCandidate {
559 is_dir: false, // You can't open directories as project items
560 path: &found_path.project.path,
561 // Only match history items names, otherwise their paths may match too many queries, producing false positives.
562 // E.g. `foo` would match both `something/foo/bar.rs` and `something/foo/foo.rs` and if the former is a history item,
563 // it would be shown first always, despite the latter being a better match.
564 char_bag: CharBag::from_iter(
565 found_path
566 .project
567 .path
568 .file_name()?
569 .to_string_lossy()
570 .to_lowercase()
571 .chars(),
572 ),
573 };
574 candidates_paths.insert(&found_path.project, found_path);
575 Some((found_path.project.worktree_id, candidate))
576 })
577 .fold(
578 HashMap::default(),
579 |mut candidates, (worktree_id, new_candidate)| {
580 candidates
581 .entry(worktree_id)
582 .or_insert_with(Vec::new)
583 .push(new_candidate);
584 candidates
585 },
586 );
587 let mut matching_history_paths = HashMap::default();
588 for (worktree, candidates) in history_items_by_worktrees {
589 let max_results = candidates.len() + 1;
590 matching_history_paths.extend(
591 fuzzy::match_fixed_path_set(
592 candidates,
593 worktree.to_usize(),
594 query.path_query(),
595 false,
596 max_results,
597 )
598 .into_iter()
599 .filter_map(|path_match| {
600 candidates_paths
601 .remove_entry(&ProjectPath {
602 worktree_id: WorktreeId::from_usize(path_match.worktree_id),
603 path: Arc::clone(&path_match.path),
604 })
605 .map(|(_, found_path)| {
606 (
607 Arc::clone(&path_match.path),
608 Match::History {
609 path: found_path.clone(),
610 panel_match: Some(ProjectPanelOrdMatch(path_match)),
611 },
612 )
613 })
614 }),
615 );
616 }
617 matching_history_paths
618}
619
620#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
621struct FoundPath {
622 project: ProjectPath,
623 absolute: Option<PathBuf>,
624}
625
626impl FoundPath {
627 fn new(project: ProjectPath, absolute: Option<PathBuf>) -> Self {
628 Self { project, absolute }
629 }
630}
631
632const MAX_RECENT_SELECTIONS: usize = 20;
633
634pub enum Event {
635 Selected(ProjectPath),
636 Dismissed,
637}
638
639#[derive(Debug, Clone)]
640struct FileSearchQuery {
641 raw_query: String,
642 file_query_end: Option<usize>,
643 path_position: PathWithPosition,
644}
645
646impl FileSearchQuery {
647 fn path_query(&self) -> &str {
648 match self.file_query_end {
649 Some(file_path_end) => &self.raw_query[..file_path_end],
650 None => &self.raw_query,
651 }
652 }
653}
654
655impl FileFinderDelegate {
656 fn new(
657 file_finder: WeakEntity<FileFinder>,
658 workspace: WeakEntity<Workspace>,
659 project: Entity<Project>,
660 currently_opened_path: Option<FoundPath>,
661 history_items: Vec<FoundPath>,
662 separate_history: bool,
663 window: &mut Window,
664 cx: &mut Context<FileFinder>,
665 ) -> Self {
666 Self::subscribe_to_updates(&project, window, cx);
667 Self {
668 file_finder,
669 workspace,
670 project,
671 search_count: 0,
672 latest_search_id: 0,
673 latest_search_did_cancel: false,
674 latest_search_query: None,
675 currently_opened_path,
676 matches: Matches::default(),
677 has_changed_selected_index: false,
678 selected_index: 0,
679 cancel_flag: Arc::new(AtomicBool::new(false)),
680 history_items,
681 separate_history,
682 first_update: true,
683 popover_menu_handle: PopoverMenuHandle::default(),
684 focus_handle: cx.focus_handle(),
685 }
686 }
687
688 fn subscribe_to_updates(
689 project: &Entity<Project>,
690 window: &mut Window,
691 cx: &mut Context<FileFinder>,
692 ) {
693 cx.subscribe_in(project, window, |file_finder, _, event, window, cx| {
694 match event {
695 project::Event::WorktreeUpdatedEntries(_, _)
696 | project::Event::WorktreeAdded(_)
697 | project::Event::WorktreeRemoved(_) => file_finder
698 .picker
699 .update(cx, |picker, cx| picker.refresh(window, cx)),
700 _ => {}
701 };
702 })
703 .detach();
704 }
705
706 fn spawn_search(
707 &mut self,
708 query: FileSearchQuery,
709 window: &mut Window,
710 cx: &mut Context<Picker<Self>>,
711 ) -> Task<()> {
712 let relative_to = self
713 .currently_opened_path
714 .as_ref()
715 .map(|found_path| Arc::clone(&found_path.project.path));
716 let worktrees = self
717 .project
718 .read(cx)
719 .visible_worktrees(cx)
720 .collect::<Vec<_>>();
721 let include_root_name = worktrees.len() > 1;
722 let candidate_sets = worktrees
723 .into_iter()
724 .map(|worktree| {
725 let worktree = worktree.read(cx);
726 PathMatchCandidateSet {
727 snapshot: worktree.snapshot(),
728 include_ignored: worktree
729 .root_entry()
730 .map_or(false, |entry| entry.is_ignored),
731 include_root_name,
732 candidates: project::Candidates::Files,
733 }
734 })
735 .collect::<Vec<_>>();
736
737 let search_id = util::post_inc(&mut self.search_count);
738 self.cancel_flag.store(true, atomic::Ordering::Relaxed);
739 self.cancel_flag = Arc::new(AtomicBool::new(false));
740 let cancel_flag = self.cancel_flag.clone();
741 cx.spawn_in(window, async move |picker, cx| {
742 let matches = fuzzy::match_path_sets(
743 candidate_sets.as_slice(),
744 query.path_query(),
745 relative_to,
746 false,
747 100,
748 &cancel_flag,
749 cx.background_executor().clone(),
750 )
751 .await
752 .into_iter()
753 .map(ProjectPanelOrdMatch);
754 let did_cancel = cancel_flag.load(atomic::Ordering::Relaxed);
755 picker
756 .update(cx, |picker, cx| {
757 picker
758 .delegate
759 .set_search_matches(search_id, did_cancel, query, matches, cx)
760 })
761 .log_err();
762 })
763 }
764
765 fn set_search_matches(
766 &mut self,
767 search_id: usize,
768 did_cancel: bool,
769 query: FileSearchQuery,
770 matches: impl IntoIterator<Item = ProjectPanelOrdMatch>,
771
772 cx: &mut Context<Picker<Self>>,
773 ) {
774 if search_id >= self.latest_search_id {
775 self.latest_search_id = search_id;
776 let query_changed = Some(query.path_query())
777 != self
778 .latest_search_query
779 .as_ref()
780 .map(|query| query.path_query());
781 let extend_old_matches = self.latest_search_did_cancel && !query_changed;
782
783 let selected_match = if query_changed {
784 None
785 } else {
786 self.matches.get(self.selected_index).cloned()
787 };
788
789 self.matches.push_new_matches(
790 &self.history_items,
791 self.currently_opened_path.as_ref(),
792 Some(&query),
793 matches.into_iter(),
794 extend_old_matches,
795 );
796
797 self.selected_index = selected_match.map_or_else(
798 || self.calculate_selected_index(),
799 |m| {
800 self.matches
801 .position(&m, self.currently_opened_path.as_ref())
802 .unwrap_or(0)
803 },
804 );
805
806 self.latest_search_query = Some(query);
807 self.latest_search_did_cancel = did_cancel;
808
809 cx.notify();
810 }
811 }
812
813 fn labels_for_match(
814 &self,
815 path_match: &Match,
816 window: &mut Window,
817 cx: &App,
818 ix: usize,
819 ) -> (HighlightedLabel, HighlightedLabel) {
820 let (file_name, file_name_positions, mut full_path, mut full_path_positions) =
821 match &path_match {
822 Match::History {
823 path: entry_path,
824 panel_match,
825 } => {
826 let worktree_id = entry_path.project.worktree_id;
827 let project_relative_path = &entry_path.project.path;
828 let has_worktree = self
829 .project
830 .read(cx)
831 .worktree_for_id(worktree_id, cx)
832 .is_some();
833
834 if let Some(absolute_path) =
835 entry_path.absolute.as_ref().filter(|_| !has_worktree)
836 {
837 (
838 absolute_path
839 .file_name()
840 .map_or_else(
841 || project_relative_path.to_string_lossy(),
842 |file_name| file_name.to_string_lossy(),
843 )
844 .to_string(),
845 Vec::new(),
846 absolute_path.to_string_lossy().to_string(),
847 Vec::new(),
848 )
849 } else {
850 let mut path = Arc::clone(project_relative_path);
851 if project_relative_path.as_ref() == Path::new("") {
852 if let Some(absolute_path) = &entry_path.absolute {
853 path = Arc::from(absolute_path.as_path());
854 }
855 }
856
857 let mut path_match = PathMatch {
858 score: ix as f64,
859 positions: Vec::new(),
860 worktree_id: worktree_id.to_usize(),
861 path,
862 is_dir: false, // File finder doesn't support directories
863 path_prefix: "".into(),
864 distance_to_relative_ancestor: usize::MAX,
865 };
866 if let Some(found_path_match) = &panel_match {
867 path_match
868 .positions
869 .extend(found_path_match.0.positions.iter())
870 }
871
872 self.labels_for_path_match(&path_match)
873 }
874 }
875 Match::Search(path_match) => self.labels_for_path_match(&path_match.0),
876 };
877
878 if file_name_positions.is_empty() {
879 if let Some(user_home_path) = std::env::var("HOME").ok() {
880 let user_home_path = user_home_path.trim();
881 if !user_home_path.is_empty() {
882 if (&full_path).starts_with(user_home_path) {
883 full_path.replace_range(0..user_home_path.len(), "~");
884 full_path_positions.retain_mut(|pos| {
885 if *pos >= user_home_path.len() {
886 *pos -= user_home_path.len();
887 *pos += 1;
888 true
889 } else {
890 false
891 }
892 })
893 }
894 }
895 }
896 }
897
898 if full_path.is_ascii() {
899 let file_finder_settings = FileFinderSettings::get_global(cx);
900 let max_width =
901 FileFinder::modal_max_width(file_finder_settings.modal_max_width, window);
902 let (normal_em, small_em) = {
903 let style = window.text_style();
904 let font_id = window.text_system().resolve_font(&style.font());
905 let font_size = TextSize::Default.rems(cx).to_pixels(window.rem_size());
906 let normal = cx
907 .text_system()
908 .em_width(font_id, font_size)
909 .unwrap_or(px(16.));
910 let font_size = TextSize::Small.rems(cx).to_pixels(window.rem_size());
911 let small = cx
912 .text_system()
913 .em_width(font_id, font_size)
914 .unwrap_or(px(10.));
915 (normal, small)
916 };
917 let budget = full_path_budget(&file_name, normal_em, small_em, max_width);
918 // If the computed budget is zero, we certainly won't be able to achieve it,
919 // so no point trying to elide the path.
920 if budget > 0 && full_path.len() > budget {
921 let components = PathComponentSlice::new(&full_path);
922 if let Some(elided_range) =
923 components.elision_range(budget - 1, &full_path_positions)
924 {
925 let elided_len = elided_range.end - elided_range.start;
926 let placeholder = "…";
927 full_path_positions.retain_mut(|mat| {
928 if *mat >= elided_range.end {
929 *mat -= elided_len;
930 *mat += placeholder.len();
931 } else if *mat >= elided_range.start {
932 return false;
933 }
934 true
935 });
936 full_path.replace_range(elided_range, placeholder);
937 }
938 }
939 }
940
941 (
942 HighlightedLabel::new(file_name, file_name_positions),
943 HighlightedLabel::new(full_path, full_path_positions)
944 .size(LabelSize::Small)
945 .color(Color::Muted),
946 )
947 }
948
949 fn labels_for_path_match(
950 &self,
951 path_match: &PathMatch,
952 ) -> (String, Vec<usize>, String, Vec<usize>) {
953 let path = &path_match.path;
954 let path_string = path.to_string_lossy();
955 let full_path = [path_match.path_prefix.as_ref(), path_string.as_ref()].join("");
956 let mut path_positions = path_match.positions.clone();
957
958 let file_name = path.file_name().map_or_else(
959 || path_match.path_prefix.to_string(),
960 |file_name| file_name.to_string_lossy().to_string(),
961 );
962 let file_name_start = path_match.path_prefix.len() + path_string.len() - file_name.len();
963 let file_name_positions = path_positions
964 .iter()
965 .filter_map(|pos| {
966 if pos >= &file_name_start {
967 Some(pos - file_name_start)
968 } else {
969 None
970 }
971 })
972 .collect();
973
974 let full_path = full_path.trim_end_matches(&file_name).to_string();
975 path_positions.retain(|idx| *idx < full_path.len());
976
977 (file_name, file_name_positions, full_path, path_positions)
978 }
979
980 fn lookup_absolute_path(
981 &self,
982 query: FileSearchQuery,
983 window: &mut Window,
984 cx: &mut Context<Picker<Self>>,
985 ) -> Task<()> {
986 cx.spawn_in(window, async move |picker, cx| {
987 let Some(project) = picker
988 .update(cx, |picker, _| picker.delegate.project.clone())
989 .log_err()
990 else {
991 return;
992 };
993
994 let query_path = Path::new(query.path_query());
995 let mut path_matches = Vec::new();
996
997 let abs_file_exists = if let Ok(task) = project.update(cx, |this, cx| {
998 this.resolve_abs_file_path(query.path_query(), cx)
999 }) {
1000 task.await.is_some()
1001 } else {
1002 false
1003 };
1004
1005 if abs_file_exists {
1006 let update_result = project
1007 .update(cx, |project, cx| {
1008 if let Some((worktree, relative_path)) =
1009 project.find_worktree(query_path, cx)
1010 {
1011 path_matches.push(ProjectPanelOrdMatch(PathMatch {
1012 score: 1.0,
1013 positions: Vec::new(),
1014 worktree_id: worktree.read(cx).id().to_usize(),
1015 path: Arc::from(relative_path),
1016 path_prefix: "".into(),
1017 is_dir: false, // File finder doesn't support directories
1018 distance_to_relative_ancestor: usize::MAX,
1019 }));
1020 }
1021 })
1022 .log_err();
1023 if update_result.is_none() {
1024 return;
1025 }
1026 }
1027
1028 picker
1029 .update_in(cx, |picker, _, cx| {
1030 let picker_delegate = &mut picker.delegate;
1031 let search_id = util::post_inc(&mut picker_delegate.search_count);
1032 picker_delegate.set_search_matches(search_id, false, query, path_matches, cx);
1033
1034 anyhow::Ok(())
1035 })
1036 .log_err();
1037 })
1038 }
1039
1040 /// Skips first history match (that is displayed topmost) if it's currently opened.
1041 fn calculate_selected_index(&self) -> usize {
1042 if let Some(Match::History { path, .. }) = self.matches.get(0) {
1043 if Some(path) == self.currently_opened_path.as_ref() {
1044 let elements_after_first = self.matches.len() - 1;
1045 if elements_after_first > 0 {
1046 return 1;
1047 }
1048 }
1049 }
1050
1051 0
1052 }
1053
1054 fn key_context(&self, window: &Window, cx: &App) -> KeyContext {
1055 let mut key_context = KeyContext::new_with_defaults();
1056 key_context.add("FileFinder");
1057 if self.popover_menu_handle.is_focused(window, cx) {
1058 key_context.add("menu_open");
1059 }
1060 key_context
1061 }
1062}
1063
1064fn full_path_budget(
1065 file_name: &str,
1066 normal_em: Pixels,
1067 small_em: Pixels,
1068 max_width: Pixels,
1069) -> usize {
1070 (((max_width / 0.8) - file_name.len() * normal_em) / small_em) as usize
1071}
1072
1073impl PickerDelegate for FileFinderDelegate {
1074 type ListItem = ListItem;
1075
1076 fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
1077 "Search project files...".into()
1078 }
1079
1080 fn match_count(&self) -> usize {
1081 self.matches.len()
1082 }
1083
1084 fn selected_index(&self) -> usize {
1085 self.selected_index
1086 }
1087
1088 fn set_selected_index(&mut self, ix: usize, _: &mut Window, cx: &mut Context<Picker<Self>>) {
1089 self.has_changed_selected_index = true;
1090 self.selected_index = ix;
1091 cx.notify();
1092 }
1093
1094 fn separators_after_indices(&self) -> Vec<usize> {
1095 if self.separate_history {
1096 let first_non_history_index = self
1097 .matches
1098 .matches
1099 .iter()
1100 .enumerate()
1101 .find(|(_, m)| !matches!(m, Match::History { .. }))
1102 .map(|(i, _)| i);
1103 if let Some(first_non_history_index) = first_non_history_index {
1104 if first_non_history_index > 0 {
1105 return vec![first_non_history_index - 1];
1106 }
1107 }
1108 }
1109 Vec::new()
1110 }
1111
1112 fn update_matches(
1113 &mut self,
1114 raw_query: String,
1115 window: &mut Window,
1116 cx: &mut Context<Picker<Self>>,
1117 ) -> Task<()> {
1118 let raw_query = raw_query.replace(' ', "");
1119 let raw_query = raw_query.trim();
1120 if raw_query.is_empty() {
1121 // if there was no query before, and we already have some (history) matches
1122 // there's no need to update anything, since nothing has changed.
1123 // We also want to populate matches set from history entries on the first update.
1124 if self.latest_search_query.is_some() || self.first_update {
1125 let project = self.project.read(cx);
1126
1127 self.latest_search_id = post_inc(&mut self.search_count);
1128 self.latest_search_query = None;
1129 self.matches = Matches {
1130 separate_history: self.separate_history,
1131 ..Matches::default()
1132 };
1133 self.matches.push_new_matches(
1134 self.history_items.iter().filter(|history_item| {
1135 project
1136 .worktree_for_id(history_item.project.worktree_id, cx)
1137 .is_some()
1138 || ((project.is_local() || project.is_via_ssh())
1139 && history_item.absolute.is_some())
1140 }),
1141 self.currently_opened_path.as_ref(),
1142 None,
1143 None.into_iter(),
1144 false,
1145 );
1146
1147 self.first_update = false;
1148 self.selected_index = 0;
1149 }
1150 cx.notify();
1151 Task::ready(())
1152 } else {
1153 let path_position = PathWithPosition::parse_str(&raw_query);
1154
1155 let query = FileSearchQuery {
1156 raw_query: raw_query.trim().to_owned(),
1157 file_query_end: if path_position.path.to_str().unwrap_or(raw_query) == raw_query {
1158 None
1159 } else {
1160 // Safe to unwrap as we won't get here when the unwrap in if fails
1161 Some(path_position.path.to_str().unwrap().len())
1162 },
1163 path_position,
1164 };
1165
1166 if Path::new(query.path_query()).is_absolute() {
1167 self.lookup_absolute_path(query, window, cx)
1168 } else {
1169 self.spawn_search(query, window, cx)
1170 }
1171 }
1172 }
1173
1174 fn confirm(
1175 &mut self,
1176 secondary: bool,
1177 window: &mut Window,
1178 cx: &mut Context<Picker<FileFinderDelegate>>,
1179 ) {
1180 if let Some(m) = self.matches.get(self.selected_index()) {
1181 if let Some(workspace) = self.workspace.upgrade() {
1182 let open_task = workspace.update(cx, |workspace, cx| {
1183 let split_or_open =
1184 |workspace: &mut Workspace,
1185 project_path,
1186 window: &mut Window,
1187 cx: &mut Context<Workspace>| {
1188 let allow_preview =
1189 PreviewTabsSettings::get_global(cx).enable_preview_from_file_finder;
1190 if secondary {
1191 workspace.split_path_preview(
1192 project_path,
1193 allow_preview,
1194 None,
1195 window,
1196 cx,
1197 )
1198 } else {
1199 workspace.open_path_preview(
1200 project_path,
1201 None,
1202 true,
1203 allow_preview,
1204 true,
1205 window,
1206 cx,
1207 )
1208 }
1209 };
1210 match &m {
1211 Match::History { path, .. } => {
1212 let worktree_id = path.project.worktree_id;
1213 if workspace
1214 .project()
1215 .read(cx)
1216 .worktree_for_id(worktree_id, cx)
1217 .is_some()
1218 {
1219 split_or_open(
1220 workspace,
1221 ProjectPath {
1222 worktree_id,
1223 path: Arc::clone(&path.project.path),
1224 },
1225 window,
1226 cx,
1227 )
1228 } else {
1229 match path.absolute.as_ref() {
1230 Some(abs_path) => {
1231 if secondary {
1232 workspace.split_abs_path(
1233 abs_path.to_path_buf(),
1234 false,
1235 window,
1236 cx,
1237 )
1238 } else {
1239 workspace.open_abs_path(
1240 abs_path.to_path_buf(),
1241 OpenOptions {
1242 visible: Some(OpenVisible::None),
1243 ..Default::default()
1244 },
1245 window,
1246 cx,
1247 )
1248 }
1249 }
1250 None => split_or_open(
1251 workspace,
1252 ProjectPath {
1253 worktree_id,
1254 path: Arc::clone(&path.project.path),
1255 },
1256 window,
1257 cx,
1258 ),
1259 }
1260 }
1261 }
1262 Match::Search(m) => split_or_open(
1263 workspace,
1264 ProjectPath {
1265 worktree_id: WorktreeId::from_usize(m.0.worktree_id),
1266 path: m.0.path.clone(),
1267 },
1268 window,
1269 cx,
1270 ),
1271 }
1272 });
1273
1274 let row = self
1275 .latest_search_query
1276 .as_ref()
1277 .and_then(|query| query.path_position.row)
1278 .map(|row| row.saturating_sub(1));
1279 let col = self
1280 .latest_search_query
1281 .as_ref()
1282 .and_then(|query| query.path_position.column)
1283 .unwrap_or(0)
1284 .saturating_sub(1);
1285 let finder = self.file_finder.clone();
1286
1287 cx.spawn_in(window, async move |_, cx| {
1288 let item = open_task.await.notify_async_err(cx)?;
1289 if let Some(row) = row {
1290 if let Some(active_editor) = item.downcast::<Editor>() {
1291 active_editor
1292 .downgrade()
1293 .update_in(cx, |editor, window, cx| {
1294 editor.go_to_singleton_buffer_point(
1295 Point::new(row, col),
1296 window,
1297 cx,
1298 );
1299 })
1300 .log_err();
1301 }
1302 }
1303 finder.update(cx, |_, cx| cx.emit(DismissEvent)).ok()?;
1304
1305 Some(())
1306 })
1307 .detach();
1308 }
1309 }
1310 }
1311
1312 fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<FileFinderDelegate>>) {
1313 self.file_finder
1314 .update(cx, |_, cx| cx.emit(DismissEvent))
1315 .log_err();
1316 }
1317
1318 fn render_match(
1319 &self,
1320 ix: usize,
1321 selected: bool,
1322 window: &mut Window,
1323 cx: &mut Context<Picker<Self>>,
1324 ) -> Option<Self::ListItem> {
1325 let settings = FileFinderSettings::get_global(cx);
1326
1327 let path_match = self
1328 .matches
1329 .get(ix)
1330 .expect("Invalid matches state: no element for index {ix}");
1331
1332 let history_icon = match &path_match {
1333 Match::History { .. } => Icon::new(IconName::HistoryRerun)
1334 .color(Color::Muted)
1335 .size(IconSize::Small)
1336 .into_any_element(),
1337 Match::Search(_) => v_flex()
1338 .flex_none()
1339 .size(IconSize::Small.rems())
1340 .into_any_element(),
1341 };
1342 let (file_name_label, full_path_label) = self.labels_for_match(path_match, window, cx, ix);
1343
1344 let file_icon = maybe!({
1345 if !settings.file_icons {
1346 return None;
1347 }
1348 let file_name = path_match.path().file_name()?;
1349 let icon = FileIcons::get_icon(file_name.as_ref(), cx)?;
1350 Some(Icon::from_path(icon).color(Color::Muted))
1351 });
1352
1353 Some(
1354 ListItem::new(ix)
1355 .spacing(ListItemSpacing::Sparse)
1356 .start_slot::<Icon>(file_icon)
1357 .end_slot::<AnyElement>(history_icon)
1358 .inset(true)
1359 .toggle_state(selected)
1360 .child(
1361 h_flex()
1362 .gap_2()
1363 .py_px()
1364 .child(file_name_label)
1365 .child(full_path_label),
1366 ),
1367 )
1368 }
1369
1370 fn render_footer(&self, _: &mut Window, cx: &mut Context<Picker<Self>>) -> Option<AnyElement> {
1371 let context = self.focus_handle.clone();
1372 Some(
1373 h_flex()
1374 .w_full()
1375 .p_2()
1376 .gap_2()
1377 .justify_end()
1378 .border_t_1()
1379 .border_color(cx.theme().colors().border_variant)
1380 .child(
1381 Button::new("open-selection", "Open").on_click(|_, window, cx| {
1382 window.dispatch_action(menu::Confirm.boxed_clone(), cx)
1383 }),
1384 )
1385 .child(
1386 PopoverMenu::new("menu-popover")
1387 .with_handle(self.popover_menu_handle.clone())
1388 .attach(gpui::Corner::TopRight)
1389 .anchor(gpui::Corner::BottomRight)
1390 .trigger(
1391 Button::new("actions-trigger", "Split…")
1392 .selected_label_color(Color::Accent),
1393 )
1394 .menu({
1395 move |window, cx| {
1396 Some(ContextMenu::build(window, cx, {
1397 let context = context.clone();
1398 move |menu, _, _| {
1399 menu.context(context)
1400 .action("Split Left", pane::SplitLeft.boxed_clone())
1401 .action("Split Right", pane::SplitRight.boxed_clone())
1402 .action("Split Up", pane::SplitUp.boxed_clone())
1403 .action("Split Down", pane::SplitDown.boxed_clone())
1404 }
1405 }))
1406 }
1407 }),
1408 )
1409 .into_any(),
1410 )
1411 }
1412}
1413
1414#[derive(Clone, Debug, PartialEq, Eq)]
1415struct PathComponentSlice<'a> {
1416 path: Cow<'a, Path>,
1417 path_str: Cow<'a, str>,
1418 component_ranges: Vec<(Component<'a>, Range<usize>)>,
1419}
1420
1421impl<'a> PathComponentSlice<'a> {
1422 fn new(path: &'a str) -> Self {
1423 let trimmed_path = Path::new(path).components().as_path().as_os_str();
1424 let mut component_ranges = Vec::new();
1425 let mut components = Path::new(trimmed_path).components();
1426 let len = trimmed_path.as_encoded_bytes().len();
1427 let mut pos = 0;
1428 while let Some(component) = components.next() {
1429 component_ranges.push((component, pos..0));
1430 pos = len - components.as_path().as_os_str().as_encoded_bytes().len();
1431 }
1432 for ((_, range), ancestor) in component_ranges
1433 .iter_mut()
1434 .rev()
1435 .zip(Path::new(trimmed_path).ancestors())
1436 {
1437 range.end = ancestor.as_os_str().as_encoded_bytes().len();
1438 }
1439 Self {
1440 path: Cow::Borrowed(Path::new(path)),
1441 path_str: Cow::Borrowed(path),
1442 component_ranges,
1443 }
1444 }
1445
1446 fn elision_range(&self, budget: usize, matches: &[usize]) -> Option<Range<usize>> {
1447 let eligible_range = {
1448 assert!(matches.windows(2).all(|w| w[0] <= w[1]));
1449 let mut matches = matches.iter().copied().peekable();
1450 let mut longest: Option<Range<usize>> = None;
1451 let mut cur = 0..0;
1452 let mut seen_normal = false;
1453 for (i, (component, range)) in self.component_ranges.iter().enumerate() {
1454 let is_normal = matches!(component, Component::Normal(_));
1455 let is_first_normal = is_normal && !seen_normal;
1456 seen_normal |= is_normal;
1457 let is_last = i == self.component_ranges.len() - 1;
1458 let contains_match = matches.peek().is_some_and(|mat| range.contains(mat));
1459 if contains_match {
1460 matches.next();
1461 }
1462 if is_first_normal || is_last || !is_normal || contains_match {
1463 if longest
1464 .as_ref()
1465 .is_none_or(|old| old.end - old.start <= cur.end - cur.start)
1466 {
1467 longest = Some(cur);
1468 }
1469 cur = i + 1..i + 1;
1470 } else {
1471 cur.end = i + 1;
1472 }
1473 }
1474 if longest
1475 .as_ref()
1476 .is_none_or(|old| old.end - old.start <= cur.end - cur.start)
1477 {
1478 longest = Some(cur);
1479 }
1480 longest
1481 };
1482
1483 let eligible_range = eligible_range?;
1484 assert!(eligible_range.start <= eligible_range.end);
1485 if eligible_range.is_empty() {
1486 return None;
1487 }
1488
1489 let elided_range: Range<usize> = {
1490 let byte_range = self.component_ranges[eligible_range.start].1.start
1491 ..self.component_ranges[eligible_range.end - 1].1.end;
1492 let midpoint = self.path_str.len() / 2;
1493 let distance_from_start = byte_range.start.abs_diff(midpoint);
1494 let distance_from_end = byte_range.end.abs_diff(midpoint);
1495 let pick_from_end = distance_from_start > distance_from_end;
1496 let mut len_with_elision = self.path_str.len();
1497 let mut i = eligible_range.start;
1498 while i < eligible_range.end {
1499 let x = if pick_from_end {
1500 eligible_range.end - i + eligible_range.start - 1
1501 } else {
1502 i
1503 };
1504 len_with_elision -= self.component_ranges[x]
1505 .0
1506 .as_os_str()
1507 .as_encoded_bytes()
1508 .len()
1509 + 1;
1510 if len_with_elision <= budget {
1511 break;
1512 }
1513 i += 1;
1514 }
1515 if len_with_elision > budget {
1516 return None;
1517 } else if pick_from_end {
1518 let x = eligible_range.end - i + eligible_range.start - 1;
1519 x..eligible_range.end
1520 } else {
1521 let x = i;
1522 eligible_range.start..x + 1
1523 }
1524 };
1525
1526 let byte_range = self.component_ranges[elided_range.start].1.start
1527 ..self.component_ranges[elided_range.end - 1].1.end;
1528 Some(byte_range)
1529 }
1530}