Don't trim whitespace when calculating cursor index

Tyriar · Tyriar · commit 4c4c692199c0 · 2025-08-10T05:10:29.000-07:00
Fixes #260746
diff --git a/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.ts b/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.ts
@@ -301,7 +301,7 @@ export class PromptInputModel extends Disposable implements IPromptInputModel {
 		let ghostTextIndex = -1;
 		if (cursorIndex === undefined) {
 			if (absoluteCursorY === commandStartY) {
-				cursorIndex = this._getRelativeCursorIndex(this._commandStartX, buffer, line);
+				cursorIndex = Math.min(this._getRelativeCursorIndex(this._commandStartX, buffer, line), commandLine.length);
 			} else {
 				cursorIndex = commandLine.trimEnd().length;
 			}
@@ -628,7 +628,7 @@ export class PromptInputModel extends Disposable implements IPromptInputModel {
 	}
 
 	private _getRelativeCursorIndex(startCellX: number, buffer: IBuffer, line: IBufferLine): number {
-		return line?.translateToString(true, startCellX, buffer.cursorX).length ?? 0;
+		return line?.translateToString(false, startCellX, buffer.cursorX).length ?? 0;
 	}
 
 	private _isCellStyledLikeGhostText(cell: IBufferCell): boolean {

Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ export class PromptInputModel extends Disposable implements IPromptInputModel {`
`301`	`301`	`let ghostTextIndex = -1;`
`302`	`302`	`if (cursorIndex === undefined) {`
`303`	`303`	`if (absoluteCursorY === commandStartY) {`
`304`		`- cursorIndex = this._getRelativeCursorIndex(this._commandStartX, buffer, line);`
	`304`	`+ cursorIndex = Math.min(this._getRelativeCursorIndex(this._commandStartX, buffer, line), commandLine.length);`
`305`	`305`	`} else {`
`306`	`306`	`cursorIndex = commandLine.trimEnd().length;`
`307`	`307`	`}`
`@@ -628,7 +628,7 @@ export class PromptInputModel extends Disposable implements IPromptInputModel {`
`628`	`628`	`}`
`629`	`629`
`630`	`630`	`private _getRelativeCursorIndex(startCellX: number, buffer: IBuffer, line: IBufferLine): number {`
`631`		`- return line?.translateToString(true, startCellX, buffer.cursorX).length ?? 0;`
	`631`	`+ return line?.translateToString(false, startCellX, buffer.cursorX).length ?? 0;`
`632`	`632`	`}`
`633`	`633`
`634`	`634`	`private _isCellStyledLikeGhostText(cell: IBufferCell): boolean {`