From 0b2a9d851141b7f99b0ead3c24364b405187f1a9 Mon Sep 17 00:00:00 2001
From: boojack <stevenlgtm@gmail.com>
Date: Thu, 20 Oct 2022 21:57:40 +0800
Subject: [PATCH] fix: bold and emphasis regex (#323)

* fix: bold and emphasis regex

* chore: udpate
---
 web/src/labs/marked/marked.test.ts     | 8 ++++++++
 web/src/labs/marked/parser/Bold.ts     | 2 +-
 web/src/labs/marked/parser/Emphasis.ts | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/web/src/labs/marked/marked.test.ts b/web/src/labs/marked/marked.test.ts
index 031403229..f8eab6688 100644
--- a/web/src/labs/marked/marked.test.ts
+++ b/web/src/labs/marked/marked.test.ts
@@ -123,6 +123,14 @@ console.log("hello world!")
         markdown: `Important: ***Minecraft/123***`,
         want: `<p>Important: <strong><em>Minecraft/123</em></strong></p>`,
       },
+      {
+        markdown: `Important: **Minecraft*123***`,
+        want: `<p>Important: <strong>Minecraft<em>123</em></strong></p>`,
+      },
+      {
+        markdown: `Important: **Minecraft*123*456**`,
+        want: `<p>Important: <strong>Minecraft<em>123</em>456</strong></p>`,
+      },
       {
         markdown: `Important: ***[baidu](https://baidu.com)***`,
         want: `<p>Important: <strong><em><a class='link' target='_blank' rel='noreferrer' href='https://baidu.com'>baidu</a></em></strong></p>`,
diff --git a/web/src/labs/marked/parser/Bold.ts b/web/src/labs/marked/parser/Bold.ts
index 31fdf433c..d118225c0 100644
--- a/web/src/labs/marked/parser/Bold.ts
+++ b/web/src/labs/marked/parser/Bold.ts
@@ -2,7 +2,7 @@ import { marked } from "..";
 import Emphasis from "./Emphasis";
 import Link from "./Link";
 
-export const BOLD_REG = /\*\*([\S ]+)\*\*/;
+export const BOLD_REG = /\*\*([\S *]+)\*\*/;
 
 const renderer = (rawStr: string): string => {
   const matchResult = rawStr.match(BOLD_REG);
diff --git a/web/src/labs/marked/parser/Emphasis.ts b/web/src/labs/marked/parser/Emphasis.ts
index 810ee736a..2b6bcafdf 100644
--- a/web/src/labs/marked/parser/Emphasis.ts
+++ b/web/src/labs/marked/parser/Emphasis.ts
@@ -2,7 +2,7 @@ import { marked } from "..";
 import Bold from "./Bold";
 import Link from "./Link";
 
-export const EMPHASIS_REG = /\*([\S ]+)\*/;
+export const EMPHASIS_REG = /\*([\S ]+?)\*/;
 
 const renderer = (rawStr: string): string => {
   const matchResult = rawStr.match(EMPHASIS_REG);