Skip to content

Commit e6a4b88

Browse files
committed
Pretty: prettyParams: refactor
1 parent 9916421 commit e6a4b88

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

src/Nix/Pretty.hs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ prettyParams :: Params (NixDoc ann) -> Doc ann
155155
prettyParams (Param n ) = prettyVarName n
156156
prettyParams (ParamSet mname variadic pset) =
157157
prettyParamSet variadic pset <>
158-
toDoc `whenJust` mname
158+
toDoc `whenJust` mname
159159
where
160160
toDoc :: VarName -> Doc ann
161161
toDoc (coerce -> name) =
@@ -166,18 +166,12 @@ prettyParamSet variadic args =
166166
encloseSep
167167
"{ "
168168
(align " }")
169-
sep
169+
(align ", ")
170170
(fmap prettySetArg args <> one "..." `whenTrue` (variadic == Variadic))
171171
where
172172
prettySetArg :: (VarName, Maybe (NixDoc ann)) -> Doc ann
173173
prettySetArg (n, maybeDef) =
174-
maybe
175-
varName
176-
(\x -> varName <> " ? " <> getDoc x)
177-
maybeDef
178-
where
179-
varName = prettyVarName n
180-
sep = align ", "
174+
(prettyVarName n <>) $ ((" ? " <>) . getDoc) `whenJust` maybeDef
181175

182176
prettyBind :: Binding (NixDoc ann) -> Doc ann
183177
prettyBind (NamedVar n v _p) =

0 commit comments

Comments
 (0)