Closes https://github.com/zed-industries/zed/issues/38690 Closes #37353 ### Background On Windows, paths are normally separated by `\`, unlike mac and linux where they are separated by `/`. When editing code in a project that uses a different path style than your local system (e.g. remoting from Windows to Linux, using WSL, and collaboration between windows and unix users), the correct separator for a path may differ from the "native" separator. Previously, to work around this, Zed converted paths' separators in numerous places. This was applied to both absolute and relative paths, leading to incorrect conversions in some cases. ### Solution Many code paths in Zed use paths that are *relative* to either a worktree root or a git repository. This PR introduces a dedicated type for these paths called `RelPath`, which stores the path in the same way regardless of host platform, and offers `Path`-like manipulation APIs. RelPath supports *displaying* the path using either separator, so that we can display paths in a style that is determined at runtime based on the current project. The representation of absolute paths is left untouched, for now. Absolute paths are different from relative paths because (except in contexts where we know that the path refers to the local filesystem) they should generally be treated as opaque strings. Currently we use a mix of types for these paths (std::path::Path, String, SanitizedPath). Release Notes: - N/A --------- Co-authored-by: Cole Miller <cole@zed.dev> Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Co-authored-by: Peter Tripp <petertripp@gmail.com> Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com> Co-authored-by: Lukas Wirth <me@lukaswirth.dev>
200 lines
6.0 KiB
Rust
200 lines
6.0 KiB
Rust
use crate::{
|
|
CharBag,
|
|
matcher::{MatchCandidate, Matcher},
|
|
};
|
|
use gpui::BackgroundExecutor;
|
|
use std::{
|
|
borrow::Borrow,
|
|
cmp::{self, Ordering},
|
|
iter,
|
|
ops::Range,
|
|
sync::atomic::{self, AtomicBool},
|
|
};
|
|
|
|
#[derive(Clone, Debug)]
|
|
pub struct StringMatchCandidate {
|
|
pub id: usize,
|
|
pub string: String,
|
|
pub char_bag: CharBag,
|
|
}
|
|
|
|
impl StringMatchCandidate {
|
|
pub fn new(id: usize, string: &str) -> Self {
|
|
Self {
|
|
id,
|
|
string: string.into(),
|
|
char_bag: string.into(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl MatchCandidate for &StringMatchCandidate {
|
|
fn has_chars(&self, bag: CharBag) -> bool {
|
|
self.char_bag.is_superset(bag)
|
|
}
|
|
|
|
fn candidate_chars(&self) -> impl Iterator<Item = char> {
|
|
self.string.chars()
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Debug)]
|
|
pub struct StringMatch {
|
|
pub candidate_id: usize,
|
|
pub score: f64,
|
|
pub positions: Vec<usize>,
|
|
pub string: String,
|
|
}
|
|
|
|
impl StringMatch {
|
|
pub fn ranges(&self) -> impl '_ + Iterator<Item = Range<usize>> {
|
|
let mut positions = self.positions.iter().peekable();
|
|
iter::from_fn(move || {
|
|
if let Some(start) = positions.next().copied() {
|
|
let Some(char_len) = self.char_len_at_index(start) else {
|
|
log::error!(
|
|
"Invariant violation: Index {start} out of range or not on a utf-8 boundary in string {:?}",
|
|
self.string
|
|
);
|
|
return None;
|
|
};
|
|
let mut end = start + char_len;
|
|
while let Some(next_start) = positions.peek() {
|
|
if end == **next_start {
|
|
let Some(char_len) = self.char_len_at_index(end) else {
|
|
log::error!(
|
|
"Invariant violation: Index {end} out of range or not on a utf-8 boundary in string {:?}",
|
|
self.string
|
|
);
|
|
return None;
|
|
};
|
|
end += char_len;
|
|
positions.next();
|
|
} else {
|
|
break;
|
|
}
|
|
}
|
|
|
|
return Some(start..end);
|
|
}
|
|
None
|
|
})
|
|
}
|
|
|
|
/// Gets the byte length of the utf-8 character at a byte offset. If the index is out of range
|
|
/// or not on a utf-8 boundary then None is returned.
|
|
fn char_len_at_index(&self, ix: usize) -> Option<usize> {
|
|
self.string
|
|
.get(ix..)
|
|
.and_then(|slice| slice.chars().next().map(|char| char.len_utf8()))
|
|
}
|
|
}
|
|
|
|
impl PartialEq for StringMatch {
|
|
fn eq(&self, other: &Self) -> bool {
|
|
self.cmp(other).is_eq()
|
|
}
|
|
}
|
|
|
|
impl Eq for StringMatch {}
|
|
|
|
impl PartialOrd for StringMatch {
|
|
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
|
|
Some(self.cmp(other))
|
|
}
|
|
}
|
|
|
|
impl Ord for StringMatch {
|
|
fn cmp(&self, other: &Self) -> Ordering {
|
|
self.score
|
|
.partial_cmp(&other.score)
|
|
.unwrap_or(Ordering::Equal)
|
|
.then_with(|| self.candidate_id.cmp(&other.candidate_id))
|
|
}
|
|
}
|
|
|
|
pub async fn match_strings<T>(
|
|
candidates: &[T],
|
|
query: &str,
|
|
smart_case: bool,
|
|
penalize_length: bool,
|
|
max_results: usize,
|
|
cancel_flag: &AtomicBool,
|
|
executor: BackgroundExecutor,
|
|
) -> Vec<StringMatch>
|
|
where
|
|
T: Borrow<StringMatchCandidate> + Sync,
|
|
{
|
|
if candidates.is_empty() || max_results == 0 {
|
|
return Default::default();
|
|
}
|
|
|
|
if query.is_empty() {
|
|
return candidates
|
|
.iter()
|
|
.map(|candidate| StringMatch {
|
|
candidate_id: candidate.borrow().id,
|
|
score: 0.,
|
|
positions: Default::default(),
|
|
string: candidate.borrow().string.clone(),
|
|
})
|
|
.collect();
|
|
}
|
|
|
|
let lowercase_query = query.to_lowercase().chars().collect::<Vec<_>>();
|
|
let query = query.chars().collect::<Vec<_>>();
|
|
|
|
let lowercase_query = &lowercase_query;
|
|
let query = &query;
|
|
let query_char_bag = CharBag::from(&lowercase_query[..]);
|
|
|
|
let num_cpus = executor.num_cpus().min(candidates.len());
|
|
let segment_size = candidates.len().div_ceil(num_cpus);
|
|
let mut segment_results = (0..num_cpus)
|
|
.map(|_| Vec::with_capacity(max_results.min(candidates.len())))
|
|
.collect::<Vec<_>>();
|
|
|
|
executor
|
|
.scoped(|scope| {
|
|
for (segment_idx, results) in segment_results.iter_mut().enumerate() {
|
|
let cancel_flag = &cancel_flag;
|
|
scope.spawn(async move {
|
|
let segment_start = cmp::min(segment_idx * segment_size, candidates.len());
|
|
let segment_end = cmp::min(segment_start + segment_size, candidates.len());
|
|
let mut matcher = Matcher::new(
|
|
query,
|
|
lowercase_query,
|
|
query_char_bag,
|
|
smart_case,
|
|
penalize_length,
|
|
);
|
|
|
|
matcher.match_candidates(
|
|
&[],
|
|
&[],
|
|
candidates[segment_start..segment_end]
|
|
.iter()
|
|
.map(|c| c.borrow()),
|
|
results,
|
|
cancel_flag,
|
|
|candidate: &&StringMatchCandidate, score, positions| StringMatch {
|
|
candidate_id: candidate.id,
|
|
score,
|
|
positions: positions.clone(),
|
|
string: candidate.string.to_string(),
|
|
},
|
|
);
|
|
});
|
|
}
|
|
})
|
|
.await;
|
|
|
|
if cancel_flag.load(atomic::Ordering::Acquire) {
|
|
return Vec::new();
|
|
}
|
|
|
|
let mut results = segment_results.concat();
|
|
util::truncate_to_bottom_n_sorted_by(&mut results, max_results, &|a, b| b.cmp(a));
|
|
results
|
|
}
|