From a10d259db1d3d15764884687782de541507582e6 Mon Sep 17 00:00:00 2001
From: Syping <schiedelrafael@keppe.org>
Date: Fri, 31 Mar 2023 01:33:54 +0200
Subject: [PATCH] SnapmaticJson: fix indent of empty array and objects
---
src/SnapmaticJson.cpp | 52 +++++++++++++++++++++++--------------------
1 file changed, 28 insertions(+), 24 deletions(-)
diff --git a/src/SnapmaticJson.cpp b/src/SnapmaticJson.cpp
index aad6f0e..cff9fff 100644
--- a/src/SnapmaticJson.cpp
+++ b/src/SnapmaticJson.cpp
@@ -27,14 +27,14 @@ void serializer(std::ostream &os, const boost::json::value &jv, std::string *ind
indent = &indent_;
switch (jv.kind()) {
case boost::json::kind::object: {
- if (do_indent) {
- os << "{\n";
- indent->append(4, ' ');
- }
- else
- os << "{";
auto const &obj = jv.get_object();
if (!obj.empty()) {
+ if (do_indent) {
+ os << "{\n";
+ indent->append(4, ' ');
+ }
+ else
+ os << "{";
auto it = obj.begin();
for (;;) {
if (do_indent)
@@ -49,25 +49,27 @@ void serializer(std::ostream &os, const boost::json::value &jv, std::string *ind
else
os << ",";
}
- }
- if (do_indent) {
- os << "\n";
- indent->resize(indent->size() - 4);
- os << *indent << "}";
+ if (do_indent) {
+ os << "\n";
+ indent->resize(indent->size() - 4);
+ os << *indent << "}";
+ }
+ else
+ os << "}";
}
else
- os << "}";
+ os << "{}";
break;
}
case boost::json::kind::array: {
- if (do_indent) {
- os << "[\n";
- indent->append(4, ' ');
- }
- else
- os << "[";
auto const &arr = jv.get_array();
if (!arr.empty()) {
+ if (do_indent) {
+ os << "[\n";
+ indent->append(4, ' ');
+ }
+ else
+ os << "[";
auto it = arr.begin();
for (;;) {
if (do_indent)
@@ -80,14 +82,16 @@ void serializer(std::ostream &os, const boost::json::value &jv, std::string *ind
else
os << ",";
}
- }
- if (do_indent) {
- os << "\n";
- indent->resize(indent->size() - 4);
- os << *indent << "]";
+ if (do_indent) {
+ os << "\n";
+ indent->resize(indent->size() - 4);
+ os << *indent << "]";
+ }
+ else
+ os << "]";
}
else
- os << "]";
+ os << "[]";
break;
}
case boost::json::kind::string: {