mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-29 12:38:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

recent project: Fix highlighting for matches in SSH projs (#18332)

Browse source 
Release Notes:

- N/A

Co-authored-by: Bennet <bennet@zed.dev>
This commit is contained in:
Thorsten Ball 2024-09-25 12:59:22 +02:00 committed by GitHub
parent 300bf87f77
commit 4e2ae06ca6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
crates/recent_projects/src/recent_projects.rs
View file

@ -259,23 +259,12 @@ impl PickerDelegate for RecentProjectsDelegate {
dev_server_project.paths.join("")
)
}
SerializedWorkspaceLocation::Ssh(ssh_project) => {
format!(
"{}{}{}{}",
ssh_project.host,
ssh_project
.port
.as_ref()
.map(|port| port.to_string())
.unwrap_or_default(),
ssh_project.paths.join(","),
ssh_project
.user
.as_ref()
.map(|user| user.to_string())
.unwrap_or_default()
)
}
SerializedWorkspaceLocation::Ssh(ssh_project) => ssh_project
.ssh_urls()
.iter()
.map(|path| path.to_string_lossy().to_string())
.collect::<Vec<_>>()
.join(""),
};
StringMatchCandidate::new(id, combined_string)
@ -458,6 +447,7 @@ impl PickerDelegate for RecentProjectsDelegate {
.order()
.iter()
.filter_map(|i| paths.paths().get(*i).cloned())
.map(|path| path.compact())
.collect(),
),
SerializedWorkspaceLocation::Ssh(ssh_project) => Arc::new(ssh_project.ssh_urls()),
@ -473,7 +463,6 @@ impl PickerDelegate for RecentProjectsDelegate {
let (match_labels, paths): (Vec<_>, Vec<_>) = paths
.iter()
.map(|path| {
let path = path.compact();
let highlighted_text =
highlights_for_path(path.as_ref(), &hit.positions, path_start_offset);
@ -704,7 +693,6 @@ fn highlights_for_path(
},
)
}
impl RecentProjectsDelegate {
fn delete_recent_project(&self, ix: usize, cx: &mut ViewContext<Picker<Self>>) {
if let Some(selected_match) = self.matches.get(ix) {