zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-28 03:42:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Windows: Fix canonicalize return UNC path (#11083)

Browse Source 
In Windows platform, using notify to watch file events. 
1. in [notify windows
implement](3df0f65152/notify/src/windows.rs (L344)),
we get the full file path, just with `path.join(file_path)`.
2. In [zed worktree
start_backgroud_scan_tasks](d2569afe66/crates/worktree/src/worktree.rs (L679)),
`abs_path` is not unc path, so we get all file events with not unc path.
3. but in [zed worktree
process_event](d2569afe66/crates/worktree/src/worktree.rs (L3619)),
we `strip_prefix` unc path all times, it will always print annoy error.

@mikayla-maki I can't reopen pre closed pr #10501 .

Release Notes:

- N/A
This commit is contained in:
CharlesChen0823 2024-05-07 09:25:21 +08:00 committed by GitHub
parent 88c4e0b2d8
commit 843d299d9a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/worktree/src/worktree.rs
View File

@ -673,7 +673,11 @@ fn start_background_scan_tasks(
) -> Vec<Task<()>> {
let (scan_states_tx, mut scan_states_rx) = mpsc::unbounded();
let background_scanner = cx.background_executor().spawn({
let abs_path = abs_path.to_path_buf();
let abs_path = if cfg!(target_os = "windows") {
abs_path.canonicalize().expect("start background scan tasks failed for canonicalize path {abs_path}")
} else {
abs_path.to_path_buf()
};
let background = cx.background_executor().clone();
async move {
let events = fs.watch(&abs_path, FS_WATCH_LATENCY).await;