Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove separator! macro and make path! handle relative paths (#32527)

Browse source 
Release Notes:

- N/A
This commit is contained in:
Michael Sloan 2025-06-13 00:32:29 -06:00 • committed by GitHub
parent babf846ef9
commit 9cc82212b5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 302 additions and 343 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/zed/src/zed.rs
View file

@ -1760,7 +1760,7 @@ mod tests {
time::Duration,
};
use theme::{ThemeRegistry, ThemeSettings};
use util::{path, separator};
use util::path;
use workspace::{
NewFile, OpenOptions, OpenVisible, SERIALIZATION_THROTTLE_TIME, SaveIntent, SplitDirection,
WorkspaceHandle,
@ -2864,8 +2864,8 @@ mod tests {
opened_paths,
vec![
None,
Some(separator!(".git/HEAD").to_string()),
Some(separator!("excluded_dir/file").to_string()),
Some(path!(".git/HEAD").to_string()),
Some(path!("excluded_dir/file").to_string()),
],
"Excluded files should get opened, excluded dir should not get opened"
);
@ -2891,7 +2891,7 @@ mod tests {
opened_buffer_paths.sort();
assert_eq!(
opened_buffer_paths,
vec![separator!(".git/HEAD").to_string(), separator!("excluded_dir/file").to_string()],
vec![path!(".git/HEAD").to_string(), path!("excluded_dir/file").to_string()],
"Despite not being present in the worktrees, buffers for excluded files are opened and added to the pane"
);
});