Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Display.withCrLf() is producing wrong line breaks on Windows #1557 #1562

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Display.withCrLf() is producing wrong line breaks on Windows #1557 #1562

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 38 additions & 52 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5215,79 +5215,65 @@ static String withCrLf (String string) {
int length = string.length ();
if (length == 0) return string;

/*
* Check for an LF or CR/LF and assume the rest of
* the string is formated that way. This will not
* work if the string contains mixed delimiters.
*/
/* If there is no LF - return string */
int i = string.indexOf ('\n', 0);
if (i == -1) return string;
if (i > 0 && string.charAt (i - 1) == '\r') {
return string;
}

/*
* The string is formatted with LF. Compute the
* number of lines and the size of the buffer
* needed to hold the result
*/
i++;
int count = 1;
while (i < length) {
if ((i = string.indexOf ('\n', i)) == -1) break;
count++; i++;
}
count += length;
/*Create String Builder for return string*/
StringBuilder result = new StringBuilder();
int j = 0;

/*If there is just LF, without CR before it,
add CR before LF*/

/* Create a new string with the CR/LF line terminator. */
i = 0;
StringBuilder result = new StringBuilder (count);
while (i < length) {
int j = string.indexOf ('\n', i);
if (j == -1) j = length;
result.append (string.substring (i, j));
if ((i = j) < length) {
result.append ("\r\n"); //$NON-NLS-1$
i++;
result.append(string.substring(j, i));
if(string.charAt(i - 1) == '\r'){
result.append('\n');
}
else {
result.append("\r\n");//$NON-NLS-1$
}
j = i + 1;
i = string.indexOf('\n', j);
if (i == -1) {
i = length;
result.append(string.substring(j));
}
}
return result.toString ();
return result.toString();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not took a detailed look in the original coding, but according to ChatGTP, we could just use a regex to normalize the String. See the coding:

/**
     * Normalize line breaks in a string to Windows line breaks (\r\n)
     *
     * @param input The input string
     * @return The string with normalized line breaks
     */
    public static String normalizeLineBreaks(String input) {
        // Replace \r\n, \r, or \n with \r\n
        return input.replaceAll("(\r\n|\r|\n)", "\r\n");
    }

This seems pretty easy and clean. Maybe you can give it a try.

}

static char [] withCrLf (char [] string) {
/* If the string is empty, return the string. */
int length = string.length;
if (length == 0) return string;

/*
* Check for an LF or CR/LF and assume the rest of
* the string is formated that way. This will not
* work if the string contains mixed delimiters.
* Also, compute the number of lines.
*/
int count = 0;
for (int i = 0; i < string.length; i++) {
if (string [i] == '\n') {

/* If there is no standalone LF - return string */
for(int i = 0; i < length; i++){
if (string[i] == '\n' && string[i-1] != '\r'){
count++;
if (count == 1 && i > 0 && string [i - 1] == '\r') return string;
}
}
if (count == 0) return string;

/*
* The string is formatted with LF.
*/
count += length;
/*Create new char array to return, and fill it
from initial char array,
adding CR before each stand-alone LF */
char[] result = new char[length + count];
count = 0;

/* Create a new string with the CR/LF line terminator. */
char [] result = new char [count];
for (int i = 0, j = 0; i < length && j < count; i++) {
if (string [i] == '\n') {
result [j++] = '\r';
for (int i = 0; i < length; i++) {
if (string[i] == '\n' && string[i-1] != '\r'){
result[i + count] = '\r';
count++;
result[i + count] = '\n';
}
result [j++] = string [i];
}

else {
result[i + count] = string[i];
}
}
return result;
}

Expand Down
Loading