github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-24 23:42:31 +03:00
Code Issues Projects Releases Wiki Activity

Simplify the pretty-printing of sequences with a helper.

Browse Source
This commit is contained in:
Rob Rix 2019-07-22 16:19:22 -04:00
parent 539f8db2f6
commit 45723e71fc
No known key found for this signature in database
GPG Key ID: F188A01508EA1CF7
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
semantic-core/src/Data/Core/Pretty.hs
View File

@ -14,7 +14,7 @@ import Data.File
import Data.Name
import Data.Scope
import Data.Term
import Data.Text.Prettyprint.Doc (Pretty (..), annotate, softline, (<+>))
import Data.Text.Prettyprint.Doc (Pretty (..), annotate, (<+>), vsep)
import qualified Data.Text.Prettyprint.Doc as Pretty
import qualified Data.Text.Prettyprint.Doc.Render.String as Pretty
import qualified Data.Text.Prettyprint.Doc.Render.Terminal as Pretty
@ -58,7 +58,13 @@ inParens :: (Member (Reader Prec) sig, Carrier sig m) => Prec -> m AnsiDoc -> m
inParens amount go = do
prec <- ask
body <- with amount go
pure (encloseIf (amount >= prec) (symbol "(") (symbol ")") body)
pure (if amount > prec then Pretty.parens body else body)
inBraces :: (Member (Reader Prec) sig, Carrier sig m) => Prec -> m AnsiDoc -> m AnsiDoc
inBraces amount go = do
prec <- ask
body <- with amount go
pure (if amount > prec then Pretty.braces body else body)
prettyCore :: Style -> Term Core User -> AnsiDoc
prettyCore style = run . runReader @Prec 0 . go
@ -68,29 +74,17 @@ prettyCore style = run . runReader @Prec 0 . go
Rec b -> inParens 11 $ do
(x, body) <- bind b
pure (keyword "rec" <+> name x <+> symbol "=" <+> body)
a :>> b -> do
prec <- ask @Prec
a :>> b -> inBraces 12 $ do
fore <- with 12 (go a)
aft <- with 12 (go b)
let open = symbol ("{" <> softline)
close = symbol (softline <> "}")
separator = ";" <> Pretty.line
body = fore <> separator <> aft
pure $ vsep [ fore <> Pretty.semi, aft ]
pure . Pretty.align $ encloseIf (12 > prec) open close (Pretty.align body)
Named (Ignored x) a :>>= b -> do
prec <- ask @Prec
Named (Ignored x) a :>>= b -> inBraces 12 $ do
fore <- with 11 (go a)
aft <- with 12 (go (instantiate1 (pure x) b))
let open = symbol ("{" <> softline)
close = symbol (softline <> "}")
separator = ";" <> Pretty.line
body = name x <+> arrowL <+> fore <> separator <> aft
pure . Pretty.align $ encloseIf (12 > prec) open close (Pretty.align body)
pure $ vsep [ name x <+> arrowL <+> fore <> Pretty.semi, aft ]
Lam f -> inParens 11 $ do
(x, body) <- bind f