diff --git a/src/ShellCheck/Formatter/GCC.hs b/src/ShellCheck/Formatter/GCC.hs index 9c5fa5f..a7307a9 100644 --- a/src/ShellCheck/Formatter/GCC.hs +++ b/src/ShellCheck/Formatter/GCC.hs @@ -22,6 +22,7 @@ module ShellCheck.Formatter.GCC (format) where import ShellCheck.Interface import ShellCheck.Formatter.Format +import Data.Either import Data.List import GHC.Exts import System.IO @@ -44,7 +45,7 @@ outputAll cr sys = mapM_ f groups f group = do let filename = sourceFile (head group) result <- (siReadFile sys) filename - let contents = either (const "") id result + let contents = fromRight "" result outputResult filename contents group outputResult filename contents warnings = do diff --git a/src/ShellCheck/Formatter/JSON1.hs b/src/ShellCheck/Formatter/JSON1.hs index 7335d8c..edc1974 100644 --- a/src/ShellCheck/Formatter/JSON1.hs +++ b/src/ShellCheck/Formatter/JSON1.hs @@ -24,6 +24,7 @@ import ShellCheck.Interface import ShellCheck.Formatter.Format import Data.Aeson +import Data.Either import Data.IORef import Data.Monoid import GHC.Exts @@ -118,7 +119,7 @@ collectResult ref cr sys = mapM_ f groups f group = do let filename = sourceFile (head group) result <- siReadFile sys filename - let contents = either (const "") id result + let contents = fromRight "" result let comments' = makeNonVirtual comments contents modifyIORef ref (\x -> comments' ++ x) diff --git a/src/ShellCheck/Formatter/TTY.hs b/src/ShellCheck/Formatter/TTY.hs index 4dabf45..ddf36aa 100644 --- a/src/ShellCheck/Formatter/TTY.hs +++ b/src/ShellCheck/Formatter/TTY.hs @@ -25,6 +25,7 @@ import ShellCheck.Formatter.Format import Control.Monad import Data.Array +import Data.Either import Data.Foldable import Data.Ord import Data.IORef @@ -122,7 +123,7 @@ outputResult options ref result sys = do outputForFile color sys comments = do let fileName = sourceFile (head comments) result <- (siReadFile sys) fileName - let contents = either (const "") id result + let contents = fromRight "" result let fileLinesList = lines contents let lineCount = length fileLinesList let fileLines = listArray (1, lineCount) fileLinesList