mirrors/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2024-09-19 12:18:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow empty lines in repeated single-line quote nodes

Browse source 
Closes #1115
This commit is contained in:
Tyrrrz 2023-08-05 18:30:11 +03:00
parent c9b68427f3
commit dd0a35838d
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
DiscordChatExporter.Core/Markdown/Parsing/MarkdownParser.cs
View file

@ -12,7 +12,7 @@ namespace DiscordChatExporter.Core.Markdown.Parsing;
// Discord does NOT use a recursive-descent parser for markdown which becomes evident in some // Discord does NOT use a recursive-descent parser for markdown which becomes evident in some
// scenarios, like when multiple formatting nodes are nested together. // scenarios, like when multiple formatting nodes are nested together.
// To replicate Discord's behavior, we're employing a special parser that uses a set of regular // To replicate Discord's behavior, we're employing a special parser that uses a set of regular
// expressions that are executed sequentially in a first-match-first-serve manner. // expressions that are executed sequentially in a first-matched-first-served manner.
internal static partial class MarkdownParser internal static partial class MarkdownParser
{ {
private const RegexOptions DefaultRegexOptions = private const RegexOptions DefaultRegexOptions =
@ -83,7 +83,9 @@ internal static partial class MarkdownParser
private static readonly IMatcher<MarkdownNode> RepeatedSingleLineQuoteNodeMatcher = new RegexMatcher<MarkdownNode>( private static readonly IMatcher<MarkdownNode> RepeatedSingleLineQuoteNodeMatcher = new RegexMatcher<MarkdownNode>(
// Include the linebreaks in the content, so that the lines are preserved in quotes. // Include the linebreaks in the content, so that the lines are preserved in quotes.
new Regex(@"(?:^>\s(.+\n?)){2,}", DefaultRegexOptions), // Empty content is allowed within quotes.
// https://github.com/Tyrrrz/DiscordChatExporter/issues/1115
new Regex(@"(?:^>\s(.*\n?)){2,}", DefaultRegexOptions),
(s, m) => new FormattingNode( (s, m) => new FormattingNode(
FormattingKind.Quote, FormattingKind.Quote,
m.Groups[1].Captures.SelectMany(c => Parse(s.Relocate(c))).ToArray() m.Groups[1].Captures.SelectMany(c => Parse(s.Relocate(c))).ToArray()