#2372 SCI_LINESJOIN sometimes works incorrect

[Arkadiusz MIchalski]

SCI_LINESJOIN sometimes unnecessary change CRLF to CR when we have some spaces before CRFL.
Check attached picture. Second case seems wrong.

[Neil Hodgson]

When there is a space at the end of a line and then empty lines, it doesn't reset prevNonWS and moves past the '\r' without deleting it. Attached a patch that may fix this.

[Zufu Liu]

The patch is missing.

[Neil Hodgson]

Patch

[Zufu Liu]

The code can be more efficient (to avoid testing space and line ending on each byte) as following:

for (Sci::Position pos = pdoc->LineEndPosition(targetRange.start.Position()); pos < targetRange.end.Position();) {
    const char chPrev = pdoc->CharAt(pos - 1);
    targetRange.end.Add(-pdoc->LenChar(pos));
    pdoc->DelChar(pos);
    if (chPrev != ' ') {
        // Ensure at least one space separating previous lines
        const Sci::Position lengthInserted = pdoc->InsertString(pos, " ", 1);
        targetRange.end.Add(lengthInserted);
    }
    pos = pdoc->LineEndPosition(pos);
}

The condition chPrev != ' ' can be changed to chPrev != ' ' && pdoc->CharAt(pos) != ' ', or changed to use IsSpaceOrTab().

[Zufu Liu]

Updated the code to call LenChar() once:

for (Sci::Position pos = pdoc->LineEndPosition(targetRange.start.Position()); pos < targetRange.end.Position();) {
    const char chPrev = pdoc->CharAt(pos - 1);
    const Sci::Position widthChar = pdoc->LenChar(pos);
    targetRange.end.Add(-widthChar);
    pdoc->DeleteChars(pos, widthChar);
    if (chPrev != ' ') {
        // Ensure at least one space separating previous lines
        const Sci::Position lengthInserted = pdoc->InsertString(pos, " ", 1);
        targetRange.end.Add(lengthInserted);
    }
    pos = pdoc->LineEndPosition(pos);
}

[Neil Hodgson]

Committed fix as [e81c4c].

[Zufu Liu]

Just found the code be optimized further: the function is join multiply lines to a single line with space delimiter, thus the line number is not changed, the loop can be written as:

const Sci::Line line = pdoc->SciLineFromPosition(targetRange.start.Position());
for (Sci::Position pos = pdoc->LineEnd(line); pos < targetRange.end.Position(); pos = pdoc->LineEnd(line)) {
    const char chPrev = pdoc->CharAt(pos - 1);
    const Sci::Position widthChar = pdoc->LenChar(pos);
    targetRange.end.Add(-widthChar);
    pdoc->DeleteChars(pos, widthChar);
    if (chPrev != ' ') {
        // Ensure at least one space separating previous lines
        const Sci::Position lengthInserted = pdoc->InsertString(pos, " ", 1);
        targetRange.end.Add(lengthInserted);
    }
}

[Neil Hodgson]

OK, [21a1a4].