Fix handling Uri with an anchor #209

Author: onizet

src/Html2OpenXml/Expressions/HyperlinkExpression.cs

@@ -112,12 +112,6 @@ public override IEnumerable<OpenXmlElement> Interpret (ParsingContext context)
         {
             h = new Hyperlink() { History = true, Anchor = "_top" };
         }
-        // is it an anchor?
-        else if (context.Converter.SupportsAnchorLinks && linkNode.Hash.Length > 1 && linkNode.Hash[0] == '#')
-        {
-            h = new Hyperlink(
-                ) { History = true, Anchor = linkNode.Hash.Substring(1) };
-        }
         // ensure the links does not start with javascript:
         else if (AngleSharpExtensions.TryParseUrl(att, UriKind.Absolute, out var uri))
         {
@@ -126,6 +120,13 @@ public override IEnumerable<OpenXmlElement> Interpret (ParsingContext context)
             h = new Hyperlink(
                 ) { History = true, Id = extLink.Id };
         }
+        // is it an anchor?
+        else if (context.Converter.SupportsAnchorLinks && linkNode.Hash.Length > 1 && linkNode.Hash[0] == '#')
+        {
+            h = new Hyperlink(
+                )
+            { History = true, Anchor = linkNode.Hash.Substring(1) };
+        }
 
         if (h == null)
         {

test/HtmlToOpenXml.Tests/LinkTests.cs

@@ -16,10 +16,11 @@ public class LinkTests : HtmlConverterTestBase
         [TestCase("://www.site.com")]
         [TestCase("www.site.com")]
         [TestCase("http://www.site.com")]
-        public void ExternalLink_ShouldSucceed (string link)
+        [TestCase("http://www.site.com/#anchor1", "http://www.site.com/#anchor1")]
+        public void ExternalLink_ShouldSucceed(string link, string expectedUri = "http://www.site.com/")
         {
             var elements = converter.Parse($@"<a href=""{link}"" title=""Test Tooltip"">Test Caption</a>");
-            AssertHyperlink(mainPart, elements);
+            AssertHyperlink(mainPart, elements, expectedUri);
         }
 
         [TestCase(@"<a href=""javascript:alert()"">Js</a>")]
@@ -193,7 +194,7 @@ public async Task ParseIntoDocumentPart_ReturnsHyperlinkParentedToPart (Type ope
                 throw new NotSupportedException($"Test case not supported for {openXmlPartType.FullName}");
             }
 
-            AssertHyperlink(container, host.ChildElements);
+            AssertHyperlink(container, host.ChildElements, "http://www.site.com/");
             AssertThatOpenXmlDocumentIsValid();
         }
 
@@ -249,7 +250,8 @@ await converter.ParseBody(@"<a href='#_top'>Move to top
             Assert.That(rel.Uri.ToString(), Is.EqualTo("#_top"));
         }
 
-        private static void AssertHyperlink(OpenXmlPartContainer container, IEnumerable<OpenXmlElement> elements)
+        private static void AssertHyperlink(OpenXmlPartContainer container, IEnumerable<OpenXmlElement> elements,
+            string expectedUri)
         {
             Assert.That(elements.Count(), Is.EqualTo(1));
             Assert.Multiple(() => {
@@ -272,7 +274,7 @@ private static void AssertHyperlink(OpenXmlPartContainer container, IEnumerable<
             var extLink = container.HyperlinkRelationships.FirstOrDefault(r => r.Id == hyperlink.Id);
             Assert.That(extLink, Is.Not.Null);
             Assert.That(extLink.IsExternal, Is.EqualTo(true));
-            Assert.That(extLink.Uri.AbsoluteUri, Is.EqualTo("http://www.site.com/"));
+            Assert.That(extLink.Uri.AbsoluteUri, Is.EqualTo(expectedUri));
         }
     }
 }

test/HtmlToOpenXml.Tests/Utilities/MockHttpMessageHandler.cs

@@ -16,7 +16,7 @@ public MockHttpMessageHandler(Func<Uri, Task<HttpResponseMessage>> getResponseFu
 
         protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
         {
-            return await _getResponseFunc(request.RequestUri);
+            return await _getResponseFunc(request.RequestUri!);
         }
     }
 }