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: "Remove Duplicate Lines": skipping line on progress to next compare when removing previous duplicate

Browse Source
This commit is contained in:
Rainer Kottenhoff 2018-03-23 16:27:23 +01:00
parent 8b9e8a7d13
commit bfe07dba67
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/Edit.c
View File

@ -3596,7 +3596,6 @@ void EditRemoveDuplicateLines(HWND hwnd, bool bRemoveEmptyLines)
DocLn iStartLine = 0;
DocLn iEndLine = 0;
const DocLn iLastLine = SciCall_GetLineCount() - 1;
const DocPos iSelStart = SciCall_GetSelectionStart();
const DocPos iSelEnd = SciCall_GetSelectionEnd();
@ -3608,7 +3607,7 @@ void EditRemoveDuplicateLines(HWND hwnd, bool bRemoveEmptyLines)
if (iSelEnd <= SciCall_PositionFromLine(iEndLine)) { --iEndLine; }
}
else {
iEndLine = iLastLine;
iEndLine = SciCall_GetLineCount() - 1; // last line
}
if ((iEndLine - iStartLine) <= 1) { return; }
@ -3631,29 +3630,34 @@ void EditRemoveDuplicateLines(HWND hwnd, bool bRemoveEmptyLines)
{
const DocPos iCurLnLen = SciCall_GetLine(iCurLine, pCurrentLine);
if (!bRemoveEmptyLines && (iCurLnLen <= iEmptyLnLen)) { continue; }
if (bRemoveEmptyLines || (iCurLnLen > iEmptyLnLen)) {
for (DocLn iCompareLine = iCurLine + 1; iCompareLine < iEndLine; ++iCompareLine)
{
const DocPos iCmpLnLen = SciCall_GetLine(iCompareLine, NULL);
if (!bRemoveEmptyLines && (iCmpLnLen <= iEmptyLnLen)) { continue; }
for (DocLn iCompareLine = iCurLine + 1; iCompareLine < iEndLine; ++iCompareLine)
{
const DocPos iCmpLnLen = SciCall_GetLine(iCompareLine, NULL);
const DocPos iBegCmpLine = SciCall_PositionFromLine(iCompareLine);
const char* pCompareLine = SciCall_GetRangePointer(iBegCmpLine, iCmpLnLen);
if (bRemoveEmptyLines || (iCmpLnLen > iEmptyLnLen)) {
if (iCurLnLen == iCmpLnLen) {
if (StringCchCompareNA(pCurrentLine, iCurLnLen, pCompareLine, iCmpLnLen) == 0) {
SciCall_SetTargetRange(iBegCmpLine, iBegCmpLine + iCmpLnLen);
SciCall_ReplaceTarget(0, "");
--iEndLine;
}
const DocPos iBegCmpLine = SciCall_PositionFromLine(iCompareLine);
const char* pCompareLine = SciCall_GetRangePointer(iBegCmpLine, iCmpLnLen + 2);
if (iCurLnLen == iCmpLnLen) {
if (StringCchCompareNA(pCurrentLine, iCurLnLen, pCompareLine, iCmpLnLen) == 0) {
SciCall_SetTargetRange(iBegCmpLine, iBegCmpLine + iCmpLnLen);
SciCall_ReplaceTarget(0, "");
--iCompareLine; // proactive preventing progress to avoid comparison line skip
--iEndLine;
}
}
} // empty
}
}
} // empty
}
FreeMem(pCurrentLine);
EditLeaveTargetTransaction();
ObserveNotifyChangeEvent();
FreeMem(pCurrentLine);
}