From 256c517ece55c07c2bcd52c011b3af95b5ecf242 Mon Sep 17 00:00:00 2001
From: Chiizujin <chiizujin@gmail.com>
Date: Sun, 7 Apr 2024 13:48:13 +1000
Subject: [PATCH] Fix traceback if invalid regex is passed into editor :s
 command

---
 evennia/utils/eveditor.py | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/evennia/utils/eveditor.py b/evennia/utils/eveditor.py
index 04578c8be8..7b1e775d1f 100644
--- a/evennia/utils/eveditor.py
+++ b/evennia/utils/eveditor.py
@@ -647,29 +647,34 @@ class CmdEditorGroup(CmdEditorBase):
                 if not self.linerange:
                     lstart = 0
                     lend = self.cline + 1
-                    caller.msg(
-                        _("Search-replaced {arg1} -> {arg2} for lines {l1}-{l2}.").format(
-                            arg1=self.arg1, arg2=self.arg2, l1=lstart + 1, l2=lend
-                        )
-                    )
-                else:
-                    caller.msg(
-                        _("Search-replaced {arg1} -> {arg2} for {line}.").format(
-                            arg1=self.arg1, arg2=self.arg2, line=self.lstr
-                        )
-                    )
                 sarea = "\n".join(linebuffer[lstart:lend])
 
                 regex = r"%s|^%s(?=\s)|(?<=\s)%s(?=\s)|^%s$|(?<=\s)%s$"
                 regarg = self.arg1.strip("'").strip('"')
                 if " " in regarg:
                     regarg = regarg.replace(" ", " +")
-                sarea = re.sub(
-                    regex % (regarg, regarg, regarg, regarg, regarg),
-                    self.arg2.strip("'").strip('"'),
-                    sarea,
-                    re.MULTILINE,
-                )
+                try:
+                    sarea = re.sub(
+                        regex % (regarg, regarg, regarg, regarg, regarg),
+                        self.arg2.strip("'").strip('"'),
+                        sarea,
+                        re.MULTILINE,
+                    )
+                except re.error as e:
+                    caller.msg(_("Invalid regular expression."))
+                else:
+                    if not self.linerange:
+                        caller.msg(
+                            _("Search-replaced {arg1} -> {arg2} for lines {l1}-{l2}.").format(
+                                arg1=self.arg1, arg2=self.arg2, l1=lstart + 1, l2=lend
+                            )
+                        )
+                    else:
+                        caller.msg(
+                            _("Search-replaced {arg1} -> {arg2} for {line}.").format(
+                                arg1=self.arg1, arg2=self.arg2, line=self.lstr
+                            )
+                        )
                 buf = linebuffer[:lstart] + sarea.split("\n") + linebuffer[lend:]
                 editor.update_buffer(buf)
         elif cmd == ":f":