Use fromRight instead of reimplementing it
This commit is contained in:
parent
01f4423465
commit
64c31d9142
|
@ -22,6 +22,7 @@ module ShellCheck.Formatter.GCC (format) where
|
||||||
import ShellCheck.Interface
|
import ShellCheck.Interface
|
||||||
import ShellCheck.Formatter.Format
|
import ShellCheck.Formatter.Format
|
||||||
|
|
||||||
|
import Data.Either
|
||||||
import Data.List
|
import Data.List
|
||||||
import GHC.Exts
|
import GHC.Exts
|
||||||
import System.IO
|
import System.IO
|
||||||
|
@ -44,7 +45,7 @@ outputAll cr sys = mapM_ f groups
|
||||||
f group = do
|
f group = do
|
||||||
let filename = sourceFile (head group)
|
let filename = sourceFile (head group)
|
||||||
result <- (siReadFile sys) filename
|
result <- (siReadFile sys) filename
|
||||||
let contents = either (const "") id result
|
let contents = fromRight "" result
|
||||||
outputResult filename contents group
|
outputResult filename contents group
|
||||||
|
|
||||||
outputResult filename contents warnings = do
|
outputResult filename contents warnings = do
|
||||||
|
|
|
@ -24,6 +24,7 @@ import ShellCheck.Interface
|
||||||
import ShellCheck.Formatter.Format
|
import ShellCheck.Formatter.Format
|
||||||
|
|
||||||
import Data.Aeson
|
import Data.Aeson
|
||||||
|
import Data.Either
|
||||||
import Data.IORef
|
import Data.IORef
|
||||||
import Data.Monoid
|
import Data.Monoid
|
||||||
import GHC.Exts
|
import GHC.Exts
|
||||||
|
@ -118,7 +119,7 @@ collectResult ref cr sys = mapM_ f groups
|
||||||
f group = do
|
f group = do
|
||||||
let filename = sourceFile (head group)
|
let filename = sourceFile (head group)
|
||||||
result <- siReadFile sys filename
|
result <- siReadFile sys filename
|
||||||
let contents = either (const "") id result
|
let contents = fromRight "" result
|
||||||
let comments' = makeNonVirtual comments contents
|
let comments' = makeNonVirtual comments contents
|
||||||
modifyIORef ref (\x -> comments' ++ x)
|
modifyIORef ref (\x -> comments' ++ x)
|
||||||
|
|
||||||
|
|
|
@ -25,6 +25,7 @@ import ShellCheck.Formatter.Format
|
||||||
|
|
||||||
import Control.Monad
|
import Control.Monad
|
||||||
import Data.Array
|
import Data.Array
|
||||||
|
import Data.Either
|
||||||
import Data.Foldable
|
import Data.Foldable
|
||||||
import Data.Ord
|
import Data.Ord
|
||||||
import Data.IORef
|
import Data.IORef
|
||||||
|
@ -122,7 +123,7 @@ outputResult options ref result sys = do
|
||||||
outputForFile color sys comments = do
|
outputForFile color sys comments = do
|
||||||
let fileName = sourceFile (head comments)
|
let fileName = sourceFile (head comments)
|
||||||
result <- (siReadFile sys) fileName
|
result <- (siReadFile sys) fileName
|
||||||
let contents = either (const "") id result
|
let contents = fromRight "" result
|
||||||
let fileLinesList = lines contents
|
let fileLinesList = lines contents
|
||||||
let lineCount = length fileLinesList
|
let lineCount = length fileLinesList
|
||||||
let fileLines = listArray (1, lineCount) fileLinesList
|
let fileLines = listArray (1, lineCount) fileLinesList
|
||||||
|
|
Loading…
Reference in New Issue