Update compiler package and fix nullable warnings (#2163)
This commit is contained in:
@@ -6,7 +6,7 @@
|
|||||||
<MicrosoftCodeAnalysisFxCopAnalyzersPackageVersion>2.9.2</MicrosoftCodeAnalysisFxCopAnalyzersPackageVersion>
|
<MicrosoftCodeAnalysisFxCopAnalyzersPackageVersion>2.9.2</MicrosoftCodeAnalysisFxCopAnalyzersPackageVersion>
|
||||||
<MicrosoftCSharpPackageVersion>4.3.0</MicrosoftCSharpPackageVersion>
|
<MicrosoftCSharpPackageVersion>4.3.0</MicrosoftCSharpPackageVersion>
|
||||||
<MicrosoftSourceLinkGitHubPackageVersion>1.0.0-beta2-19367-01</MicrosoftSourceLinkGitHubPackageVersion>
|
<MicrosoftSourceLinkGitHubPackageVersion>1.0.0-beta2-19367-01</MicrosoftSourceLinkGitHubPackageVersion>
|
||||||
<MicrosoftNetCompilersToolsetPackageVersion>3.3.0-beta1-final</MicrosoftNetCompilersToolsetPackageVersion>
|
<MicrosoftNetCompilersToolsetPackageVersion>3.3.1-beta3-final</MicrosoftNetCompilersToolsetPackageVersion>
|
||||||
<MicrosoftNETTestSdkPackageVersion>15.7.2</MicrosoftNETTestSdkPackageVersion>
|
<MicrosoftNETTestSdkPackageVersion>15.7.2</MicrosoftNETTestSdkPackageVersion>
|
||||||
<MoqPackageVersion>4.8.1</MoqPackageVersion>
|
<MoqPackageVersion>4.8.1</MoqPackageVersion>
|
||||||
<NunitPackageVersion>3.11.0</NunitPackageVersion>
|
<NunitPackageVersion>3.11.0</NunitPackageVersion>
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
if (value.GetType().FullName == BinaryTypeName)
|
if (value.GetType().FullName == BinaryTypeName)
|
||||||
{
|
{
|
||||||
EnsureReflectionObject(value.GetType());
|
EnsureReflectionObject(value.GetType());
|
||||||
Debug.Assert(_reflectionObject != null);
|
MiscellaneousUtils.Assert(_reflectionObject != null);
|
||||||
|
|
||||||
return (byte[])_reflectionObject.GetValue(value, BinaryToArrayName)!;
|
return (byte[])_reflectionObject.GetValue(value, BinaryToArrayName)!;
|
||||||
}
|
}
|
||||||
@@ -142,7 +142,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
if (t.FullName == BinaryTypeName)
|
if (t.FullName == BinaryTypeName)
|
||||||
{
|
{
|
||||||
EnsureReflectionObject(t);
|
EnsureReflectionObject(t);
|
||||||
Debug.Assert(_reflectionObject != null);
|
MiscellaneousUtils.Assert(_reflectionObject != null);
|
||||||
|
|
||||||
return _reflectionObject.Creator!(data);
|
return _reflectionObject.Creator!(data);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
}
|
}
|
||||||
|
|
||||||
EnsureReflectionObject(value.GetType());
|
EnsureReflectionObject(value.GetType());
|
||||||
Debug.Assert(_reflectionObject != null);
|
MiscellaneousUtils.Assert(_reflectionObject != null);
|
||||||
|
|
||||||
DefaultContractResolver? resolver = serializer.ContractResolver as DefaultContractResolver;
|
DefaultContractResolver? resolver = serializer.ContractResolver as DefaultContractResolver;
|
||||||
|
|
||||||
@@ -117,7 +117,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
|
public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
|
||||||
{
|
{
|
||||||
EnsureReflectionObject(objectType);
|
EnsureReflectionObject(objectType);
|
||||||
Debug.Assert(_reflectionObject != null);
|
MiscellaneousUtils.Assert(_reflectionObject != null);
|
||||||
|
|
||||||
object entityKeyMember = _reflectionObject.Creator!();
|
object entityKeyMember = _reflectionObject.Creator!();
|
||||||
|
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
public string? DateTimeFormat
|
public string? DateTimeFormat
|
||||||
{
|
{
|
||||||
get => _dateTimeFormat ?? string.Empty;
|
get => _dateTimeFormat ?? string.Empty;
|
||||||
set => _dateTimeFormat = (string.IsNullOrEmpty(value)) ? null : value;
|
set => _dateTimeFormat = (StringUtils.IsNullOrEmpty(value)) ? null : value;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -162,7 +162,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
|
|
||||||
string? dateText = reader.Value?.ToString();
|
string? dateText = reader.Value?.ToString();
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(dateText) && nullable)
|
if (StringUtils.IsNullOrEmpty(dateText) && nullable)
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -170,7 +170,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
#if HAVE_DATE_TIME_OFFSET
|
#if HAVE_DATE_TIME_OFFSET
|
||||||
if (t == typeof(DateTimeOffset))
|
if (t == typeof(DateTimeOffset))
|
||||||
{
|
{
|
||||||
if (!string.IsNullOrEmpty(_dateTimeFormat))
|
if (!StringUtils.IsNullOrEmpty(_dateTimeFormat))
|
||||||
{
|
{
|
||||||
return DateTimeOffset.ParseExact(dateText, _dateTimeFormat, Culture, _dateTimeStyles);
|
return DateTimeOffset.ParseExact(dateText, _dateTimeFormat, Culture, _dateTimeStyles);
|
||||||
}
|
}
|
||||||
@@ -181,7 +181,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(_dateTimeFormat))
|
if (!StringUtils.IsNullOrEmpty(_dateTimeFormat))
|
||||||
{
|
{
|
||||||
return DateTime.ParseExact(dateText, _dateTimeFormat, Culture, _dateTimeStyles);
|
return DateTime.ParseExact(dateText, _dateTimeFormat, Culture, _dateTimeStyles);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -230,7 +230,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
{
|
{
|
||||||
string? enumText = reader.Value?.ToString();
|
string? enumText = reader.Value?.ToString();
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(enumText) && isNullable)
|
if (StringUtils.IsNullOrEmpty(enumText) && isNullable)
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -882,9 +882,9 @@ namespace Newtonsoft.Json.Converters
|
|||||||
|
|
||||||
private bool HasImplicitNamespaceAttribute(string namespaceUri)
|
private bool HasImplicitNamespaceAttribute(string namespaceUri)
|
||||||
{
|
{
|
||||||
if (!string.IsNullOrEmpty(namespaceUri) && namespaceUri != ParentNode?.NamespaceUri)
|
if (!StringUtils.IsNullOrEmpty(namespaceUri) && namespaceUri != ParentNode?.NamespaceUri)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(GetPrefixOfNamespace(namespaceUri)))
|
if (StringUtils.IsNullOrEmpty(GetPrefixOfNamespace(namespaceUri)))
|
||||||
{
|
{
|
||||||
bool namespaceDeclared = false;
|
bool namespaceDeclared = false;
|
||||||
|
|
||||||
@@ -892,7 +892,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
{
|
{
|
||||||
foreach (XAttribute attribute in Element.Attributes())
|
foreach (XAttribute attribute in Element.Attributes())
|
||||||
{
|
{
|
||||||
if (attribute.Name.LocalName == "xmlns" && string.IsNullOrEmpty(attribute.Name.NamespaceName) && attribute.Value == namespaceUri)
|
if (attribute.Name.LocalName == "xmlns" && StringUtils.IsNullOrEmpty(attribute.Name.NamespaceName) && attribute.Value == namespaceUri)
|
||||||
{
|
{
|
||||||
namespaceDeclared = true;
|
namespaceDeclared = true;
|
||||||
}
|
}
|
||||||
@@ -1072,7 +1072,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
? null
|
? null
|
||||||
: manager.LookupPrefix(node.NamespaceUri);
|
: manager.LookupPrefix(node.NamespaceUri);
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(prefix))
|
if (!StringUtils.IsNullOrEmpty(prefix))
|
||||||
{
|
{
|
||||||
return prefix + ":" + XmlConvert.DecodeName(node.LocalName);
|
return prefix + ":" + XmlConvert.DecodeName(node.LocalName);
|
||||||
}
|
}
|
||||||
@@ -1405,17 +1405,17 @@ namespace Newtonsoft.Json.Converters
|
|||||||
writer.WritePropertyName(GetPropertyName(node, manager));
|
writer.WritePropertyName(GetPropertyName(node, manager));
|
||||||
writer.WriteStartObject();
|
writer.WriteStartObject();
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(declaration.Version))
|
if (!StringUtils.IsNullOrEmpty(declaration.Version))
|
||||||
{
|
{
|
||||||
writer.WritePropertyName("@version");
|
writer.WritePropertyName("@version");
|
||||||
writer.WriteValue(declaration.Version);
|
writer.WriteValue(declaration.Version);
|
||||||
}
|
}
|
||||||
if (!string.IsNullOrEmpty(declaration.Encoding))
|
if (!StringUtils.IsNullOrEmpty(declaration.Encoding))
|
||||||
{
|
{
|
||||||
writer.WritePropertyName("@encoding");
|
writer.WritePropertyName("@encoding");
|
||||||
writer.WriteValue(declaration.Encoding);
|
writer.WriteValue(declaration.Encoding);
|
||||||
}
|
}
|
||||||
if (!string.IsNullOrEmpty(declaration.Standalone))
|
if (!StringUtils.IsNullOrEmpty(declaration.Standalone))
|
||||||
{
|
{
|
||||||
writer.WritePropertyName("@standalone");
|
writer.WritePropertyName("@standalone");
|
||||||
writer.WriteValue(declaration.Standalone);
|
writer.WriteValue(declaration.Standalone);
|
||||||
@@ -1428,22 +1428,22 @@ namespace Newtonsoft.Json.Converters
|
|||||||
writer.WritePropertyName(GetPropertyName(node, manager));
|
writer.WritePropertyName(GetPropertyName(node, manager));
|
||||||
writer.WriteStartObject();
|
writer.WriteStartObject();
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(documentType.Name))
|
if (!StringUtils.IsNullOrEmpty(documentType.Name))
|
||||||
{
|
{
|
||||||
writer.WritePropertyName("@name");
|
writer.WritePropertyName("@name");
|
||||||
writer.WriteValue(documentType.Name);
|
writer.WriteValue(documentType.Name);
|
||||||
}
|
}
|
||||||
if (!string.IsNullOrEmpty(documentType.Public))
|
if (!StringUtils.IsNullOrEmpty(documentType.Public))
|
||||||
{
|
{
|
||||||
writer.WritePropertyName("@public");
|
writer.WritePropertyName("@public");
|
||||||
writer.WriteValue(documentType.Public);
|
writer.WriteValue(documentType.Public);
|
||||||
}
|
}
|
||||||
if (!string.IsNullOrEmpty(documentType.System))
|
if (!StringUtils.IsNullOrEmpty(documentType.System))
|
||||||
{
|
{
|
||||||
writer.WritePropertyName("@system");
|
writer.WritePropertyName("@system");
|
||||||
writer.WriteValue(documentType.System);
|
writer.WriteValue(documentType.System);
|
||||||
}
|
}
|
||||||
if (!string.IsNullOrEmpty(documentType.InternalSubset))
|
if (!StringUtils.IsNullOrEmpty(documentType.InternalSubset))
|
||||||
{
|
{
|
||||||
writer.WritePropertyName("@internalSubset");
|
writer.WritePropertyName("@internalSubset");
|
||||||
writer.WriteValue(documentType.InternalSubset);
|
writer.WriteValue(documentType.InternalSubset);
|
||||||
@@ -1537,7 +1537,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
throw JsonSerializationException.Create(reader, "Unexpected type when converting XML: " + objectType);
|
throw JsonSerializationException.Create(reader, "Unexpected type when converting XML: " + objectType);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(DeserializeRootElementName))
|
if (!StringUtils.IsNullOrEmpty(DeserializeRootElementName))
|
||||||
{
|
{
|
||||||
ReadElement(reader, document, rootNode, DeserializeRootElementName, manager);
|
ReadElement(reader, document, rootNode, DeserializeRootElementName, manager);
|
||||||
}
|
}
|
||||||
@@ -1586,7 +1586,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
return;
|
return;
|
||||||
default:
|
default:
|
||||||
// processing instructions and the xml declaration start with ?
|
// processing instructions and the xml declaration start with ?
|
||||||
if (!string.IsNullOrEmpty(propertyName) && propertyName[0] == '?')
|
if (!StringUtils.IsNullOrEmpty(propertyName) && propertyName[0] == '?')
|
||||||
{
|
{
|
||||||
CreateInstruction(reader, document, currentNode, propertyName);
|
CreateInstruction(reader, document, currentNode, propertyName);
|
||||||
return;
|
return;
|
||||||
@@ -1616,7 +1616,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
|
|
||||||
private void ReadElement(JsonReader reader, IXmlDocument document, IXmlNode currentNode, string propertyName, XmlNamespaceManager manager)
|
private void ReadElement(JsonReader reader, IXmlDocument document, IXmlNode currentNode, string propertyName, XmlNamespaceManager manager)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(propertyName))
|
if (StringUtils.IsNullOrEmpty(propertyName))
|
||||||
{
|
{
|
||||||
throw JsonSerializationException.Create(reader, "XmlNodeConverter cannot convert JSON with an empty property name to XML.");
|
throw JsonSerializationException.Create(reader, "XmlNodeConverter cannot convert JSON with an empty property name to XML.");
|
||||||
}
|
}
|
||||||
@@ -1685,7 +1685,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
string encodedName = XmlConvert.EncodeName(nameValue.Key);
|
string encodedName = XmlConvert.EncodeName(nameValue.Key);
|
||||||
string? attributePrefix = MiscellaneousUtils.GetPrefix(nameValue.Key);
|
string? attributePrefix = MiscellaneousUtils.GetPrefix(nameValue.Key);
|
||||||
|
|
||||||
IXmlNode attribute = (!string.IsNullOrEmpty(attributePrefix)) ? document.CreateAttribute(encodedName, manager.LookupNamespace(attributePrefix) ?? string.Empty, nameValue.Value) : document.CreateAttribute(encodedName, nameValue.Value);
|
IXmlNode attribute = (!StringUtils.IsNullOrEmpty(attributePrefix)) ? document.CreateAttribute(encodedName, manager.LookupNamespace(attributePrefix) ?? string.Empty, nameValue.Value) : document.CreateAttribute(encodedName, nameValue.Value);
|
||||||
|
|
||||||
element.SetAttributeNode(attribute);
|
element.SetAttributeNode(attribute);
|
||||||
}
|
}
|
||||||
@@ -1733,7 +1733,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
string encodedName = XmlConvert.EncodeName(attributeName);
|
string encodedName = XmlConvert.EncodeName(attributeName);
|
||||||
string? attributeValue = ConvertTokenToXmlValue(reader);
|
string? attributeValue = ConvertTokenToXmlValue(reader);
|
||||||
|
|
||||||
IXmlNode attribute = (!string.IsNullOrEmpty(attributePrefix))
|
IXmlNode attribute = (!StringUtils.IsNullOrEmpty(attributePrefix))
|
||||||
? document.CreateAttribute(encodedName, manager.LookupNamespace(attributePrefix), attributeValue)
|
? document.CreateAttribute(encodedName, manager.LookupNamespace(attributePrefix), attributeValue)
|
||||||
: document.CreateAttribute(encodedName, attributeValue);
|
: document.CreateAttribute(encodedName, attributeValue);
|
||||||
|
|
||||||
@@ -1876,7 +1876,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
case JsonToken.PropertyName:
|
case JsonToken.PropertyName:
|
||||||
string attributeName = reader.Value!.ToString();
|
string attributeName = reader.Value!.ToString();
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(attributeName))
|
if (!StringUtils.IsNullOrEmpty(attributeName))
|
||||||
{
|
{
|
||||||
char firstChar = attributeName[0];
|
char firstChar = attributeName[0];
|
||||||
string? attributeValue;
|
string? attributeValue;
|
||||||
@@ -2058,9 +2058,9 @@ namespace Newtonsoft.Json.Converters
|
|||||||
private IXmlElement CreateElement(string elementName, IXmlDocument document, string? elementPrefix, XmlNamespaceManager manager)
|
private IXmlElement CreateElement(string elementName, IXmlDocument document, string? elementPrefix, XmlNamespaceManager manager)
|
||||||
{
|
{
|
||||||
string encodeName = EncodeSpecialCharacters ? XmlConvert.EncodeLocalName(elementName) : XmlConvert.EncodeName(elementName);
|
string encodeName = EncodeSpecialCharacters ? XmlConvert.EncodeLocalName(elementName) : XmlConvert.EncodeName(elementName);
|
||||||
string ns = string.IsNullOrEmpty(elementPrefix) ? manager.DefaultNamespace : manager.LookupNamespace(elementPrefix);
|
string ns = StringUtils.IsNullOrEmpty(elementPrefix) ? manager.DefaultNamespace : manager.LookupNamespace(elementPrefix);
|
||||||
|
|
||||||
IXmlElement element = (!string.IsNullOrEmpty(ns)) ? document.CreateElement(encodeName, ns) : document.CreateElement(encodeName);
|
IXmlElement element = (!StringUtils.IsNullOrEmpty(ns)) ? document.CreateElement(encodeName, ns) : document.CreateElement(encodeName);
|
||||||
|
|
||||||
return element;
|
return element;
|
||||||
}
|
}
|
||||||
@@ -2092,7 +2092,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
if (count == 1 && WriteArrayAttribute)
|
if (count == 1 && WriteArrayAttribute)
|
||||||
{
|
{
|
||||||
MiscellaneousUtils.GetQualifiedNameParts(propertyName, out string? elementPrefix, out string localName);
|
MiscellaneousUtils.GetQualifiedNameParts(propertyName, out string? elementPrefix, out string localName);
|
||||||
string ns = string.IsNullOrEmpty(elementPrefix) ? manager.DefaultNamespace : manager.LookupNamespace(elementPrefix);
|
string ns = StringUtils.IsNullOrEmpty(elementPrefix) ? manager.DefaultNamespace : manager.LookupNamespace(elementPrefix);
|
||||||
|
|
||||||
foreach (IXmlNode childNode in currentNode.ChildNodes)
|
foreach (IXmlNode childNode in currentNode.ChildNodes)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -445,7 +445,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
internal int? ReadInt32String(string? s)
|
internal int? ReadInt32String(string? s)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(s))
|
if (StringUtils.IsNullOrEmpty(s))
|
||||||
{
|
{
|
||||||
SetToken(JsonToken.Null, null, false);
|
SetToken(JsonToken.Null, null, false);
|
||||||
return null;
|
return null;
|
||||||
@@ -656,7 +656,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
internal double? ReadDoubleString(string? s)
|
internal double? ReadDoubleString(string? s)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(s))
|
if (StringUtils.IsNullOrEmpty(s))
|
||||||
{
|
{
|
||||||
SetToken(JsonToken.Null, null, false);
|
SetToken(JsonToken.Null, null, false);
|
||||||
return null;
|
return null;
|
||||||
@@ -715,7 +715,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
internal bool? ReadBooleanString(string? s)
|
internal bool? ReadBooleanString(string? s)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(s))
|
if (StringUtils.IsNullOrEmpty(s))
|
||||||
{
|
{
|
||||||
SetToken(JsonToken.Null, null, false);
|
SetToken(JsonToken.Null, null, false);
|
||||||
return null;
|
return null;
|
||||||
@@ -786,7 +786,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
internal decimal? ReadDecimalString(string? s)
|
internal decimal? ReadDecimalString(string? s)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(s))
|
if (StringUtils.IsNullOrEmpty(s))
|
||||||
{
|
{
|
||||||
SetToken(JsonToken.Null, null, false);
|
SetToken(JsonToken.Null, null, false);
|
||||||
return null;
|
return null;
|
||||||
@@ -840,7 +840,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
internal DateTime? ReadDateTimeString(string? s)
|
internal DateTime? ReadDateTimeString(string? s)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(s))
|
if (StringUtils.IsNullOrEmpty(s))
|
||||||
{
|
{
|
||||||
SetToken(JsonToken.Null, null, false);
|
SetToken(JsonToken.Null, null, false);
|
||||||
return null;
|
return null;
|
||||||
@@ -895,7 +895,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
internal DateTimeOffset? ReadDateTimeOffsetString(string? s)
|
internal DateTimeOffset? ReadDateTimeOffsetString(string? s)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(s))
|
if (StringUtils.IsNullOrEmpty(s))
|
||||||
{
|
{
|
||||||
SetToken(JsonToken.Null, null, false);
|
SetToken(JsonToken.Null, null, false);
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private async Task<bool> ParsePostValueAsync(bool ignoreComments, CancellationToken cancellationToken)
|
private async Task<bool> ParsePostValueAsync(bool ignoreComments, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
@@ -196,7 +196,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private async Task<bool> ReadFromFinishedAsync(CancellationToken cancellationToken)
|
private async Task<bool> ReadFromFinishedAsync(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
if (await EnsureCharsAsync(0, false, cancellationToken).ConfigureAwait(false))
|
if (await EnsureCharsAsync(0, false, cancellationToken).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
@@ -227,7 +227,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private async Task<int> ReadDataAsync(bool append, int charsRequired, CancellationToken cancellationToken)
|
private async Task<int> ReadDataAsync(bool append, int charsRequired, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
if (_isEndOfFile)
|
if (_isEndOfFile)
|
||||||
{
|
{
|
||||||
@@ -251,7 +251,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private async Task<bool> ParseValueAsync(CancellationToken cancellationToken)
|
private async Task<bool> ParseValueAsync(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
@@ -382,7 +382,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private async Task ReadStringIntoBufferAsync(char quote, CancellationToken cancellationToken)
|
private async Task ReadStringIntoBufferAsync(char quote, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
int charPos = _charPos;
|
int charPos = _charPos;
|
||||||
int initialPosition = _charPos;
|
int initialPosition = _charPos;
|
||||||
@@ -600,7 +600,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private async Task<bool> ParseObjectAsync(CancellationToken cancellationToken)
|
private async Task<bool> ParseObjectAsync(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
@@ -659,7 +659,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private async Task ParseCommentAsync(bool setToken, CancellationToken cancellationToken)
|
private async Task ParseCommentAsync(bool setToken, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
// should have already parsed / character before reaching this method
|
// should have already parsed / character before reaching this method
|
||||||
_charPos++;
|
_charPos++;
|
||||||
@@ -757,7 +757,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private async Task EatWhitespaceAsync(CancellationToken cancellationToken)
|
private async Task EatWhitespaceAsync(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
@@ -815,7 +815,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private async Task<bool> MatchValueWithTrailingSeparatorAsync(string value, CancellationToken cancellationToken)
|
private async Task<bool> MatchValueWithTrailingSeparatorAsync(string value, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
// will match value and then move to the next character, checking that it is a separator character
|
// will match value and then move to the next character, checking that it is a separator character
|
||||||
if (!await MatchValueAsync(value, cancellationToken).ConfigureAwait(false))
|
if (!await MatchValueAsync(value, cancellationToken).ConfigureAwait(false))
|
||||||
@@ -860,7 +860,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private async Task ParseConstructorAsync(CancellationToken cancellationToken)
|
private async Task ParseConstructorAsync(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
if (await MatchValueWithTrailingSeparatorAsync("new", cancellationToken).ConfigureAwait(false))
|
if (await MatchValueWithTrailingSeparatorAsync("new", cancellationToken).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
@@ -960,7 +960,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private async Task ParseNumberAsync(ReadType readType, CancellationToken cancellationToken)
|
private async Task ParseNumberAsync(ReadType readType, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
ShiftBufferIfNeeded();
|
ShiftBufferIfNeeded();
|
||||||
|
|
||||||
@@ -979,7 +979,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private async Task<bool> ParsePropertyAsync(CancellationToken cancellationToken)
|
private async Task<bool> ParsePropertyAsync(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
char firstChar = _chars[_charPos];
|
char firstChar = _chars[_charPos];
|
||||||
char quoteChar;
|
char quoteChar;
|
||||||
@@ -1033,7 +1033,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private async Task ReadNumberIntoBufferAsync(CancellationToken cancellationToken)
|
private async Task ReadNumberIntoBufferAsync(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
int charPos = _charPos;
|
int charPos = _charPos;
|
||||||
|
|
||||||
@@ -1069,7 +1069,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private async Task ParseUnquotedPropertyAsync(CancellationToken cancellationToken)
|
private async Task ParseUnquotedPropertyAsync(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
int initialPosition = _charPos;
|
int initialPosition = _charPos;
|
||||||
|
|
||||||
@@ -1120,7 +1120,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private async Task HandleNullAsync(CancellationToken cancellationToken)
|
private async Task HandleNullAsync(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
if (await EnsureCharsAsync(1, true, cancellationToken).ConfigureAwait(false))
|
if (await EnsureCharsAsync(1, true, cancellationToken).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
@@ -1140,7 +1140,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private async Task ReadFinishedAsync(CancellationToken cancellationToken)
|
private async Task ReadFinishedAsync(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
if (await EnsureCharsAsync(0, false, cancellationToken).ConfigureAwait(false))
|
if (await EnsureCharsAsync(0, false, cancellationToken).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
@@ -1167,7 +1167,7 @@ namespace Newtonsoft.Json
|
|||||||
private async Task<object?> ReadStringValueAsync(ReadType readType, CancellationToken cancellationToken)
|
private async Task<object?> ReadStringValueAsync(ReadType readType, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
EnsureBuffer();
|
EnsureBuffer();
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
switch (_currentState)
|
switch (_currentState)
|
||||||
{
|
{
|
||||||
@@ -1303,7 +1303,7 @@ namespace Newtonsoft.Json
|
|||||||
private async Task<object?> ReadNumberValueAsync(ReadType readType, CancellationToken cancellationToken)
|
private async Task<object?> ReadNumberValueAsync(ReadType readType, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
EnsureBuffer();
|
EnsureBuffer();
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
switch (_currentState)
|
switch (_currentState)
|
||||||
{
|
{
|
||||||
@@ -1430,7 +1430,7 @@ namespace Newtonsoft.Json
|
|||||||
internal async Task<bool?> DoReadAsBooleanAsync(CancellationToken cancellationToken)
|
internal async Task<bool?> DoReadAsBooleanAsync(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
EnsureBuffer();
|
EnsureBuffer();
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
switch (_currentState)
|
switch (_currentState)
|
||||||
{
|
{
|
||||||
@@ -1566,7 +1566,7 @@ namespace Newtonsoft.Json
|
|||||||
internal async Task<byte[]?> DoReadAsBytesAsync(CancellationToken cancellationToken)
|
internal async Task<byte[]?> DoReadAsBytesAsync(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
EnsureBuffer();
|
EnsureBuffer();
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
bool isWrapped = false;
|
bool isWrapped = false;
|
||||||
|
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private void SetNewLine(bool hasNextChar)
|
private void SetNewLine(bool hasNextChar)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
if (hasNextChar && _chars[_charPos] == StringUtils.LineFeed)
|
if (hasNextChar && _chars[_charPos] == StringUtils.LineFeed)
|
||||||
{
|
{
|
||||||
@@ -252,7 +252,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private void ShiftBufferIfNeeded()
|
private void ShiftBufferIfNeeded()
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
// once in the last 10% of the buffer, or buffer is already very large then
|
// once in the last 10% of the buffer, or buffer is already very large then
|
||||||
// shift the remaining content to the start to avoid unnecessarily increasing
|
// shift the remaining content to the start to avoid unnecessarily increasing
|
||||||
@@ -280,7 +280,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private void PrepareBufferForReadData(bool append, int charsRequired)
|
private void PrepareBufferForReadData(bool append, int charsRequired)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
// char buffer is full
|
// char buffer is full
|
||||||
if (_charsUsed + charsRequired >= _chars.Length - 1)
|
if (_charsUsed + charsRequired >= _chars.Length - 1)
|
||||||
@@ -345,7 +345,7 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
|
|
||||||
PrepareBufferForReadData(append, charsRequired);
|
PrepareBufferForReadData(append, charsRequired);
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
int attemptCharReadCount = _chars.Length - _charsUsed - 1;
|
int attemptCharReadCount = _chars.Length - _charsUsed - 1;
|
||||||
|
|
||||||
@@ -414,7 +414,7 @@ namespace Newtonsoft.Json
|
|||||||
public override bool Read()
|
public override bool Read()
|
||||||
{
|
{
|
||||||
EnsureBuffer();
|
EnsureBuffer();
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
@@ -497,7 +497,7 @@ namespace Newtonsoft.Json
|
|||||||
public override byte[]? ReadAsBytes()
|
public override byte[]? ReadAsBytes()
|
||||||
{
|
{
|
||||||
EnsureBuffer();
|
EnsureBuffer();
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
bool isWrapped = false;
|
bool isWrapped = false;
|
||||||
|
|
||||||
@@ -603,7 +603,7 @@ namespace Newtonsoft.Json
|
|||||||
private object? ReadStringValue(ReadType readType)
|
private object? ReadStringValue(ReadType readType)
|
||||||
{
|
{
|
||||||
EnsureBuffer();
|
EnsureBuffer();
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
switch (_currentState)
|
switch (_currentState)
|
||||||
{
|
{
|
||||||
@@ -770,7 +770,7 @@ namespace Newtonsoft.Json
|
|||||||
public override bool? ReadAsBoolean()
|
public override bool? ReadAsBoolean()
|
||||||
{
|
{
|
||||||
EnsureBuffer();
|
EnsureBuffer();
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
switch (_currentState)
|
switch (_currentState)
|
||||||
{
|
{
|
||||||
@@ -908,7 +908,7 @@ namespace Newtonsoft.Json
|
|||||||
private object? ReadNumberValue(ReadType readType)
|
private object? ReadNumberValue(ReadType readType)
|
||||||
{
|
{
|
||||||
EnsureBuffer();
|
EnsureBuffer();
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
switch (_currentState)
|
switch (_currentState)
|
||||||
{
|
{
|
||||||
@@ -1062,7 +1062,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private void HandleNull()
|
private void HandleNull()
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
if (EnsureChars(1, true))
|
if (EnsureChars(1, true))
|
||||||
{
|
{
|
||||||
@@ -1084,7 +1084,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private void ReadFinished()
|
private void ReadFinished()
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
if (EnsureChars(0, false))
|
if (EnsureChars(0, false))
|
||||||
{
|
{
|
||||||
@@ -1135,7 +1135,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private void ReadStringIntoBuffer(char quote)
|
private void ReadStringIntoBuffer(char quote)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
int charPos = _charPos;
|
int charPos = _charPos;
|
||||||
int initialPosition = _charPos;
|
int initialPosition = _charPos;
|
||||||
@@ -1290,7 +1290,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private void FinishReadStringIntoBuffer(int charPos, int initialPosition, int lastWritePosition)
|
private void FinishReadStringIntoBuffer(int charPos, int initialPosition, int lastWritePosition)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
if (initialPosition == lastWritePosition)
|
if (initialPosition == lastWritePosition)
|
||||||
{
|
{
|
||||||
@@ -1313,7 +1313,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private void WriteCharToBuffer(char writeChar, int lastWritePosition, int writeToPosition)
|
private void WriteCharToBuffer(char writeChar, int lastWritePosition, int writeToPosition)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
if (writeToPosition > lastWritePosition)
|
if (writeToPosition > lastWritePosition)
|
||||||
{
|
{
|
||||||
@@ -1325,7 +1325,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private char ConvertUnicode(bool enoughChars)
|
private char ConvertUnicode(bool enoughChars)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
if (enoughChars)
|
if (enoughChars)
|
||||||
{
|
{
|
||||||
@@ -1353,7 +1353,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private void ReadNumberIntoBuffer()
|
private void ReadNumberIntoBuffer()
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
int charPos = _charPos;
|
int charPos = _charPos;
|
||||||
|
|
||||||
@@ -1439,7 +1439,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private bool ParsePostValue(bool ignoreComments)
|
private bool ParsePostValue(bool ignoreComments)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
@@ -1521,7 +1521,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private bool ParseObject()
|
private bool ParseObject()
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
@@ -1577,7 +1577,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private bool ParseProperty()
|
private bool ParseProperty()
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
char firstChar = _chars[_charPos];
|
char firstChar = _chars[_charPos];
|
||||||
char quoteChar;
|
char quoteChar;
|
||||||
@@ -1640,7 +1640,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private void ParseUnquotedProperty()
|
private void ParseUnquotedProperty()
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
int initialPosition = _charPos;
|
int initialPosition = _charPos;
|
||||||
|
|
||||||
@@ -1673,7 +1673,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private bool ReadUnquotedPropertyReportIfDone(char currentChar, int initialPosition)
|
private bool ReadUnquotedPropertyReportIfDone(char currentChar, int initialPosition)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
if (ValidIdentifierChar(currentChar))
|
if (ValidIdentifierChar(currentChar))
|
||||||
{
|
{
|
||||||
@@ -1692,7 +1692,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private bool ParseValue()
|
private bool ParseValue()
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
@@ -1834,7 +1834,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private void EatWhitespace()
|
private void EatWhitespace()
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
@@ -1877,7 +1877,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private void ParseConstructor()
|
private void ParseConstructor()
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
if (MatchValueWithTrailingSeparator("new"))
|
if (MatchValueWithTrailingSeparator("new"))
|
||||||
{
|
{
|
||||||
@@ -1963,7 +1963,7 @@ namespace Newtonsoft.Json
|
|||||||
private void ParseNumber(ReadType readType)
|
private void ParseNumber(ReadType readType)
|
||||||
{
|
{
|
||||||
ShiftBufferIfNeeded();
|
ShiftBufferIfNeeded();
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
char firstChar = _chars[_charPos];
|
char firstChar = _chars[_charPos];
|
||||||
int initialPosition = _charPos;
|
int initialPosition = _charPos;
|
||||||
@@ -1975,7 +1975,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private void ParseReadNumber(ReadType readType, char firstChar, int initialPosition)
|
private void ParseReadNumber(ReadType readType, char firstChar, int initialPosition)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
// set state to PostValue now so that if there is an error parsing the number then the reader can continue
|
// set state to PostValue now so that if there is an error parsing the number then the reader can continue
|
||||||
SetPostValueState(true);
|
SetPostValueState(true);
|
||||||
@@ -2257,7 +2257,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private void ParseComment(bool setToken)
|
private void ParseComment(bool setToken)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
// should have already parsed / character before reaching this method
|
// should have already parsed / character before reaching this method
|
||||||
_charPos++;
|
_charPos++;
|
||||||
@@ -2364,7 +2364,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private bool MatchValue(bool enoughChars, string value)
|
private bool MatchValue(bool enoughChars, string value)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
if (!enoughChars)
|
if (!enoughChars)
|
||||||
{
|
{
|
||||||
@@ -2388,7 +2388,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private bool MatchValueWithTrailingSeparator(string value)
|
private bool MatchValueWithTrailingSeparator(string value)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
// will match value and then move to the next character, checking that it is a separator character
|
// will match value and then move to the next character, checking that it is a separator character
|
||||||
bool match = MatchValue(value);
|
bool match = MatchValue(value);
|
||||||
@@ -2408,7 +2408,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private bool IsSeparator(char c)
|
private bool IsSeparator(char c)
|
||||||
{
|
{
|
||||||
Debug.Assert(_chars != null);
|
MiscellaneousUtils.Assert(_chars != null);
|
||||||
|
|
||||||
switch (c)
|
switch (c)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -165,7 +165,7 @@ namespace Newtonsoft.Json
|
|||||||
int currentIndentCount = Top * _indentation;
|
int currentIndentCount = Top * _indentation;
|
||||||
|
|
||||||
int newLineLen = SetIndentChars();
|
int newLineLen = SetIndentChars();
|
||||||
Debug.Assert(_indentChars != null);
|
MiscellaneousUtils.Assert(_indentChars != null);
|
||||||
|
|
||||||
if (currentIndentCount <= IndentCharBufferSize)
|
if (currentIndentCount <= IndentCharBufferSize)
|
||||||
{
|
{
|
||||||
@@ -177,7 +177,7 @@ namespace Newtonsoft.Json
|
|||||||
|
|
||||||
private async Task WriteIndentAsync(int currentIndentCount, int newLineLen, CancellationToken cancellationToken)
|
private async Task WriteIndentAsync(int currentIndentCount, int newLineLen, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
Debug.Assert(_indentChars != null);
|
MiscellaneousUtils.Assert(_indentChars != null);
|
||||||
|
|
||||||
await _writer.WriteAsync(_indentChars, 0, newLineLen + Math.Min(currentIndentCount, IndentCharBufferSize), cancellationToken).ConfigureAwait(false);
|
await _writer.WriteAsync(_indentChars, 0, newLineLen + Math.Min(currentIndentCount, IndentCharBufferSize), cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
@@ -657,7 +657,7 @@ namespace Newtonsoft.Json
|
|||||||
await InternalWriteValueAsync(JsonToken.Date, cancellationToken).ConfigureAwait(false);
|
await InternalWriteValueAsync(JsonToken.Date, cancellationToken).ConfigureAwait(false);
|
||||||
value = DateTimeUtils.EnsureDateTime(value, DateTimeZoneHandling);
|
value = DateTimeUtils.EnsureDateTime(value, DateTimeZoneHandling);
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(DateFormatString))
|
if (StringUtils.IsNullOrEmpty(DateFormatString))
|
||||||
{
|
{
|
||||||
int length = WriteValueToBuffer(value);
|
int length = WriteValueToBuffer(value);
|
||||||
|
|
||||||
@@ -706,7 +706,7 @@ namespace Newtonsoft.Json
|
|||||||
{
|
{
|
||||||
await InternalWriteValueAsync(JsonToken.Date, cancellationToken).ConfigureAwait(false);
|
await InternalWriteValueAsync(JsonToken.Date, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(DateFormatString))
|
if (StringUtils.IsNullOrEmpty(DateFormatString))
|
||||||
{
|
{
|
||||||
int length = WriteValueToBuffer(value);
|
int length = WriteValueToBuffer(value);
|
||||||
|
|
||||||
|
|||||||
@@ -633,7 +633,7 @@ namespace Newtonsoft.Json
|
|||||||
InternalWriteValue(JsonToken.Date);
|
InternalWriteValue(JsonToken.Date);
|
||||||
value = DateTimeUtils.EnsureDateTime(value, DateTimeZoneHandling);
|
value = DateTimeUtils.EnsureDateTime(value, DateTimeZoneHandling);
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(DateFormatString))
|
if (StringUtils.IsNullOrEmpty(DateFormatString))
|
||||||
{
|
{
|
||||||
int length = WriteValueToBuffer(value);
|
int length = WriteValueToBuffer(value);
|
||||||
|
|
||||||
@@ -650,7 +650,7 @@ namespace Newtonsoft.Json
|
|||||||
private int WriteValueToBuffer(DateTime value)
|
private int WriteValueToBuffer(DateTime value)
|
||||||
{
|
{
|
||||||
EnsureWriteBuffer();
|
EnsureWriteBuffer();
|
||||||
Debug.Assert(_writeBuffer != null);
|
MiscellaneousUtils.Assert(_writeBuffer != null);
|
||||||
|
|
||||||
int pos = 0;
|
int pos = 0;
|
||||||
_writeBuffer[pos++] = _quoteChar;
|
_writeBuffer[pos++] = _quoteChar;
|
||||||
@@ -688,7 +688,7 @@ namespace Newtonsoft.Json
|
|||||||
{
|
{
|
||||||
InternalWriteValue(JsonToken.Date);
|
InternalWriteValue(JsonToken.Date);
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(DateFormatString))
|
if (StringUtils.IsNullOrEmpty(DateFormatString))
|
||||||
{
|
{
|
||||||
int length = WriteValueToBuffer(value);
|
int length = WriteValueToBuffer(value);
|
||||||
|
|
||||||
@@ -705,7 +705,7 @@ namespace Newtonsoft.Json
|
|||||||
private int WriteValueToBuffer(DateTimeOffset value)
|
private int WriteValueToBuffer(DateTimeOffset value)
|
||||||
{
|
{
|
||||||
EnsureWriteBuffer();
|
EnsureWriteBuffer();
|
||||||
Debug.Assert(_writeBuffer != null);
|
MiscellaneousUtils.Assert(_writeBuffer != null);
|
||||||
|
|
||||||
int pos = 0;
|
int pos = 0;
|
||||||
_writeBuffer[pos++] = _quoteChar;
|
_writeBuffer[pos++] = _quoteChar;
|
||||||
@@ -842,7 +842,7 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
|
|
||||||
EnsureWriteBuffer();
|
EnsureWriteBuffer();
|
||||||
Debug.Assert(_writeBuffer != null);
|
MiscellaneousUtils.Assert(_writeBuffer != null);
|
||||||
|
|
||||||
int totalLength = MathUtils.IntLength(value);
|
int totalLength = MathUtils.IntLength(value);
|
||||||
|
|
||||||
@@ -894,7 +894,7 @@ namespace Newtonsoft.Json
|
|||||||
private int WriteNumberToBuffer(uint value, bool negative)
|
private int WriteNumberToBuffer(uint value, bool negative)
|
||||||
{
|
{
|
||||||
EnsureWriteBuffer();
|
EnsureWriteBuffer();
|
||||||
Debug.Assert(_writeBuffer != null);
|
MiscellaneousUtils.Assert(_writeBuffer != null);
|
||||||
|
|
||||||
int totalLength = MathUtils.IntLength(value);
|
int totalLength = MathUtils.IntLength(value);
|
||||||
|
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ namespace Newtonsoft.Json.Linq
|
|||||||
parent = parent.Parent;
|
parent = parent.Parent;
|
||||||
}
|
}
|
||||||
|
|
||||||
Debug.Assert(parent != null);
|
MiscellaneousUtils.Assert(parent != null);
|
||||||
|
|
||||||
switch (reader.TokenType)
|
switch (reader.TokenType)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -765,7 +765,7 @@ namespace Newtonsoft.Json.Linq
|
|||||||
parent = parent.Parent;
|
parent = parent.Parent;
|
||||||
}
|
}
|
||||||
|
|
||||||
Debug.Assert(parent != null);
|
MiscellaneousUtils.Assert(parent != null);
|
||||||
|
|
||||||
switch (r.TokenType)
|
switch (r.TokenType)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -122,7 +122,7 @@ namespace Newtonsoft.Json.Linq
|
|||||||
throw new IndexOutOfRangeException();
|
throw new IndexOutOfRangeException();
|
||||||
}
|
}
|
||||||
|
|
||||||
Debug.Assert(_token != null);
|
MiscellaneousUtils.Assert(_token != null);
|
||||||
return _token;
|
return _token;
|
||||||
}
|
}
|
||||||
set
|
set
|
||||||
|
|||||||
@@ -315,9 +315,9 @@ namespace Newtonsoft.Json.Linq
|
|||||||
_initialPath = _root.Path;
|
_initialPath = _root.Path;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(_initialPath))
|
if (!StringUtils.IsNullOrEmpty(_initialPath))
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(path))
|
if (StringUtils.IsNullOrEmpty(path))
|
||||||
{
|
{
|
||||||
return _initialPath;
|
return _initialPath;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -356,7 +356,7 @@ namespace Newtonsoft.Json.Linq
|
|||||||
}
|
}
|
||||||
|
|
||||||
byte[]? bytesA = objA as byte[];
|
byte[]? bytesA = objA as byte[];
|
||||||
Debug.Assert(bytesA != null);
|
MiscellaneousUtils.Assert(bytesA != null);
|
||||||
|
|
||||||
return MiscellaneousUtils.ByteArrayCompare(bytesA!, bytesB);
|
return MiscellaneousUtils.ByteArrayCompare(bytesA!, bytesB);
|
||||||
case JTokenType.Guid:
|
case JTokenType.Guid:
|
||||||
|
|||||||
@@ -294,8 +294,8 @@ namespace Newtonsoft.Json.Linq.JsonPath
|
|||||||
|
|
||||||
internal static bool EqualsWithStrictMatch(JValue value, JValue queryValue)
|
internal static bool EqualsWithStrictMatch(JValue value, JValue queryValue)
|
||||||
{
|
{
|
||||||
Debug.Assert(value != null);
|
MiscellaneousUtils.Assert(value != null);
|
||||||
Debug.Assert(queryValue != null);
|
MiscellaneousUtils.Assert(queryValue != null);
|
||||||
|
|
||||||
// Handle comparing an integer with a float
|
// Handle comparing an integer with a float
|
||||||
// e.g. Comparing 1 and 1.0
|
// e.g. Comparing 1 and 1.0
|
||||||
|
|||||||
@@ -221,7 +221,7 @@ namespace Newtonsoft.Json.Schema
|
|||||||
}
|
}
|
||||||
|
|
||||||
string location = token.Path.Replace(".", "/").Replace("[", "/").Replace("]", string.Empty);
|
string location = token.Path.Replace(".", "/").Replace("[", "/").Replace("]", string.Empty);
|
||||||
if (!string.IsNullOrEmpty(location))
|
if (!StringUtils.IsNullOrEmpty(location))
|
||||||
{
|
{
|
||||||
location = "/" + location;
|
location = "/" + location;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -175,7 +175,7 @@ namespace Newtonsoft.Json.Schema
|
|||||||
{
|
{
|
||||||
JsonContainerAttribute containerAttribute = JsonTypeReflector.GetCachedAttribute<JsonContainerAttribute>(type);
|
JsonContainerAttribute containerAttribute = JsonTypeReflector.GetCachedAttribute<JsonContainerAttribute>(type);
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(containerAttribute?.Title))
|
if (!StringUtils.IsNullOrEmpty(containerAttribute?.Title))
|
||||||
{
|
{
|
||||||
return containerAttribute.Title;
|
return containerAttribute.Title;
|
||||||
}
|
}
|
||||||
@@ -187,7 +187,7 @@ namespace Newtonsoft.Json.Schema
|
|||||||
{
|
{
|
||||||
JsonContainerAttribute containerAttribute = JsonTypeReflector.GetCachedAttribute<JsonContainerAttribute>(type);
|
JsonContainerAttribute containerAttribute = JsonTypeReflector.GetCachedAttribute<JsonContainerAttribute>(type);
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(containerAttribute?.Description))
|
if (!StringUtils.IsNullOrEmpty(containerAttribute?.Description))
|
||||||
{
|
{
|
||||||
return containerAttribute.Description;
|
return containerAttribute.Description;
|
||||||
}
|
}
|
||||||
@@ -204,7 +204,7 @@ namespace Newtonsoft.Json.Schema
|
|||||||
{
|
{
|
||||||
JsonContainerAttribute containerAttribute = JsonTypeReflector.GetCachedAttribute<JsonContainerAttribute>(type);
|
JsonContainerAttribute containerAttribute = JsonTypeReflector.GetCachedAttribute<JsonContainerAttribute>(type);
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(containerAttribute?.Id))
|
if (!StringUtils.IsNullOrEmpty(containerAttribute?.Id))
|
||||||
{
|
{
|
||||||
return containerAttribute.Id;
|
return containerAttribute.Id;
|
||||||
}
|
}
|
||||||
@@ -232,7 +232,7 @@ namespace Newtonsoft.Json.Schema
|
|||||||
string resolvedId = GetTypeId(type, false);
|
string resolvedId = GetTypeId(type, false);
|
||||||
string explicitId = GetTypeId(type, true);
|
string explicitId = GetTypeId(type, true);
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(resolvedId))
|
if (!StringUtils.IsNullOrEmpty(resolvedId))
|
||||||
{
|
{
|
||||||
JsonSchema resolvedSchema = _resolver.GetSchema(resolvedId);
|
JsonSchema resolvedSchema = _resolver.GetSchema(resolvedId);
|
||||||
if (resolvedSchema != null)
|
if (resolvedSchema != null)
|
||||||
|
|||||||
@@ -273,7 +273,7 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
{
|
{
|
||||||
if (_genericWrapperCreator == null)
|
if (_genericWrapperCreator == null)
|
||||||
{
|
{
|
||||||
Debug.Assert(_genericCollectionDefinitionType != null);
|
MiscellaneousUtils.Assert(_genericCollectionDefinitionType != null);
|
||||||
|
|
||||||
_genericWrapperType = typeof(CollectionWrapper<>).MakeGenericType(CollectionItemType);
|
_genericWrapperType = typeof(CollectionWrapper<>).MakeGenericType(CollectionItemType);
|
||||||
|
|
||||||
|
|||||||
@@ -307,7 +307,7 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
internal void WritePropertyName(JsonWriter writer)
|
internal void WritePropertyName(JsonWriter writer)
|
||||||
{
|
{
|
||||||
string? propertyName = PropertyName;
|
string? propertyName = PropertyName;
|
||||||
Debug.Assert(propertyName != null);
|
MiscellaneousUtils.Assert(propertyName != null);
|
||||||
|
|
||||||
if (_skipPropertyNameEscape)
|
if (_skipPropertyNameEscape)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
/// <param name="property">The property to add to the collection.</param>
|
/// <param name="property">The property to add to the collection.</param>
|
||||||
public void AddProperty(JsonProperty property)
|
public void AddProperty(JsonProperty property)
|
||||||
{
|
{
|
||||||
Debug.Assert(property.PropertyName != null);
|
MiscellaneousUtils.Assert(property.PropertyName != null);
|
||||||
|
|
||||||
if (Contains(property.PropertyName))
|
if (Contains(property.PropertyName))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -351,7 +351,7 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
|
|
||||||
private static bool CoerceEmptyStringToNull(Type? objectType, JsonContract? contract, string s)
|
private static bool CoerceEmptyStringToNull(Type? objectType, JsonContract? contract, string s)
|
||||||
{
|
{
|
||||||
return string.IsNullOrEmpty(s) && objectType != null && objectType != typeof(string) && objectType != typeof(object) && contract != null && contract.IsNullable;
|
return StringUtils.IsNullOrEmpty(s) && objectType != null && objectType != typeof(string) && objectType != typeof(object) && contract != null && contract.IsNullable;
|
||||||
}
|
}
|
||||||
|
|
||||||
internal string GetExpectedDescription(JsonContract contract)
|
internal string GetExpectedDescription(JsonContract contract)
|
||||||
@@ -464,8 +464,8 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
return CreateJObject(reader);
|
return CreateJObject(reader);
|
||||||
}
|
}
|
||||||
|
|
||||||
Debug.Assert(resolvedObjectType != null);
|
MiscellaneousUtils.Assert(resolvedObjectType != null);
|
||||||
Debug.Assert(contract != null);
|
MiscellaneousUtils.Assert(contract != null);
|
||||||
|
|
||||||
switch (contract.ContractType)
|
switch (contract.ContractType)
|
||||||
{
|
{
|
||||||
@@ -840,8 +840,8 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
return CreateJToken(reader, contract);
|
return CreateJToken(reader, contract);
|
||||||
}
|
}
|
||||||
|
|
||||||
Debug.Assert(objectType != null);
|
MiscellaneousUtils.Assert(objectType != null);
|
||||||
Debug.Assert(contract != null);
|
MiscellaneousUtils.Assert(contract != null);
|
||||||
|
|
||||||
JsonArrayContract arrayContract = EnsureArrayContract(reader, objectType, contract);
|
JsonArrayContract arrayContract = EnsureArrayContract(reader, objectType, contract);
|
||||||
|
|
||||||
@@ -936,7 +936,7 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
Debug.Assert(contract != null);
|
MiscellaneousUtils.Assert(contract != null);
|
||||||
Type? valueType = ReflectionUtils.GetObjectType(value);
|
Type? valueType = ReflectionUtils.GetObjectType(value);
|
||||||
|
|
||||||
// type of value and type of target don't match
|
// type of value and type of target don't match
|
||||||
|
|||||||
@@ -159,7 +159,7 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Debug.Assert(valueContract != null);
|
MiscellaneousUtils.Assert(valueContract != null);
|
||||||
|
|
||||||
JsonConverter? converter =
|
JsonConverter? converter =
|
||||||
member?.Converter ??
|
member?.Converter ??
|
||||||
@@ -252,7 +252,7 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
Debug.Assert(valueContract != null);
|
MiscellaneousUtils.Assert(valueContract != null);
|
||||||
|
|
||||||
if (valueContract.ContractType == JsonContractType.Primitive || valueContract.ContractType == JsonContractType.String)
|
if (valueContract.ContractType == JsonContractType.Primitive || valueContract.ContractType == JsonContractType.String)
|
||||||
{
|
{
|
||||||
@@ -304,7 +304,7 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
Debug.Assert(contract != null);
|
MiscellaneousUtils.Assert(contract != null);
|
||||||
|
|
||||||
if (contract.ContractType == JsonContractType.Primitive || contract.ContractType == JsonContractType.String)
|
if (contract.ContractType == JsonContractType.Primitive || contract.ContractType == JsonContractType.String)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -54,13 +54,13 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
// previous frameworks.
|
// previous frameworks.
|
||||||
public static Task FromCanceled(this CancellationToken cancellationToken)
|
public static Task FromCanceled(this CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
Debug.Assert(cancellationToken.IsCancellationRequested);
|
MiscellaneousUtils.Assert(cancellationToken.IsCancellationRequested);
|
||||||
return new Task(() => {}, cancellationToken);
|
return new Task(() => {}, cancellationToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Task<T> FromCanceled<T>(this CancellationToken cancellationToken)
|
public static Task<T> FromCanceled<T>(this CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
Debug.Assert(cancellationToken.IsCancellationRequested);
|
MiscellaneousUtils.Assert(cancellationToken.IsCancellationRequested);
|
||||||
#pragma warning disable CS8653 // A default expression introduces a null value for a type parameter.
|
#pragma warning disable CS8653 // A default expression introduces a null value for a type parameter.
|
||||||
return new Task<T>(() => default, cancellationToken);
|
return new Task<T>(() => default, cancellationToken);
|
||||||
#pragma warning restore CS8653 // A default expression introduces a null value for a type parameter.
|
#pragma warning restore CS8653 // A default expression introduces a null value for a type parameter.
|
||||||
@@ -73,25 +73,25 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
|
|
||||||
public static Task WriteAsync(this TextWriter writer, char value, CancellationToken cancellationToken)
|
public static Task WriteAsync(this TextWriter writer, char value, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
Debug.Assert(writer != null);
|
MiscellaneousUtils.Assert(writer != null);
|
||||||
return cancellationToken.IsCancellationRequested ? FromCanceled(cancellationToken) : writer.WriteAsync(value);
|
return cancellationToken.IsCancellationRequested ? FromCanceled(cancellationToken) : writer.WriteAsync(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Task WriteAsync(this TextWriter writer, string? value, CancellationToken cancellationToken)
|
public static Task WriteAsync(this TextWriter writer, string? value, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
Debug.Assert(writer != null);
|
MiscellaneousUtils.Assert(writer != null);
|
||||||
return cancellationToken.IsCancellationRequested ? FromCanceled(cancellationToken) : writer.WriteAsync(value);
|
return cancellationToken.IsCancellationRequested ? FromCanceled(cancellationToken) : writer.WriteAsync(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Task WriteAsync(this TextWriter writer, char[] value, int start, int count, CancellationToken cancellationToken)
|
public static Task WriteAsync(this TextWriter writer, char[] value, int start, int count, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
Debug.Assert(writer != null);
|
MiscellaneousUtils.Assert(writer != null);
|
||||||
return cancellationToken.IsCancellationRequested ? FromCanceled(cancellationToken) : writer.WriteAsync(value, start, count);
|
return cancellationToken.IsCancellationRequested ? FromCanceled(cancellationToken) : writer.WriteAsync(value, start, count);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Task<int> ReadAsync(this TextReader reader, char[] buffer, int index, int count, CancellationToken cancellationToken)
|
public static Task<int> ReadAsync(this TextReader reader, char[] buffer, int index, int count, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
Debug.Assert(reader != null);
|
MiscellaneousUtils.Assert(reader != null);
|
||||||
return cancellationToken.IsCancellationRequested ? FromCanceled<int>(cancellationToken) : reader.ReadAsync(buffer, index, count);
|
return cancellationToken.IsCancellationRequested ? FromCanceled<int>(cancellationToken) : reader.ReadAsync(buffer, index, count);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -364,7 +364,7 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(dateFormatString))
|
if (!StringUtils.IsNullOrEmpty(dateFormatString))
|
||||||
{
|
{
|
||||||
if (TryParseDateTimeExact(s.ToString(), dateTimeZoneHandling, dateFormatString, culture, out dt))
|
if (TryParseDateTimeExact(s.ToString(), dateTimeZoneHandling, dateFormatString, culture, out dt))
|
||||||
{
|
{
|
||||||
@@ -400,7 +400,7 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(dateFormatString))
|
if (!StringUtils.IsNullOrEmpty(dateFormatString))
|
||||||
{
|
{
|
||||||
if (TryParseDateTimeExact(s, dateTimeZoneHandling, dateFormatString, culture, out dt))
|
if (TryParseDateTimeExact(s, dateTimeZoneHandling, dateFormatString, culture, out dt))
|
||||||
{
|
{
|
||||||
@@ -437,7 +437,7 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(dateFormatString))
|
if (!StringUtils.IsNullOrEmpty(dateFormatString))
|
||||||
{
|
{
|
||||||
if (TryParseDateTimeOffsetExact(s.ToString(), dateFormatString, culture, out dt))
|
if (TryParseDateTimeOffsetExact(s.ToString(), dateFormatString, culture, out dt))
|
||||||
{
|
{
|
||||||
@@ -475,7 +475,7 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(dateFormatString))
|
if (!StringUtils.IsNullOrEmpty(dateFormatString))
|
||||||
{
|
{
|
||||||
if (TryParseDateTimeOffsetExact(s, dateFormatString, culture, out dt))
|
if (TryParseDateTimeOffsetExact(s, dateFormatString, culture, out dt))
|
||||||
{
|
{
|
||||||
@@ -620,7 +620,7 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
#region Write
|
#region Write
|
||||||
internal static void WriteDateTimeString(TextWriter writer, DateTime value, DateFormatHandling format, string? formatString, CultureInfo culture)
|
internal static void WriteDateTimeString(TextWriter writer, DateTime value, DateFormatHandling format, string? formatString, CultureInfo culture)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(formatString))
|
if (StringUtils.IsNullOrEmpty(formatString))
|
||||||
{
|
{
|
||||||
char[] chars = new char[64];
|
char[] chars = new char[64];
|
||||||
int pos = WriteDateTimeString(chars, 0, value, null, value.Kind, format);
|
int pos = WriteDateTimeString(chars, 0, value, null, value.Kind, format);
|
||||||
@@ -753,7 +753,7 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
#if HAVE_DATE_TIME_OFFSET
|
#if HAVE_DATE_TIME_OFFSET
|
||||||
internal static void WriteDateTimeOffsetString(TextWriter writer, DateTimeOffset value, DateFormatHandling format, string? formatString, CultureInfo culture)
|
internal static void WriteDateTimeOffsetString(TextWriter writer, DateTimeOffset value, DateFormatHandling format, string? formatString, CultureInfo culture)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(formatString))
|
if (StringUtils.IsNullOrEmpty(formatString))
|
||||||
{
|
{
|
||||||
char[] chars = new char[64];
|
char[] chars = new char[64];
|
||||||
int pos = WriteDateTimeString(chars, 0, (format == DateFormatHandling.IsoDateFormat) ? value.DateTime : value.UtcDateTime, value.Offset, DateTimeKind.Local, format);
|
int pos = WriteDateTimeString(chars, 0, (format == DateFormatHandling.IsoDateFormat) ? value.DateTime : value.UtcDateTime, value.Offset, DateTimeKind.Local, format);
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
Debug.Assert(_genericDictionary != null);
|
MiscellaneousUtils.Assert(_genericDictionary != null);
|
||||||
return _genericDictionary;
|
return _genericDictionary;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -117,8 +117,8 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
{
|
{
|
||||||
#if !HAVE_REFLECTION_BINDER
|
#if !HAVE_REFLECTION_BINDER
|
||||||
Init();
|
Init();
|
||||||
Debug.Assert(_getMemberCall != null);
|
MiscellaneousUtils.Assert(_getMemberCall != null);
|
||||||
Debug.Assert(_getCSharpArgumentInfoArray != null);
|
MiscellaneousUtils.Assert(_getCSharpArgumentInfoArray != null);
|
||||||
return (CallSiteBinder)_getMemberCall(null, 0, name, context, _getCSharpArgumentInfoArray)!;
|
return (CallSiteBinder)_getMemberCall(null, 0, name, context, _getCSharpArgumentInfoArray)!;
|
||||||
#else
|
#else
|
||||||
return Binder.GetMember(
|
return Binder.GetMember(
|
||||||
@@ -130,8 +130,8 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
{
|
{
|
||||||
#if !HAVE_REFLECTION_BINDER
|
#if !HAVE_REFLECTION_BINDER
|
||||||
Init();
|
Init();
|
||||||
Debug.Assert(_setMemberCall != null);
|
MiscellaneousUtils.Assert(_setMemberCall != null);
|
||||||
Debug.Assert(_setCSharpArgumentInfoArray != null);
|
MiscellaneousUtils.Assert(_setCSharpArgumentInfoArray != null);
|
||||||
return (CallSiteBinder)_setMemberCall(null, 0, name, context, _setCSharpArgumentInfoArray)!;
|
return (CallSiteBinder)_setMemberCall(null, 0, name, context, _setCSharpArgumentInfoArray)!;
|
||||||
#else
|
#else
|
||||||
return Binder.SetMember(
|
return Binder.SetMember(
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
Debug.Assert(_instance != null);
|
MiscellaneousUtils.Assert(_instance != null);
|
||||||
return _instance;
|
return _instance;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -153,7 +153,7 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
writer.Write(delimiter);
|
writer.Write(delimiter);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(s))
|
if (!StringUtils.IsNullOrEmpty(s))
|
||||||
{
|
{
|
||||||
int lastWritePosition = FirstCharToEscape(s, charEscapeFlags, stringEscapeHandling);
|
int lastWritePosition = FirstCharToEscape(s, charEscapeFlags, stringEscapeHandling);
|
||||||
if (lastWritePosition == -1)
|
if (lastWritePosition == -1)
|
||||||
@@ -266,7 +266,7 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
// copy it over when creating new buffer
|
// copy it over when creating new buffer
|
||||||
if (isEscapedUnicodeText)
|
if (isEscapedUnicodeText)
|
||||||
{
|
{
|
||||||
Debug.Assert(writeBuffer != null, "Write buffer should never be null because it is set when the escaped unicode text is encountered.");
|
MiscellaneousUtils.Assert(writeBuffer != null, "Write buffer should never be null because it is set when the escaped unicode text is encountered.");
|
||||||
|
|
||||||
Array.Copy(writeBuffer, newBuffer, UnicodeTextLength);
|
Array.Copy(writeBuffer, newBuffer, UnicodeTextLength);
|
||||||
}
|
}
|
||||||
@@ -293,7 +293,7 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Debug.Assert(lastWritePosition != 0);
|
MiscellaneousUtils.Assert(lastWritePosition != 0);
|
||||||
length = s.Length - lastWritePosition;
|
length = s.Length - lastWritePosition;
|
||||||
if (length > 0)
|
if (length > 0)
|
||||||
{
|
{
|
||||||
@@ -374,7 +374,7 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
return WriteEscapedJavaScriptStringWithDelimitersAsync(writer, s, delimiter, charEscapeFlags, stringEscapeHandling, client, writeBuffer, cancellationToken);
|
return WriteEscapedJavaScriptStringWithDelimitersAsync(writer, s, delimiter, charEscapeFlags, stringEscapeHandling, client, writeBuffer, cancellationToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(s))
|
if (StringUtils.IsNullOrEmpty(s))
|
||||||
{
|
{
|
||||||
return cancellationToken.CancelIfRequestedAsync() ?? AsyncUtils.CompletedTask;
|
return cancellationToken.CancelIfRequestedAsync() ?? AsyncUtils.CompletedTask;
|
||||||
}
|
}
|
||||||
@@ -391,7 +391,7 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
return WriteEscapedJavaScriptStringWithDelimitersAsync(task, writer, s, delimiter, charEscapeFlags, stringEscapeHandling, client, writeBuffer, cancellationToken);
|
return WriteEscapedJavaScriptStringWithDelimitersAsync(task, writer, s, delimiter, charEscapeFlags, stringEscapeHandling, client, writeBuffer, cancellationToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(s))
|
if (!StringUtils.IsNullOrEmpty(s))
|
||||||
{
|
{
|
||||||
task = WriteEscapedJavaScriptStringWithoutDelimitersAsync(writer, s, charEscapeFlags, stringEscapeHandling, client, writeBuffer, cancellationToken);
|
task = WriteEscapedJavaScriptStringWithoutDelimitersAsync(writer, s, charEscapeFlags, stringEscapeHandling, client, writeBuffer, cancellationToken);
|
||||||
if (task.IsCompletedSucessfully())
|
if (task.IsCompletedSucessfully())
|
||||||
@@ -409,7 +409,7 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
{
|
{
|
||||||
await task.ConfigureAwait(false);
|
await task.ConfigureAwait(false);
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(s))
|
if (!StringUtils.IsNullOrEmpty(s))
|
||||||
{
|
{
|
||||||
await WriteEscapedJavaScriptStringWithoutDelimitersAsync(writer, s, charEscapeFlags, stringEscapeHandling, client, writeBuffer, cancellationToken).ConfigureAwait(false);
|
await WriteEscapedJavaScriptStringWithoutDelimitersAsync(writer, s, charEscapeFlags, stringEscapeHandling, client, writeBuffer, cancellationToken).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -377,7 +377,7 @@ namespace Newtonsoft.Json.Utilities.LinqBridge
|
|||||||
Func<TSource> empty)
|
Func<TSource> empty)
|
||||||
{
|
{
|
||||||
CheckNotNull(source, "source");
|
CheckNotNull(source, "source");
|
||||||
Debug.Assert(empty != null);
|
MiscellaneousUtils.Assert(empty != null);
|
||||||
|
|
||||||
var list = source as IList<TSource>; // optimized case for lists
|
var list = source as IList<TSource>; // optimized case for lists
|
||||||
if (list != null)
|
if (list != null)
|
||||||
@@ -1364,7 +1364,7 @@ namespace Newtonsoft.Json.Utilities.LinqBridge
|
|||||||
Func<TSource, TSource, bool> lesser)
|
Func<TSource, TSource, bool> lesser)
|
||||||
{
|
{
|
||||||
CheckNotNull(source, "source");
|
CheckNotNull(source, "source");
|
||||||
Debug.Assert(lesser != null);
|
MiscellaneousUtils.Assert(lesser != null);
|
||||||
|
|
||||||
return source.Aggregate((a, item) => lesser(a, item) ? a : item);
|
return source.Aggregate((a, item) => lesser(a, item) ? a : item);
|
||||||
}
|
}
|
||||||
@@ -1378,7 +1378,7 @@ namespace Newtonsoft.Json.Utilities.LinqBridge
|
|||||||
TSource? seed, Func<TSource?, TSource?, bool> lesser) where TSource : struct
|
TSource? seed, Func<TSource?, TSource?, bool> lesser) where TSource : struct
|
||||||
{
|
{
|
||||||
CheckNotNull(source, "source");
|
CheckNotNull(source, "source");
|
||||||
Debug.Assert(lesser != null);
|
MiscellaneousUtils.Assert(lesser != null);
|
||||||
|
|
||||||
return source.Aggregate(seed, (a, item) => lesser(a, item) ? a : item);
|
return source.Aggregate(seed, (a, item) => lesser(a, item) ? a : item);
|
||||||
// == MinMaxImpl(Repeat<TSource?>(null, 1).Concat(source), lesser);
|
// == MinMaxImpl(Repeat<TSource?>(null, 1).Concat(source), lesser);
|
||||||
@@ -1442,7 +1442,7 @@ namespace Newtonsoft.Json.Utilities.LinqBridge
|
|||||||
|
|
||||||
private static IEnumerable<T> Renumerable<T>(this IEnumerator<T> e)
|
private static IEnumerable<T> Renumerable<T>(this IEnumerator<T> e)
|
||||||
{
|
{
|
||||||
Debug.Assert(e != null);
|
MiscellaneousUtils.Assert(e != null);
|
||||||
|
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -31,6 +31,8 @@ using System.Reflection;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
|
using System.Diagnostics;
|
||||||
|
using System.Diagnostics.CodeAnalysis;
|
||||||
|
|
||||||
namespace Newtonsoft.Json.Utilities
|
namespace Newtonsoft.Json.Utilities
|
||||||
{
|
{
|
||||||
@@ -38,6 +40,12 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
|
|
||||||
internal static class MiscellaneousUtils
|
internal static class MiscellaneousUtils
|
||||||
{
|
{
|
||||||
|
[Conditional("DEBUG")]
|
||||||
|
public static void Assert([DoesNotReturnIf(false)] bool condition, string? message = null)
|
||||||
|
{
|
||||||
|
Debug.Assert(condition, message);
|
||||||
|
}
|
||||||
|
|
||||||
public static bool ValueEquals(object? objA, object? objB)
|
public static bool ValueEquals(object? objA, object? objB)
|
||||||
{
|
{
|
||||||
if (objA == objB)
|
if (objA == objB)
|
||||||
|
|||||||
@@ -52,4 +52,23 @@ namespace System.Diagnostics.CodeAnalysis
|
|||||||
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)]
|
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)]
|
||||||
internal sealed class AllowNullAttribute : Attribute
|
internal sealed class AllowNullAttribute : Attribute
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Specifies that the method will not return if the associated Boolean parameter is passed the specified value.
|
||||||
|
/// </summary>
|
||||||
|
[AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
|
||||||
|
internal class DoesNotReturnIfAttribute : Attribute
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="DoesNotReturnIfAttribute"/> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="parameterValue">
|
||||||
|
/// The condition parameter value. Code after the method will be considered unreachable by diagnostics if the argument to
|
||||||
|
/// the associated parameter matches this value.
|
||||||
|
/// </param>
|
||||||
|
public DoesNotReturnIfAttribute(bool parameterValue) => this.ParameterValue = parameterValue;
|
||||||
|
|
||||||
|
/// <summary>Gets the condition parameter value.</summary>
|
||||||
|
public bool ParameterValue { get; }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -28,6 +28,7 @@ using System.Collections.Generic;
|
|||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
|
using System.Diagnostics.CodeAnalysis;
|
||||||
#if !HAVE_LINQ
|
#if !HAVE_LINQ
|
||||||
using Newtonsoft.Json.Utilities.LinqBridge;
|
using Newtonsoft.Json.Utilities.LinqBridge;
|
||||||
#else
|
#else
|
||||||
@@ -45,6 +46,11 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
public const char LineFeed = '\n';
|
public const char LineFeed = '\n';
|
||||||
public const char Tab = '\t';
|
public const char Tab = '\t';
|
||||||
|
|
||||||
|
public static bool IsNullOrEmpty([NotNullWhen(false)] string? value)
|
||||||
|
{
|
||||||
|
return string.IsNullOrEmpty(value);
|
||||||
|
}
|
||||||
|
|
||||||
public static string FormatWith(this string format, IFormatProvider provider, object? arg0)
|
public static string FormatWith(this string format, IFormatProvider provider, object? arg0)
|
||||||
{
|
{
|
||||||
return format.FormatWith(provider, new object?[] { arg0 });
|
return format.FormatWith(provider, new object?[] { arg0 });
|
||||||
@@ -148,7 +154,7 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
|
|
||||||
public static string ToCamelCase(string s)
|
public static string ToCamelCase(string s)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(s) || !char.IsUpper(s[0]))
|
if (StringUtils.IsNullOrEmpty(s) || !char.IsUpper(s[0]))
|
||||||
{
|
{
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
@@ -207,7 +213,7 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
|
|
||||||
public static string ToSnakeCase(string s)
|
public static string ToSnakeCase(string s)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(s))
|
if (StringUtils.IsNullOrEmpty(s))
|
||||||
{
|
{
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user