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

[#1007] Patched SimpleTerminalEmulator to handle \r & \r\n correctly for Win32. #249

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

[#1007] Patched SimpleTerminalEmulator to handle \r & \r\n correctly for Win32. #249

Show file tree
Hide file tree
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
18 changes: 18 additions & 0 deletions ...rg.python.pydev.shared_core/src/org/python/pydev/shared_core/string/FastStringBuffer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,24 @@ public int indexOf(char c, int fromOffset) {
return -1;
}

public int lastIndexOf(char c) {
for (int i = this.count - 1; i > 0; i--) {
if (c == this.value[i]) {
return i;
}
}
return -1;
}

public int lastIndexOf(char c, int fromOffset) {
for (int i = fromOffset; i > 0; i--) {
if (c == this.value[i]) {
return i;
}
}
return -1;
}

public char firstChar() {
return this.value[0];
}
Expand Down
63 changes: 36 additions & 27 deletions plugins/org.python.pydev/src/org/python/pydev/process_window/SimpleTerminalEmulator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package org.python.pydev.process_window;

import java.util.Collections;
import java.util.List;

import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Text;
import org.python.pydev.shared_core.string.FastStringBuffer;
import org.python.pydev.shared_core.string.StringUtils;
import org.python.pydev.shared_ui.FontUtils;
import org.python.pydev.shared_ui.IFontUsage;
Expand Down Expand Up @@ -72,10 +74,9 @@ public Control getControl() {
}

public void processText(String contents) {
List<String> splitInLines = StringUtils.splitInLines(contents, false);
List<String> splitInLines = StringUtils.splitInLines(contents, true);
FastStringBuffer buf = new FastStringBuffer(output.getTextChars()).removeChars(Collections.singleton('\r'));
for (String line : splitInLines) {
output.append(line);
output.append("\n");
// System.out.println("start line ---");
// char[] charArray = line.toCharArray();
// for (char c : charArray) {
Expand All @@ -93,30 +94,38 @@ public void processText(String contents) {
// }
// }
// System.out.println("end line ---");
// if (line.endsWith("\r")) {
// // Work as a terminal emulator and go to the start of the line
// char[] textChars = output.getTextChars();
// FastStringBuffer buf = new FastStringBuffer(textChars);
// while (buf.length() > 0 && !buf.endsWith('\n')) {
// buf.deleteLast();
// }
// cursor = buf.length();
// output.append(line.substring(0, line.length() - 1));
// } else {
// String text = output.getText();
// if (text.length() == cursor) {
// output.append(line);
// cursor += line.length();
// } else if (line.equals("\r\n") || line.equals("\n")) {
// cursor = text.length() + line.length();
// output.append(line);
// } else {
// text = text.substring(0, cursor);
// text += line;
// output.setText(text);
// cursor = text.length();
// }
// }

// Convert Windows newlines to Unix.
if (line.endsWith("\r\n")) {
line = line.substring(0, line.length() - 2) + "\n";
}
// Rewrite each line in between carriage returns.
while (!line.isEmpty()) {
String cutString = line;
int crIndex = line.indexOf('\r');
if (crIndex > -1) {
cutString = line.substring(0, crIndex);
line = line.substring(crIndex + 1);
}
if (cursor < buf.length()) {
buf.setLength(cursor);
buf.append(cutString);
output.setText(buf.toString());
cursor = buf.length();
} else {
output.append(cutString);
buf.append(cutString);
cursor += cutString.length();
}
if (line.isEmpty()) {
// Line ended with \r, so line.substring made it blank,
// so we reset the cursor to the last newline character.
cursor = buf.lastIndexOf('\n') + 1;
} else if (crIndex < 0) {
// \r didn't exist so we already processed a whole line.
line = "";
}
}
}
}
}