github/shellcheck
1
0
Fork 0
mirror of https://github.com/koalaman/shellcheck synced 2025-07-06 21:11:35 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add JSON1 as a separate format, wrap result in an object

Browse source
This commit is contained in:
Vidar Holen 2019-06-02 10:28:37 -07:00
parent f4be53eb19
commit 1297ef46d7
3 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/ShellCheck/Formatter/JSON.hs
View file

@ -30,12 +30,12 @@ import GHC.Exts
import System.IO
import qualified Data.ByteString.Lazy.Char8 as BL
format :: Bool -> IO Formatter
format removeTabs = do
format :: IO Formatter
format = do
ref <- newIORef []
return Formatter {
header = return (),
onResult = collectResult removeTabs ref,
onResult = collectResult ref,
onFailure = outputError,
footer = finish ref
}
@ -98,19 +98,12 @@ instance ToJSON Fix where
outputError file msg = hPutStrLn stderr $ file ++ ": " ++ msg
collectResult removeTabs ref cr sys = mapM_ f groups
collectResult ref cr sys = mapM_ f groups
where
comments = crComments cr
groups = groupWith sourceFile comments
f :: [PositionedComment] -> IO ()
f group = do
let filename = sourceFile (head group)
result <- siReadFile sys filename
let contents = either (const "") id result
let comments' = if removeTabs
then makeNonVirtual comments contents
else comments
modifyIORef ref (\x -> comments' ++ x)
f group = modifyIORef ref (\x -> comments ++ x)
finish ref = do
list <- readIORef ref