tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not modify doc if sort when doc is already sorted 

Fix #8558, close #8559
This commit is contained in:
Scott Sumner 2020-07-13 11:01:13 -04:00 committed by Don HO
parent b724a04eeb
commit d42f13071d
No known key found for this signature in database
GPG Key ID: 6C429F1D8D84F46E
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
View File

@ -3590,7 +3590,7 @@ void ScintillaEditView::insertNewLineBelowCurrentLine()
execute(SCI_SETEMPTYSELECTION, execute(SCI_POSITIONFROMLINE, current_line + 1)); execute(SCI_SETEMPTYSELECTION, execute(SCI_POSITIONFROMLINE, current_line + 1));
} }
void ScintillaEditView::sortLines(size_t fromLine, size_t toLine, ISorter *pSort) void ScintillaEditView::sortLines(size_t fromLine, size_t toLine, ISorter* pSort)
{ {
if (fromLine >= toLine) if (fromLine >= toLine)
{ {
@ -3612,16 +3612,19 @@ void ScintillaEditView::sortLines(size_t fromLine, size_t toLine, ISorter *pSort
} }
assert(toLine - fromLine + 1 == splitText.size()); assert(toLine - fromLine + 1 == splitText.size());
const std::vector<generic_string> sortedText = pSort->sort(splitText); const std::vector<generic_string> sortedText = pSort->sort(splitText);
const generic_string joined = stringJoin(sortedText, getEOLString()); generic_string joined = stringJoin(sortedText, getEOLString());
if (sortEntireDocument) if (sortEntireDocument)
{ {
assert(joined.length() == text.length()); assert(joined.length() == text.length());
replaceTarget(joined.c_str(), int(startPos), int(endPos));
} }
else else
{ {
assert(joined.length() + getEOLString().length() == text.length()); assert(joined.length() + getEOLString().length() == text.length());
replaceTarget((joined + getEOLString()).c_str(), int(startPos), int(endPos)); joined += getEOLString();
}
if (text != joined)
{
replaceTarget(joined.c_str(), int(startPos), int(endPos));
} }
} }