Skip to content

change default -pretty and -S indentation to 2 spaces #6364

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

Merged
nwt merged 2 commits into from
Nov 17, 2025
Merged

change default -pretty and -S indentation to 2 spaces #6364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a4df5a
change default -pretty and -S indentation to 2 spaces
nwt Nov 15, 2025
031a833
Merge branch 'main' into default-pretty-2
nwt Nov 17, 2025
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
2 changes: 1 addition & 1 deletion cli/outputflags/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func (f *Flags) setFlags(fs *flag.FlagSet) {
fs.BoolVar(&f.color, "color", true, "enable/disable color formatting for -S and db text output")
fs.StringVar(&f.supPersist, "persist", "",
"regular expression to persist type definitions across the stream")
fs.IntVar(&f.pretty, "pretty", 4,
fs.IntVar(&f.pretty, "pretty", 2,
"tab size to pretty print JSON and Super JSON output (0 for newline-delimited output")
fs.StringVar(&f.outputFile, "o", "", "write data to output file")
fs.StringVar(&f.split, "split", "",
Expand Down
8 changes: 4 additions & 4 deletions cmd/super/db/manage/ztests/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ outputs:
- name: inherit.sup
data: |
{
name: "test1",
branch: "main"
name: "test1",
branch: "main"
}
{
name: "test2",
branch: "live"
name: "test2",
branch: "live"
}
- name: stderr
data: ""
Expand Down
124 changes: 62 additions & 62 deletions compiler/semantic/ztests/imdb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,66 +76,66 @@ outputs:
- name: stdout
data: |
{
title: "Baby Driver",
director: [
"Edgar Wright"
],
writer: [
"Edgar Wright"
],
genres: [
"Action",
"Crime",
"Drama"
],
actors: [
{
name: "Ansel Elgort",
characters: [
"Baby"
]
},
{
name: "Jon Bernthal",
characters: [
"Griff"
]
},
{
name: "Jon Hamm",
characters: [
"Buddy"
]
},
{
name: "Micah Howard",
characters: [
"Barista"
]
},
{
name: "Morgan Brown",
characters: [
"Street Preacher"
]
},
{
name: "Kevin Spacey",
characters: [
"Doc"
]
},
{
name: "Morse Diggs",
characters: [
"Morse Diggs"
]
},
{
name: "CJ Jones",
characters: [
"Joseph"
]
}
]
title: "Baby Driver",
director: [
"Edgar Wright"
],
writer: [
"Edgar Wright"
],
genres: [
"Action",
"Crime",
"Drama"
],
actors: [
{
name: "Ansel Elgort",
characters: [
"Baby"
]
},
{
name: "Jon Bernthal",
characters: [
"Griff"
]
},
{
name: "Jon Hamm",
characters: [
"Buddy"
]
},
{
name: "Micah Howard",
characters: [
"Barista"
]
},
{
name: "Morgan Brown",
characters: [
"Street Preacher"
]
},
{
name: "Kevin Spacey",
characters: [
"Doc"
]
},
{
name: "Morse Diggs",
characters: [
"Morse Diggs"
]
},
{
name: "CJ Jones",
characters: [
"Joseph"
]
}
]
}
30 changes: 15 additions & 15 deletions db/ztests/ls.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@ outputs:
- name: stdout
data: |
{
name: "logs",
layout: {
order: "desc"::=order.Which,
keys: [
[
"ts"
]::=field.Path
]::=field.List
}::=order.SortKey,
seek_stride: 65536,
threshold: 524288000
name: "logs",
layout: {
order: "desc"::=order.Which,
keys: [
[
"ts"
]::=field.Path
]::=field.List
}::=order.SortKey,
seek_stride: 65536,
threshold: 524288000
}
===
{
min: 2020-04-21T22:40:30.06852324Z,
max: 2020-04-22T01:23:40.0622373Z,
count: 1000::uint64,
size: 33493
min: 2020-04-21T22:40:30.06852324Z,
max: 2020-04-22T01:23:40.0622373Z,
count: 1000::uint64,
size: 33493
}
58 changes: 29 additions & 29 deletions db/ztests/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,42 +25,42 @@ outputs:
- name: stdout
data: |
{
name: "poolA",
layout: {
order: "asc"::=order.Which,
keys: [
[
"a"
]::=field.Path
]::=field.List
}::=order.SortKey,
seek_stride: 65536,
threshold: 524288000
name: "poolA",
layout: {
order: "asc"::=order.Which,
keys: [
[
"a"
]::=field.Path
]::=field.List
}::=order.SortKey,
seek_stride: 65536,
threshold: 524288000
}
{
name: "poolB",
layout: {
order: "desc"::=order.Which,
keys: [
[
"b"
]::=field.Path
]::=field.List
}::=order.SortKey,
seek_stride: 65536,
threshold: 524288000
name: "poolB",
layout: {
order: "desc"::=order.Which,
keys: [
[
"b"
]::=field.Path
]::=field.List
}::=order.SortKey,
seek_stride: 65536,
threshold: 524288000
}
===
{
nameof: "data.Object",
min: 1,
max: 2,
count: 2::uint64,
size: 18
nameof: "data.Object",
min: 1,
max: 2,
count: 2::uint64,
size: 18
}
{
nameof: "db.BranchTip"
nameof: "db.BranchTip"
}
{
nameof: "Commit"
nameof: "Commit"
}
16 changes: 8 additions & 8 deletions db/ztests/overlap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ outputs:
- name: stdout
data: |
{
min: 2020-04-21T22:40:30.06852324Z,
max: 2020-04-22T01:23:40.0622373Z,
count: 500::uint64,
size: 17073
min: 2020-04-21T22:40:30.06852324Z,
max: 2020-04-22T01:23:40.0622373Z,
count: 500::uint64,
size: 17073
}
{
min: 2020-04-21T22:40:49.0635839Z,
max: 2020-04-22T01:23:21.06632034Z,
count: 500::uint64,
size: 17039
min: 2020-04-21T22:40:49.0635839Z,
max: 2020-04-22T01:23:21.06632034Z,
count: 500::uint64,
size: 17039
}
8 changes: 4 additions & 4 deletions db/ztests/s3/stat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ outputs:
- name: stdout
data: |
{
min: 2020-04-21T22:40:30.06852324Z,
max: 2020-04-22T01:23:40.0622373Z,
count: 1000::uint64,
size: 33493
min: 2020-04-21T22:40:30.06852324Z,
max: 2020-04-22T01:23:40.0622373Z,
count: 1000::uint64,
size: 33493
}
8 changes: 4 additions & 4 deletions db/ztests/vector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ outputs:
- name: stdout
data: |
{
min: null,
max: null,
count: 5::uint64,
size: 72
min: null,
max: null,
count: 5::uint64,
size: 72
}
===
===
56 changes: 28 additions & 28 deletions runtime/sam/op/meta/ztests/partitions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,38 +35,38 @@ outputs:
{k:13}
===
[
{
min: 1,
max: 1
}
{
min: 1,
max: 1
}
]
[
{
min: 2,
max: 3
}
{
min: 2,
max: 3
}
]
[
{
min: 4,
max: 5
}
{
min: 4,
max: 5
}
]
[
{
min: 6,
max: 8
},
{
min: 7,
max: 12
},
{
min: 9,
max: 11
},
{
min: 10,
max: 13
}
{
min: 6,
max: 8
},
{
min: 7,
max: 12
},
{
min: 9,
max: 11
},
{
min: 10,
max: 13
}
]
Loading