-Code reformat
This commit is contained in:
@@ -31,85 +31,85 @@ using Newtonsoft.Json.Utilities;
|
||||
|
||||
namespace Newtonsoft.Json
|
||||
{
|
||||
internal enum JsonContainerType
|
||||
{
|
||||
None,
|
||||
Object,
|
||||
Array,
|
||||
Constructor
|
||||
}
|
||||
|
||||
internal struct JsonPosition
|
||||
{
|
||||
internal JsonContainerType Type;
|
||||
internal int Position;
|
||||
internal string PropertyName;
|
||||
internal bool HasIndex;
|
||||
|
||||
public JsonPosition(JsonContainerType type)
|
||||
internal enum JsonContainerType
|
||||
{
|
||||
Type = type;
|
||||
HasIndex = TypeHasIndex(type);
|
||||
Position = -1;
|
||||
PropertyName = null;
|
||||
None,
|
||||
Object,
|
||||
Array,
|
||||
Constructor
|
||||
}
|
||||
|
||||
internal void WriteTo(StringBuilder sb)
|
||||
internal struct JsonPosition
|
||||
{
|
||||
switch (Type)
|
||||
{
|
||||
case JsonContainerType.Object:
|
||||
if (sb.Length > 0)
|
||||
sb.Append(".");
|
||||
sb.Append(PropertyName);
|
||||
break;
|
||||
case JsonContainerType.Array:
|
||||
case JsonContainerType.Constructor:
|
||||
sb.Append("[");
|
||||
sb.Append(Position);
|
||||
sb.Append("]");
|
||||
break;
|
||||
}
|
||||
internal JsonContainerType Type;
|
||||
internal int Position;
|
||||
internal string PropertyName;
|
||||
internal bool HasIndex;
|
||||
|
||||
public JsonPosition(JsonContainerType type)
|
||||
{
|
||||
Type = type;
|
||||
HasIndex = TypeHasIndex(type);
|
||||
Position = -1;
|
||||
PropertyName = null;
|
||||
}
|
||||
|
||||
internal void WriteTo(StringBuilder sb)
|
||||
{
|
||||
switch (Type)
|
||||
{
|
||||
case JsonContainerType.Object:
|
||||
if (sb.Length > 0)
|
||||
sb.Append(".");
|
||||
sb.Append(PropertyName);
|
||||
break;
|
||||
case JsonContainerType.Array:
|
||||
case JsonContainerType.Constructor:
|
||||
sb.Append("[");
|
||||
sb.Append(Position);
|
||||
sb.Append("]");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
internal static bool TypeHasIndex(JsonContainerType type)
|
||||
{
|
||||
return (type == JsonContainerType.Array || type == JsonContainerType.Constructor);
|
||||
}
|
||||
|
||||
internal static string BuildPath(IEnumerable<JsonPosition> positions)
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
|
||||
foreach (JsonPosition state in positions)
|
||||
{
|
||||
state.WriteTo(sb);
|
||||
}
|
||||
|
||||
return sb.ToString();
|
||||
}
|
||||
|
||||
internal static string FormatMessage(IJsonLineInfo lineInfo, string path, string message)
|
||||
{
|
||||
// don't add a fullstop and space when message ends with a new line
|
||||
if (!message.EndsWith(Environment.NewLine))
|
||||
{
|
||||
message = message.Trim();
|
||||
|
||||
if (!message.EndsWith("."))
|
||||
message += ".";
|
||||
|
||||
message += " ";
|
||||
}
|
||||
|
||||
message += "Path '{0}'".FormatWith(CultureInfo.InvariantCulture, path);
|
||||
|
||||
if (lineInfo != null && lineInfo.HasLineInfo())
|
||||
message += ", line {0}, position {1}".FormatWith(CultureInfo.InvariantCulture, lineInfo.LineNumber, lineInfo.LinePosition);
|
||||
|
||||
message += ".";
|
||||
|
||||
return message;
|
||||
}
|
||||
}
|
||||
|
||||
internal static bool TypeHasIndex(JsonContainerType type)
|
||||
{
|
||||
return (type == JsonContainerType.Array || type == JsonContainerType.Constructor);
|
||||
}
|
||||
|
||||
internal static string BuildPath(IEnumerable<JsonPosition> positions)
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
|
||||
foreach (JsonPosition state in positions)
|
||||
{
|
||||
state.WriteTo(sb);
|
||||
}
|
||||
|
||||
return sb.ToString();
|
||||
}
|
||||
|
||||
internal static string FormatMessage(IJsonLineInfo lineInfo, string path, string message)
|
||||
{
|
||||
// don't add a fullstop and space when message ends with a new line
|
||||
if (!message.EndsWith(Environment.NewLine))
|
||||
{
|
||||
message = message.Trim();
|
||||
|
||||
if (!message.EndsWith("."))
|
||||
message += ".";
|
||||
|
||||
message += " ";
|
||||
}
|
||||
|
||||
message += "Path '{0}'".FormatWith(CultureInfo.InvariantCulture, path);
|
||||
|
||||
if (lineInfo != null && lineInfo.HasLineInfo())
|
||||
message += ", line {0}, position {1}".FormatWith(CultureInfo.InvariantCulture, lineInfo.LineNumber, lineInfo.LinePosition);
|
||||
|
||||
message += ".";
|
||||
|
||||
return message;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user