From 7dbdfcc823acc3f212d53338d566374bdbcac81e Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Wed, 13 Dec 2023 19:29:29 -0500
Subject: [PATCH] fix: Allow parenthesis before mention. closes #6280

---
 app/editor/extensions/EmojiMenu.tsx   | 4 ++--
 app/editor/extensions/MentionMenu.tsx | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/editor/extensions/EmojiMenu.tsx b/app/editor/extensions/EmojiMenu.tsx
index 01312f216..813fecc02 100644
--- a/app/editor/extensions/EmojiMenu.tsx
+++ b/app/editor/extensions/EmojiMenu.tsx
@@ -20,10 +20,10 @@ export default class EmojiMenuExtension extends Suggestion {
 
     return {
       openRegex: new RegExp(
-        `(?:^|\\s):([0-9a-zA-Z_+-]+)${languageIsUsingColon ? "" : "?"}$`
+        `(?:^|\\s|\\():([0-9a-zA-Z_+-]+)${languageIsUsingColon ? "" : "?"}$`
       ),
       closeRegex:
-        /(?:^|\s):(([0-9a-zA-Z_+-]*\s+)|(\s+[0-9a-zA-Z_+-]+)|[^0-9a-zA-Z_+-]+)$/,
+        /(?:^|\s|\():(([0-9a-zA-Z_+-]*\s+)|(\s+[0-9a-zA-Z_+-]+)|[^0-9a-zA-Z_+-]+)$/,
       enabledInTable: true,
     };
   }
diff --git a/app/editor/extensions/MentionMenu.tsx b/app/editor/extensions/MentionMenu.tsx
index a6e7f1cdb..a7f4119f8 100644
--- a/app/editor/extensions/MentionMenu.tsx
+++ b/app/editor/extensions/MentionMenu.tsx
@@ -8,8 +8,8 @@ export default class MentionMenuExtension extends Suggestion {
   get defaultOptions() {
     return {
       // ported from https://github.com/tc39/proposal-regexp-unicode-property-escapes#unicode-aware-version-of-w
-      openRegex: /(?:^|\s)@([\p{L}\p{M}\d]+)?$/u,
-      closeRegex: /(?:^|\s)@(([\p{L}\p{M}\d]*\s+)|(\s+[\p{L}\p{M}\d]+))$/u,
+      openRegex: /(?:^|\s|\()@([\p{L}\p{M}\d]+)?$/u,
+      closeRegex: /(?:^|\s|\()@(([\p{L}\p{M}\d]*\s+)|(\s+[\p{L}\p{M}\d]+))$/u,
       enabledInTable: true,
     };
   }