github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-06 03:02:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

(Untested) work to adapt to the registry API changes

Browse Source
This commit is contained in:
Ash Wilson
2017-06-23 16:09:34 -04:00
committed by Ash Wilson
parent 0c5674a56c
commit 2b79295d0b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/filesystem-manager.js
View File

@@ -122,8 +122,11 @@ class NativeWatcher {
// Private: Broadcast an `onShouldDetach` event to prompt any {Watcher} instances bound here to attach to a new
// {NativeWatcher} instead.
reattachTo (other) {
this.emitter.emit('should-detach', other)
//
// * `replacement` the new {NativeWatcher} instance that a live {Watcher} instance should reattach to instead.
// * `watchedPath` absolute path watched by the new {NativeWatcher}.
reattachTo (replacement, watchedPath) {
this.emitter.emit('should-detach', {replacement, watchedPath})
}
// Private: Stop the native watcher and release any operating system resources associated with it.
@@ -262,8 +265,8 @@ class Watcher {
this.emitter.emit('did-error', err)
}))
this.subs.add(native.onShouldDetach(replacement => {
if (replacement !== native) {
this.subs.add(native.onShouldDetach(({replacement, watchedPath}) => {
if (replacement !== native && this.normalizedPath.startsWith(watchedPath)) {
this.attachToNative(replacement)
}
}))