tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-23 13:54:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

More performance optimization for the Remove Empty Lines command

Browse Source 
Close #12544
This commit is contained in:
Arkadiusz Michalski 2022-11-21 01:03:31 +01:00 committed by Don Ho
parent 891f2ed682
commit cffdf79a9b
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
PowerEditor/src/Notepad_plus.cpp
View File

@ -1493,11 +1493,11 @@ void Notepad_plus::removeEmptyLine(bool isBlankContained)
FindOption env; FindOption env;
if (isBlankContained) if (isBlankContained)
{ {
env._str2Search = TEXT("^([\\t ]*$(\\r?\\n|\\r))(\\1)*"); env._str2Search = TEXT("^(?>[\\t ]*[\\r\\n]+)+");
} }
else else
{ {
env._str2Search = TEXT("^$(\\r?\\n|\\r)(\\1)*"); env._str2Search = TEXT("^[\\r\\n]+");
} }
env._str4Replace = TEXT(""); env._str4Replace = TEXT("");
env._searchType = FindRegex; env._searchType = FindRegex;
@ -1509,15 +1509,22 @@ void Notepad_plus::removeEmptyLine(bool isBlankContained)
_findReplaceDlg.processAll(ProcessReplaceAll, &env, isEntireDoc); _findReplaceDlg.processAll(ProcessReplaceAll, &env, isEntireDoc);
// remove the last line if it's an empty line. // remove the last line if it's an empty line.
if (isBlankContained) auto lastLineDoc = _pEditView->execute(SCI_GETLINECOUNT) - 1;
auto str2Search = isBlankContained ? TEXT("[\\r\\n]+^[\\t ]*$|^[\\t ]+$") : TEXT("[\\r\\n]+^$");
auto startPos = _pEditView->execute(SCI_POSITIONFROMLINE, lastLineDoc - 1);
auto endPos = _pEditView->execute(SCI_GETLENGTH);
if (!isEntireDoc)
{ {
env._str2Search = TEXT("(\\r?\\n|\\r)^[\\t ]*$"); startPos = _pEditView->execute(SCI_GETSELECTIONSTART);
endPos = _pEditView->execute(SCI_GETSELECTIONEND);
auto endLine = _pEditView->execute(SCI_LINEFROMPOSITION, endPos);
if (endPos != (_pEditView->execute(SCI_POSITIONFROMLINE, endLine) + _pEditView->execute(SCI_LINELENGTH, endLine)))
return;
} }
else _pEditView->execute(SCI_SETSEARCHFLAGS, SCFIND_REGEXP|SCFIND_POSIX);
{ auto posFound = _pEditView->searchInTarget(str2Search, lstrlen(str2Search), startPos, endPos);
env._str2Search = TEXT("(\\r?\\n|\\r)^$"); if (posFound >= 0)
} _pEditView->replaceTarget(TEXT(""), posFound, endPos);
_findReplaceDlg.processAll(ProcessReplaceAll, &env, isEntireDoc);
} }
void Notepad_plus::removeDuplicateLines() void Notepad_plus::removeDuplicateLines()