From: Ajay Bura <32841439+ajbura@users.noreply.github.com>
Date: Tue, 31 Oct 2023 03:18:30 +0000 (+1100)
Subject: Fix blockcode with empty lines not rendered (#1524)
X-Git-Tag: v3.2.0~2
X-Git-Url: https://git.wafflesoft.org/?a=commitdiff_plain;h=687ad8d0f0b30146d4cad585d73e79dba57ed729;p=rainny.git

Fix blockcode with empty lines not rendered (#1524)
---

diff --git a/src/app/plugins/markdown.ts b/src/app/plugins/markdown.ts
index c6bb391..40427a7 100644
--- a/src/app/plugins/markdown.ts
+++ b/src/app/plugins/markdown.ts
@@ -248,7 +248,7 @@ const HeadingRule: BlockMDRule = {
 };
 
 const CODEBLOCK_MD_1 = '```';
-const CODEBLOCK_REG_1 = /^`{3}(\S*)\n((.+\n)+)`{3} *(?!.)\n?/m;
+const CODEBLOCK_REG_1 = /^`{3}(\S*)\n((?:.*\n)+?)`{3} *(?!.)\n?/m;
 const CodeBlockRule: BlockMDRule = {
   match: (text) => text.match(CODEBLOCK_REG_1),
   html: (match) => {
@@ -285,7 +285,7 @@ const O_LIST_ITEM_PREFIX = /^(-|[\da-zA-Z]\.) */;
 const O_LIST_START = /^([\d])\./;
 const O_LIST_TYPE = /^([aAiI])\./;
 const O_LIST_TRAILING_NEWLINE = /\n$/;
-const ORDERED_LIST_REG_1 = /(^(-|[\da-zA-Z]\.) +.+\n?)+/m;
+const ORDERED_LIST_REG_1 = /(^(?:-|[\da-zA-Z]\.) +.+\n?)+/m;
 const OrderedListRule: BlockMDRule = {
   match: (text) => text.match(ORDERED_LIST_REG_1),
   html: (match, parseInline) => {