lib/options: add prime variants for the rest of defaultNullOpts
#1619
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
Replaced all instances of `"null"` with `null`, when passing plugin-defaults to `defaultNullOpts` functions.
All `defaultNullOpts` functions now have a prime variant.
MattSturgeon
commented
Jun 2, 2024
Comment on lines
+80
to
+92
| let | ||
| # Convert `defaultNullOpts`-style arguments into normal `mkOption`-style arguments, | ||
| # i.e. moves `default` into `description` using `defaultNullOpts.mkDesc` | ||
| convertArgs = | ||
| { default, description, ... }@args: | ||
| ( | ||
| args | ||
| // { | ||
| default = null; | ||
| description = defaultNullOpts.mkDesc default description; | ||
| } | ||
| ); | ||
| in |
There was a problem hiding this comment.
Putting this in a let block has caused the rest of the file to be indented. Maybe review with whitespace changes hidden...
Or we could come up with a better name for the helper and expose it publicly (removing the let-block).
There was a problem hiding this comment.
That said, almost all lines were touched anyway, so the extra indent probably isn't a big deal 🤔
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.
Follow up to #1603
plugins: normalise
nullplugin-defaultsThis first commit was needed to satisfy the assertion I added to
mkEnum'.I could move this to another PR if needed.
We could also check each of the files touched to see if other changes ought to be made.
lib/options: add more
defaultNullOpts'variantsThe meat of this PR - add a prime variant for each
defaultNullOptsoption factory function.lib/options: add
mkEnum'argument assertionsI also added some assertions to ensure
mkEnum'is always used correctly. This could be kept or dropped (after running it through CI) depending on preference.@GaetanLepage It'd be great if you could run CI with these changes on #1614.