7x31/shellcheck
1
0
Fork 0
mirror of https://github.com/koalaman/shellcheck.git synced 2025-08-08 12:37:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix remaining FIXME for tty error color output.

Browse Source
This commit is contained in:
Vidar Holen
2015-12-06 12:48:53 -08:00
parent 8acd5b13cd
commit b4390414ef
5 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ShellCheck/Formatter/TTY.hs
View File

@@ -27,12 +27,12 @@ import GHC.Exts
import System.Info
import System.IO
format :: IO Formatter
format = return Formatter {
format :: FormatterOptions -> IO Formatter
format options = return Formatter {
header = return (),
footer = return (),
onFailure = outputError,
onResult = outputResult
onFailure = outputError options,
onResult = outputResult options
}
colorForLevel level =
@@ -45,12 +45,12 @@ colorForLevel level =
"source" -> 0 -- none
otherwise -> 0 -- none
outputError file error = do
color <- getColorFunc $ ColorAuto -- FIXME: should respect --color
hPutStrLn stderr $ color "error ZZZ" $ file ++ ": " ++ error
outputError options file error = do
color <- getColorFunc $ foColorOption options
hPutStrLn stderr $ color "error" $ file ++ ": " ++ error
outputResult result contents = do
color <- getColorFunc $ crColorOption result
outputResult options result contents = do
color <- getColorFunc $ foColorOption options
let comments = crComments result
let fileLines = lines contents
let lineCount = fromIntegral $ length fileLines