From 9740db868546cea4e86fd81153b5b49e1225e876 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 17 Jan 2019 09:24:20 +0900 Subject: [PATCH] [MFM] Better hashtag parsing: Ignore double quotation Resolve #3886 --- src/mfm/parser.ts | 2 +- test/mfm.ts | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/mfm/parser.ts b/src/mfm/parser.ts index 50877bcdb..2f1608832 100644 --- a/src/mfm/parser.ts +++ b/src/mfm/parser.ts @@ -205,7 +205,7 @@ const mfm = P.createLanguage({ hashtag: r => P((input, i) => { const text = input.substr(i); - const match = text.match(/^#([^\s\.,!\?#:]+)/i); + const match = text.match(/^#([^\s\.,!\?"#:]+)/i); if (!match) return P.makeFailure(i, 'not a hashtag'); let hashtag = match[1]; hashtag = removeOrphanedBrackets(hashtag); diff --git a/test/mfm.ts b/test/mfm.ts index 7e2de4733..60fd4d62f 100644 --- a/test/mfm.ts +++ b/test/mfm.ts @@ -365,6 +365,14 @@ describe('MFM', () => { ]); }); + it('ignore double quote', () => { + const tokens = analyze('#foo"'); + assert.deepStrictEqual(tokens, [ + leaf('hashtag', { hashtag: 'foo' }), + text('"'), + ]); + }); + it('allow including number', () => { const tokens = analyze('#foo123'); assert.deepStrictEqual(tokens, [