mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-30 13:13:08 +02:00
[MFM] Better hashtag parsing: Ignore trailing colon
This commit is contained in:
parent
3d62bd8007
commit
cd628eaf54
2 changed files with 9 additions and 1 deletions
|
@ -205,7 +205,7 @@ const mfm = P.createLanguage({
|
||||||
hashtag: r =>
|
hashtag: r =>
|
||||||
P((input, i) => {
|
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);
|
||||||
|
|
|
@ -357,6 +357,14 @@ describe('MFM', () => {
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('ignore colon', () => {
|
||||||
|
const tokens = analyze('#Foo:');
|
||||||
|
assert.deepStrictEqual(tokens, [
|
||||||
|
leaf('hashtag', { hashtag: 'Foo' }),
|
||||||
|
text(':'),
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
it('allow including number', () => {
|
it('allow including number', () => {
|
||||||
const tokens = analyze('#foo123');
|
const tokens = analyze('#foo123');
|
||||||
assert.deepStrictEqual(tokens, [
|
assert.deepStrictEqual(tokens, [
|
||||||
|
|
Loading…
Reference in a new issue