Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make empty arrays and dictionaries render compactly even when indent > 0 #501

Merged
merged 6 commits into from
Jul 9, 2023
Merged

Make empty arrays and dictionaries render compactly even when indent > 0 #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f6337f9
.
lihaoyi Jul 9, 2023
c2501a7
.
lihaoyi Jul 9, 2023
2247748
.
lihaoyi Jul 9, 2023
3ab0c9f
.
lihaoyi Jul 9, 2023
05f7501
.
lihaoyi Jul 9, 2023
2dc7e3a
.
lihaoyi Jul 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions ujson/templates/BaseElemRenderer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,16 @@ class BaseElemRenderer[T <: upickle.core.ElemOps.Output]
private[this] var visitingKey = false

private[this] var commaBuffered = false
private[this] var indentBuffered = false
private[this] var quoteBuffered = false

def flushBuffer() = {
if (commaBuffered) {
commaBuffered = false
elemBuilder.append(',')
}
if (indentBuffered){
indentBuffered = false
renderIndent()
}
if (quoteBuffered) {
Expand All @@ -47,16 +51,21 @@ class BaseElemRenderer[T <: upickle.core.ElemOps.Output]
elemBuilder.append('[')

depth += 1
renderIndent()
indentBuffered = true

def subVisitor = BaseElemRenderer.this

def visitValue(v: T, index: Int): Unit = {
flushBuffer()
commaBuffered = true
indentBuffered = true
}

def visitEnd(index: Int) = {
commaBuffered = false
depth -= 1
renderIndent()
if (indentBuffered && commaBuffered) renderIndent()
commaBuffered = false
indentBuffered = false
elemBuilder.append(']')
flushElemBuilder()
out
Expand All @@ -67,26 +76,32 @@ class BaseElemRenderer[T <: upickle.core.ElemOps.Output]
flushBuffer()
elemBuilder.append('{')
depth += 1
renderIndent()
indentBuffered = true

def subVisitor = BaseElemRenderer.this
def visitKey(index: Int) = {
quoteBuffered = true
visitingKey = true
BaseElemRenderer.this
}

def visitKeyValue(s: Any): Unit = {
elemBuilder.append('"')
visitingKey = false
elemBuilder.append(':')
if (indent != -1) elemBuilder.append(' ')
}

def visitValue(v: T, index: Int): Unit = {
commaBuffered = true
indentBuffered = true
}

def visitEnd(index: Int) = {
commaBuffered = false
depth -= 1
renderIndent()
if (indentBuffered && commaBuffered) renderIndent()
commaBuffered = false
indentBuffered = false
elemBuilder.append('}')
flushElemBuilder()
out
Expand Down
15 changes: 14 additions & 1 deletion upickle/test/src/upickle/example/ExampleTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,11 @@ object ExampleTests extends TestSuite {
write("omg") ==> "\"omg\""
}
test("seqs"){
write(Array.empty[Int]) ==> "[]"
write(Array(1, 2, 3)) ==> "[1,2,3]"

// You can pass in an `indent` parameter to format it nicely
write(Array.empty[Int], indent = 4) ==> "[]"
write(Array(1, 2, 3), indent = 4) ==>
"""[
| 1,
Expand All @@ -176,6 +178,18 @@ object ExampleTests extends TestSuite {
write(Map(1 -> 2, 3 -> 4)) ==> """{"1":2,"3":4}"""
write(Map("hello" -> "world")) ==> """{"hello":"world"}"""
write(Map(Seq(1, 2) -> Seq(3, 4))) ==> """[[[1,2],[3,4]]]"""
write(Map.empty[Int, Int]) ==> """{}"""
write(Map(Seq.empty[Int] -> Seq.empty[Int])) ==> """[[[],[]]]"""

write(Map(Seq.empty[Int] -> Seq.empty[Int]), indent = 4) ==>
"""[
| [
| [],
| []
| ]
|]""".stripMargin

write(Map.empty[Int, Int], indent = 4) ==> """{}"""
}
test("options"){
write(Some(1)) ==> "[1]"
Expand Down Expand Up @@ -227,7 +241,6 @@ object ExampleTests extends TestSuite {

write(Bar("bearrr", Seq(Foo(1), Foo(2), Foo(3)))) ==>
"""{"name":"bearrr","foos":[{"i":1},{"i":2},{"i":3}]}"""

}
test("null"){
write(Bar(null, Seq(Foo(1), null, Foo(3)))) ==>
Expand Down