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

+ fix: bug in joining lines algorithm

Browse Source
This commit is contained in:
Rainer Kottenhoff 2018-01-15 23:12:58 +01:00
parent c4d6042737
commit dec5280501
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/Edit.c
View File

@ -3630,36 +3630,28 @@ void EditJoinLinesEx(HWND hwnd, BOOL bPreserveParagraphs, BOOL bCRLF2Space)
int cchJoin = -1;
for (int i = 0; i < iSelCount; ++i)
{
if (pszText[i] == '\r' || pszText[i] == '\n')
if ((pszText[i] == '\r') || (pszText[i] == '\n'))
{
if (pszText[i] == '\r' && pszText[i + 1] == '\n') { ++i; }
if ((pszText[i+1] == '\r') || (pszText[i+1] == '\n')) { ++i; }
if (!StrChrA("\r\n",pszText[i+1]) && pszText[i+1])
int j = ++i;
while (StrChrA("\r\n", pszText[j])) { ++j; } // swallow all next line-breaks
if ((i < j) && (j < iSelCount) && pszText[j] && bPreserveParagraphs)
{
// next char is non line-break
if (bCRLF2Space) { pszJoin[++cchJoin] = ' '; }
bModified = TRUE;
}
else { // we are between paragraphs
// swallow all line-breaks
while (StrChrA("\r\n",pszText[i+1])) {
++i;
bModified = TRUE;
}
if (bPreserveParagraphs) {
if (pszText[i + 1] != 0) {
for (int k = 0; k < cchEOL; ++k) { pszJoin[++cchJoin] = szEOL[k]; }
if (cchJoin > cchEOL) {
for (int k = 0; k < cchEOL; ++k) { pszJoin[++cchJoin] = szEOL[k]; }
}
bModified = TRUE;
}
for (int k = 0; k < cchEOL; ++k) { pszJoin[++cchJoin] = szEOL[k]; }
if (bCRLF2Space) {
for (int k = 0; k < cchEOL; ++k) { pszJoin[++cchJoin] = szEOL[k]; }
}
}
else if ((j < iSelCount) && pszText[j] && bCRLF2Space)
{
pszJoin[++cchJoin] = ' ';
}
i = j;
bModified = TRUE;
}
else {
if (i < iSelCount) {
pszJoin[++cchJoin] = pszText[i]; // copy char
}
}