From 53481accf13cbb6227d12e98542b0f314b2a586e Mon Sep 17 00:00:00 2001
From: ibrokemypie <ibrokemypie@bastardi.net>
Date: Sun, 20 Jan 2019 20:00:55 +1100
Subject: [PATCH] Add double underscore syntax for bold markdown (#3733)

* Add double underscore syntax for bold markdown
see https://github.com/syuilo/misskey/pull/3732
this allows bold text through either **text** or __text__

* Add tests for underscore bold mfm syntax
---
 src/mfm/parser.ts |  2 +-
 test/mfm.ts       | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/mfm/parser.ts b/src/mfm/parser.ts
index 2ab38d97a..c271b62e2 100644
--- a/src/mfm/parser.ts
+++ b/src/mfm/parser.ts
@@ -154,7 +154,7 @@ const mfm = P.createLanguage({
 
 	//#region Bold
 	bold: r =>
-		P.regexp(/\*\*([\s\S]+?)\*\*/, 1)
+		P.regexp(/(\*\*|__)([\s\S]+?)\1/, 2)
 		.map(x => createTree('bold', P.alt(
 			r.strike,
 			r.italic,
diff --git a/test/mfm.ts b/test/mfm.ts
index b681ed1d0..bacce017c 100644
--- a/test/mfm.ts
+++ b/test/mfm.ts
@@ -177,6 +177,29 @@ describe('MFM', () => {
 					text('bar'),
 				]);
 			});
+
+			it('with underscores', () => {
+				const tokens = analyze('__foo__');
+				assert.deepStrictEqual(tokens, [
+					tree('bold', [
+						text('foo')
+					], {}),
+				]);
+			});
+
+			it('mixed syntax', () => {
+				const tokens = analyze('**foo__');
+				assert.deepStrictEqual(tokens, [
+						text('**foo__'),
+				]);
+			});
+
+			it('mixed syntax', () => {
+				const tokens = analyze('__foo**');
+				assert.deepStrictEqual(tokens, [
+						text('__foo**'),
+				]);
+			});
 		});
 
 		it('big', () => {