Fix missing events for files with directory prefix

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.9.7+15-dev
+
+* Fix a bug on Mac where modifying a directory with a path exactly matching a
+  prefix of a modified file would suppress change events for that file.
+
 # 0.9.7+14
 
 * Prepare for breaking change in SDK where modified times for not found files

lib/src/directory_watcher/mac_os.dart

@@ -5,6 +5,8 @@
 import 'dart:async';
 import 'dart:io';
 
+import 'package:path/path.dart' as p;
+
 import '../directory_watcher.dart';
 import '../constructable_file_system_event.dart';
 import '../path_set.dart';
@@ -196,7 +198,7 @@ class _MacOSDirectoryWatcher
     }));
 
     bool isInModifiedDirectory(String path) =>
-        directories.any((dir) => path != dir && path.startsWith(dir));
+        directories.any((dir) => path != dir && p.isWithin(dir, path));
 
     void addEvent(String path, FileSystemEvent event) {
       if (isInModifiedDirectory(path)) return;

lib/src/directory_watcher/windows.dart

@@ -237,7 +237,7 @@ class _WindowsDirectoryWatcher
     }));
 
     bool isInModifiedDirectory(String path) =>
-        directories.any((dir) => path != dir && path.startsWith(dir));
+        directories.any((dir) => path != dir && p.isWithin(dir, path));
 
     void addEvent(String path, FileSystemEvent event) {
       if (isInModifiedDirectory(path)) return;

pubspec.yaml

@@ -1,5 +1,5 @@
 name: watcher
-version: 0.9.7+14
+version: 0.9.7+15-dev
 
 description: >-
   A file system watcher. It monitors changes to contents of directories and

test/directory_watcher/mac_os_test.dart

@@ -54,4 +54,15 @@ void main() {
           (i, j, k) => isModifyEvent('dir/sub/sub-$i/sub-$j/file-$k.txt')));
     });
   });
+  test('does not suppress files with the same prefix as a directory', () async {
+    // Regression test for https://github.com/dart-lang/watcher/issues/83
+    writeFile('some_name.txt');
+
+    await startWatcher();
+
+    writeFile('some_name/some_name.txt');
+    deleteFile('some_name.txt');
+
+    await expectRemoveEvent('some_name.txt');
+  });
 }