Refactor type name multidimensional array support and add tests

This commit is contained in:
James Newton-King
2021-11-14 18:04:58 +13:00
parent 233ed3a961
commit af6e7b9c13
3 changed files with 130 additions and 5 deletions
@@ -187,7 +187,7 @@ namespace Newtonsoft.Json.Utilities
// loop through the type name and filter out qualified assembly details from nested type names
bool writingAssemblyName = false;
bool skippingAssemblyDetails = false;
bool DimensionArrayMaybe = false;
bool followBrackets = false;
for (int i = 0; i < fullyQualifiedTypeName.Length; i++)
{
char current = fullyQualifiedTypeName[i];
@@ -196,17 +196,17 @@ namespace Newtonsoft.Json.Utilities
case '[':
writingAssemblyName = false;
skippingAssemblyDetails = false;
DimensionArrayMaybe = true;
followBrackets = true;
builder.Append(current);
break;
case ']':
writingAssemblyName = false;
skippingAssemblyDetails = false;
DimensionArrayMaybe = false;
followBrackets = false;
builder.Append(current);
break;
case ',':
if (DimensionArrayMaybe)
if (followBrackets)
{
builder.Append(current);
}
@@ -221,7 +221,7 @@ namespace Newtonsoft.Json.Utilities
}
break;
default:
DimensionArrayMaybe = false;
followBrackets = false;
if (!skippingAssemblyDetails)
{
builder.Append(current);