-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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.
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
Enhance loop condition in URI.allLocations to prevent endless loops #6378
Conversation
e293d45
to
403e244
Compare
@corneliusludmann please add tests, see there is |
…ith no parent - Adds `Path#hasDir` - Adds `location.path.hasDir` check in while loop of `URI#allLocations` - Adds some tests Fixes eclipse-theia#6377 Signed-off-by: Cornelius A. Ludmann <cornelius.ludmann@typefox.io>
403e244
to
b59987e
Compare
Done. See updated commit. |
@@ -51,7 +51,7 @@ export default class URI { | |||
get allLocations(): URI[] { | |||
const locations = []; | |||
let location: URI = this; | |||
while (!location.path.isRoot) { | |||
while (!location.path.isRoot && location.path.hasDir) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think location.path.hasDir
should not be necessary.
Since we cannot return undefined
for path.dir
, can we return an empty path instead? It would be aligned when with Node.js behaviour as it should be, i.e.
const path = require('path');
console.log(path.parse('foo'));
prints:
gitpod /workspace/theia $ node test.js
{ root: '', dir: '', base: 'foo', ext: '', name: 'foo' }
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you mean that Path#dir
should return an empty string instead of this
when there is no dir? If you mean that, then I would totally agree with you. In my opinion, that would be much more intuitive. I just wonder what the reason for returning this
was in the first place … and if changing this would break something elsewhere.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I meant an empty path, i.e. something like new Path('')
.
My concern is that a loop like here should always terminate for any URI just by checking path.isRoot
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry for the confusion, just spotted that i typed remove
instead of return
in the original comment.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And I meant empty path instead of empty string. :-D
I totally agree with you that an empty path instead of this
makes more sense as return value. The same goes in my opinion for URI#parent
, by the way. But this does not terminates the loop above. A path that is not absolute does not have a root at all and therefore asking for isRoot
is not right here. Or am I wrong?
But the loop condition above can be abbreviated by just checking for hasDir
because root never has a dir.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, I think you are right, let's go with this solution it does not seem to be breaking
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thank you for catching it and adding more tests!
Fixes #6377
What it does
This commit adds
hasDir()
inPath
and extend the loop condition inURI.allLocations
to prevent an endless loop. See #6377 for a detailed description of the problem and a discussion.How to test
Execute
will leads to an endless loop without this commit. After this commit it won't.
Review checklist
Reminder for reviewers