diff options
| author | Florian Frank <flori@ping.de> | 2011-05-11 07:57:28 -0700 |
|---|---|---|
| committer | Florian Frank <flori@ping.de> | 2011-05-11 07:57:28 -0700 |
| commit | 8dccea9aff840b73f5227e61c9b27060fae1adb2 (patch) | |
| tree | 86b133a64d031ac24c496b35a58cc2b02b079a49 | |
| parent | ebcfd0eb03e30c1068ba4e0beacd67ec8ca6ea27 (diff) | |
| parent | 6a3adbf64a765562b14d16b862f3b50cbb989db6 (diff) | |
| download | json-8dccea9aff840b73f5227e61c9b27060fae1adb2.tar.gz | |
Merge pull request #63 from vakuum/issue-60
flori/json#60: Incorrect pretty-print indentation
| -rw-r--r-- | java/src/json/ext/Generator.java | 6 | ||||
| -rwxr-xr-x | tests/test_json_generate.rb | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/java/src/json/ext/Generator.java b/java/src/json/ext/Generator.java index 230d68f..92fd90e 100644 --- a/java/src/json/ext/Generator.java +++ b/java/src/json/ext/Generator.java @@ -354,11 +354,7 @@ public final class Generator { state.decreaseDepth(); if (objectNl.length() != 0) { buffer.append(objectNl); - if (indent.length != 0) { - for (int i = 0; i < state.getDepth(); i++) { - buffer.append(indent); - } - } + buffer.append(Utils.repeat(state.getIndent(), state.getDepth())); } buffer.append((byte)'}'); } diff --git a/tests/test_json_generate.rb b/tests/test_json_generate.rb index e6219df..bfaee82 100755 --- a/tests/test_json_generate.rb +++ b/tests/test_json_generate.rb @@ -54,6 +54,7 @@ EOT def test_generate_pretty json = pretty_generate(@hash) + assert_equal(@json3, json) assert_equal(JSON.parse(@json3), JSON.parse(json)) parsed_json = parse(json) assert_equal(@hash, parsed_json) |