hexagoxel
/
hxtools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hxbrief: Change output colouring (skipped lines)

master
Lennart Spitzner 2022-03-04 16:26:01 +00:00
parent d6c797dc2e
commit f4cde7248a
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src-hxbrief/Main.hs
View File

@ -237,9 +237,9 @@ dispatchSkipped oldKind i = do
++ show i ++ show i
++ " lines " ++ " lines "
++ kindStr ++ kindStr
++ ")" ++ ") …skipped…"
++ fReset ++ fReset
++ " …skipped…\n" ++ "\n"
conf <- gets s_config conf <- gets s_config
liftIO $ case oldKind of liftIO $ case oldKind of
StdOut -> when (c_keepStdout conf /= Drop) $ outputConcurrent prettyPat StdOut -> when (c_keepStdout conf /= Drop) $ outputConcurrent prettyPat
@ -369,7 +369,14 @@ processLine newPair@(kind, _) = execStateT $ do
Just ((StdOut, line), JoinedAll 1) -> Just ((StdOut, line), JoinedAll 1) ->
(fWhiteDis ++ "│ " ++ fReset ++ ellipse line) : prettyLines (fWhiteDis ++ "│ " ++ fReset ++ ellipse line) : prettyLines
Just ((StdOut, _line), JoinedAll i) -> Just ((StdOut, _line), JoinedAll i) ->
(fWhiteDis ++ "│ " ++ fReset ++ "…skipped… (" ++ show i ++ " lines)") ( fWhiteDis
++ "│ "
++ fGrey
++ "…skipped… ("
++ show i
++ " lines)"
++ fReset
)
: prettyLines : prettyLines
Just ((StdOut, line), Joined 1 _ _) -> Just ((StdOut, line), Joined 1 _ _) ->
(fWhiteDis ++ "│ " ++ fReset ++ ellipse line) : prettyLines (fWhiteDis ++ "│ " ++ fReset ++ ellipse line) : prettyLines
@ -378,9 +385,11 @@ processLine newPair@(kind, _) = execStateT $ do
++ "│ " ++ "│ "
++ fReset ++ fReset
++ showPattern pat ++ showPattern pat
++ fGrey
++ " (" ++ " ("
++ show i ++ show i
++ " lines)" ++ " lines)"
++ fReset
) )
: prettyLines : prettyLines
Just ((StdOut, line), JoinedYield) -> Just ((StdOut, line), JoinedYield) ->
@ -392,7 +401,14 @@ processLine newPair@(kind, _) = execStateT $ do
Just ((StdErr, line), JoinedAll 1) -> Just ((StdErr, line), JoinedAll 1) ->
(fRedDis ++ "│ " ++ fReset ++ ellipse line) : prettyLines (fRedDis ++ "│ " ++ fReset ++ ellipse line) : prettyLines
Just ((StdErr, _line), JoinedAll i) -> Just ((StdErr, _line), JoinedAll i) ->
(fRedDis ++ "│ " ++ fReset ++ "…skipped… (" ++ show i ++ " lines)") ( fRedDis
++ "│ "
++ fGrey
++ "…skipped… ("
++ show i
++ " lines)"
++ fReset
)
: prettyLines : prettyLines
Just ((StdErr, line), Joined 1 _ _) -> Just ((StdErr, line), Joined 1 _ _) ->
(fRedDis ++ "│ " ++ fReset ++ ellipse line) : prettyLines (fRedDis ++ "│ " ++ fReset ++ ellipse line) : prettyLines
@ -401,9 +417,11 @@ processLine newPair@(kind, _) = execStateT $ do
++ "│ " ++ "│ "
++ fReset ++ fReset
++ showPattern pat ++ showPattern pat
++ fGrey
++ " (" ++ " ("
++ show i ++ show i
++ " lines)" ++ " lines)"
++ fReset
) )
: prettyLines : prettyLines
let showCount = min (c_lines conf) (length prettyLinesWithSummary) let showCount = min (c_lines conf) (length prettyLinesWithSummary)