Uh oh!
There was an error while loading. Please reload this page.
opts: parseKeyValueFile: cleanup and remove redundant trimming - #5496
Conversation
thaJeztah
commented
Oct 3, 2024
- relates to introduce ParseKeyValueFile #5491
- the function already trimmed leading whitespace from each line before parsing. keys with trailing whitespace would be invalidated, and values have whitespace preserved, so there's no need to trim whitespace for the key.
- if a line is validated (key is valid), we don't need to reconstruct the key=value by concatenating, and we can add the line as-is.
- check if the key is empty before checking if it contains whitespace
- touch-up comments
- rename some variables for readability
- slight cleanup to use early returns / early continues to reduce nesting
thaJeztah
commented
Oct 3, 2024
I'll rebase #5491 after this; still looking at separating this to a separate package, so there will be some follow-ups. |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@## master #5496 +/- ##
==========================================
- Coverage 60.09% 60.09% -0.01%
==========================================
Files 345 345 Lines 23445 23441 -4 ==========================================
- Hits 14090 14086 -4
Misses 8381 8381 Partials 974 974 |
| // leading whitespace was already removed from the line, but | ||
| // variables are not allowed to contain whitespace or have | ||
| // trailing whitespace. | ||
| if strings.ContainsAny(key, whiteSpaces) { |
There was a problem hiding this comment.
It seems odd to search for whitespace like this, but trim leading whitespace with TrimLeftFunc(_, unicode.IsSpace) above?
strings.ContainsFunc(key, unicode.IsSpace) would catch things that were missed before (like non-breaking space), so I guess it'd be a breaking change. Maybe worthwhile though?
There was a problem hiding this comment.
Yeah, I was looking at that as well; indeed also considering whether we should change. I'll keep this one for a follow-up in the meantime, but good suggestion.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
bd9ff60 to
355b18fCompare- the function already trimmed leading whitespace from each line before parsing. keys with trailing whitespace would be invalidated, and values have whitespace preserved, so there's no need to trim whitespace for the key. - if a line is validated (key is valid), we don't need to reconstruct the key=value by concatenating, and we can add the line as-is. - check if the key is empty before checking if it contains whitespace - touch-up comments - rename some variables for readability - slight cleanup to use early returns / early continues to reduce nesting Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
355b18f to
76196dbCompare