Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
title_bar: Fix project name shown for `repo.git` bare clones on Windows remotes (#66199)
Xin Zhaof2a60bb8b6c1
diff --git a/crates/path/src/path.rs b/crates/path/src/path.rsindex 6dec76b784b..b0fdba0327e 100644--- a/crates/path/src/path.rs+++ b/crates/path/src/path.rs@@ -17,7 +17,9 @@ use std::{#[cfg(windows)]use tendril::fmt::{Format, WTF8};-use crate::path_component::{Component, Components, Prefix, PrefixExt, iter_after};+use crate::path_component::{+ Component, Components, Prefix, PrefixExt, iter_after, rsplit_file_at_dot,+};use crate::rel_path::{RelPath, StripPrefixError};pub mod abs_path;@@ -250,6 +252,18 @@ impl PathStyle {.map(|c| c.as_path()).ok_or(StripPrefixError)}++ pub fn file_stem<'a>(&self, path: &'a Path) -> Option<&'a OsStr> {+ self.file_name(path)+ .map(rsplit_file_at_dot)+ .and_then(|(before, after)| before.or(after))+ }++ pub fn extension<'a>(&self, path: &'a Path) -> Option<&'a OsStr> {+ self.file_name(path)+ .map(rsplit_file_at_dot)+ .and_then(|(before, after)| before.and(after))+ }}// This part contains the methods adopted from the std lib@@ -650,6 +664,83 @@ mod tests {}}+ #[test]+ fn test_path_style_file_stem_and_extension() {+ let unix_paths_and_stems_and_extensions = [+ ("foo", Some("foo"), None),+ ("foo.", Some("foo"), Some("")),+ (".foo", Some(".foo"), None),+ ("foo.txt", Some("foo"), Some("txt")),+ ("/tmp/archive.tar.gz", Some("archive.tar"), Some("gz")),+ ("foo.bar.", Some("foo.bar"), Some("")),+ (".x.y.z", Some(".x.y"), Some("z")),+ ("a/.rustfmt.toml", Some(".rustfmt"), Some("toml")),+ ("a.b/c.md", Some("c"), Some("md")),+ ("", None, None),+ ("/", None, None),+ (".", None, None),+ ("..", None, None),+ ("foo/.", Some("foo"), None),+ ("foo/..", None, None),+ ("/foo/bar/", Some("bar"), None),+ ("/etc/passwd", Some("passwd"), None),+ ];++ for (path, expected_stem, expected_extension) in unix_paths_and_stems_and_extensions {+ let path = Path::new(path);+ assert_eq!(+ PathStyle::Unix.file_stem(path),+ expected_stem.map(OsStr::new),+ "file_stem({path:?})"+ );+ assert_eq!(+ PathStyle::Unix.extension(path),+ expected_extension.map(OsStr::new),+ "extension({path:?})"+ );+ }++ let windows_paths_and_stems_and_extensions = [+ (+ r"C:\Users\user\Documents\report.docx",+ Some("report"),+ Some("docx"),+ ),+ (+ r"C:\Users\user\Downloads\archive.tar.gz",+ Some("archive.tar"),+ Some("gz"),+ ),+ (r"C:\Users\user\.gitignore", Some(".gitignore"), None),+ (r"C:\Users\user\config.", Some("config"), Some("")),+ (r"C:\Users\user\README", Some("README"), None),+ (r"D:\projects\my.app\src\main.rs", Some("main"), Some("rs")),+ ("C:/Users/user/report.txt", Some("report"), Some("txt")),+ (+ r"\\server\share\reports\2024.summary.xlsx",+ Some("2024.summary"),+ Some("xlsx"),+ ),+ (r"\\?\C:\Users\user\report.txt", Some("report"), Some("txt")),+ (r"C:\Users\user\.", Some("user"), None),+ (r"C:\Users\user\..", None, None),+ ];++ for (path, expected_stem, expected_extension) in windows_paths_and_stems_and_extensions {+ let path = Path::new(path);+ assert_eq!(+ PathStyle::Windows.file_stem(path),+ expected_stem.map(OsStr::new),+ "file_stem({path:?})"+ );+ assert_eq!(+ PathStyle::Windows.extension(path),+ expected_extension.map(OsStr::new),+ "extension({path:?})"+ );+ }+ }+#[test]fn test_unix_path_style_parent() {let unix_paths_and_parents = [diff --git a/crates/path/src/path_component.rs b/crates/path/src/path_component.rsindex b6d407e4792..c71d3bd2ea7 100644--- a/crates/path/src/path_component.rs+++ b/crates/path/src/path_component.rs@@ -463,3 +463,28 @@ impl<'a> DoubleEndedIterator for Components<'a> {None}}++// basic workhorse for splitting stem and extension+pub(crate) fn rsplit_file_at_dot(file: &OsStr) -> (Option<&OsStr>, Option<&OsStr>) {+ if file.as_encoded_bytes() == b".." {+ return (Some(file), None);+ }++ // The unsafety here stems from converting between &OsStr and &[u8]+ // and back. This is safe to do because (1) we only look at ASCII+ // contents of the encoding and (2) new &OsStr values are produced+ // only from ASCII-bounded slices of existing &OsStr values.+ let mut iter = file.as_encoded_bytes().rsplitn(2, |b| *b == b'.');+ let after = iter.next();+ let before = iter.next();+ if before == Some(b"") {+ (Some(file), None)+ } else {+ unsafe {+ (+ before.map(|s| OsStr::from_encoded_bytes_unchecked(s)),+ after.map(|s| OsStr::from_encoded_bytes_unchecked(s)),+ )+ }+ }+}diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rsindex 8c2aaf6e7e9..21411e21f4d 100644--- a/crates/title_bar/src/title_bar.rs+++ b/crates/title_bar/src/title_bar.rs@@ -281,11 +281,12 @@ impl Render for TitleBar {.flatten()});- let display_name = if identity.extension() == Some(std::ffi::OsStr::new("git")) {- identity.file_stem()- } else {- path_style.file_name(identity)- };+ let display_name =+ if path_style.extension(identity) == Some(std::ffi::OsStr::new("git")) {+ path_style.file_stem(identity)+ } else {+ path_style.file_name(identity)+ };if let Some(repo_name) = display_name.and_then(|n| n.to_str()) {let visible_worktrees_in_repo =