mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-10 06:03:08 +02:00
[MFM] Better hashtag parsing: Ignore slash
This commit is contained in:
parent
4a41d2fddc
commit
31929dad61
2 changed files with 9 additions and 1 deletions
|
@ -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);
|
||||||
|
|
|
@ -611,6 +611,14 @@ describe('MFM', () => {
|
||||||
text('(#123)'),
|
text('(#123)'),
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('ignore slash', () => {
|
||||||
|
const tokens = parse('#foo/bar');
|
||||||
|
assert.deepStrictEqual(tokens, [
|
||||||
|
leaf('hashtag', { hashtag: 'foo' }),
|
||||||
|
text('/bar'),
|
||||||
|
]);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('quote', () => {
|
describe('quote', () => {
|
||||||
|
|
Loading…
Reference in a new issue