more fixes after merge

Author: egil

src/AngleSharp.Diffing.Tests/Core/HtmlDifferenceEngineTest.cs

@@ -1,6 +1,7 @@
-using System;
+using System;
 using System.Collections.Generic;
 using AngleSharp.Dom;
+using AngleSharp.Diffing.Strategies.NodeStrategies;
 using Shouldly;
 using Xunit;
 
@@ -412,14 +413,7 @@ private static Func<DiffContext, SourceCollection, SourceCollection, IEnumerable
         private static IEnumerable<Comparison> OneToOneNodeListMatcher(
             DiffContext context,
             SourceCollection controlNodes,
-            SourceCollection testNodes)
-        {
-            var matchLength = Math.Min(controlNodes.Count, testNodes.Count);
-            for (int i = 0; i < matchLength; i++)
-            {
-                yield return new Comparison(controlNodes[i], testNodes[i]);
-            }
-        }
+            SourceCollection testNodes) => OneToOneNodeMatcher.Match(context, controlNodes, testNodes);
 
         #endregion
 

src/AngleSharp.Diffing.Tests/DiffBuilderTest.cs

@@ -51,18 +51,18 @@ public void Test6()
             diffs.ShouldNotBeEmpty();
         }
 
-        [Fact(DisplayName = "Test")]
-        public void MyTestMethod()
-        {
-            var control = "\r\n        <h1>Hello world</h1>\r\n        <h1>Hello world</h1>\r\n    ";
-            var test = "\r\n        <h1>Hello world</h1>\r\n        <h1>Hello world</h1>\r\n    ";
+        //[Fact(DisplayName = "Calling Build() with DefaultOptions() returns expected diffs")]
+        //public void Test7()
+        //{
+        //    var control = "<h1>Hello World</h1>";
+        //    var test = "<h1>Hello world</h1>";
 
-            var diffs = new DiffBuilder(DefaultStrategy)
-                .Compare(control)
-                .WithTest(test)
-                .Build();
+        //    var diffs = new DiffBuilder(DefaultStrategy)
+        //        .Compare(control)
+        //        .WithTest(test)
+        //        .Build();
 
-            diffs.ShouldBeEmpty();
-        }
+        //    diffs.ShouldNotBeEmpty();
+        //}
     }
 }

src/AngleSharp.Diffing.Tests/Strategies/NodeStrategies/ForwardSearchingNodeMatcherTest.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Linq;
+using AngleSharp.Dom;
 using AngleSharp.Diffing.Core;
 using Shouldly;
 using Xunit;
@@ -28,6 +29,21 @@ public void Test001(string controlHtml, string testHtml)
             actual.ShouldAllBe((c, idx) => c.Control == controls[idx] && c.Test == tests[idx]);
         }
 
+        [Theory(DisplayName = "The matcher matches two nodes with the same node name")]
+        [InlineData("asdf<h1>Hello world</h1>asdf<h1>Hello world</h1>", "asdf<h1>Hello world</h1>asdf<h1>Hello world</h1>")]
+        public void Test0011(string controlHtml, string testHtml)
+        {
+            var controls = ToSourceCollection(controlHtml, ComparisonSourceType.Control);
+            var tests = ToSourceCollection(testHtml, ComparisonSourceType.Test);
+            controls.Remove((in ComparisonSource x) => x.Node is IElement ? FilterDecision.Keep : FilterDecision.Exclude);
+            tests.Remove((in ComparisonSource x) => x.Node is IElement ? FilterDecision.Keep : FilterDecision.Exclude);
+
+            var actual = ForwardSearchingNodeMatcher.Match(_context, controls, tests).ToList();
+
+            actual.Count.ShouldBe(2);
+            actual.ShouldAllBe(c => c.Control == controls[c.Control.Index] && c.Test == tests[c.Test.Index]);
+        }
+
         [Theory(DisplayName = "The matcher does not matches two nodes with the different node names")]
         [InlineData("textnode", "<!--comment-->")]
         [InlineData("textnode", "<p></p>")]

src/AngleSharp.Diffing.sln

@@ -7,6 +7,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AngleSharp.Diffing", "Angle
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AngleSharp.DiffingTests", "AngleSharp.Diffing.Tests\AngleSharp.DiffingTests.csproj", "{18203D98-66B4-4736-B79A-3B7D02EFA9E8}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E8E3C8B4-92C3-4DB7-B920-D28651E24A57}"
+	ProjectSection(SolutionItems) = preProject
+		AngleSharp.Diffing.nuspec = AngleSharp.Diffing.nuspec
+		Directory.Build.props = Directory.Build.props
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

src/AngleSharp.Diffing/Core/HtmlDifferenceEngine.cs

@@ -76,6 +76,8 @@ private IEnumerable<Comparison> MatchNodes(DiffContext context, SourceCollection
 
             void UpdateMatchedTracking(in Comparison comparison)
             {
+                controls.MarkAsMatched(comparison.Control);
+                tests.MarkAsMatched(comparison.Test);
                 context.MissingSources.Remove(comparison.Control);
                 context.UnexpectedSources.Remove(comparison.Test);
             }

src/AngleSharp.Diffing/Core/SourceCollection.cs

@@ -11,6 +11,7 @@ public class SourceCollection : IEnumerable<ComparisonSource>
     {
         private const int SOURCE_REMOVED = -1;
         private const int SOURCE_UNMATCHED = 0;
+        private const int SOURCE_MATCHED = 1;
 
         private readonly int[] _status;
         private ComparisonSource[] _sources;
@@ -21,7 +22,12 @@ public class SourceCollection : IEnumerable<ComparisonSource>
 
         public ComparisonSource this[int index]
         {
-            get => _sources[index];
+            get
+            {
+                if (_status[_sources[index].Index] == SOURCE_REMOVED)
+                    throw new InvalidOperationException("The source at the specified index has been removed.");
+                return _sources[index];
+            }
         }
 
         public SourceCollection(ComparisonSourceType sourceType, IEnumerable<ComparisonSource> sources)
@@ -49,21 +55,37 @@ public IEnumerator<ComparisonSource> GetEnumerator()
         {
             for (int i = 0; i < _sources.Length; i++)
             {
-                yield return _sources[i];
+                if (_status[_sources[i].Index] != SOURCE_REMOVED)
+                {
+                    yield return _sources[i];
+                }
             }
             yield break;
         }
 
         IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
+        /// <summary>
+        /// Gets all the sources originally in the collection, even those removed and those marked as matched.
+        /// </summary>
+        public IEnumerable<ComparisonSource> GetAllSources() => _sources;
+
+        /// <summary>
+        /// Mark a source as matched. After it has been marked, it will not be returned by <see cref="GetUnmatched(int)"/>.
+        /// </summary>
         public void MarkAsMatched(in ComparisonSource source)
         {
             if (_status[source.Index] == SOURCE_REMOVED)
                 throw new InvalidOperationException("A removed source cannot be marked as matched. The source is not supposed to be part of the comparison.");
 
-            _status[source.Index]++;
+            _status[source.Index] = SOURCE_MATCHED;
         }
 
+        /// <summary>
+        /// Apply a filter predicate to the collection. All matched sources will not be returned
+        /// by <see cref="GetUnmatched(int)"/> or by <see cref="GetEnumerator"/>.
+        /// </summary>
+        /// <param name="predicate"></param>
         public void Remove(SourceCollectionRemovePredicate predicate)
         {
             for (int i = 0; i < _sources.Length; i++)
@@ -75,18 +97,6 @@ public void Remove(SourceCollectionRemovePredicate predicate)
                     Count--;
                 }
             }
-            var oldSources = _sources;
-            _sources = Count == 0 ? Array.Empty<ComparisonSource>() : new ComparisonSource[Count];
-            if (Count > 0)
-            {
-                for (int i = 0, j = 0; i < oldSources.Length; i++)
-                {
-                    if (_status[i] != SOURCE_REMOVED)
-                    {
-                        _sources[j++] = oldSources[i];
-                    }
-                }
-            }
         }
 
         private void EnsureSourcesAreInCorrectOrder()

src/AngleSharp.Diffing/Strategies/NodeStrategies/NodeComparer.cs

@@ -1,4 +1,4 @@
-using AngleSharp.Diffing.Core;
+using AngleSharp.Diffing.Core;
 
 namespace AngleSharp.Diffing.Strategies.NodeStrategies
 {

src/AngleSharp.Diffing/Strategies/TextNodeStrategies/DiffingStrategyPipelineBuilderExtensions.cs

@@ -10,7 +10,7 @@ public static partial class DiffingStrategyPipelineBuilderExtensions
         public static IDiffingStrategyPipelineBuilder WithTextComparer(this IDiffingStrategyPipelineBuilder builder, WhitespaceOption whitespaceOption, bool ignoreCase)
         {
             builder.WithFilter(new TextNodeFilter(whitespaceOption).Filter, isSpecializedFilter: true);
-            builder.WithComparer(new TextNodeComparer(whitespaceOption, ignoreCase).Compare, isSpecializedComparer: false);
+            builder.WithComparer(new TextNodeComparer(whitespaceOption, ignoreCase).Compare, isSpecializedComparer: true);
             return builder;
         }
 

src/AngleSharp.Diffing/Strategies/TextNodeStrategies/TextNodeComparer.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text.RegularExpressions;
 using AngleSharp.Dom;
 using AngleSharp.Diffing.Core;
@@ -44,7 +44,7 @@ private CompareResult Compare(IText controlTextNode, IText testTextNode)
             if (option == WhitespaceOption.Normalize)
             {
                 controlText = WhitespaceReplace.Replace(controlText.Trim(), " ");
-                testText = WhitespaceReplace.Replace(controlText.Trim(), " ");
+                testText = WhitespaceReplace.Replace(testText.Trim(), " ");
             }
 
             var isRegexCompare = GetIsRegexComparison(controlTextNode);