diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-01-17 09:24:20 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-01-17 09:24:20 +0900 |
| commit | 9740db868546cea4e86fd81153b5b49e1225e876 (patch) | |
| tree | b10569921fe73f39a3d73bcc72ee325fa4d224b6 | |
| parent | :art: (diff) | |
| download | misskey-9740db868546cea4e86fd81153b5b49e1225e876.tar.gz misskey-9740db868546cea4e86fd81153b5b49e1225e876.tar.bz2 misskey-9740db868546cea4e86fd81153b5b49e1225e876.zip | |
[MFM] Better hashtag parsing: Ignore double quotation
Resolve #3886
| -rw-r--r-- | src/mfm/parser.ts | 2 | ||||
| -rw-r--r-- | test/mfm.ts | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/mfm/parser.ts b/src/mfm/parser.ts index 50877bcdb5..2f1608832e 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 7e2de47339..60fd4d62f8 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, [ |