From a430c0dfd7ce89a617df5b6f410e65633864953f Mon Sep 17 00:00:00 2001
From: Ajay Bura <32841439+ajbura@users.noreply.github.com>
Date: Sat, 22 Oct 2022 16:31:26 +0530
Subject: [PATCH] remove paragraph from markdown

---
 src/util/markdown.js | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/util/markdown.js b/src/util/markdown.js
index 411eec37..e52a538d 100644
--- a/src/util/markdown.js
+++ b/src/util/markdown.js
@@ -82,13 +82,22 @@ const plainRules = {
   },
   newline: {
     ...defaultRules.newline,
+    match: blockRegex(/^ *\n/),
     plain: () => '\n',
+    html: () => '<br>',
   },
   paragraph: {
     ...defaultRules.paragraph,
-    match: blockRegex(/^((?:[^\n]|\n(?! *\n))+)(?:\n *)+\n/),
-    plain: (node, output, state) => `${output(node.content, state)}\n`,
-    html: (node, output, state) => htmlTag('p', output(node.content, state)),
+    match: (source, state) => {
+      const endMatch = blockRegex(/^([^\n]*)\n*$/);
+      if (endMatch) {
+        state.end = true;
+        return endMatch(source, state);
+      }
+      return blockRegex(/^([^\n]*)\n?/)(source, state);
+    },
+    plain: (node, output, state) => `${output(node.content, state)}${state.end ? '' : '\n'}`,
+    html: (node, output, state) => `${output(node.content, state)}${state.end ? '' : '<br>'}`,
   },
   escape: {
     ...defaultRules.escape,
@@ -141,10 +150,10 @@ const markdownRules = {
     parse: (capture, parse, state) => {
       const content = capture[0].replace(/^ *> ?/gm, '');
       return {
-        content: parse(`${content}\n`, state), // TODO: remove /n after fixing paragraph
+        content: parse(`${content}`, state),
       };
     },
-    plain: (node, output, state) => `> ${output(node.content, state).trim().replace(/\n/g, '\n> ')}`,
+    plain: (node, output, state) => `> ${output(node.content, state).trim().replace(/\n/g, '\n> ')}\n`,
     html: (node, output, state) => htmlTag('blockquote', output(node.content, state)),
   },
   list: {
@@ -499,11 +508,11 @@ function render(content, state, plainOut, htmlOut) {
   };
 }
 
-const plainParser = parserFor(plainRules);
+const plainParser = parserFor(plainRules, { disableAutoBlockNewlines: true });
 const plainPlainOut = outputFor(plainRules, 'plain');
 const plainHtmlOut = outputFor(plainRules, 'html');
 
-const mdParser = parserFor(markdownRules);
+const mdParser = parserFor(markdownRules, { disableAutoBlockNewlines: true });
 const mdPlainOut = outputFor(markdownRules, 'plain');
 const mdHtmlOut = outputFor(markdownRules, 'html');