From d807255e13466ba27fccfc181e688028cdcba29e Mon Sep 17 00:00:00 2001 From: Yufei Huang Date: Fri, 21 Jan 2022 23:37:27 +0800 Subject: [PATCH] Fix link reference definition parse bug with title and CRLF --- src/Markdig.Tests/TestPlayParser.cs | 16 +++++++++++----- src/Markdig/Helpers/LinkHelper.cs | 14 ++++++++++---- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/Markdig.Tests/TestPlayParser.cs b/src/Markdig.Tests/TestPlayParser.cs index ee737631..dc17bdf0 100644 --- a/src/Markdig.Tests/TestPlayParser.cs +++ b/src/Markdig.Tests/TestPlayParser.cs @@ -15,11 +15,17 @@ namespace Markdig.Tests [Test] public void TestLinksWithCarriageReturn() { - { - var text = "[Link 1][link-1], [link 2][link-2].\r\n\r\n[link-1]: https://example.com\r\n[link-2]: https://example.com"; - var result = Markdown.ToHtml(text).TrimEnd(); - Assert.AreEqual("

Link 1, link 2.

", result); - } + var text = "[Link 1][link-1], [link 2][link-2].\r\n\r\n[link-1]: https://example.com\r\n[link-2]: https://example.com"; + var result = Markdown.ToHtml(text).TrimEnd(); + Assert.AreEqual("

Link 1, link 2.

", result); + } + + [Test] + public void TestLinksWithTitleAndCarriageReturn() + { + var text = "[Link 1][link-1], [link 2][link-2].\r\n\r\n[link-1]: https://example.com \"title 1\" \r\n[link-2]: https://example.com \"title 2\""; + var result = Markdown.ToHtml(text).TrimEnd(); + Assert.AreEqual("

Link 1, link 2.

", result); } [Test] diff --git a/src/Markdig/Helpers/LinkHelper.cs b/src/Markdig/Helpers/LinkHelper.cs index f0b7ee31..bf0e70be 100644 --- a/src/Markdig/Helpers/LinkHelper.cs +++ b/src/Markdig/Helpers/LinkHelper.cs @@ -606,7 +606,7 @@ namespace Markdig.Helpers hasOnlyWhiteSpacesSinceLastLine = 1; } } - else if (c != '\n' && c != '\r' && (c != '\r' && text.PeekChar() != '\n')) + else if (c != '\n' && c != '\r' && text.PeekChar() != '\n') { hasOnlyWhiteSpacesSinceLastLine = 0; } @@ -700,7 +700,7 @@ namespace Markdig.Helpers hasOnlyWhiteSpacesSinceLastLine = 1; } } - else if (c != '\n' && c != '\r' && (c != '\r' && text.PeekChar() != '\n')) + else if (c != '\n' && c != '\r' && text.PeekChar() != '\n') { hasOnlyWhiteSpacesSinceLastLine = 0; } @@ -1141,7 +1141,7 @@ namespace Markdig.Helpers c = text.NextChar(); } - if (c != '\0' && c != '\n') + if (c != '\0' && c != '\n' && c != '\r' && text.PeekChar() != '\n') { // If we were able to parse the url but the title doesn't end with space, // we are still returning a valid definition @@ -1158,6 +1158,11 @@ namespace Markdig.Helpers return false; } + if (c == '\r' && text.PeekChar() == '\n') + { + text.SkipChar(); + } + return true; } @@ -1276,7 +1281,7 @@ namespace Markdig.Helpers c = text.NextChar(); } - if (c != '\0' && c != '\n' && c != '\r' && (c != '\r' && text.PeekChar() != '\n')) + if (c != '\0' && c != '\n' && c != '\r' && text.PeekChar() != '\n') { // If we were able to parse the url but the title doesn't end with space, // we are still returning a valid definition @@ -1307,6 +1312,7 @@ namespace Markdig.Helpers else if (c == '\r' && text.PeekChar() == '\n') { newLine = NewLine.CarriageReturnLineFeed; + text.SkipChar(); } else if (c == '\r') {