Skip to content

Commit 4a10f09

Browse files
committed
Introduce a stringParts helper
1 parent 90ee508 commit 4a10f09

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/Nix/Eval.hs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -465,14 +465,9 @@ assembleString
465465
. (MonadEval v m, FromValue NixString m v)
466466
=> NString (m v)
467467
-> m (Maybe NixString)
468-
assembleString =
469-
fromParts .
470-
\case
471-
Indented _ parts -> parts
472-
DoubleQuoted parts -> parts
468+
assembleString = fromParts . stringParts
473469
where
474470
fromParts xs = (mconcat <$>) . sequence <$> traverse go xs
475-
476471
go =
477472
runAntiquoted
478473
"\n"

src/Nix/Expr/Types.hs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,10 @@ paramName :: Params r -> Maybe VarName
610610
paramName (Param n ) = pure n
611611
paramName (ParamSet _ _ n) = n
612612

613+
stringParts :: NString r -> [Antiquoted Text r]
614+
stringParts (DoubleQuoted parts) = parts
615+
stringParts (Indented _ parts) = parts
616+
613617
stripPositionInfo :: NExpr -> NExpr
614618
stripPositionInfo = transport phi
615619
where

0 commit comments

Comments
 (0)