diff --git a/Src/Newtonsoft.Json.Tests/Issues/Issue2156.cs b/Src/Newtonsoft.Json.Tests/Issues/Issue2156.cs new file mode 100644 index 000000000..b04354319 --- /dev/null +++ b/Src/Newtonsoft.Json.Tests/Issues/Issue2156.cs @@ -0,0 +1,65 @@ +#region License +// Copyright (c) 2007 James Newton-King +// +// Permission is hereby granted, free of charge, to any person +// obtaining a copy of this software and associated documentation +// files (the "Software"), to deal in the Software without +// restriction, including without limitation the rights to use, +// copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following +// conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +// OTHER DEALINGS IN THE SOFTWARE. +#endregion + +using Newtonsoft.Json.Linq; +using System.Linq; +#if DNXCORE50 +using Xunit; +using Test = Xunit.FactAttribute; +using Assert = Newtonsoft.Json.Tests.XUnitAssert; +#else +using NUnit.Framework; +#endif + +namespace Newtonsoft.Json.Tests.Issues +{ + [TestFixture] + public class Issue2156 + { + [Test] + public void Test() + { + string json = @" + { + ""root"": { + ""a"": { + ""name"": ""John"", + ""b"": { + ""name"": ""Sarah"" + } + } + } + }"; + + JToken t = JToken.Parse(json); + + int count1 = t.SelectTokens("$..a.name").Count(); // result: 1, expected: 1 + int count2 = t.SelectTokens("$..['a']['name']").Count(); // result: 2, expected: 1 + + Assert.AreEqual(1, count1); + Assert.AreEqual(1, count2); + } + } +} \ No newline at end of file diff --git a/Src/Newtonsoft.Json/Linq/JsonPath/JPath.cs b/Src/Newtonsoft.Json/Linq/JsonPath/JPath.cs index c0e5ccd14..f18fb6c9a 100644 --- a/Src/Newtonsoft.Json/Linq/JsonPath/JPath.cs +++ b/Src/Newtonsoft.Json/Linq/JsonPath/JPath.cs @@ -118,6 +118,8 @@ private bool ParsePath(List filters, int currentPartStartIndex, bool } filters.Add(ParseIndexer(currentChar, scan)); + scan = false; + _currentIndex++; currentPartStartIndex = _currentIndex; followingIndexer = true;