Fix watcher crashing in package subdirectories #67
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MaxDesiatov
changed the title
traverseRecursively error message
RayZhao1998
reviewed
Jul 25, 2020
RayZhao1998
reviewed
Jul 25, 2020
|
|
||
| // `parentDirectory` just returns `self` if it's `root` | ||
| cwd = cwd.parentDirectory | ||
| } while cwd != root |
There was a problem hiding this comment.
It seems that AbsolutePath has a property isRoot to check whether it's a root directory.
Suggested change
| } while cwd != root | |
| } while !cwd.isRoot |
There was a problem hiding this comment.
Great point, I initially wasn't sure if this property is public at all.
Co-authored-by: ninjiacoder <ninjiacoder@gmail.com>
carson-katri
approved these changes
Jul 25, 2020
RayZhao1998
approved these changes
Jul 25, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, when
carton devis launched in any subdirectory of the package not containingPackage.swiftit crashes. It's caused bytraverseRecursivelyprecondition failing when a non-directory (or non-existent) path is passed to it. I thinktraverseRecursivelycan handle non-existing paths well by returning an empty array, and the path itself when it's a file and not a directory. Thus the precondition check is not needed at all.Non-existent paths were created due to a wrong assumption that the root package directory is always the current directory. This is now fixed by adding a new
inferManifestDirectoryfunction, which correctly calculates absolute paths of source directories before passing them to the watcher.Additionally the watcher code in the
TSCBasiccode has its own precondition for non-empty path arrays passed to it. To avoid triggering it and staying extra-safe, we check for an empty watcher paths array and avoid watching anything at all.