From 98e4546e4e288befb1f69f5a43b9cf128cf0e199 Mon Sep 17 00:00:00 2001
From: Egil Hansen <egil@assimilated.dk>
Date: Thu, 16 Apr 2020 20:37:25 +0000
Subject: [PATCH] Added support for AngleSharp 0.14.0

---
 CHANGELOG.md                                       |  2 +-
 .../Extensions/ElementExtensions.cs                | 12 ++++++------
 .../Extensions/NodeExtensions.cs                   | 14 +++++++-------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df9640b..3ded3f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # 0.14.0
 
-Released on Wednesday, April 1, 2020.
+Released on Wednesday, April 16, 2020.
 
 - Bug: custom whitespace options on `<pre>`/`<style>`/`<script>` not being applied during comparison.
 - Upgraded to version 0.14.0 of AngleSharp.
diff --git a/src/AngleSharp.Diffing/Extensions/ElementExtensions.cs b/src/AngleSharp.Diffing/Extensions/ElementExtensions.cs
index 9547f49..91c0f10 100644
--- a/src/AngleSharp.Diffing/Extensions/ElementExtensions.cs
+++ b/src/AngleSharp.Diffing/Extensions/ElementExtensions.cs
@@ -26,7 +26,7 @@ public static bool TryGetAttrValue(this IElement element, string attributeName,
         /// Try to get an attribute value off of an element.
         /// Returns true when the attribute was found, false otherwise.
         /// </summary>
-        public static bool TryGetAttrValue(this IElement element, string attributeName, [NotNullWhen(true)]out string result)
+        public static bool TryGetAttrValue(this IElement element, string attributeName, [NotNullWhen(true)] out string result)
         {
             return TryGetAttrValue(element, attributeName, GetStringAttrValue, out result);
 
@@ -48,7 +48,7 @@ public static bool TryGetAttrValue<T>(this IElement element, string attributeNam
         /// Try to get an attribute value off of an element.
         /// Returns true when the attribute was found, false otherwise.
         /// </summary>
-        public static bool TryGetAttrValue<T>(this IElement element, string attributeName, Func<string, T> resultFunc, [NotNullWhen(true)] out T result)
+        public static bool TryGetAttrValue<T>(this IElement element, string attributeName, Func<string, T> resultFunc, [NotNullWhen(true)] out T result) where T : notnull
         {
             if (element is null)
                 throw new ArgumentNullException(nameof(element));
@@ -62,9 +62,9 @@ public static bool TryGetAttrValue<T>(this IElement element, string attributeNam
             }
             else
             {
-#pragma warning disable CS8653 // A default expression introduces a null value for a type parameter.
-                result = default;
-#pragma warning restore CS8653 // A default expression introduces a null value for a type parameter.
+#pragma warning disable CS8601 // Possible null reference assignment.
+                result = default(T);
+#pragma warning restore CS8601 // Possible null reference assignment.
                 return false;
             }
         }
@@ -112,7 +112,7 @@ public static T GetInlineOptionOrDefault<T>(this IElement startElement, string o
         /// Try to get the index of the node in its parent's ChildNodes list.
         /// Returns true if index was found. False otherwise.
         /// </summary>
-        public static bool TryGetNodeIndex(this INode node, [NotNullWhen(true)]out int index)
+        public static bool TryGetNodeIndex(this INode node, [NotNullWhen(true)] out int index)
         {
             index = -1;
 
diff --git a/src/AngleSharp.Diffing/Extensions/NodeExtensions.cs b/src/AngleSharp.Diffing/Extensions/NodeExtensions.cs
index dabcf1b..09a958f 100644
--- a/src/AngleSharp.Diffing/Extensions/NodeExtensions.cs
+++ b/src/AngleSharp.Diffing/Extensions/NodeExtensions.cs
@@ -22,7 +22,7 @@ public static bool HasAttributes(this INode node)
         /// Try to get an attribute with the <paramref name="attributeName"/> from the <paramref name="node"/>.
         /// Returns true if the attribute exists, false otherwise.
         /// </summary>
-        public static bool TryGetAttr(this INode node, string attributeName, [NotNullWhen(true)]out IAttr? attribute)
+        public static bool TryGetAttr(this INode node, string attributeName, [NotNullWhen(true)] out IAttr? attribute)
         {
             if (node is IElement element && element.HasAttribute(attributeName))
             {
@@ -52,7 +52,7 @@ public static bool TryGetAttrValue(this INode node, string attributeName, out bo
         /// Try to get an attribute value off of an element.
         /// Returns true when the attribute was found, false otherwise.
         /// </summary>
-        public static bool TryGetAttrValue(this INode node, string attributeName, [NotNullWhen(true)]out string result)
+        public static bool TryGetAttrValue(this INode node, string attributeName, [NotNullWhen(true)] out string result)
         {
 #pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
             result = default;
@@ -66,9 +66,9 @@ public static bool TryGetAttrValue(this INode node, string attributeName, [NotNu
         /// </summary>
         public static bool TryGetAttrValue<T>(this INode node, string attributeName, out T result) where T : System.Enum
         {
-#pragma warning disable CS8653 // A default expression introduces a null value for a type parameter.
+#pragma warning disable CS8601 // Possible null reference assignment.
             result = default;
-#pragma warning restore CS8653 // A default expression introduces a null value for a type parameter.
+#pragma warning restore CS8601 // Possible null reference assignment.
             return node is IElement element && element.TryGetAttrValue(attributeName, out result);
         }
 
@@ -76,11 +76,11 @@ public static bool TryGetAttrValue<T>(this INode node, string attributeName, out
         /// Try to get an attribute value off of an element.
         /// Returns true when the attribute was found, false otherwise.
         /// </summary>
-        public static bool TryGetAttrValue<T>(this INode node, string attributeName, Func<string, T> resultFunc, [NotNullWhen(true)] out T result)
+        public static bool TryGetAttrValue<T>(this INode node, string attributeName, Func<string, T> resultFunc, [NotNullWhen(true)] out T result) where T : notnull
         {
-#pragma warning disable CS8653 // A default expression introduces a null value for a type parameter.
+#pragma warning disable CS8601 // Possible null reference assignment.
             result = default;
-#pragma warning restore CS8653 // A default expression introduces a null value for a type parameter.
+#pragma warning restore CS8601 // Possible null reference assignment.
             return node is IElement element && element.TryGetAttrValue(attributeName, resultFunc, out result);
         }