fix: Fix showNode to display ANSI colours.

Without this, tokstyle will not show colours in error messages.
TokTok · Nov 6, 2024 · ed563ef · ed563ef
1 parent 94ea74a
commit ed563ef
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/src/Language/Cimple/Pretty.hs b/src/Language/Cimple/Pretty.hs
@@ -576,7 +576,7 @@ ppTranslationUnit :: [Node (Lexeme Text)] -> Doc AnsiStyle
 ppTranslationUnit decls = (ppToplevel . map ppNode $ decls) <> line
 
 showNode  :: Node (Lexeme Text) -> Text
-showNode = Text.pack . show . ppNode
+showNode = render . ppNode
 
 renderSmart :: Float -> Int -> Doc AnsiStyle -> SimpleDocStream AnsiStyle
 renderSmart ribbonFraction widthPerLine

diff --git a/test/Language/Cimple/PrettySpec.hs b/test/Language/Cimple/PrettySpec.hs
@@ -1,11 +1,15 @@
+{-# LANGUAGE OverloadedStrings #-}
 module Language.Cimple.PrettySpec where
 
 import           Test.Hspec                    (Spec, describe, it, shouldBe)
 
+import           Data.Text                     (Text)
 import qualified Data.Text                     as Text
 import qualified Data.Text.Lazy                as TL
+import           Language.Cimple               (Lexeme, Node)
 import           Language.Cimple.IO            (parseText)
-import           Language.Cimple.Pretty        (plain, ppTranslationUnit)
+import           Language.Cimple.Pretty        (plain, ppTranslationUnit,
+                                                showNode)
 import           Prettyprinter                 (SimpleDocStream, layoutCompact)
 import           Prettyprinter.Render.Terminal (AnsiStyle, renderLazy)
 
@@ -18,17 +22,19 @@ pretty =
     show
     . plain
     . ppTranslationUnit
-    . getRight
-    . parseText
-    . Text.pack
+    . mustParse
 
 compact :: String -> String
 compact =
     flip displayS ""
     . layoutCompact
     . plain
     . ppTranslationUnit
-    . getRight
+    . mustParse
+
+mustParse :: String -> [Node (Lexeme Text)]
+mustParse =
+    getRight
     . parseText
     . Text.pack
 
@@ -40,6 +46,15 @@ displayS sdoc =
 
 spec :: Spec
 spec = do
+    describe "showNode" $ do
+        it "prints code with syntax highlighting" $ do
+            let pp = showNode $ head $ mustParse "int a(void) { return 3; }"
+            pp <> "\n" `shouldBe` Text.unlines
+                [ "\ESC[0;32mint\ESC[0m a(\ESC[0;32mvoid\ESC[0m) {"
+                , "  \ESC[0;31mreturn\ESC[0m \ESC[0;31m3\ESC[0m;"
+                , "}"
+                ]
+
     describe "renderPretty" $ do
         it "pretty-prints a simple C function" $ do
             let pp = pretty "int a(void) { return 3; }"