Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

attempt at fixing #1884 #1887

Merged
merged 1 commit into from
Nov 15, 2023
Merged

attempt at fixing #1884 #1887

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions src/org/rascalmpl/uri/URIResolverRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -964,29 +964,40 @@ private void mkParentDir(ISourceLocation uri) throws IOException {
}
}

public void watch(ISourceLocation loc, boolean recursive, Consumer<ISourceLocationChanged> callback)
public void watch(ISourceLocation loc, boolean recursive, final Consumer<ISourceLocationChanged> callback)
throws IOException {
loc = safeResolve(loc);

if (!isDirectory(loc)) {
// so underlying implementations of ISourceLocationWatcher only have to support
// watching directories (the native NEO file watchers are like that)
loc = URIUtil.getParentLocation(loc);
}

ISourceLocationWatcher watcher = watchers.getOrDefault(loc.getScheme(), fallbackWatcher);
ISourceLocation resolved = safeResolve(loc);

Consumer<ISourceLocationChanged> newCallback = !resolved.equals(loc) ?
// we resolved logical resolvers in order to use native watchers as much as possible
// for efficiency sake, but this breaks the logical URI abstraction. We have to undo
// this renaming before we trigger the callback.
changes -> {
ISourceLocation relative = URIUtil.relativize(resolved, changes.getLocation());
ISourceLocation unresolved = URIUtil.getChildLocation(loc, relative.getPath());
callback.accept(ISourceLocationWatcher.makeChange(unresolved, changes.getChangeType(), changes.getType()));
}
: callback;

ISourceLocationWatcher watcher = watchers.getOrDefault(resolved.getScheme(), fallbackWatcher);
if (watcher != null) {
watcher.watch(loc, callback);
watcher.watch(resolved, callback);
}
else {
DavyLandman marked this conversation as resolved.
Show resolved Hide resolved
watching.computeIfAbsent(loc, k -> ConcurrentHashMap.newKeySet()).add(callback);
watching.computeIfAbsent(resolved, k -> ConcurrentHashMap.newKeySet()).add(newCallback);
}

if (isDirectory(loc) && recursive) {
for (ISourceLocation elem : list(loc)) {
if (isDirectory(resolved) && recursive) {
for (ISourceLocation elem : list(resolved)) {
if (isDirectory(elem)) {
try {
watch(elem, recursive, callback);
watch(elem, recursive, newCallback);
}
catch (IOException e) {
// we swallow recursive IO errors which can be caused by file permissions.
Expand Down
Loading