github/shellcheck
1
0
Fork 0
mirror of https://github.com/koalaman/shellcheck synced 2025-07-07 13:31:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1206 from ngzhian/aeson

Browse source 
Change to aeson (fixes #1085)
This commit is contained in:
Vidar Holen 2018-05-20 17:19:20 -07:00 • committed by GitHub
commit 4a5ee06ce4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,4 @@
{-# LANGUAGE OverloadedStrings #-}
{-
Copyright 2012-2015 Vidar Holen
@ -22,10 +23,12 @@ module ShellCheck.Formatter.JSON (format) where
import ShellCheck.Interface
import ShellCheck.Formatter.Format
import Data.Aeson
import Data.IORef
import Data.Monoid
import GHC.Exts
import System.IO
import Text.JSON
import qualified Data.ByteString.Lazy.Char8 as BL
format = do
ref <- newIORef []
@ -36,19 +39,30 @@ format = do
footer = finish ref
}
instance JSON (PositionedComment) where
showJSON comment@(PositionedComment start end (Comment level code string)) = makeObj [
("file", showJSON $ posFile start),
("line", showJSON $ posLine start),
("endLine", showJSON $ posLine end),
("column", showJSON $ posColumn start),
("endColumn", showJSON $ posColumn end),
("level", showJSON $ severityText comment),
("code", showJSON code),
("message", showJSON string)
]
instance ToJSON (PositionedComment) where
toJSON comment@(PositionedComment start end (Comment level code string)) =
object [
"file" .= posFile start,
"line" .= posLine start,
"endLine" .= posLine end,
"column" .= posColumn start,
"endColumn" .= posColumn end,
"level" .= severityText comment,
"code" .= code,
"message" .= string
]
readJSON = undefined
toEncoding comment@(PositionedComment start end (Comment level code string)) =
pairs (
"file" .= posFile start
<> "line" .= posLine start
<> "endLine" .= posLine end
<> "column" .= posColumn start
<> "endColumn" .= posColumn end
<> "level" .= severityText comment
<> "code" .= code
<> "message" .= string
)
outputError file msg = hPutStrLn stderr $ file ++ ": " ++ msg
collectResult ref result _ =
@ -56,5 +70,5 @@ collectResult ref result _ =
finish ref = do
list <- readIORef ref
putStrLn $ encodeStrict list
BL.putStrLn $ encode list