Update upstream files

Author: veblush

src/Newtonsoft.Json/Linq/JsonPath/ArrayIndexFilter.cs

@@ -14,10 +14,12 @@ public override IEnumerable<JToken> ExecuteFilter(IEnumerable<JToken> current, b
             {
                 if (Index != null)
                 {
-                    JToken v = GetTokenIndex(t, errorWhenNoMatch, Index.Value);
+                    JToken v = GetTokenIndex(t, errorWhenNoMatch, Index.GetValueOrDefault());
 
                     if (v != null)
+                    {
                         yield return v;
+                    }
                 }
                 else
                 {
@@ -31,7 +33,9 @@ public override IEnumerable<JToken> ExecuteFilter(IEnumerable<JToken> current, b
                     else
                     {
                         if (errorWhenNoMatch)
+                        {
                             throw new JsonException("Index * not valid on {0}.".FormatWith(CultureInfo.InvariantCulture, t.GetType().Name));
+                        }
                     }
                 }
             }

src/Newtonsoft.Json/Linq/JsonPath/ArrayMultipleIndexFilter.cs

@@ -15,7 +15,9 @@ public override IEnumerable<JToken> ExecuteFilter(IEnumerable<JToken> current, b
                     JToken v = GetTokenIndex(t, errorWhenNoMatch, i);
 
                     if (v != null)
+                    {
                         yield return v;
+                    }
                 }
             }
         }

src/Newtonsoft.Json/Linq/JsonPath/ArraySliceFilter.cs

@@ -14,7 +14,9 @@ internal class ArraySliceFilter : PathFilter
         public override IEnumerable<JToken> ExecuteFilter(IEnumerable<JToken> current, bool errorWhenNoMatch)
         {
             if (Step == 0)
+            {
                 throw new JsonException("Step cannot be zero.");
+            }
 
             foreach (JToken t in current)
             {
@@ -27,10 +29,16 @@ public override IEnumerable<JToken> ExecuteFilter(IEnumerable<JToken> current, b
                     int stopIndex = End ?? ((stepCount > 0) ? a.Count : -1);
 
                     // start from the end of the list if start is negitive
-                    if (Start < 0) startIndex = a.Count + startIndex;
+                    if (Start < 0)
+                    {
+                        startIndex = a.Count + startIndex;
+                    }
 
                     // end from the start of the list if stop is negitive
-                    if (End < 0) stopIndex = a.Count + stopIndex;
+                    if (End < 0)
+                    {
+                        stopIndex = a.Count + stopIndex;
+                    }
 
                     // ensure indexes keep within collection bounds
                     startIndex = Math.Max(startIndex, (stepCount > 0) ? 0 : int.MinValue);
@@ -50,23 +58,29 @@ public override IEnumerable<JToken> ExecuteFilter(IEnumerable<JToken> current, b
                     else
                     {
                         if (errorWhenNoMatch)
+                        {
                             throw new JsonException("Array slice of {0} to {1} returned no results.".FormatWith(CultureInfo.InvariantCulture,
-                                Start != null ? Start.Value.ToString(CultureInfo.InvariantCulture) : "*",
-                                End != null ? End.Value.ToString(CultureInfo.InvariantCulture) : "*"));
+                                Start != null ? Start.GetValueOrDefault().ToString(CultureInfo.InvariantCulture) : "*",
+                                End != null ? End.GetValueOrDefault().ToString(CultureInfo.InvariantCulture) : "*"));
+                        }
                     }
                 }
                 else
                 {
                     if (errorWhenNoMatch)
+                    {
                         throw new JsonException("Array slice is not valid on {0}.".FormatWith(CultureInfo.InvariantCulture, t.GetType().Name));
+                    }
                 }
             }
         }
 
         private bool IsValid(int index, int stopIndex, bool positiveStep)
         {
             if (positiveStep)
+            {
                 return (index < stopIndex);
+            }
 
             return (index > stopIndex);
         }

src/Newtonsoft.Json/Linq/JsonPath/FieldFilter.cs

@@ -20,9 +20,13 @@ public override IEnumerable<JToken> ExecuteFilter(IEnumerable<JToken> current, b
                         JToken v = o[Name];
 
                         if (v != null)
+                        {
                             yield return v;
+                        }
                         else if (errorWhenNoMatch)
+                        {
                             throw new JsonException("Property '{0}' does not exist on JObject.".FormatWith(CultureInfo.InvariantCulture, Name));
+                        }
                     }
                     else
                     {
@@ -35,7 +39,9 @@ public override IEnumerable<JToken> ExecuteFilter(IEnumerable<JToken> current, b
                 else
                 {
                     if (errorWhenNoMatch)
+                    {
                         throw new JsonException("Property '{0}' not valid on {1}.".FormatWith(CultureInfo.InvariantCulture, Name ?? "*", t.GetType().Name));
+                    }
                 }
             }
         }

src/Newtonsoft.Json/Linq/JsonPath/FieldMultipleFilter.cs

@@ -25,16 +25,22 @@ public override IEnumerable<JToken> ExecuteFilter(IEnumerable<JToken> current, b
                         JToken v = o[name];
 
                         if (v != null)
+                        {
                             yield return v;
+                        }
 
                         if (errorWhenNoMatch)
+                        {
                             throw new JsonException("Property '{0}' does not exist on JObject.".FormatWith(CultureInfo.InvariantCulture, name));
+                        }
                     }
                 }
                 else
                 {
                     if (errorWhenNoMatch)
+                    {
                         throw new JsonException("Properties {0} not valid on {1}.".FormatWith(CultureInfo.InvariantCulture, string.Join(", ", Names.Select(n => "'" + n + "'").ToArray()), t.GetType().Name));
+                    }
                 }
             }
         }