-Refactor away var

This commit is contained in:
James Newton-King
2016-11-07 13:33:53 -08:00
parent b2afa9d674
commit 38809c68e8
10 changed files with 25 additions and 29 deletions
+1 -1
View File
@@ -858,7 +858,7 @@ namespace Newtonsoft.Json
jsonSerializer.CheckAdditionalContent = true; jsonSerializer.CheckAdditionalContent = true;
} }
using (var reader = new JsonTextReader(new StringReader(value))) using (JsonTextReader reader = new JsonTextReader(new StringReader(value)))
{ {
return jsonSerializer.Deserialize(reader, type); return jsonSerializer.Deserialize(reader, type);
} }
+1 -1
View File
@@ -2249,7 +2249,7 @@ namespace Newtonsoft.Json
return false; return false;
} }
var nextChart = _chars[_charPos + 1]; char nextChart = _chars[_charPos + 1];
return (nextChart == '*' || nextChart == '/'); return (nextChart == '*' || nextChart == '/');
case ')': case ')':
+3 -3
View File
@@ -78,9 +78,9 @@ namespace Newtonsoft.Json
internal static State[][] BuildStateArray() internal static State[][] BuildStateArray()
{ {
var allStates = StateArrayTempate.ToList(); List<State[]> allStates = StateArrayTempate.ToList();
var errorStates = StateArrayTempate[0]; State[] errorStates = StateArrayTempate[0];
var valueStates = StateArrayTempate[7]; State[] valueStates = StateArrayTempate[7];
foreach (JsonToken valueToken in EnumUtils.GetValues(typeof(JsonToken))) foreach (JsonToken valueToken in EnumUtils.GetValues(typeof(JsonToken)))
{ {
@@ -651,7 +651,7 @@ namespace Newtonsoft.Json.Serialization
/// <returns>Properties for the given <see cref="ConstructorInfo"/>.</returns> /// <returns>Properties for the given <see cref="ConstructorInfo"/>.</returns>
protected virtual IList<JsonProperty> CreateConstructorParameters(ConstructorInfo constructor, JsonPropertyCollection memberProperties) protected virtual IList<JsonProperty> CreateConstructorParameters(ConstructorInfo constructor, JsonPropertyCollection memberProperties)
{ {
var constructorParameters = constructor.GetParameters(); ParameterInfo[] constructorParameters = constructor.GetParameters();
JsonPropertyCollection parameterCollection = new JsonPropertyCollection(constructor.DeclaringType); JsonPropertyCollection parameterCollection = new JsonPropertyCollection(constructor.DeclaringType);
@@ -62,7 +62,7 @@ namespace Newtonsoft.Json.Serialization
public string GetReference(object context, object value) public string GetReference(object context, object value)
{ {
var mappings = GetMappings(context); BidirectionalDictionary<string, object> mappings = GetMappings(context);
string reference; string reference;
if (!mappings.TryGetBySecond(value, out reference)) if (!mappings.TryGetBySecond(value, out reference))
@@ -31,56 +31,56 @@ namespace Newtonsoft.Json.Serialization
public override bool Read() public override bool Read()
{ {
var value = _innerReader.Read(); bool value = _innerReader.Read();
_textWriter.WriteToken(_innerReader, false, false, true); _textWriter.WriteToken(_innerReader, false, false, true);
return value; return value;
} }
public override int? ReadAsInt32() public override int? ReadAsInt32()
{ {
var value = _innerReader.ReadAsInt32(); int? value = _innerReader.ReadAsInt32();
_textWriter.WriteToken(_innerReader, false, false, true); _textWriter.WriteToken(_innerReader, false, false, true);
return value; return value;
} }
public override string ReadAsString() public override string ReadAsString()
{ {
var value = _innerReader.ReadAsString(); string value = _innerReader.ReadAsString();
_textWriter.WriteToken(_innerReader, false, false, true); _textWriter.WriteToken(_innerReader, false, false, true);
return value; return value;
} }
public override byte[] ReadAsBytes() public override byte[] ReadAsBytes()
{ {
var value = _innerReader.ReadAsBytes(); byte[] value = _innerReader.ReadAsBytes();
_textWriter.WriteToken(_innerReader, false, false, true); _textWriter.WriteToken(_innerReader, false, false, true);
return value; return value;
} }
public override decimal? ReadAsDecimal() public override decimal? ReadAsDecimal()
{ {
var value = _innerReader.ReadAsDecimal(); decimal? value = _innerReader.ReadAsDecimal();
_textWriter.WriteToken(_innerReader, false, false, true); _textWriter.WriteToken(_innerReader, false, false, true);
return value; return value;
} }
public override double? ReadAsDouble() public override double? ReadAsDouble()
{ {
var value = _innerReader.ReadAsDouble(); double? value = _innerReader.ReadAsDouble();
_textWriter.WriteToken(_innerReader, false, false, true); _textWriter.WriteToken(_innerReader, false, false, true);
return value; return value;
} }
public override bool? ReadAsBoolean() public override bool? ReadAsBoolean()
{ {
var value = _innerReader.ReadAsBoolean(); bool? value = _innerReader.ReadAsBoolean();
_textWriter.WriteToken(_innerReader, false, false, true); _textWriter.WriteToken(_innerReader, false, false, true);
return value; return value;
} }
public override DateTime? ReadAsDateTime() public override DateTime? ReadAsDateTime()
{ {
var value = _innerReader.ReadAsDateTime(); DateTime? value = _innerReader.ReadAsDateTime();
_textWriter.WriteToken(_innerReader, false, false, true); _textWriter.WriteToken(_innerReader, false, false, true);
return value; return value;
} }
@@ -88,7 +88,7 @@ namespace Newtonsoft.Json.Serialization
#if !NET20 #if !NET20
public override DateTimeOffset? ReadAsDateTimeOffset() public override DateTimeOffset? ReadAsDateTimeOffset()
{ {
var value = _innerReader.ReadAsDateTimeOffset(); DateTimeOffset? value = _innerReader.ReadAsDateTimeOffset();
_textWriter.WriteToken(_innerReader, false, false, true); _textWriter.WriteToken(_innerReader, false, false, true);
return value; return value;
} }
+2 -6
View File
@@ -160,9 +160,7 @@ namespace Newtonsoft.Json.Utilities
List<object> values = new List<object>(); List<object> values = new List<object>();
var fields = enumType.GetFields().Where(f => f.IsLiteral); foreach (FieldInfo field in enumType.GetFields(BindingFlags.Public | BindingFlags.Static))
foreach (FieldInfo field in fields)
{ {
object value = field.GetValue(enumType); object value = field.GetValue(enumType);
values.Add(value); values.Add(value);
@@ -180,9 +178,7 @@ namespace Newtonsoft.Json.Utilities
List<string> values = new List<string>(); List<string> values = new List<string>();
var fields = enumType.GetFields().Where(f => f.IsLiteral); foreach (FieldInfo field in enumType.GetFields(BindingFlags.Public | BindingFlags.Static))
foreach (FieldInfo field in fields)
{ {
values.Add(field.Name); values.Add(field.Name);
} }
@@ -97,15 +97,15 @@ namespace Newtonsoft.Json.Utilities
escapeChars.Add((char)i); escapeChars.Add((char)i);
} }
foreach (var escapeChar in escapeChars.Union(new[] { '\'' })) foreach (char escapeChar in escapeChars.Union(new[] { '\'' }))
{ {
SingleQuoteCharEscapeFlags[escapeChar] = true; SingleQuoteCharEscapeFlags[escapeChar] = true;
} }
foreach (var escapeChar in escapeChars.Union(new[] { '"' })) foreach (char escapeChar in escapeChars.Union(new[] { '"' }))
{ {
DoubleQuoteCharEscapeFlags[escapeChar] = true; DoubleQuoteCharEscapeFlags[escapeChar] = true;
} }
foreach (var escapeChar in escapeChars.Union(new[] { '"', '\'', '<', '>', '&' })) foreach (char escapeChar in escapeChars.Union(new[] { '"', '\'', '<', '>', '&' }))
{ {
HtmlCharEscapeFlags[escapeChar] = true; HtmlCharEscapeFlags[escapeChar] = true;
} }
@@ -161,7 +161,7 @@ namespace Newtonsoft.Json.Utilities
for (int i = 0; i < s.Length; i++) for (int i = 0; i < s.Length; i++)
{ {
var c = s[i]; char c = s[i];
if (c < charEscapeFlags.Length && !charEscapeFlags[c]) if (c < charEscapeFlags.Length && !charEscapeFlags[c])
{ {
@@ -662,7 +662,7 @@ namespace Newtonsoft.Json.Utilities
// update: I think this is fixed in .NET 3.5 SP1 - leave this in for now... // update: I think this is fixed in .NET 3.5 SP1 - leave this in for now...
List<MemberInfo> distinctMembers = new List<MemberInfo>(targetMembers.Count); List<MemberInfo> distinctMembers = new List<MemberInfo>(targetMembers.Count);
foreach (var groupedMember in targetMembers.GroupBy(m => m.Name)) foreach (IGrouping<string, MemberInfo> groupedMember in targetMembers.GroupBy(m => m.Name))
{ {
int count = groupedMember.Count(); int count = groupedMember.Count();
IList<MemberInfo> members = groupedMember.ToList(); IList<MemberInfo> members = groupedMember.ToList();
+2 -2
View File
@@ -133,7 +133,7 @@ namespace Newtonsoft.Json.Utilities
throw new ArgumentNullException(nameof(valueSelector)); throw new ArgumentNullException(nameof(valueSelector));
} }
var caseInsensitiveResults = source.Where(s => string.Equals(valueSelector(s), testValue, StringComparison.OrdinalIgnoreCase)); IEnumerable<TSource> caseInsensitiveResults = source.Where(s => string.Equals(valueSelector(s), testValue, StringComparison.OrdinalIgnoreCase));
if (caseInsensitiveResults.Count() <= 1) if (caseInsensitiveResults.Count() <= 1)
{ {
return caseInsensitiveResults.SingleOrDefault(); return caseInsensitiveResults.SingleOrDefault();
@@ -141,7 +141,7 @@ namespace Newtonsoft.Json.Utilities
else else
{ {
// multiple results returned. now filter using case sensitivity // multiple results returned. now filter using case sensitivity
var caseSensitiveResults = source.Where(s => string.Equals(valueSelector(s), testValue, StringComparison.Ordinal)); IEnumerable<TSource> caseSensitiveResults = source.Where(s => string.Equals(valueSelector(s), testValue, StringComparison.Ordinal));
return caseSensitiveResults.SingleOrDefault(); return caseSensitiveResults.SingleOrDefault();
} }
} }