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

Fix plain roots watching on Macs

Browse Source
This commit is contained in:
Roman Shevchenko
2012-04-12 16:15:53 +02:00
parent ab6c4eb537
commit bddcd06971
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/FileWatcher.java
+19 -13
View File
@@ -413,15 +413,19 @@ public class FileWatcher {
continue;
}
final ChangeKind kind;
try {
kind = ChangeKind.valueOf(command);
}
catch (IllegalArgumentException e) {
LOG.error("Illegal watcher command: " + command);
continue;
}
synchronized (LOCK) {
final Collection<String> watchedPaths = checkWatchable(path);
final Collection<String> watchedPaths = checkWatchable(path, !(kind == ChangeKind.DIRTY || kind == ChangeKind.RECDIRTY));
if (!watchedPaths.isEmpty()) {
try {
onPathChange(ChangeKind.valueOf(command), watchedPaths);
}
catch (IllegalArgumentException e) {
LOG.error("Illegal watcher command: " + command);
}
onPathChange(kind, watchedPaths);
}
else if (LOG.isDebugEnabled()) {
LOG.debug("Not watchable, filtered: " + path);
@@ -489,14 +493,14 @@ public class FileWatcher {
public boolean isWatched(@NotNull final VirtualFile file) {
if (isOperational()) {
synchronized (LOCK) {
return !checkWatchable(file.getPresentableUrl()).isEmpty();
return !checkWatchable(file.getPresentableUrl(), true).isEmpty();
}
}
return false;
}
@NotNull
private Collection<String> checkWatchable(final String reportedPath) {
private Collection<String> checkWatchable(final String reportedPath, final boolean checkParent) {
if (reportedPath == null) return Collections.emptyList();
myAllPaths.clear();
@@ -525,10 +529,12 @@ public class FileWatcher {
myWatchedPaths.add(path);
continue ext;
}
final File parentFile = new File(path).getParentFile();
if (parentFile != null && FileUtil.pathsEqual(parentFile.getPath(), root)) {
myWatchedPaths.add(path);
continue ext;
if (checkParent) {
final File parentFile = new File(path).getParentFile();
if (parentFile != null && FileUtil.pathsEqual(parentFile.getPath(), root)) {
myWatchedPaths.add(path);
continue ext;
}
}
}
}