Merge pull request #134 from torhovland/infinite-watch-loop-windows

Infinite watch loop on Windows
trunk-rs · Mar 2, 2021 · bf27965 · bf27965
2 parents 6dc36e7 + e805e0d
commit bf27965
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@ This changelog follows the patterns described here: https://keepachangelog.com/e
 Subheadings to categorize changes are `added, changed, deprecated, removed, fixed, security`.
 
 ## Unreleased
+### fixed
+- Fixed [#133](https://github.com/thedodd/trunk/issues/133) where `watch` was infinitely looping on Windows 
+because the canonicalization path didn't match the un-canonicalized ignore list.
 
 ## 0.8.2 & 0.8.1
 ### fixed

diff --git a/src/watch.rs b/src/watch.rs
@@ -99,7 +99,12 @@ impl WatchSystem {
         }
     }
 
-    fn update_ignore_list(&mut self, path: PathBuf) {
+    fn update_ignore_list(&mut self, arg_path: PathBuf) {
+        let path = match arg_path.canonicalize() {
+            Ok(canon_path) => canon_path,
+            Err(_) => arg_path,
+        };
+
         if !self.ignored_paths.contains(&path) {
             self.ignored_paths.push(path);
         }