Skip to content

A Swiss Army knife for developers.

Fix JsonHelper.Format failing when deserializing top-level array objects. (#640)

rahman-benbfc54ad9bec7
diff --git a/src/dev/impl/DevToys/Helpers/JsonYaml/JsonHelper.cs b/src/dev/impl/DevToys/Helpers/JsonYaml/JsonHelper.cs
index d4de4ebc3..3005c989e 100644
--- a/src/dev/impl/DevToys/Helpers/JsonYaml/JsonHelper.cs
+++ b/src/dev/impl/DevToys/Helpers/JsonYaml/JsonHelper.cs
@@ -69,18 +69,25 @@ namespace DevToys.Helpers.JsonYaml
LineInfoHandling = LineInfoHandling.Load
};
- JObject jObject;
+ JToken jToken;
using (var jsonReader = new JsonTextReader(new StringReader(input)))
{
jsonReader.DateParseHandling = DateParseHandling.None;
jsonReader.DateTimeZoneHandling = DateTimeZoneHandling.RoundtripKind;
- jObject = JObject.Load(jsonReader, jsonLoadSettings);
+ jToken = JToken.Load(jsonReader, jsonLoadSettings);
}
if (sortProperties)
{
- SortJsonPropertiesAlphabetically(jObject);
+ if (jToken is JObject obj)
+ {
+ SortJsonPropertiesAlphabetically(obj);
+ }
+ else if (jToken is JArray array)
+ {
+ SortJsonPropertiesAlphabetically(array);
+ }
}
var stringBuilder = new StringBuilder();
@@ -114,7 +121,7 @@ namespace DevToys.Helpers.JsonYaml
jsonTextWriter.DateFormatHandling = DateFormatHandling.IsoDateFormat;
jsonTextWriter.DateTimeZoneHandling = DateTimeZoneHandling.RoundtripKind;
- jObject.WriteTo(jsonTextWriter);
+ jToken.WriteTo(jsonTextWriter);
}
return stringBuilder.ToString();
@@ -215,13 +222,22 @@ namespace DevToys.Helpers.JsonYaml
}
else if (property.Value is JArray array)
{
- foreach (JToken? arrayItem in array)
- {
- if (arrayItem is JObject arrayObj)
- {
- SortJsonPropertiesAlphabetically(arrayObj);
- }
- }
+ SortJsonPropertiesAlphabetically(array);
+ }
+ }
+ }
+
+ private static void SortJsonPropertiesAlphabetically(JArray jArray)
+ {
+ foreach (JToken? arrayItem in jArray)
+ {
+ if (arrayItem is JObject arrayObj)
+ {
+ SortJsonPropertiesAlphabetically(arrayObj);
+ }
+ else if (arrayItem is JArray array)
+ {
+ SortJsonPropertiesAlphabetically(array);
}
}
}
diff --git a/src/tests/DevToys.Tests/Helpers/JsonHelperTests.cs b/src/tests/DevToys.Tests/Helpers/JsonHelperTests.cs
index cfb119300..760910929 100644
--- a/src/tests/DevToys.Tests/Helpers/JsonHelperTests.cs
+++ b/src/tests/DevToys.Tests/Helpers/JsonHelperTests.cs
@@ -14,6 +14,7 @@ namespace DevToys.Tests.Helpers
[DataRow("", false)]
[DataRow(" ", false)]
[DataRow(" { } ", true)]
+ [DataRow(" [ ] ", true)]
[DataRow(" { \"foo\": 123 } ", true)]
[DataRow(" bar { \"foo\": 123 } ", false)]
public void IsValid(string input, bool expectedResult)
@@ -26,6 +27,7 @@ namespace DevToys.Tests.Helpers
[DataRow("", "")]
[DataRow(" ", "")]
[DataRow(" { } ", "{}")]
+ [DataRow(" [ ] ", "[]")]
[DataRow(" { \"foo\": 123 } ", "{\r\n \"foo\": 123\r\n}")]
public void FormatTwoSpaces(string input, string expectedResult)
{
@@ -37,6 +39,7 @@ namespace DevToys.Tests.Helpers
[DataRow("", "")]
[DataRow(" ", "")]
[DataRow(" { } ", "{}")]
+ [DataRow(" [ ] ", "[]")]
[DataRow(" { \"foo\": 123 } ", "{\r\n \"foo\": 123\r\n}")]
public void FormatFourSpaces(string input, string expectedResult)
{
@@ -48,6 +51,7 @@ namespace DevToys.Tests.Helpers
[DataRow("", "")]
[DataRow(" ", "")]
[DataRow(" { } ", "{}")]
+ [DataRow(" [ ] ", "[]")]
[DataRow(" { \"foo\": 123 } ", "{\r\n\t\"foo\": 123\r\n}")]
public void FormatOneTab(string input, string expectedResult)
{
@@ -59,6 +63,7 @@ namespace DevToys.Tests.Helpers
[DataRow("", "")]
[DataRow(" ", "")]
[DataRow(" { } ", "{}")]
+ [DataRow(" [ ] ", "[]")]
[DataRow(" { \"foo\": 123 } ", "{\"foo\":123}")]
public void FormatMinified(string input, string expectedResult)
{