Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correctly interpret emoji followed by # sign #501

Merged
merged 2 commits into from
Dec 4, 2024
Merged

Correctly interpret emoji followed by # sign #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a049281
correctly interpret emoji followed by pound
nfrasser Dec 4, 2024
f9e4e56
better hashtag plugin test
nfrasser Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/linkifyjs/src/scanner.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,13 @@ export function init(customSchemes = []) {
// Emoji tokens. They are not grouped by the scanner except in cases where a
// zero-width joiner is present
const Emoji = tr(Start, re.EMOJI, tk.EMOJI, { [fsm.emoji]: true });
tt(Emoji, '#'); // no transition, emoji regex seems to match #
tr(Emoji, re.EMOJI, Emoji);
tt(Emoji, EMOJI_VARIATION, Emoji);
// tt(Start, EMOJI_VARIATION, Emoji); // This one is sketchy

const EmojiJoiner = tt(Emoji, EMOJI_JOINER);
tt(EmojiJoiner, '#');
tr(EmojiJoiner, re.EMOJI, Emoji);
// tt(EmojiJoiner, EMOJI_VARIATION, Emoji); // also sketchy

Expand Down
10 changes: 5 additions & 5 deletions test/spec/linkify-plugin-hashtag.test.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe('linkify-plugin-hashtag', () => {

it('can parse hashtags after applying the plugin', () => {
expect(
linkify.find('There is a #hashtag #YOLO_2015 #__swag__ and #1234 and #%^&*( #_ #__ should not work'),
linkify.find('There is a #hashtag 💃#YOLO_2015 #__swag__ and #1234 and #%^&*( #_ #__ should not work'),
).to.be.eql([
{
type: 'hashtag',
Expand All @@ -36,16 +36,16 @@ describe('linkify-plugin-hashtag', () => {
value: '#YOLO_2015',
href: '#YOLO_2015',
isLink: true,
start: 20,
end: 30,
start: 22,
end: 32,
},
{
type: 'hashtag',
value: '#__swag__',
href: '#__swag__',
isLink: true,
start: 31,
end: 40,
start: 33,
end: 42,
},
]);
});
Expand Down
1 change: 1 addition & 0 deletions test/spec/linkifyjs/scanner.test.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ const tests = [
[t.UWORD, t.SLASH_SCHEME, t.COLON, t.SLASH, t.SLASH, t.WORD, t.DOT, t.TLD, t.UWORD],
['テスト', 'http', ':', '/', '/', 'example', '.', 'com', 'テスト'],
],
['👻#PhotoOfTheDay', [t.EMOJI, t.POUND, t.WORD], ['👻', '#', 'PhotoOfTheDay']],
];

const customSchemeTests = [
Expand Down
Loading