Skip to content

Search to the last possible match of regexp in reverse search #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marlon-sousa merged 1 commit into from
Jul 13, 2025
Merged

Search to the last possible match of regexp in reverse search #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions addon/globalPlugins/EnhancedFindDialog/cursorManagerHelper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,10 +222,17 @@ def find(cursorManager, searchTerm, info, reverse, caseSensitive):
def findRegexp(self, text, reverse=False):
if reverse:
inText = self._getTextRange(0, self._startOffset)
matches = list(re.finditer(text, inText, re.UNICODE))
if not matches:
return False
m = matches[-1]
curOffset = 0
endOffset = self._startOffset
m = None
while curOffset < self._startOffset:
tempMatch = re.search(text, inText[curOffset:endOffset + 1], re.UNICODE)
if not tempMatch:
break

m = tempMatch
matchLocation = curOffset + m.start()
curOffset += m.start() + 1
else:
inText = self._getTextRange(self._startOffset + 1, self._getStoryLength())
m = re.search(text, inText, re.UNICODE)
Expand All @@ -235,7 +242,7 @@ def findRegexp(self, text, reverse=False):
converter = textUtils.getOffsetConverter(self.encoding)(inText)

if reverse:
offset = converter.strToEncodedOffsets(m.start())
offset = converter.strToEncodedOffsets(matchLocation)
else:
offset = self._startOffset + 1 + converter.strToEncodedOffsets(m.start())

Expand Down
2 changes: 1 addition & 1 deletion buildVars.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
# Minimum NVDA version supported (e.g. "2018.3.0", minor version is optional)
"addon_minimumNVDAVersion" : "2022.1",
# Last NVDA version supported/tested (e.g. "2018.4.0", ideally more recent than minimum version)
"addon_lastTestedNVDAVersion" : "2024.1",
"addon_lastTestedNVDAVersion" : "2025.1",
# Add-on update channel (default is None, denoting stable releases, and for development releases, use "dev"; do not change unless you know what you are doing)
"addon_updateChannel" : None,
}
Expand Down