Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

unflip {mkNixDoc, nvSet{,'}}; refactors #878

Merged
merged 45 commits into from
Mar 11, 2021
Merged
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
6d614e8
Pretty: mkNixDoc: unflip
Anton-Latukha Mar 8, 2021
886d83b
Expr.Types.Annotated: fx inline directive
Anton-Latukha Mar 8, 2021
5583b0a
rm unused RankNTypes; Utils: embed RankNtypes `transport`
Anton-Latukha Mar 8, 2021
82754ad
Value: unflip nvSet{,'}
Anton-Latukha Mar 8, 2021
78651d4
Exec: refactor
Anton-Latukha Mar 8, 2021
d869d20
Exec: refactor
Anton-Latukha Mar 8, 2021
2a47a8e
(mappend -> <>)
Anton-Latukha Mar 8, 2021
b7acde7
Exec: m refactor
Anton-Latukha Mar 8, 2021
a0eba14
Effects: TOC the file structure
Anton-Latukha Mar 8, 2021
5cf0c7b
Effects: put derived instances into structure
Anton-Latukha Mar 8, 2021
90b828a
Eval: m refactor
Anton-Latukha Mar 8, 2021
6cf382e
Eval: refactor (includes (=<<) -> (<$>))
Anton-Latukha Mar 8, 2021
f529db9
Eval: refactor
Anton-Latukha Mar 8, 2021
a0edfaa
Lint: refactor
Anton-Latukha Mar 8, 2021
1d77b58
Lint: add ApplicativeDo extention - very fit here
Anton-Latukha Mar 8, 2021
152138e
Scope: refactor
Anton-Latukha Mar 8, 2021
2c3caf4
Scope: m refactor
Anton-Latukha Mar 8, 2021
0412ab8
(HashMap.empty -> mempty)
Anton-Latukha Mar 8, 2021
d936e95
{Set,Map}.empty-> mempty
Anton-Latukha Mar 8, 2021
0155454
Expr.Types: Alternative.empty -> mempty, it is used for []
Anton-Latukha Mar 8, 2021
d5d853d
Effects: m refactor
Anton-Latukha Mar 8, 2021
2b658fb
Parser: parseFromText: (=<< -> <$>)
Anton-Latukha Mar 8, 2021
9c4d123
Parser: refactor
Anton-Latukha Mar 8, 2021
bb1ebba
Parser: refactor
Anton-Latukha Mar 8, 2021
47b1f03
Parser: make imports explicit
Anton-Latukha Mar 9, 2021
9a7f07c
Parser: m refactor
Anton-Latukha Mar 9, 2021
2a4b7eb
Parser: add ApplicativeDo
Anton-Latukha Mar 9, 2021
200ca83
Value.Equal: refactor
Anton-Latukha Mar 9, 2021
84d9625
Value.Equal: refactor
Anton-Latukha Mar 9, 2021
884e16a
Type.Infer: refactor
Anton-Latukha Mar 9, 2021
9af8917
Builtins: refactor
Anton-Latukha Mar 9, 2021
a86140e
Reduce: reduce: refactor
Anton-Latukha Mar 9, 2021
ea6e8c5
Reduce: reduce: reduce (=<< -> <$>)
Anton-Latukha Mar 9, 2021
fab166d
Reduce: reduce: reduce <$>
Anton-Latukha Mar 9, 2021
78771ce
Eval: addStackFrames: nodge GHC to optimize it
Anton-Latukha Mar 9, 2021
6e23add
Builtins: Eval: evalBinds: (maybe -> =<<)
Anton-Latukha Mar 9, 2021
4e3aa9b
Pretty: refactor
Anton-Latukha Mar 9, 2021
a869b4e
Pretty: refactor
Anton-Latukha Mar 10, 2021
2b326e9
Pretty: refactor
Anton-Latukha Mar 10, 2021
f3e6887
Pretty: refactor
Anton-Latukha Mar 10, 2021
1a3c8e2
Pretty: refactor
Anton-Latukha Mar 10, 2021
24683c3
Pretty: refactor
Anton-Latukha Mar 10, 2021
5e88b8a
Exec: unflip nvSetP
Anton-Latukha Mar 11, 2021
b015ae2
ChangeLog: note on `nvSet{,',P}`
Anton-Latukha Mar 11, 2021
a802a10
ChangeLog: note about `mkNixDoc`
Anton-Latukha Mar 11, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Pretty: refactor
  • Loading branch information
Anton-Latukha committed Mar 10, 2021
commit 24683c3a059661a4d6c365196b31129bc5f2bef0
13 changes: 7 additions & 6 deletions src/Nix/Pretty.hs
Original file line number Diff line number Diff line change
Expand Up @@ -287,13 +287,9 @@ exprFNixDoc = \case
, align ("else " <> withoutParens falseBody)
]
NWith scope body ->
leastPrecedence $
vsep
["with " <> withoutParens scope <> ";", align $ withoutParens body]
prettyAddScope "with " scope body
NAssert cond body ->
leastPrecedence $
vsep
["assert " <> withoutParens cond <> ";", align $ withoutParens body]
prettyAddScope "assert " cond body
NSynHole name -> simpleExpr $ pretty ("^" <> name)
where
prettyContainer h f t c =
Expand All @@ -302,6 +298,11 @@ exprFNixDoc = \case
(const $ simpleExpr $ group $ nest 2 $ vsep $ [h] <> (f <$> c) <> [t])
c

prettyAddScope h c b =
leastPrecedence $
vsep
[h <> withoutParens c <> ";", align $ withoutParens b]


valueToExpr :: forall t f m . MonadDataContext f m => NValue t f m -> NExpr
valueToExpr = iterNValue (\_ _ -> thk) phi
Expand Down