Fix #58: Improve handling of array and object literals and trailing/leading spaces

Author: sibprogrammer

internal/utils/utils.go

@@ -409,15 +409,6 @@ func FormatJson(reader io.Reader, writer io.Writer, indent string, colors int) e
 		v := reflect.ValueOf(*decoder)
 		tokenState := v.FieldByName("tokenState").Int()
 
-		switch tokenState {
-		case jsonTokenObjectColon:
-			suffix = ": "
-		case jsonTokenObjectComma:
-			suffix = "," + newline + strings.Repeat(indent, level)
-		case jsonTokenArrayComma:
-			suffix = "," + newline + strings.Repeat(indent, level)
-		}
-
 		switch tokenType := token.(type) {
 		case json.Delim:
 			switch rune(tokenType) {
@@ -455,6 +446,15 @@ func FormatJson(reader io.Reader, writer io.Writer, indent string, colors int) e
 			_, _ = fmt.Fprintf(writer, "%s%s", prefix, valueColor("null"))
 		}
 
+		switch tokenState {
+		case jsonTokenObjectColon:
+			suffix = ": "
+		case jsonTokenObjectComma:
+			suffix = "," + newline + strings.Repeat(indent, level)
+		case jsonTokenArrayComma:
+			suffix = "," + newline + strings.Repeat(indent, level)
+		}
+
 		prefix = suffix
 	}
 

internal/utils/utils_test.go

@@ -79,7 +79,8 @@ func TestFormatHtml(t *testing.T) {
 
 func TestFormatJson(t *testing.T) {
 	files := map[string]string{
-		"unformatted.json": "formatted.json",
+		"unformatted.json":  "formatted.json",
+		"unformatted2.json": "formatted2.json",
 	}
 
 	for unformattedFile, expectedFile := range files {

test/data/json/formatted2.json

@@ -0,0 +1,9 @@
+{
+  "fields": {
+    "fixVersions": [
+      "1.0.0"
+    ],
+    "customfield_10473": null,
+    "customfield_10474": null
+  }
+}

test/data/json/unformatted2.json

@@ -0,0 +1,9 @@
+{
+  "fields": {
+    "fixVersions": [
+      "1.0.0"
+    ],
+    "customfield_10473": null,
+    "customfield_10474": null
+  }
+}