From 1a8632e80259c74489fd935ae0b7c9c6a320a9d9 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Sun, 15 Sep 2019 23:33:58 +0900
Subject: [PATCH] =?UTF-8?q?Fix:=20Keycap=20Number=20Sign=20=E3=81=8C?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=20(#5431?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix: Keycap Number Sign が表示できない

* add U+20E3
---
 src/mfm/language.ts |  1 +
 test/mfm.ts         | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/mfm/language.ts b/src/mfm/language.ts
index 5d5e35fbfd..53c275342b 100644
--- a/src/mfm/language.ts
+++ b/src/mfm/language.ts
@@ -145,6 +145,7 @@ export const mfmLanguage = P.createLanguage({
 		if (!match) return P.makeFailure(i, 'not a hashtag');
 		let hashtag = match[1];
 		hashtag = removeOrphanedBrackets(hashtag);
+		if (hashtag.match(/^(\u20e3|\ufe0f)/)) return P.makeFailure(i, 'not a hashtag');
 		if (hashtag.match(/^[0-9]+$/)) return P.makeFailure(i, 'not a hashtag');
 		if (input[i - 1] != null && input[i - 1].match(/[a-z0-9]/i)) return P.makeFailure(i, 'not a hashtag');
 		if (hashtag.length > 50) return P.makeFailure(i, 'not a hashtag');
diff --git a/test/mfm.ts b/test/mfm.ts
index 03d9f593af..12d9563e58 100644
--- a/test/mfm.ts
+++ b/test/mfm.ts
@@ -639,6 +639,20 @@ describe('MFM', () => {
 					text('/bar'),
 				]);
 			});
+
+			it('ignore Keycap Number Sign (U+0023 + U+20E3)', () => {
+				const tokens = parse('#⃣');
+				assert.deepStrictEqual(tokens, [
+					leaf('emoji', { emoji: '#⃣' })
+				]);
+			});
+
+			it('ignore Keycap Number Sign (U+0023 + U+FE0F + U+20E3)', () => {
+				const tokens = parse('#️⃣');
+				assert.deepStrictEqual(tokens, [
+					leaf('emoji', { emoji: '#️⃣' })
+				]);
+			});
 		});
 
 		describe('quote', () => {