improve emoji code parsing

misskey-dev · Sep 9, 2024 · 947d41d · 947d41d
1 parent 27bba7e
commit 947d41d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/internal/parser.ts b/src/internal/parser.ts
@@ -645,14 +645,13 @@ export const language = P.createLanguage<TypeTable>({
 	},
 
 	emojiCode: () => {
-		const side = P.notMatch(P.regexp(/[a-z0-9]/i));
 		const mark = P.str(':');
 		return P.seq( 
-			P.alt([P.lineBegin, side]),
+			P.notRegexpBefore(/[a-z0-9]$/i),
 			mark,
 			P.regexp(/[a-z0-9_+-]+/i),
 			mark,
-			P.alt([P.lineEnd, side]),
+			P.alt([P.lineEnd, P.notMatch(P.regexp(/[a-z0-9]/i))]),
 		).select(2).map(name => M.EMOJI_CODE(name));
 	},
 

diff --git a/test/api.ts b/test/api.ts
@@ -204,7 +204,6 @@ after`;
 		test('nested', () => {
 			const nodes = mfm.parse('abc:hoge:$[tada 123 @hoge :foo:]:piyo:');
 			const expect = [
-				EMOJI_CODE('hoge'),
 				EMOJI_CODE('foo'),
 				EMOJI_CODE('piyo')
 			];

diff --git a/test/parser.ts b/test/parser.ts
@@ -49,6 +49,12 @@ describe('SimpleParser', () => {
 			const output = [TEXT('あ'), EMOJI_CODE('bar'), TEXT('い')];
 			assert.deepStrictEqual(mfm.parseSimple(input), output);
 		});
+
+		test('end of text', () => {
+			const input = 'At 10:30:';
+			const output = [TEXT('At 10:30:')];
+			assert.deepStrictEqual(mfm.parseSimple(input), output);
+		});
 	});
 
 	test('disallow other syntaxes', () => {