From 8d15e51228f736a2a969dbc802e5e485518c9f7f Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Fri, 23 Jan 2015 12:03:41 -0600 Subject: [PATCH 1/2] add test_comment_00 one-element array with comment, for issue #103 --- test/data/test_comment_00.expected | 4 ++++ test/data/test_comment_00.json | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 test/data/test_comment_00.expected create mode 100644 test/data/test_comment_00.json diff --git a/test/data/test_comment_00.expected b/test/data/test_comment_00.expected new file mode 100644 index 0000000..284a797 --- /dev/null +++ b/test/data/test_comment_00.expected @@ -0,0 +1,4 @@ +// Comment for array +.=[] +// Comment within array +.[0]="one-element" diff --git a/test/data/test_comment_00.json b/test/data/test_comment_00.json new file mode 100644 index 0000000..4df577a --- /dev/null +++ b/test/data/test_comment_00.json @@ -0,0 +1,5 @@ +// Comment for array +[ + // Comment within array + "one-element" +] From 216ecd30851d5cebc2a4f3786196d981a44d26e0 Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Fri, 23 Jan 2015 12:46:10 -0600 Subject: [PATCH 2/2] fix test_comment_00 for #103 --- src/lib_json/json_writer.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp index 467ab82..d8a3046 100644 --- a/src/lib_json/json_writer.cpp +++ b/src/lib_json/json_writer.cpp @@ -376,6 +376,9 @@ bool StyledWriter::isMultineArray(const Value& value) { addChildValues_ = true; int lineLength = 4 + (size - 1) * 2; // '[ ' + ', '*n + ' ]' for (int index = 0; index < size; ++index) { + if (hasCommentForValue(value[index])) { + isMultiLine = true; + } writeValue(value[index]); lineLength += int(childValues_[index].length()); } @@ -584,6 +587,9 @@ bool StyledStreamWriter::isMultineArray(const Value& value) { addChildValues_ = true; int lineLength = 4 + (size - 1) * 2; // '[ ' + ', '*n + ' ]' for (int index = 0; index < size; ++index) { + if (hasCommentForValue(value[index])) { + isMultiLine = true; + } writeValue(value[index]); lineLength += int(childValues_[index].length()); }