Skip to content

Commit 3c04e3d

Browse files
committed
fix problems reported by pre-commit
1 parent 74a37d9 commit 3c04e3d

4 files changed

Lines changed: 25 additions & 21 deletions

File tree

addon/globalPlugins/EnhancedFindDialog/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,5 @@ def injectProcessing(self):
5252

5353
# add methods to CursorManager class
5454
cursorManagerHelper.patchCursorManager()
55-
# add methods to offsetsTextInfo class
55+
# add methods to offsetsTextInfo class
5656
cursorManagerHelper.patchOffsetsTextInfo()

addon/globalPlugins/EnhancedFindDialog/cursorManagerHelper.py

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ def run():
9595

9696
def 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

110112
def 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

203207
def 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

218222
def findRegexp(self, text, reverse=False):

addon/globalPlugins/EnhancedFindDialog/guiHelper.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# This file is covered by the GNU General Public License.
55
# See the file COPYING.txt for more details.
66

7-
from enum import Enum, unique
87
import addonHandler
98
import config
109
import core
@@ -194,16 +193,17 @@ def onOk(self, evt):
194193
log.debug("called onOk")
195194
text = self.findTextField.GetValue()
196195
if self.searchType == SearchType.REGULAR_EXPRESSION.name:
197-
try:
196+
try:
198197
re.compile(text)
199198
except re.error:
200-
wx.CallAfter(gui.messageBox,
199+
wx.CallAfter(
200+
gui.messageBox,
201201
# Translators: Message shown when an invalid regular expression is entered.
202202
_("The entered text is not a valid regular expression."),
203203
cursorManagerHelper.FIND_ERROR_DIALOG_TITLE, wx.OK | wx.ICON_ERROR
204204
) # Noqa E101
205205
return
206-
206+
207207
self.caseSensitive = self.caseSensitiveCheckBox.GetValue()
208208

209209
self.searchWrap = self.searchWrapCheckBox.GetValue()

addon/globalPlugins/EnhancedFindDialog/searchHistory.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ def getItems(self, searchType=None):
3030
return list(filter(lambda t: t.searchType == searchType, self._terms))
3131

3232
def getItemByText(self, text):
33-
return next((term for term in self._terms if term.text == text), None)
34-
33+
return next((term for term in self._terms if term.text == text), None)
34+
3535
def append(self, term):
3636
if not term.text:
3737
return

0 commit comments

Comments
 (0)