Merge f678111 into 563e38f

CyrilleB79 · web-flow · commit 5ed1c6b8526b · 2023-02-14T08:27:04.000+10:00
diff --git a/source/gui/speechDict.py b/source/gui/speechDict.py
@@ -1,10 +1,12 @@
 # -*- coding: UTF-8 -*-
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2007-2022 NV Access Limited, Peter Vágner, Mesar Hameed, Joseph Lee,
+# Copyright (C) 2007-2023 NV Access Limited, Peter Vágner, Mesar Hameed, Joseph Lee,
 # Aaron Cannon, Ethan Holliger, Julien Cochuyt, Thomas Stivers, Cyrille Bougot, Aleksey Sadovoy
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
+from re import error as RegexpError
+
 from abc import abstractmethod
 import wx
 
@@ -94,25 +96,44 @@ def onOk(self, evt):
 			)
 			self.patternTextCtrl.SetFocus()
 			return
+		entryType = self.getType()
 		try:
 			dictEntry = self.dictEntry = speechDictHandler.SpeechDictEntry(
 				self.patternTextCtrl.GetValue(),
 				self.replacementTextCtrl.GetValue(),
 				self.commentTextCtrl.GetValue(),
 				bool(self.caseSensitiveCheckBox.GetValue()),
-				self.getType()
+				entryType,
 			)
+		except RegexpError as e:
+			log.debugWarning(f"Could not add dictionary entry due to regex error in the pattern field : {e}")
+			if entryType != speechDictHandler.ENTRY_TYPE_REGEXP:
+				raise e
+			gui.messageBox(
+				# Translators: This is an error message to let the user know that the dictionary entry is not valid.
+				_("Regular Expression error in the pattern field: \"{error}\".").format(error=e),
+				# Translators: The title of an error message raised by the Dictionary Entry dialog
+				_("Dictionary Entry Error"),
+				wx.OK | wx.ICON_WARNING,
+				self
+			)
+			self.patternTextCtrl.SetFocus()
+			return
+		try:
 			dictEntry.sub("test")  # Ensure there are no grouping error (#11407)
-		except Exception as e:
-			log.debugWarning("Could not add dictionary entry due to (regex error) : %s" % e)
+		except RegexpError as e:
+			log.debugWarning(f"Could not add dictionary entry due to regex error in the replacement field : {e}")
+			if entryType != speechDictHandler.ENTRY_TYPE_REGEXP:
+				raise e
 			gui.messageBox(
 				# Translators: This is an error message to let the user know that the dictionary entry is not valid.
-				_("Regular Expression error: \"%s\".") % e,
+				_("Regular Expression error in the replacement field: \"{error}\".").format(error=e),
 				# Translators: The title of an error message raised by the Dictionary Entry dialog
 				_("Dictionary Entry Error"),
 				wx.OK | wx.ICON_WARNING,
 				self
 			)
+			self.replacementTextCtrl.SetFocus()
 			return
 		evt.Skip()
 
diff --git a/source/speechDictHandler/__init__.py b/source/speechDictHandler/__init__.py
@@ -1,8 +1,7 @@
-#speechDictHandler.py
-#A part of NonVisual Desktop Access (NVDA)
-#Copyright (C) 2006-2017 NVDA Contributors <http://www.nvda-project.org/>
-#This file is covered by the GNU General Public License.
-#See the file COPYING for more details.
+# A part of NonVisual Desktop Access (NVDA)
+# Copyright (C) 2006-2023 NVDA Contributors <http://www.nvda-project.org/>
+# This file is covered by the GNU General Public License.
+# See the file COPYING for more details.
 
 import re
 import globalVars
@@ -42,7 +41,10 @@ def __init__(self, pattern, replacement,comment,caseSensitive=True,type=ENTRY_TY
 		self.type=type
 
 	def sub(self, text):
-		replacement=self.replacement
+		if self.type == ENTRY_TYPE_REGEXP:
+			replacement = self.replacement
+		else:
+			replacement = re.escape(self.replacement)
 		return self.compiled.sub(replacement, text)
 
 class SpeechDict(list):
