fixes after namespace changes

egil · egil · commit baef3317c009 · 2019-11-01T20:43:47.000Z
diff --git a/src/AngleSharp.Diffing.Tests/DiffBuilderTest.cs b/src/AngleSharp.Diffing.Tests/DiffBuilderTest.cs
@@ -1,9 +1,9 @@
 using System;
-using Egil.AngleSharp.Diffing.Strategies;
+using AngleSharp.Diffing.Strategies;
 using Shouldly;
 using Xunit;
 
-namespace Egil.AngleSharp.Diffing
+namespace AngleSharp.Diffing
 {
 
     public class DiffBuilderTest
diff --git a/src/AngleSharp.Diffing.Tests/DiffingStrategyPipelineBuilderTest.cs b/src/AngleSharp.Diffing.Tests/DiffingStrategyPipelineBuilderTest.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Linq;
-using Egil.AngleSharp.Diffing.Core;
+using AngleSharp.Diffing.Core;
 using Shouldly;
 using Xunit;
 
-namespace Egil.AngleSharp.Diffing
+namespace AngleSharp.Diffing
 {
     public class DiffingStrategyPipelineBuilderTest : DiffingTestBase
     {
diff --git a/src/AngleSharp.Diffing.Tests/Strategies/AttributeStrategies/IgnoreDiffAttributesFilterTest.cs b/src/AngleSharp.Diffing.Tests/Strategies/AttributeStrategies/IgnoreDiffAttributesFilterTest.cs
@@ -1,4 +1,4 @@
-﻿using Egil.AngleSharp.Diffing.Core;
+using AngleSharp.Diffing.Core;
 using Shouldly;
 using Xunit;
 
diff --git a/src/AngleSharp.Diffing.Tests/Strategies/CommentStrategies/IgnoreCommentsFilterTest.cs b/src/AngleSharp.Diffing.Tests/Strategies/CommentStrategies/IgnoreCommentsFilterTest.cs
@@ -1,4 +1,4 @@
-﻿using Egil.AngleSharp.Diffing.Core;
+using AngleSharp.Diffing.Core;
 using Shouldly;
 using Xunit;
 
diff --git a/src/AngleSharp.Diffing/Core/FilterDecision.cs b/src/AngleSharp.Diffing/Core/FilterDecision.cs
@@ -1,4 +1,4 @@
-namespace Egil.AngleSharp.Diffing.Core
+namespace AngleSharp.Diffing.Core
 {
     public enum FilterDecision
     {
diff --git a/src/AngleSharp.Diffing/Core/IFilterStrategy.cs b/src/AngleSharp.Diffing/Core/IFilterStrategy.cs
@@ -1,4 +1,6 @@
-﻿namespace AngleSharp.Diffing.Core
+using AngleSharp.Diffing.Core;
+
+namespace AngleSharp.Diffing.Core
 {
     /// <summary>
     /// The filter strategy used by the <see cref="HtmlDifferenceEngine"/>
diff --git a/src/AngleSharp.Diffing/Core/SourceCollection.cs b/src/AngleSharp.Diffing/Core/SourceCollection.cs
@@ -5,7 +5,7 @@
 
 namespace AngleSharp.Diffing.Core
 {
-    internal delegate FilterDecision SourceCollectionRemovePredicate(in ComparisonSource source);
+    public delegate FilterDecision SourceCollectionRemovePredicate(in ComparisonSource source);
 
     public class SourceCollection : IEnumerable<ComparisonSource>
     {
@@ -56,15 +56,15 @@ public IEnumerator<ComparisonSource> GetEnumerator()
 
         IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
-        internal void MarkAsMatched(in ComparisonSource source)
+        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]++;
         }
 
-        internal void Remove(SourceCollectionRemovePredicate predicate)
+        public void Remove(SourceCollectionRemovePredicate predicate)
         {
             for (int i = 0; i < _sources.Length; i++)
             {
diff --git a/src/AngleSharp.Diffing/Core/SourceMap.cs b/src/AngleSharp.Diffing/Core/SourceMap.cs
@@ -6,7 +6,7 @@
 
 namespace AngleSharp.Diffing.Core
 {
-    internal delegate FilterDecision SourceMapRemovePredicate(in AttributeComparisonSource source);
+    public delegate FilterDecision SourceMapRemovePredicate(in AttributeComparisonSource source);
 
     [SuppressMessage("Naming", "CA1710:Identifiers should have correct suffix")]
     public class SourceMap : IEnumerable<AttributeComparisonSource>
@@ -58,7 +58,7 @@ public IEnumerable<AttributeComparisonSource> GetUnmatched()
 
         IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
-        internal void Remove(SourceMapRemovePredicate predicate)
+        public void Remove(SourceMapRemovePredicate predicate)
         {
             var removeQueue = new Queue<string>(Count);
             foreach (var source in _sources.Values)
@@ -71,7 +71,7 @@ internal void Remove(SourceMapRemovePredicate predicate)
             }
         }
 
-        internal void MarkAsMatched(in AttributeComparisonSource source)
+        public void MarkAsMatched(in AttributeComparisonSource source)
         {
             _matched.Add(source.Attribute.Name);
         }
diff --git a/src/AngleSharp.Diffing/DiffingStrategyPipelineBuilder.cs b/src/AngleSharp.Diffing/DiffingStrategyPipelineBuilder.cs
@@ -1,8 +1,8 @@
-﻿using System;
-using Egil.AngleSharp.Diffing.Core;
-using Egil.AngleSharp.Diffing.Strategies;
+using System;
+using AngleSharp.Diffing.Core;
+using AngleSharp.Diffing.Strategies;
 
-namespace Egil.AngleSharp.Diffing
+namespace AngleSharp.Diffing
 {
 
     public class DiffingStrategyPipelineBuilder : IDiffingStrategyPipelineBuilder
diff --git a/src/AngleSharp.Diffing/IDiffingStrategyPipelineBuilder.cs b/src/AngleSharp.Diffing/IDiffingStrategyPipelineBuilder.cs
@@ -1,7 +1,7 @@
-using Egil.AngleSharp.Diffing.Core;
-using Egil.AngleSharp.Diffing.Strategies;
+using AngleSharp.Diffing.Core;
+using AngleSharp.Diffing.Strategies;
 
-namespace Egil.AngleSharp.Diffing
+namespace AngleSharp.Diffing
 {
     public interface IDiffingStrategyPipelineBuilder
     {
diff --git a/src/AngleSharp.Diffing/Strategies/AttributeStrategies/DiffingStrategyPipelineBuilderExtensions.cs b/src/AngleSharp.Diffing/Strategies/AttributeStrategies/DiffingStrategyPipelineBuilderExtensions.cs
@@ -1,6 +1,6 @@
-using Egil.AngleSharp.Diffing.Strategies.AttributeStrategies;
+using AngleSharp.Diffing.Strategies.AttributeStrategies;
 
-namespace Egil.AngleSharp.Diffing
+namespace AngleSharp.Diffing
 {
     public static partial class DiffingStrategyPipelineBuilderExtensions
     {
diff --git a/src/AngleSharp.Diffing/Strategies/CommentStrategies/DiffingStrategyPipelineBuilderExtensions.cs b/src/AngleSharp.Diffing/Strategies/CommentStrategies/DiffingStrategyPipelineBuilderExtensions.cs
@@ -1,6 +1,6 @@
-using Egil.AngleSharp.Diffing.Strategies.CommentStrategies;
+using AngleSharp.Diffing.Strategies.CommentStrategies;
 
-namespace Egil.AngleSharp.Diffing
+namespace AngleSharp.Diffing
 {
     public static partial class DiffingStrategyPipelineBuilderExtensions
     {
diff --git a/src/AngleSharp.Diffing/Strategies/DiffingStrategyPipelineBuilderExtensions.cs b/src/AngleSharp.Diffing/Strategies/DiffingStrategyPipelineBuilderExtensions.cs
@@ -1,7 +1,7 @@
-using Egil.AngleSharp.Diffing.Strategies.AttributeStrategies;
-using Egil.AngleSharp.Diffing.Strategies.TextNodeStrategies;
+using AngleSharp.Diffing.Strategies.AttributeStrategies;
+using AngleSharp.Diffing.Strategies.TextNodeStrategies;
 
-namespace Egil.AngleSharp.Diffing
+namespace AngleSharp.Diffing
 {
     public static partial class DiffingStrategyPipelineBuilderExtensions
     {
diff --git a/src/AngleSharp.Diffing/Strategies/ElementStrategies/DiffingStrategyPipelineBuilderExtensions.cs b/src/AngleSharp.Diffing/Strategies/ElementStrategies/DiffingStrategyPipelineBuilderExtensions.cs
@@ -1,6 +1,6 @@
-using Egil.AngleSharp.Diffing.Strategies.ElementStrategies;
+using AngleSharp.Diffing.Strategies.ElementStrategies;
 
-namespace Egil.AngleSharp.Diffing
+namespace AngleSharp.Diffing
 {
     public static partial class DiffingStrategyPipelineBuilderExtensions
     {
diff --git a/src/AngleSharp.Diffing/Strategies/NodeStrategies/DiffingStrategyPipelineBuilderExtensions.cs b/src/AngleSharp.Diffing/Strategies/NodeStrategies/DiffingStrategyPipelineBuilderExtensions.cs
@@ -1,6 +1,6 @@
-using Egil.AngleSharp.Diffing.Strategies.NodeStrategies;
+using AngleSharp.Diffing.Strategies.NodeStrategies;
 
-namespace Egil.AngleSharp.Diffing
+namespace AngleSharp.Diffing
 {
     public static partial class DiffingStrategyPipelineBuilderExtensions
     {
diff --git a/src/AngleSharp.Diffing/Strategies/TextNodeStrategies/DiffingStrategyPipelineBuilderExtensions.cs b/src/AngleSharp.Diffing/Strategies/TextNodeStrategies/DiffingStrategyPipelineBuilderExtensions.cs
@@ -1,6 +1,6 @@
-using Egil.AngleSharp.Diffing.Strategies.TextNodeStrategies;
+using AngleSharp.Diffing.Strategies.TextNodeStrategies;
 
-namespace Egil.AngleSharp.Diffing
+namespace AngleSharp.Diffing
 {
     public static partial class DiffingStrategyPipelineBuilderExtensions
     {

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Linq;`
`3`		`-using Egil.AngleSharp.Diffing.Core;`
	`3`	`+using AngleSharp.Diffing.Core;`
`4`	`4`	`using Shouldly;`
`5`	`5`	`using Xunit;`
`6`	`6`
`7`		`-namespace Egil.AngleSharp.Diffing`
	`7`	`+namespace AngleSharp.Diffing`
`8`	`8`	`{`
`9`	`9`	`public class DiffingStrategyPipelineBuilderTest : DiffingTestBase`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using Egil.AngleSharp.Diffing.Core;`
	`1`	`+using AngleSharp.Diffing.Core;`
`2`	`2`	`using Shouldly;`
`3`	`3`	`using Xunit;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace Egil.AngleSharp.Diffing.Core`
	`1`	`+namespace AngleSharp.Diffing.Core`
`2`	`2`	`{`
`3`	`3`	`public enum FilterDecision`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-namespace AngleSharp.Diffing.Core`
	`1`	`+using AngleSharp.Diffing.Core;`
	`2`	`+`
	`3`	`+namespace AngleSharp.Diffing.Core`
`2`	`4`	`{`
`3`	`5`	`/// <summary>`
`4`	`6`	`/// The filter strategy used by the <see cref="HtmlDifferenceEngine"/>`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace AngleSharp.Diffing.Core`
`7`	`7`	`{`
`8`		`- internal delegate FilterDecision SourceCollectionRemovePredicate(in ComparisonSource source);`
	`8`	`+ public delegate FilterDecision SourceCollectionRemovePredicate(in ComparisonSource source);`
`9`	`9`
`10`	`10`	`public class SourceCollection : IEnumerable<ComparisonSource>`
`11`	`11`	`{`
`@@ -56,15 +56,15 @@ public IEnumerator<ComparisonSource> GetEnumerator()`
`56`	`56`
`57`	`57`	`IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();`
`58`	`58`
`59`		`- internal void MarkAsMatched(in ComparisonSource source)`
	`59`	`+ public void MarkAsMatched(in ComparisonSource source)`
`60`	`60`	`{`
`61`	`61`	`if (_status[source.Index] == SOURCE_REMOVED)`
`62`	`62`	`throw new InvalidOperationException("A removed source cannot be marked as matched. The source is not supposed to be part of the comparison.");`
`63`	`63`
`64`	`64`	`_status[source.Index]++;`
`65`	`65`	`}`
`66`	`66`
`67`		`- internal void Remove(SourceCollectionRemovePredicate predicate)`
	`67`	`+ public void Remove(SourceCollectionRemovePredicate predicate)`
`68`	`68`	`{`
`69`	`69`	`for (int i = 0; i < _sources.Length; i++)`
`70`	`70`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace AngleSharp.Diffing.Core`
`8`	`8`	`{`
`9`		`- internal delegate FilterDecision SourceMapRemovePredicate(in AttributeComparisonSource source);`
	`9`	`+ public delegate FilterDecision SourceMapRemovePredicate(in AttributeComparisonSource source);`
`10`	`10`
`11`	`11`	`[SuppressMessage("Naming", "CA1710:Identifiers should have correct suffix")]`
`12`	`12`	`public class SourceMap : IEnumerable<AttributeComparisonSource>`
`@@ -58,7 +58,7 @@ public IEnumerable<AttributeComparisonSource> GetUnmatched()`
`58`	`58`
`59`	`59`	`IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();`
`60`	`60`
`61`		`- internal void Remove(SourceMapRemovePredicate predicate)`
	`61`	`+ public void Remove(SourceMapRemovePredicate predicate)`
`62`	`62`	`{`
`63`	`63`	`var removeQueue = new Queue<string>(Count);`
`64`	`64`	`foreach (var source in _sources.Values)`
`@@ -71,7 +71,7 @@ internal void Remove(SourceMapRemovePredicate predicate)`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`		`- internal void MarkAsMatched(in AttributeComparisonSource source)`
	`74`	`+ public void MarkAsMatched(in AttributeComparisonSource source)`
`75`	`75`	`{`
`76`	`76`	`_matched.Add(source.Attribute.Name);`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-using Egil.AngleSharp.Diffing.Core;`
`2`		`-using Egil.AngleSharp.Diffing.Strategies;`
	`1`	`+using AngleSharp.Diffing.Core;`
	`2`	`+using AngleSharp.Diffing.Strategies;`
`3`	`3`
`4`		`-namespace Egil.AngleSharp.Diffing`
	`4`	`+namespace AngleSharp.Diffing`
`5`	`5`	`{`
`6`	`6`	`public interface IDiffingStrategyPipelineBuilder`
`7`	`7`	`{`