unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-09-23 08:18:04 +03:00
Code Issues Projects Releases Wiki Activity

display now applies doc rendering!

Browse Source
This commit is contained in:
Paul Chiusano 2021-03-26 13:10:52 -05:00
parent ddc72fbc01
commit 4440aa002d
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
parser-typechecker/src/Unison/CommandLine/DisplayValues.hs
View File

@ -44,8 +44,28 @@ displayTerm :: (Var v, Monad m)
displayTerm pped terms typeOf eval types = \case
tm@(Term.Apps' (Term.Constructor' typ _) _)
| typ == DD.docRef -> displayDoc pped terms typeOf eval types tm
| typ == DD.doc2Ref -> do
-- Pretty.get (doc.formatConsole tm)
let tm' = Term.app() (Term.ref() DD.prettyGetRef)
(Term.app() (Term.ref() DD.doc2FormatConsoleRef) tm)
tm <- eval tm'
case tm of
Nothing -> pure $ errMsg tm'
Just tm -> displayTerm pped terms typeOf eval types tm
| typ == DD.prettyAnnotatedRef -> displayPretty pped terms typeOf eval types tm
tm -> pure $ TP.pretty (PPE.suffixifiedPPE pped) tm
tm -> pure $ src tm
where
errMsg tm = P.fatalCallout $ P.lines [
P.wrap $ "I couldn't render this document, because the"
<> "rendering function produced an error when"
<> "evaluating this expression:",
"",
P.indentN 2 $ src tm,
"",
P.wrap $ "Sadly, I don't know the error, but you can evaluate"
<> "the above expression in a scratch file to see it."
]
src tm = TP.pretty (PPE.suffixifiedPPE pped) tm
-- assume this is given a
-- Pretty.Annotated ann (Either SpecialForm ConsoleText)

3
parser-typechecker/src/Unison/Runtime/IOSource.hs
View File

@ -211,6 +211,9 @@ pattern PrettyAppend ann tms <- Term.Apps' (Term.Constructor' PrettyAnnotatedRef
pattern PrettyRef <- ((== prettyRef) -> True)
prettyGetRef = termNamed "Pretty.get"
doc2FormatConsoleRef = termNamed "syntax.doc.formatConsole"
pattern AnsiColorRef <- ((== ansiColorRef) -> True)
[ ansiColorBlackId, ansiColorRedId, ansiColorGreenId, ansiColorYellowId
, ansiColorBlueId, ansiColorMagentaId, ansiColorCyanId, ansiColorWhiteId