fix: only replace path with env var if value defined#557
Open
bryankenote wants to merge 2 commits intosindrets:mainfrom
Open
fix: only replace path with env var if value defined#557bryankenote wants to merge 2 commits intosindrets:mainfrom
bryankenote wants to merge 2 commits intosindrets:mainfrom
Conversation
… $ character in the path
bryankenote
changed the title
bryankenote
force-pushed
the
file-path-with-$
branch
from
5551a8a to
5c80f19
Compare
bryankenote
force-pushed
the
file-path-with-$
branch
from
5c80f19 to
90a72f0
Compare
Author
|
If we don't want to modify the existing method this way, we could also either
I don't have any strong opinions on this. Just would like to fix this bug. Please let me know if you would like any changes or additional test cases. |
|
The fix works for me. Thanks @bryankenote Hopefully this could be merged. |
|
Bumping this as well. Hopefully this PR will be merged. |
1orZero
added a commit
to 1orZero/diffview.nvim
that referenced
this pull request
Oct 19, 2025
* pr-557: add `$` to test case on a segment with no corresponding env var fix: only replace path with env var if value defined, otherwise leave $ character in the path
dlyongemallo
pushed a commit
to dlyongemallo/diffview.nvim
that referenced
this pull request
Feb 4, 2026
Only expand environment variables in paths when the variable is actually defined. Previously, undefined variables would be replaced with their literal name (e.g., $FOO -> FOO), which could cause unexpected behaviour with paths containing dollar signs. Fixes sindrets#556
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 #556
The code in question is trying to replace an environment variable name in a file path with it's value. It is assuming that if a segment starts with
$then it is an environment variable name. There are frontend frameworks with file-based routing that use$to indicate a value in a path (ie https://tanstack.com/router/latest/docs/framework/react/guide/file-based-routing). We need to strip the$off of the name to pass toos_getenvbut If there isn't a value for the environment variable, we shouldn't remove the$from the path since this is a valid file and directory name.