relativeFileDirname gives empty string when the Dirname equals to current working directory
#108588
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
…urrent working directory Fixes #108437
alexr00
commented
Oct 13, 2020
| @@ -278,7 +278,8 @@ export class AbstractVariableResolverService implements IConfigurationResolverSe | |||
| } | |||
| const dirname = paths.dirname(getFilePath()); | |||
| if (folderUri || argument) { | |||
| return paths.relative(this.fsPath(getFolderUri()), dirname); | |||
| const relative = paths.relative(this.fsPath(getFolderUri()), dirname); | |||
| return relative.length === 0 ? '.' : relative; | |||
There was a problem hiding this comment.
We used to call paths.normalize(relative), which does the conversion from empty string to '.'. Since it isn't safe to call normalize on a path that could come from a remote, I removed it. In this case though, we still need the '.' instead of empty string.
There was a problem hiding this comment.
There's potential for refactoring here as fsPath and path.relative should not be used on remote URIs.
But for the fix release the change is minimal and good.
aeschli
approved these changes
Oct 13, 2020
| @@ -278,7 +278,8 @@ export class AbstractVariableResolverService implements IConfigurationResolverSe | |||
| } | |||
| const dirname = paths.dirname(getFilePath()); | |||
| if (folderUri || argument) { | |||
| return paths.relative(this.fsPath(getFolderUri()), dirname); | |||
| const relative = paths.relative(this.fsPath(getFolderUri()), dirname); | |||
| return relative.length === 0 ? '.' : relative; | |||
There was a problem hiding this comment.
There's potential for refactoring here as fsPath and path.relative should not be used on remote URIs.
But for the fix release the change is minimal and good.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #108437