-Refactor away var

Src/Newtonsoft.Json/JsonConvert.cs

@@ -858,7 +858,7 @@ namespace Newtonsoft.Json
                 jsonSerializer.CheckAdditionalContent = true;
             }
 
-            using (var reader = new JsonTextReader(new StringReader(value)))
+            using (JsonTextReader reader = new JsonTextReader(new StringReader(value)))
             {
                 return jsonSerializer.Deserialize(reader, type);
             }

Src/Newtonsoft.Json/JsonTextReader.cs

@@ -2249,7 +2249,7 @@ namespace Newtonsoft.Json
                         return false;
                     }
 
-                    var nextChart = _chars[_charPos + 1];
+                    char nextChart = _chars[_charPos + 1];
 
                     return (nextChart == '*' || nextChart == '/');
                 case ')':

Src/Newtonsoft.Json/JsonWriter.cs

@@ -78,9 +78,9 @@ namespace Newtonsoft.Json
 
         internal static State[][] BuildStateArray()
         {
-            var allStates = StateArrayTempate.ToList();
-            var errorStates = StateArrayTempate[0];
-            var valueStates = StateArrayTempate[7];
+            List<State[]> allStates = StateArrayTempate.ToList();
+            State[] errorStates = StateArrayTempate[0];
+            State[] valueStates = StateArrayTempate[7];
 
             foreach (JsonToken valueToken in EnumUtils.GetValues(typeof(JsonToken)))
             {

Src/Newtonsoft.Json/Serialization/DefaultContractResolver.cs

@@ -651,7 +651,7 @@ namespace Newtonsoft.Json.Serialization
         /// <returns>Properties for the given <see cref="ConstructorInfo"/>.</returns>
         protected virtual IList<JsonProperty> CreateConstructorParameters(ConstructorInfo constructor, JsonPropertyCollection memberProperties)
         {
-            var constructorParameters = constructor.GetParameters();
+            ParameterInfo[] constructorParameters = constructor.GetParameters();
 
             JsonPropertyCollection parameterCollection = new JsonPropertyCollection(constructor.DeclaringType);
 

Src/Newtonsoft.Json/Serialization/DefaultReferenceResolver.cs

@@ -62,7 +62,7 @@ namespace Newtonsoft.Json.Serialization
 
         public string GetReference(object context, object value)
         {
-            var mappings = GetMappings(context);
+            BidirectionalDictionary<string, object> mappings = GetMappings(context);
 
             string reference;
             if (!mappings.TryGetBySecond(value, out reference))

Src/Newtonsoft.Json/Serialization/TraceJsonReader.cs

@@ -31,56 +31,56 @@ namespace Newtonsoft.Json.Serialization
 
         public override bool Read()
         {
-            var value = _innerReader.Read();
+            bool value = _innerReader.Read();
             _textWriter.WriteToken(_innerReader, false, false, true);
             return value;
         }
 
         public override int? ReadAsInt32()
         {
-            var value = _innerReader.ReadAsInt32();
+            int? value = _innerReader.ReadAsInt32();
             _textWriter.WriteToken(_innerReader, false, false, true);
             return value;
         }
 
         public override string ReadAsString()
         {
-            var value = _innerReader.ReadAsString();
+            string value = _innerReader.ReadAsString();
             _textWriter.WriteToken(_innerReader, false, false, true);
             return value;
         }
 
         public override byte[] ReadAsBytes()
         {
-            var value = _innerReader.ReadAsBytes();
+            byte[] value = _innerReader.ReadAsBytes();
             _textWriter.WriteToken(_innerReader, false, false, true);
             return value;
         }
 
         public override decimal? ReadAsDecimal()
         {
-            var value = _innerReader.ReadAsDecimal();
+            decimal? value = _innerReader.ReadAsDecimal();
             _textWriter.WriteToken(_innerReader, false, false, true);
             return value;
         }
 
         public override double? ReadAsDouble()
         {
-            var value = _innerReader.ReadAsDouble();
+            double? value = _innerReader.ReadAsDouble();
             _textWriter.WriteToken(_innerReader, false, false, true);
             return value;
         }
 
         public override bool? ReadAsBoolean()
         {
-            var value = _innerReader.ReadAsBoolean();
+            bool? value = _innerReader.ReadAsBoolean();
             _textWriter.WriteToken(_innerReader, false, false, true);
             return value;
         }
 
         public override DateTime? ReadAsDateTime()
         {
-            var value = _innerReader.ReadAsDateTime();
+            DateTime? value = _innerReader.ReadAsDateTime();
             _textWriter.WriteToken(_innerReader, false, false, true);
             return value;
         }
@@ -88,7 +88,7 @@ namespace Newtonsoft.Json.Serialization
 #if !NET20
         public override DateTimeOffset? ReadAsDateTimeOffset()
         {
-            var value = _innerReader.ReadAsDateTimeOffset();
+            DateTimeOffset? value = _innerReader.ReadAsDateTimeOffset();
             _textWriter.WriteToken(_innerReader, false, false, true);
             return value;
         }

Src/Newtonsoft.Json/Utilities/EnumUtils.cs

@@ -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);
             }

Src/Newtonsoft.Json/Utilities/JavaScriptUtils.cs

@@ -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])
                     {

Src/Newtonsoft.Json/Utilities/ReflectionUtils.cs

@@ -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();

Src/Newtonsoft.Json/Utilities/StringUtils.cs

@@ -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();
             }
         }