From a81ae6208649bc3f9542bc6ce5ba65c7bb3e5321 Mon Sep 17 00:00:00 2001
From: Chris Maltby <chris.maltby@gmail.com>
Date: Thu, 6 Jun 2024 15:54:20 +0100
Subject: [PATCH] Fix issue using using non-English named variables and text
 codes in dialogue

---
 CHANGELOG.md                                |  1 +
 src/components/ui/form/DialogueTextarea.tsx | 10 +++++-----
 src/components/ui/form/MathTextarea.tsx     |  2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bba27d9ef..47fa03cdc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,6 +53,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix issue where searching through menus would use very low contrast text colours when using Dark theme
 - Fix issue preventing palette names from being over 25 characters long
 - Fix issue where sceneTypes in `engine.json` for plugins could cause duplicate scene types to appear
+- Fix issue using using non-English named variables and text codes in dialogue.
 
 ## [4.0.0-beta2] - 2024-05-20
 
diff --git a/src/components/ui/form/DialogueTextarea.tsx b/src/components/ui/form/DialogueTextarea.tsx
index 976090ffa..74ce833b8 100644
--- a/src/components/ui/form/DialogueTextarea.tsx
+++ b/src/components/ui/form/DialogueTextarea.tsx
@@ -454,7 +454,7 @@ export const DialogueTextarea: FC<DialogueTextareaProps> = ({
       >
         <CustomMention
           className="Mentions__TokenVar"
-          trigger={/(\$([A-Za-z0-9]+))$/}
+          trigger={/(\$([\p{L}0-9]+))$/u}
           markup="$__id__$"
           data={searchVariables(variables, "$")}
           regex={/\$([VLT0-9][0-9]*)\$/}
@@ -484,7 +484,7 @@ export const DialogueTextarea: FC<DialogueTextareaProps> = ({
         />
         <CustomMention
           className="Mentions__TokenChar"
-          trigger={/(#([A-Za-z0-9]+))$/}
+          trigger={/(#([\p{L}0-9]+))$/u}
           markup="#__id__#"
           data={searchVariables(variables, "#")}
           regex={/#([VLT0-9][0-9]*)#/}
@@ -514,7 +514,7 @@ export const DialogueTextarea: FC<DialogueTextareaProps> = ({
         />
         <CustomMention
           className="Mentions__TokenSpeed"
-          trigger={/(!([A-Za-z0-9]+))$/}
+          trigger={/(!([\p{L}0-9]+))$/u}
           data={speedCodes}
           markup="!__id__!"
           regex={/!(S[0-5]+)!/}
@@ -541,7 +541,7 @@ export const DialogueTextarea: FC<DialogueTextareaProps> = ({
         />
         <CustomMention
           className="Mentions__TokenFont"
-          trigger={/(!([A-Za-z0-9]+))$/}
+          trigger={/(!([\p{L}0-9]+))$/u}
           data={fontItems}
           markup="!__id__!"
           regex={/!(F:[0-9a-f-]+)!/}
@@ -568,7 +568,7 @@ export const DialogueTextarea: FC<DialogueTextareaProps> = ({
         />
         <CustomMention
           className="Mentions__TokenGoto"
-          trigger={/(!([A-Za-z0-9]+))$/}
+          trigger={/(!([\p{L}0-9]+))$/u}
           data={moveCodes}
           markup={`__id__`}
           regex={/(\\00[34]\\[0-7][0-7][0-7]\\[0-7][0-7][0-7])/}
diff --git a/src/components/ui/form/MathTextarea.tsx b/src/components/ui/form/MathTextarea.tsx
index a8b127d60..4f95ebbc9 100644
--- a/src/components/ui/form/MathTextarea.tsx
+++ b/src/components/ui/form/MathTextarea.tsx
@@ -363,7 +363,7 @@ export const MathTextarea: FC<MathTextareaProps> = ({
       >
         <CustomMention
           className="Mentions__TokenVar"
-          trigger={/(\$([A-Za-z0-9]+))$/}
+          trigger={/(\$([\p{L}0-9]+))$/u}
           markup="$__id__$"
           data={searchVariables(variables)}
           regex={/\$([VLT0-9][0-9]*)\$/}