natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

[MFM] Improve hashtag parsing

This commit is contained in:
syuilo 2019-03-05 22:18:29 +09:00
parent 2c83a05e80
commit 2782e7d26f
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mfm/language.ts
View File

@ -142,7 +142,7 @@ export const mfmLanguage = P.createLanguage({
}, },
hashtag: () => P((input, i) => { hashtag: () => P((input, i) => {
const text = input.substr(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'); if (!match) return P.makeFailure(i, 'not a hashtag');
let hashtag = match[1]; let hashtag = match[1];
hashtag = removeOrphanedBrackets(hashtag); hashtag = removeOrphanedBrackets(hashtag);

8
test/mfm.ts
View File

@ -550,6 +550,14 @@ describe('MFM', () => {
]); ]);
}); });
it('ignore square brackets', () => {
const tokens = parse('#foo]');
assert.deepStrictEqual(tokens, [
leaf('hashtag', { hashtag: 'foo' }),
text(']'),
]);
});
it('allow including number', () => { it('allow including number', () => {
const tokens = parse('#foo123'); const tokens = parse('#foo123');
assert.deepStrictEqual(tokens, [ assert.deepStrictEqual(tokens, [