@@ -95,7 +95,9 @@ def run():
9595
9696def script_enhancedFindNext (self , gesture ):
9797 mostRecentSearchTerm = getMostRecentSearchTerm ()
98- if mostRecentSearchTerm is None or (mostRecentSearchTerm .searchType == SearchType .REGULAR_EXPRESSION .name and not self .supportsRegexpSearch ()):
98+ if (mostRecentSearchTerm is None
99+ or (mostRecentSearchTerm .searchType == SearchType .REGULAR_EXPRESSION .name
100+ and not self .supportsRegexpSearch ())):
99101 self .script_find (gesture )
100102 return
101103 doFindText (
@@ -109,7 +111,9 @@ def script_enhancedFindNext(self, gesture):
109111
110112def script_EnhancedFindPrevious (self , gesture ):
111113 mostRecentSearchTerm = getMostRecentSearchTerm ()
112- if mostRecentSearchTerm is None or (mostRecentSearchTerm .searchType == SearchType .REGULAR_EXPRESSION .name and not self .supportsRegexpSearch ()):
114+ if (mostRecentSearchTerm is None
115+ or (mostRecentSearchTerm .searchType == SearchType .REGULAR_EXPRESSION .name
116+ and not self .supportsRegexpSearch ())):
113117 self .script_find (gesture , reverse = True )
114118 return
115119 doFindText (
@@ -201,18 +205,18 @@ def performSearch(cursorManager, searchTerm, info, reverse, caseSensitive, wrapS
201205
202206
203207def find (cursorManager , searchTerm , info , reverse , caseSensitive ):
204- if searchTerm .searchType == SearchType .REGULAR_EXPRESSION .name :
205- if not cursorManager .supportsRegexpSearch ():
206- wx .CallAfter (
207- # Translators: Message shown when an invalid regular expression is entered.
208- _ ("current textInfo backend does not support regular expression searches" ),
209- FIND_ERROR_DIALOG_TITLE , wx .OK | wx .ICON_ERROR
210- )
211- return None
212- res = info .findRegexp (searchTerm .text , reverse = reverse )
213- else :
214- res = info .find (searchTerm .text , reverse = reverse , caseSensitive = caseSensitive )
215- return res
208+ if searchTerm .searchType == SearchType .REGULAR_EXPRESSION .name :
209+ if not cursorManager .supportsRegexpSearch ():
210+ wx .CallAfter (
211+ # Translators: Message shown when an invalid regular expression is entered.
212+ _ ("current textInfo backend does not support regular expression searches" ),
213+ FIND_ERROR_DIALOG_TITLE , wx .OK | wx .ICON_ERROR
214+ )
215+ return None
216+ res = info .findRegexp (searchTerm .text , reverse = reverse )
217+ else :
218+ res = info .find (searchTerm .text , reverse = reverse , caseSensitive = caseSensitive )
219+ return res
216220
217221
218222def findRegexp (self , text , reverse = False ):
0 commit comments