👯♀️ Improve the plural logging function
#689
Merged
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
fwkoch
reviewed
Oct 20, 2023
packages/myst-cli-utils/src/utils.ts
Outdated
| return f | ||
| .replace('%s', String(num)) | ||
| .replace(/\(s\)/g, num === 1 ? '' : 's') | ||
| .replace(/\(([a-z0-9A-Z-]*)\|([a-z0-9A-Z-]*)\)/g, num === 1 ? '$1' : '$2'); |
There was a problem hiding this comment.
You can replace line 67 and 68 with this:
Suggested change
| .replace(/\(([a-z0-9A-Z-]*)\|([a-z0-9A-Z-]*)\)/g, num === 1 ? '$1' : '$2'); | |
| .replace(/\((([a-z0-9A-Z-]*)\|)?([a-z0-9A-Z-]*)\)/g, num === 1 ? '$2' : '$3'); |
In addition to only being one regex, it handles additional cases that were not covered before, e.g. stitch(es).
There was a problem hiding this comment.
(Would be good to chuck some tests on this though...)
There was a problem hiding this comment.
Time for some tests, yeah. :)
There was a problem hiding this comment.
Brought in your changes and added tests!
packages/myst-cli-utils/src/utils.ts
Outdated
| return f.replace('%s', String(num)).replace(/\(s\)/g, num === 1 ? '' : 's'); | ||
| return f | ||
| .replace('%s', String(num)) | ||
| .replace(/\(s\)/g, num === 1 ? '' : 's') |
There was a problem hiding this comment.
Suggested change
| .replace(/\(s\)/g, num === 1 ? '' : 's') |
fwkoch
approved these changes
Oct 20, 2023
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.
No description provided.