From 58516eea7753dae7e989deb5eec9966769c18daa Mon Sep 17 00:00:00 2001 From: Stephen Morgan Date: Wed, 21 Jul 2021 16:42:15 +1000 Subject: [PATCH] imp: json: Decrease indentation in JSON output. --- hledger-lib/Hledger/Data/Json.hs | 2 +- hledger/test/json.test | 186 +++++++++++++++---------------- 2 files changed, 94 insertions(+), 94 deletions(-) diff --git a/hledger-lib/Hledger/Data/Json.hs b/hledger-lib/Hledger/Data/Json.hs index f17645ec9..ea5ce68b0 100644 --- a/hledger-lib/Hledger/Data/Json.hs +++ b/hledger-lib/Hledger/Data/Json.hs @@ -261,7 +261,7 @@ instance FromJSON (DecimalRaw Integer) -- | Config for pretty printing JSON output. jsonConf :: Config -jsonConf = Config{confIndent=Spaces 4,confCompare=compare, confNumFormat=Generic, confTrailingNewline=True} +jsonConf = Config{confIndent=Spaces 2, confCompare=compare, confNumFormat=Generic, confTrailingNewline=True} -- | Show a JSON-convertible haskell value as pretty-printed JSON text. toJsonText :: ToJSON a => a -> TL.Text diff --git a/hledger/test/json.test b/hledger/test/json.test index 75b77aa0c..925221e26 100644 --- a/hledger/test/json.test +++ b/hledger/test/json.test @@ -5,111 +5,111 @@ # 1. Test the json output for register reports $ hledger -f- reg --output-format=json [ - [ - "2019-01-01", - null, - "", + [ + "2019-01-01", + null, + "", + { + "paccount": "a", + "pamount": [ { - "paccount": "a", - "pamount": [ - { - "acommodity": "AAA", - "aismultiplier": false, - "aprice": null, - "aquantity": { - "decimalMantissa": 10, - "decimalPlaces": 1, - "floatingPoint": 1 - }, - "astyle": { - "ascommodityside": "R", - "ascommodityspaced": true, - "asdecimalpoint": ".", - "asdigitgroups": null, - "asprecision": 1 - } - } - ], - "pbalanceassertion": null, - "pcomment": "", - "pdate": null, - "pdate2": null, - "poriginal": null, - "pstatus": "Unmarked", - "ptags": [], - "ptransaction_": "1", - "ptype": "VirtualPosting" + "acommodity": "AAA", + "aismultiplier": false, + "aprice": null, + "aquantity": { + "decimalMantissa": 10, + "decimalPlaces": 1, + "floatingPoint": 1 + }, + "astyle": { + "ascommodityside": "R", + "ascommodityspaced": true, + "asdecimalpoint": ".", + "asdigitgroups": null, + "asprecision": 1 + } + } + ], + "pbalanceassertion": null, + "pcomment": "", + "pdate": null, + "pdate2": null, + "poriginal": null, + "pstatus": "Unmarked", + "ptags": [], + "ptransaction_": "1", + "ptype": "VirtualPosting" + }, + [ + { + "acommodity": "AAA", + "aismultiplier": false, + "aprice": null, + "aquantity": { + "decimalMantissa": 10, + "decimalPlaces": 1, + "floatingPoint": 1 }, - [ - { - "acommodity": "AAA", - "aismultiplier": false, - "aprice": null, - "aquantity": { - "decimalMantissa": 10, - "decimalPlaces": 1, - "floatingPoint": 1 - }, - "astyle": { - "ascommodityside": "R", - "ascommodityspaced": true, - "asdecimalpoint": ".", - "asdigitgroups": null, - "asprecision": 1 - } - } - ] + "astyle": { + "ascommodityside": "R", + "ascommodityspaced": true, + "asdecimalpoint": ".", + "asdigitgroups": null, + "asprecision": 1 + } + } ] + ] ] # 2. Test the json output for balance reports $ hledger -f- bal --output-format=json [ + [ [ - [ - "a", - "a", - 0, - [ - { - "acommodity": "AAA", - "aismultiplier": false, - "aprice": null, - "aquantity": { - "decimalMantissa": 10, - "decimalPlaces": 1, - "floatingPoint": 1 - }, - "astyle": { - "ascommodityside": "R", - "ascommodityspaced": true, - "asdecimalpoint": ".", - "asdigitgroups": null, - "asprecision": 1 - } - } - ] - ] - ], - [ + "a", + "a", + 0, + [ { - "acommodity": "AAA", - "aismultiplier": false, - "aprice": null, - "aquantity": { - "decimalMantissa": 10, - "decimalPlaces": 1, - "floatingPoint": 1 - }, - "astyle": { - "ascommodityside": "R", - "ascommodityspaced": true, - "asdecimalpoint": ".", - "asdigitgroups": null, - "asprecision": 1 - } + "acommodity": "AAA", + "aismultiplier": false, + "aprice": null, + "aquantity": { + "decimalMantissa": 10, + "decimalPlaces": 1, + "floatingPoint": 1 + }, + "astyle": { + "ascommodityside": "R", + "ascommodityspaced": true, + "asdecimalpoint": ".", + "asdigitgroups": null, + "asprecision": 1 + } } + ] ] + ], + [ + { + "acommodity": "AAA", + "aismultiplier": false, + "aprice": null, + "aquantity": { + "decimalMantissa": 10, + "decimalPlaces": 1, + "floatingPoint": 1 + }, + "astyle": { + "ascommodityside": "R", + "ascommodityspaced": true, + "asdecimalpoint": ".", + "asdigitgroups": null, + "asprecision": 1 + } + } + ] ] >=0