Fix remaining FIXME for tty error color output.

ShellCheck/Checker.hs

@@ -48,7 +48,6 @@ checkScript sys spec = do
     results <- checkScript (csScript spec)
     return CheckResult {
         crFilename = csFilename spec,
-        crColorOption = csColorOption spec,
         crComments = results
     }
   where

ShellCheck/Formatter/TTY.hs

@@ -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

ShellCheck/Interface.hs

@@ -34,30 +34,21 @@ data CheckSpec = CheckSpec {
     csFilename :: String,
     csScript :: String,
     csExcludedWarnings :: [Integer],
-    csColorOption :: ColorOptions,
     csShellTypeOverride :: Maybe Shell
 } deriving (Show, Eq)
 
 data CheckResult = CheckResult {
     crFilename :: String,
-    crComments :: [PositionedComment],
-    crColorOption :: ColorOptions
+    crComments :: [PositionedComment]
 } deriving (Show, Eq)
 
 emptyCheckSpec = CheckSpec {
     csFilename = "",
     csScript = "",
     csExcludedWarnings = [],
-    csShellTypeOverride = Nothing,
-    csColorOption = ColorAuto
+    csShellTypeOverride = Nothing
 }
 
-data ColorOptions =
-    ColorAuto
-    | ColorAlways
-    | ColorNever
-  deriving (Ord, Eq, Show)
-
 -- Parser input and output
 data ParseSpec = ParseSpec {
     psFilename :: String,
@@ -81,6 +72,13 @@ data AnalysisResult = AnalysisResult {
     arComments :: [TokenComment]
 }
 
+
+-- Formatter options
+data FormatterOptions = FormatterOptions {
+    foColorOption :: ColorOption
+}
+
+
 -- Supporting data types
 data Shell = Ksh | Sh | Bash | Dash deriving (Show, Eq)
 data ExecutionMode = Executed | Sourced deriving (Show, Eq)
@@ -99,6 +97,12 @@ data Comment = Comment Severity Code String deriving (Show, Eq)
 data PositionedComment = PositionedComment Position Comment deriving (Show, Eq)
 data TokenComment = TokenComment Id Comment deriving (Show, Eq)
 
+data ColorOption =
+    ColorAuto
+    | ColorAlways
+    | ColorNever
+  deriving (Ord, Eq, Show)
+
 -- For testing
 mockedSystemInterface :: [(String, String)] -> SystemInterface Identity
 mockedSystemInterface files = SystemInterface {