fortify: move json indent call
Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
parent
df7f692e61
commit
e08c48cf3d
19
print.go
19
print.go
@ -15,18 +15,15 @@ import (
|
||||
|
||||
func printShow(instance *state.State, config *fst.Config) {
|
||||
if flagJSON {
|
||||
v := interface{}(config)
|
||||
v := any(config)
|
||||
if instance != nil {
|
||||
v = instance
|
||||
}
|
||||
|
||||
if s, err := json.MarshalIndent(v, "", " "); err != nil {
|
||||
fmsg.Fatalf("cannot serialise as JSON: %v", err)
|
||||
panic("unreachable")
|
||||
} else {
|
||||
fmt.Println(string(s))
|
||||
printJSON(v)
|
||||
return
|
||||
}
|
||||
} else {
|
||||
|
||||
buf := new(strings.Builder)
|
||||
w := tabwriter.NewWriter(buf, 0, 1, 4, ' ', 0)
|
||||
|
||||
@ -140,4 +137,12 @@ func printShow(instance *state.State, config *fst.Config) {
|
||||
}
|
||||
fmt.Print(buf.String())
|
||||
}
|
||||
|
||||
func printJSON(v any) {
|
||||
if s, err := json.MarshalIndent(v, "", " "); err != nil {
|
||||
fmsg.Fatalf("cannot serialise as JSON: %v", err)
|
||||
panic("unreachable")
|
||||
} else {
|
||||
fmt.Println(string(s))
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user