Skip to content

toggle terminal line wrapping beginning with last buffer line #134521

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

Merged
meganrogge merged 3 commits into from
Oct 6, 2021
Merged

toggle terminal line wrapping beginning with last buffer line #134521

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9fc317a
fix #134407
meganrogge Oct 6, 2021
56fb69e
use getLineWidth
meganrogge Oct 6, 2021
3524d03
Revert "use getLineWidth"
meganrogge Oct 6, 2021
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
32 changes: 18 additions & 14 deletions src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1934,10 +1934,14 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
this._horizontalScrollbar?.setScrollDimensions({ scrollWidth: 0 });
} else {
let maxCols = 0;
for (let i = this._xterm.buffer.active.viewportY; i < this._xterm.buffer.active.length; i++) {
const lineWidth = this._getLineWidth(i, this._xterm.buffer.active);
maxCols = Math.max(maxCols, lineWidth.width || 0);
i = lineWidth.newIndex;
if (!this._xterm.buffer.active.getLine(0)) {
return;
}
const lineWidth = this._xterm.buffer.active.getLine(0)!.length;
for (let i = this._xterm.buffer.active.length - 1; i >= this._xterm.buffer.active.viewportY; i--) {
const lineInfo = this._getWrappedLineCount(i, this._xterm.buffer.active);
maxCols = Math.max(maxCols, lineInfo.lineCount * lineWidth || 0);
i = lineInfo.currentIndex;
}
maxCols = Math.min(maxCols, Constants.MaxSupportedCols);
this._fixedCols = maxCols;
Expand Down Expand Up @@ -1984,17 +1988,17 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
}
}

private _getLineWidth(index: number, buffer: IBuffer): { width: number, newIndex: number } {
let width = 0;
private _getWrappedLineCount(index: number, buffer: IBuffer): { lineCount: number, currentIndex: number } {
let line = buffer.getLine(index);
let newIndex = index;
while (line?.isWrapped) {
width += line.length;
newIndex++;
line = buffer.getLine(newIndex);
}
width += line!.length;
return { width, newIndex };
if (!line) {
throw new Error('Could not get line');
}
let currentIndex = index;
while (line?.isWrapped && currentIndex > 0) {
currentIndex--;
line = buffer.getLine(currentIndex);
}
return { lineCount: index - currentIndex + 1, currentIndex };
}

private _setResolvedShellLaunchConfig(shellLaunchConfig: IShellLaunchConfig): void {
Expand Down