CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-17 21:03:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

+fix: special not found position value in case of regex search

Browse Source
This commit is contained in:
METANEOCORTEX\Kotti 2022-08-29 00:41:43 +02:00
parent 7dcfec1138
commit de0e2e0be3
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Edit.c
View File

@ -923,6 +923,9 @@ bool EditCopyRangeAppend(HWND hwnd, DocPos posBegin, DocPos posEnd, bool bAppend
pszTextW[cchTextW] = L'\0';
}
}
else {
return false;
}
}
bool res = false;
@ -951,7 +954,7 @@ bool EditCopyRangeAppend(HWND hwnd, DocPos posBegin, DocPos posEnd, bool bAppend
size_t cchNewText = cchTextW;
if (pszOld && *pszOld) {
cchNewText += StringCchLen(pszOld, 0) + StringCchLen(pszSep, 0);
cchNewText += (StringCchLen(pszOld, 0) + StringCchLen(pszSep, 0));
}
// Copy Clip & add line break
@ -5888,6 +5891,8 @@ static DocPos _FindInTarget(LPCWSTR wchFind, int sFlags,
DocPos const len = (DocPos)WideCharToMultiByte(Encoding_SciCP, 0, wchFind, -1, chFind, COUNTOF(chFind), NULL, NULL);
iPos = SciCall_SearchInTarget(len - 1, chFind);
iPos = (bFindNext ? (iPos >= stop) : (iPos <= stop)) ? -1LL : iPos; // regex search
// handle next in case of zero-length-matches (regex) !
if (iPos == start) {
DocPos const nstop = SciCall_GetTargetEnd();
@ -7721,6 +7726,7 @@ void EditMarkAll(LPCWSTR wchFind, int sFlags, DocPos rangeStart, DocPos rangeEnd
};
Globals.iSelectionMarkNumber = found;
Globals.iMarkOccurrencesCount = count;
assert(!bMultiSel || (SciCall_GetSelections() == count));
}
observe:

8
src/Notepad3.c
View File

@ -4981,14 +4981,14 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
case IDM_EDIT_SELECTALLMATCHES: {
if (!Sci_IsMultiOrRectangleSelection()) {
if (!IsWindow(Globals.hwndDlgFindReplace)) {
if (IsWindow(Globals.hwndDlgFindReplace)) {
SetFindReplaceData(); // s_FindReplaceData
EditSelectionMultiSelectAllEx(Globals.hwndEdit, &s_FindReplaceData);
} else {
if (SciCall_IsSelectionEmpty()) {
EditSelectWordAtPos(SciCall_GetCurrentPos(), false);
}
EditSelectionMultiSelectAll();
} else {
SetFindReplaceData(); // s_FindReplaceData
EditSelectionMultiSelectAllEx(Globals.hwndEdit, &s_FindReplaceData);
}
}
}