-Refactor away var
This commit is contained in:
@@ -160,9 +160,7 @@ namespace Newtonsoft.Json.Utilities
|
||||
|
||||
List<object> values = new List<object>();
|
||||
|
||||
var fields = enumType.GetFields().Where(f => f.IsLiteral);
|
||||
|
||||
foreach (FieldInfo field in fields)
|
||||
foreach (FieldInfo field in enumType.GetFields(BindingFlags.Public | BindingFlags.Static))
|
||||
{
|
||||
object value = field.GetValue(enumType);
|
||||
values.Add(value);
|
||||
@@ -180,9 +178,7 @@ namespace Newtonsoft.Json.Utilities
|
||||
|
||||
List<string> values = new List<string>();
|
||||
|
||||
var fields = enumType.GetFields().Where(f => f.IsLiteral);
|
||||
|
||||
foreach (FieldInfo field in fields)
|
||||
foreach (FieldInfo field in enumType.GetFields(BindingFlags.Public | BindingFlags.Static))
|
||||
{
|
||||
values.Add(field.Name);
|
||||
}
|
||||
|
||||
@@ -97,15 +97,15 @@ namespace Newtonsoft.Json.Utilities
|
||||
escapeChars.Add((char)i);
|
||||
}
|
||||
|
||||
foreach (var escapeChar in escapeChars.Union(new[] { '\'' }))
|
||||
foreach (char escapeChar in escapeChars.Union(new[] { '\'' }))
|
||||
{
|
||||
SingleQuoteCharEscapeFlags[escapeChar] = true;
|
||||
}
|
||||
foreach (var escapeChar in escapeChars.Union(new[] { '"' }))
|
||||
foreach (char escapeChar in escapeChars.Union(new[] { '"' }))
|
||||
{
|
||||
DoubleQuoteCharEscapeFlags[escapeChar] = true;
|
||||
}
|
||||
foreach (var escapeChar in escapeChars.Union(new[] { '"', '\'', '<', '>', '&' }))
|
||||
foreach (char escapeChar in escapeChars.Union(new[] { '"', '\'', '<', '>', '&' }))
|
||||
{
|
||||
HtmlCharEscapeFlags[escapeChar] = true;
|
||||
}
|
||||
@@ -161,7 +161,7 @@ namespace Newtonsoft.Json.Utilities
|
||||
|
||||
for (int i = 0; i < s.Length; i++)
|
||||
{
|
||||
var c = s[i];
|
||||
char c = s[i];
|
||||
|
||||
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...
|
||||
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();
|
||||
IList<MemberInfo> members = groupedMember.ToList();
|
||||
|
||||
@@ -133,7 +133,7 @@ namespace Newtonsoft.Json.Utilities
|
||||
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)
|
||||
{
|
||||
return caseInsensitiveResults.SingleOrDefault();
|
||||
@@ -141,7 +141,7 @@ namespace Newtonsoft.Json.Utilities
|
||||
else
|
||||
{
|
||||
// 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();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user