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

Fix condition where Join Lines does one too many lines 

Fix #8503, close #8506
This commit is contained in:
Scott Sumner 2020-07-01 19:36:45 -04:00 committed by Don HO
parent 4bf662d031
commit 8b93240c59
No known key found for this signature in database
GPG Key ID: 6C429F1D8D84F46E
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
PowerEditor/src/NppCommands.cpp
View File

@ -1438,9 +1438,18 @@ void Notepad_plus::command(int id)
break; break;
case IDM_EDIT_JOIN_LINES: case IDM_EDIT_JOIN_LINES:
_pEditView->execute(SCI_TARGETFROMSELECTION); {
_pEditView->execute(SCI_LINESJOIN); const pair<int, int> lineRange = _pEditView->getSelectionLinesRange();
break; if (lineRange.first != lineRange.second)
{
auto anchorPos = _pEditView->execute(SCI_POSITIONFROMLINE, lineRange.first);
auto caretPos = _pEditView->execute(SCI_GETLINEENDPOSITION, lineRange.second);
_pEditView->execute(SCI_SETSELECTION, caretPos, anchorPos);
_pEditView->execute(SCI_TARGETFROMSELECTION);
_pEditView->execute(SCI_LINESJOIN);
}
}
break;
case IDM_EDIT_LINE_UP: case IDM_EDIT_LINE_UP:
_pEditView->currentLinesUp(); _pEditView->currentLinesUp();