commit be51c94825ea2e35fe4312f36f22af641774c893
author Christian Hopps <chopps@gmail.com> Fri Apr 02 16:29:51 2021 -0400
committer Radek Krejci <rkrejci@cesnet.cz> Tue Apr 06 21:08:31 2021 +0200
tree 883d0eabbad783213e6b7707e9208b67c6d03682
parent 71877dfb2c1cdfd7fbe3487c252d073b75ec7162

printers MAINTENANCE restore json printing to previous style

Makes 2 changes, to return formatting to what was in libyang1

- Change:
    {
      list-node-content
    },    {
      list-node-content
    }
 Back to the definitely more common:
    {
      list-node-content
    },
    {
      list-node-content
    }

- Change leaf lists back to be one item per line when formatting. While
one line might look nice for leaf lists with only a couple items, it
can't be considered "formated" when that list grows to many items
and everything is on a single line wrapping around the screen.

src/printer_json.c

diff --git a/src/printer_json.c b/src/printer_json.c
index a3fe6fc..a284844 100644
--- a/src/printer_json.c
+++ b/src/printer_json.c
@@ -97,8 +97,7 @@
 static LY_ERR
 json_print_array_open(struct jsonpr_ctx *ctx, const struct lyd_node *node)
 {
-    /* leaf-list's content is always printed on a single line */
-    ly_print_(ctx->out, "[%s", (!node->schema || node->schema->nodetype != LYS_LEAFLIST) && DO_FORMAT ? "\n" : "");
+    ly_print_(ctx->out, "[%s", DO_FORMAT ? "\n" : "");
     LY_CHECK_RET(ly_set_add(&ctx->open, (void *)node, 0, NULL));
     LEVEL_INC;
 
@@ -131,16 +130,9 @@
 static void
 json_print_array_close(struct jsonpr_ctx *ctx)
 {
-    const struct lysc_node *schema = ((const struct lyd_node *)ctx->open.objs[ctx->open.count - 1])->schema;
-
     LEVEL_DEC;
     ly_set_rm_index(&ctx->open, ctx->open.count - 1, NULL);
-    if (schema && (schema->nodetype == LYS_LEAFLIST)) {
-        /* leaf-list's content is always printed on a single line */
-        ly_print_(ctx->out, "]");
-    } else {
-        ly_print_(ctx->out, "%s%*s]", DO_FORMAT ? "\n" : "", INDENT);
-    }
+    ly_print_(ctx->out, "%s%*s]", DO_FORMAT ? "\n" : "", INDENT);
 }
 
 /**
@@ -612,7 +604,7 @@
         ly_print_(ctx->out, "%s{%s", (is_open_array(ctx, node) && ctx->level_printed >= ctx->level) ? "," : "",
                 (DO_FORMAT && has_content) ? "\n" : "");
     } else {
-        ly_print_(ctx->out, "%s%*s{%s", (is_open_array(ctx, node) && ctx->level_printed >= ctx->level) ? "," : "",
+        ly_print_(ctx->out, "%s%*s{%s", (is_open_array(ctx, node) && ctx->level_printed >= ctx->level) ? (DO_FORMAT ? ",\n" : ",") : "",
                 INDENT, (DO_FORMAT && has_content) ? "\n" : "");
     }
     LEVEL_INC;
@@ -673,8 +665,10 @@
     if (!is_open_array(ctx, node)) {
         LY_CHECK_RET(json_print_member(ctx, node, 0));
         LY_CHECK_RET(json_print_array_open(ctx, node));
+        if (node->schema->nodetype == LYS_LEAFLIST)
+            ly_print_(ctx->out, "%*s", INDENT);
     } else if (node->schema->nodetype == LYS_LEAFLIST) {
-        ly_print_(ctx->out, ",");
+        ly_print_(ctx->out, ",%s%*s", DO_FORMAT ? "\n" : "", INDENT);
     }
 
     if (node->schema->nodetype == LYS_LIST) {