usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MFM] Improve hashtag detection

This commit is contained in:
syuilo 2018-11-29 20:12:37 +09:00
parent 0489291815
commit 48d0e2fa5f
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/parser.ts
View File

@ -162,7 +162,7 @@ const mfm = P.createLanguage({
let hashtag = match[1]; let hashtag = match[1];
hashtag = hashtag.substr(0, getTrailingPosition(hashtag)); hashtag = hashtag.substr(0, getTrailingPosition(hashtag));
if (hashtag.match(/^[0-9]+$/)) return P.makeFailure(i, 'not a hashtag'); if (hashtag.match(/^[0-9]+$/)) return P.makeFailure(i, 'not a hashtag');
if (!['\n', ' ', '(', '「', null, undefined].includes(input[i - 1])) return P.makeFailure(i, 'require space before "#"'); if (!['\n', ' ', '　', '(', '「', null, undefined].includes(input[i - 1])) return P.makeFailure(i, 'require space before "#"');
return P.makeSuccess(i + ('#' + hashtag).length, makeNode('hashtag', { hashtag: hashtag })); return P.makeSuccess(i + ('#' + hashtag).length, makeNode('hashtag', { hashtag: hashtag }));
}), }),
//#endregion //#endregion

8
test/mfm.ts
View File

@ -186,6 +186,14 @@ describe('Text', () => {
], tokens); ], tokens);
}); });
it('with text (zenkaku)', () => {
const tokens = analyze('こんにちは　#世界');
assert.deepEqual([
text('こんにちは　'),
node('hashtag', { hashtag: '世界' })
], tokens);
});
it('ignore comma and period', () => { it('ignore comma and period', () => {
const tokens = analyze('Foo #bar, baz #piyo.'); const tokens = analyze('Foo #bar, baz #piyo.');
assert.deepEqual([ assert.deepEqual([