MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[vfs] LocalFileSystem.replaceWatchedRoot() implementation fixed

Browse Source
This commit is contained in:
Roman Shevchenko
2015-08-27 12:34:58 +03:00
parent cbfa8e3575
commit 6ee3957e68
2 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemImpl.java
+2 -2
View File
@@ -396,8 +396,8 @@ public final class LocalFileSystemImpl extends LocalFileSystemBase implements Ap
@Override
public void run() {
synchronized (myLock) {
final boolean update = doAddRootsToWatch(recursiveRoots, flatRoots, result, filesToSync) ||
doRemoveWatchedRoots(watchRequests);
boolean update = doAddRootsToWatch(recursiveRoots, flatRoots, result, filesToSync) |
doRemoveWatchedRoots(watchRequests);
if (update) {
myNormalizedTree = null;
setUpFileWatcher();
platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/FileWatcherTest.java
+33
View File
@@ -761,6 +761,39 @@ public class FileWatcherTest extends PlatformTestCase {
}
}
public void testWatchRootReplacement() throws IOException {
File top = createTestDir("top");
File dir1 = createTestDir(top, "dir1");
File dir2 = createTestDir(top, "dir2");
File f1 = createTestFile(dir1, "f.txt");
File f2 = createTestFile(dir2, "f.txt");
refresh(f1);
refresh(f2);
final Ref<LocalFileSystem.WatchRequest> request = Ref.create(watch(dir1));
try {
myAccept = true;
FileUtil.writeToFile(f1, "data");
FileUtil.writeToFile(f2, "data");
assertEvent(VFileContentChangeEvent.class, f1.getPath());
final String newRoot = dir2.getPath();
getEvents("events to replace watch root", new Runnable() {
@Override
public void run() {
request.set(myFileSystem.replaceWatchedRoot(request.get(), newRoot, true));
}
});
myAccept = true;
FileUtil.writeToFile(f1, "more data");
FileUtil.writeToFile(f2, "more data");
assertEvent(VFileContentChangeEvent.class, f2.getPath());
}
finally {
unwatch(request.get());
}
}
@NotNull
private LocalFileSystem.WatchRequest watch(File watchFile) {