Skip to content

Commit 05ee3d5

Browse files
javier-godoypaodb
authored andcommitted
fix: fix regression in line wrapping
1 parent fb38318 commit 05ee3d5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/main/resources/META-INF/frontend/fc-xterm/xterm-console-mixin.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class ConsoleAddon extends TerminalAddon<IConsoleMixin> {
5353
let scanEOL = (function() {
5454
let buffer = this._bufferService.buffer;
5555
let col = this._bufferService.buffer.lines.get(buffer.ybase+buffer.y).getTrimmedLength();
56-
this.cursorCharAbsolute({params:[col+1]});
56+
this._activeBuffer.x = Math.min(col, terminal.cols);
5757
}).bind(inputHandler);
5858

5959
let cursorForwardWrapped = (function(params: any) {
@@ -109,7 +109,7 @@ class ConsoleAddon extends TerminalAddon<IConsoleMixin> {
109109
line.isWrapped=false;
110110
if (y==range.last) {
111111
y--;
112-
x=this._bufferService.cols-1;
112+
x=this._bufferService.cols;
113113
}
114114
}
115115
}

src/main/resources/META-INF/frontend/fc-xterm/xterm-insertfix-mixin.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class InsertFixAddon extends TerminalAddon<TerminalMixin> {
4343
const printedLength = end-start;
4444
let trimmedLength = bufferRow.getTrimmedLength();
4545

46-
if (trimmedLength+printedLength > bufferRow.length) {
46+
if (buffer.x!=trimmedLength && trimmedLength+printedLength > bufferRow.length) {
4747
let range = buffer.getWrappedRangeForLine(buffer.y + buffer.ybase)
4848
range.first = buffer.y + buffer.ybase;
4949

0 commit comments

Comments
 (0)