Create IgnoreAttributeStrategy and make IgnoreAttributeComparer obsolete

Author: RiRiSharp

src/AngleSharp.Diffing.Tests/Strategies/AttributeStrategies/IgnoreAttributeComparerTest.cs

@@ -17,7 +17,7 @@ public void Test000(CompareResult currentResult)
             @"<p foo=""bar""></p>", "foo"
         );
 
-        IgnoreAttributeComparer
+        IgnoreAttributeStrategy
             .Compare(comparison, currentResult)
             .ShouldBe(currentResult);
     }
@@ -30,8 +30,8 @@ public void Test003()
             @"<p foo=""bar""></p>", "foo"
         );
 
-        IgnoreAttributeComparer.Compare(comparison, CompareResult.Different).ShouldBe(CompareResult.Different);
-        IgnoreAttributeComparer.Compare(comparison, CompareResult.Same).ShouldBe(CompareResult.Same);
+        IgnoreAttributeStrategy.Compare(comparison, CompareResult.Different).ShouldBe(CompareResult.Different);
+        IgnoreAttributeStrategy.Compare(comparison, CompareResult.Same).ShouldBe(CompareResult.Same);
     }
 
     [Fact(DisplayName = "When a attribute does contain have the ':ignore' postfix, Same is returned")]
@@ -42,6 +42,6 @@ public void Test004()
             @"<p foo=""baz""></p>", "foo"
         );
 
-        IgnoreAttributeComparer.Compare(comparison, CompareResult.Unknown).ShouldBe(CompareResult.Same);
+        IgnoreAttributeStrategy.Compare(comparison, CompareResult.Unknown).ShouldBe(CompareResult.Same);
     }
 }

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

@@ -23,7 +23,7 @@ public static IDiffingStrategyCollection IgnoreDiffAttributes(this IDiffingStrat
     public static IDiffingStrategyCollection AddAttributeNameMatcher(this IDiffingStrategyCollection builder)
     {
         builder.AddMatcher(AttributeNameMatcher.Match, StrategyType.Generalized);
-        builder.AddMatcher(IgnoreAttributeMatcher.Match, StrategyType.Generalized);
+        builder.AddMatcher(IgnoreAttributeStrategy.Match, StrategyType.Generalized);
         return builder;
     }
 
@@ -34,7 +34,7 @@ public static IDiffingStrategyCollection AddAttributeComparer(this IDiffingStrat
     {
         builder.AddMatcher(PostfixedAttributeMatcher.Match, StrategyType.Specialized);
         builder.AddComparer(AttributeComparer.Compare, StrategyType.Generalized);
-        builder.AddComparer(IgnoreAttributeComparer.Compare, StrategyType.Specialized);
+        builder.AddComparer(IgnoreAttributeStrategy.Compare, StrategyType.Specialized);
         return builder;
     }
 

src/AngleSharp.Diffing/Strategies/AttributeStrategies/IgnoreAttributeComparer.cs

@@ -3,6 +3,7 @@
 /// <summary>
 /// Represents the ignore attribute comparer.
 /// </summary>
+[Obsolete("Has been moved to IgnoreAttributeStrategy")]
 public static class IgnoreAttributeComparer
 {
     private const string DIFF_IGNORE_POSTFIX = ":ignore";
@@ -20,8 +21,8 @@ public static CompareResult Compare(in AttributeComparison comparison, CompareRe
             : currentDecision;
     }
 
-    public static bool IsIgnoreAttribute(IAttr source)
+    private static bool IsIgnoreAttribute(IAttr source)
     {
-        return source.Name.EndsWith(DIFF_IGNORE_POSTFIX,  StringComparison.OrdinalIgnoreCase);
+        return source.Name.EndsWith(DIFF_IGNORE_POSTFIX, StringComparison.OrdinalIgnoreCase);
     }
-}
+}

src/AngleSharp.Diffing/Strategies/AttributeStrategies/IgnoreAttributeMatcher.cs renamed to src/AngleSharp.Diffing/Strategies/AttributeStrategies/IgnoreAttributeStrategy.cs

@@ -3,10 +3,23 @@
 /// <summary>
 /// Ignore Attribute matcher strategy.
 /// </summary>
-public static class IgnoreAttributeMatcher
+public static class IgnoreAttributeStrategy
 {
     private const string DIFF_IGNORE_POSTFIX = ":ignore";
 
+    /// <summary>
+    /// The ignore attribute comparer.
+    /// </summary>
+    public static CompareResult Compare(in AttributeComparison comparison, CompareResult currentDecision)
+    {
+        if (currentDecision.IsSameOrSkip)
+            return currentDecision;
+
+        return IsIgnoreAttribute(comparison.Control.Attribute)
+            ? CompareResult.Same
+            : currentDecision;
+    }
+
     /// <summary>
     /// Attribute name matcher strategy.
     /// </summary>
@@ -26,4 +39,9 @@ public static IEnumerable<AttributeComparison> Match(IDiffContext context, Sourc
                 yield return new AttributeComparison(control, control);
         }
     }
+
+    private static bool IsIgnoreAttribute(IAttr source)
+    {
+        return source.Name.EndsWith(DIFF_IGNORE_POSTFIX,  StringComparison.OrdinalIgnoreCase);
+    }
 }