mirrors/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2025-05-30 06:25:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix markdown grammar being too greedy in some places

Browse source 
Fixes #150
This commit is contained in:
Alexey Golub 2019-03-06 22:37:36 +02:00
parent d1d82f975b
commit dda32d8af2
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
DiscordChatExporter.Core.Markdown/Internal/Grammar.cs
View file

@ -71,7 +71,7 @@ namespace DiscordChatExporter.Core.Markdown.Internal
// The first word is a language identifier if it's the only word followed by a newline, the rest is code // The first word is a language identifier if it's the only word followed by a newline, the rest is code
private static readonly Parser<Node> MultilineCodeBlockNode = private static readonly Parser<Node> MultilineCodeBlockNode =
Parse.RegexMatch(new Regex("```(?:(\\w*?)?(?:\\s*?\\n))?(.+)```", RegexOptions.Singleline)) Parse.RegexMatch(new Regex("```(?:(\\w*?)?(?:\\s*?\\n))?(.+?)```", RegexOptions.Singleline))
.Select(m => new MultilineCodeBlockNode(m.Value, m.Groups[1].Value, m.Groups[2].Value)); .Select(m => new MultilineCodeBlockNode(m.Value, m.Groups[1].Value, m.Groups[2].Value));
// Combinator, order matters // Combinator, order matters
@ -114,7 +114,7 @@ namespace DiscordChatExporter.Core.Markdown.Internal
.Select(m => new EmojiNode(m.Value, m.Groups[1].Value)); .Select(m => new EmojiNode(m.Value, m.Groups[1].Value));
// <:lul:123456> or <a:lul:123456> // <:lul:123456> or <a:lul:123456>
private static readonly Parser<Node> CustomEmojiNode = Parse.RegexMatch("<(a)?:(.+):(\\d+)>") private static readonly Parser<Node> CustomEmojiNode = Parse.RegexMatch("<(a)?:(.+?):(\\d+)>")
.Select(m => new EmojiNode(m.Value, m.Groups[3].Value, m.Groups[2].Value, m.Groups[1].Value.IsNotBlank())); .Select(m => new EmojiNode(m.Value, m.Groups[3].Value, m.Groups[2].Value, m.Groups[1].Value.IsNotBlank()));
// Combinator, order matters // Combinator, order matters
@ -123,7 +123,7 @@ namespace DiscordChatExporter.Core.Markdown.Internal
/* Links */ /* Links */
// [title](link) // [title](link)
private static readonly Parser<Node> TitledLinkNode = Parse.RegexMatch("\\[(.+)\\]\\((.+)\\)") private static readonly Parser<Node> TitledLinkNode = Parse.RegexMatch("\\[(.+?)\\]\\((.+?)\\)")
.Select(m => new LinkNode(m.Value, m.Groups[2].Value, m.Groups[1].Value)); .Select(m => new LinkNode(m.Value, m.Groups[2].Value, m.Groups[1].Value));
// Starts with http:// or https://, stops at the last non-whitespace character followed by whitespace or punctuation character // Starts with http:// or https://, stops at the last non-whitespace character followed by whitespace or punctuation character