mirror of
https://activitypub.software/TransFem-org/Sharkey.git
synced 2024-12-14 10:05:46 +01:00
[MFM] Fix hashtag parsing
This commit is contained in:
parent
ef30f36f55
commit
8f5f3985f4
2 changed files with 41 additions and 20 deletions
|
@ -110,7 +110,7 @@ const mfm = P.createLanguage({
|
||||||
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');
|
||||||
if (input[i - 1] != ' ' && input[i - 1] != null) return P.makeFailure(i, 'require space before "#"');
|
if (input[i - 1] != '\n' && input[i - 1] != ' ' && input[i - 1] != null) return P.makeFailure(i, 'require space before "#"');
|
||||||
return P.makeSuccess(i + match[0].length, makeNode('hashtag', { hashtag: match[1] }));
|
return P.makeSuccess(i + match[0].length, makeNode('hashtag', { hashtag: match[1] }));
|
||||||
}),
|
}),
|
||||||
//#endregion
|
//#endregion
|
||||||
|
|
35
test/mfm.ts
35
test/mfm.ts
|
@ -162,27 +162,48 @@ describe('Text', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('hashtag', () => {
|
describe('hashtag', () => {
|
||||||
const tokens1 = analyze('Strawberry Pasta #alice');
|
it('simple', () => {
|
||||||
|
const tokens = analyze('#alice');
|
||||||
|
assert.deepEqual([
|
||||||
|
node('hashtag', { hashtag: 'alice' })
|
||||||
|
], tokens);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('after line break', () => {
|
||||||
|
const tokens = analyze('foo\n#alice');
|
||||||
|
assert.deepEqual([
|
||||||
|
text('foo\n'),
|
||||||
|
node('hashtag', { hashtag: 'alice' })
|
||||||
|
], tokens);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('with text', () => {
|
||||||
|
const tokens = analyze('Strawberry Pasta #alice');
|
||||||
assert.deepEqual([
|
assert.deepEqual([
|
||||||
text('Strawberry Pasta '),
|
text('Strawberry Pasta '),
|
||||||
node('hashtag', { hashtag: 'alice' })
|
node('hashtag', { hashtag: 'alice' })
|
||||||
], tokens1);
|
], tokens);
|
||||||
|
});
|
||||||
|
|
||||||
const tokens2 = analyze('Foo #bar, baz #piyo.');
|
it('ignore comma and period', () => {
|
||||||
|
const tokens = analyze('Foo #bar, baz #piyo.');
|
||||||
assert.deepEqual([
|
assert.deepEqual([
|
||||||
text('Foo '),
|
text('Foo '),
|
||||||
node('hashtag', { hashtag: 'bar' }),
|
node('hashtag', { hashtag: 'bar' }),
|
||||||
text(', baz '),
|
text(', baz '),
|
||||||
node('hashtag', { hashtag: 'piyo' }),
|
node('hashtag', { hashtag: 'piyo' }),
|
||||||
text('.'),
|
text('.'),
|
||||||
], tokens2);
|
], tokens);
|
||||||
|
});
|
||||||
|
|
||||||
const tokens3 = analyze('#Foo!');
|
it('ignore exclamation mark', () => {
|
||||||
|
const tokens = analyze('#Foo!');
|
||||||
assert.deepEqual([
|
assert.deepEqual([
|
||||||
node('hashtag', { hashtag: 'Foo' }),
|
node('hashtag', { hashtag: 'Foo' }),
|
||||||
text('!'),
|
text('!'),
|
||||||
], tokens3);
|
], tokens);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('quote', () => {
|
describe('quote', () => {
|
||||||
|
|
Loading…
Reference in a new issue