fix: use prompt height to support multiline prompt adjustments

Signed-off-by: Chapman Pendery <[email protected]>

Author: cpendery

src/vs/platform/terminal/common/capabilities/capabilities.ts

@@ -179,6 +179,7 @@ export interface ICommandDetectionCapability {
 	readonly onCommandInvalidated: Event<ITerminalCommand[]>;
 	readonly onCurrentCommandInvalidated: Event<ICommandInvalidationRequest>;
 	setCwd(value: string): void;
+	setPromptHeight(value: number): void;
 	setIsWindowsPty(value: boolean): void;
 	setIsCommandStorageDisabled(): void;
 	/**

src/vs/platform/terminal/common/capabilities/commandDetection/terminalCommand.ts

@@ -213,6 +213,7 @@ export class TerminalCommand implements ITerminalCommand {
 
 export interface ICurrentPartialCommand {
 	promptStartMarker?: IMarker;
+	promptHeight?: number;
 
 	commandStartMarker?: IMarker;
 	commandStartX?: number;
@@ -260,6 +261,7 @@ export interface ICurrentPartialCommand {
 
 export class PartialTerminalCommand implements ICurrentPartialCommand {
 	promptStartMarker?: IMarker;
+	promptHeight?: number;
 
 	commandStartMarker?: IMarker;
 	commandStartX?: number;

src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts

@@ -198,6 +198,10 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 		this._cwd = value;
 	}
 
+	setPromptHeight(value: number) {
+		this._currentCommand.promptHeight = value;
+	}
+
 	setIsWindowsPty(value: boolean) {
 		if (value && !(this._ptyHeuristics.value instanceof WindowsPtyHeuristics)) {
 			const that = this;
@@ -646,7 +650,9 @@ class WindowsPtyHeuristics extends Disposable {
 	}
 
 	handleInput() {
-		if (this._capability.currentCommand.isAdjusted === true || this._capability.currentCommand.isInputAdjusted === true) {
+		const hasActiveCommand = this._capability.currentCommand.commandStartX !== undefined && this._capability.currentCommand.commandExecutedX === undefined;
+		const hasAdjusted = this._capability.currentCommand.isAdjusted === true || this._capability.currentCommand.isInputAdjusted === true;
+		if (!hasActiveCommand || hasAdjusted) {
 			return;
 		}
 		this._capability.currentCommand.isInputAdjusted = true;
@@ -723,14 +729,14 @@ class WindowsPtyHeuristics extends Disposable {
 					// Adjust the prompt start marker to the command start marker
 					this._logService.debug('CommandDetectionCapability#_tryAdjustCommandStartMarker adjusted promptStart', `${this._capability.currentCommand.promptStartMarker?.line} -> ${this._capability.currentCommand.commandStartMarker.line}`);
 					this._capability.currentCommand.promptStartMarker?.dispose();
-					this._capability.currentCommand.promptStartMarker = cloneMarker(this._terminal, this._capability.currentCommand.commandStartMarker);
+					this._capability.currentCommand.promptStartMarker = cloneMarker(this._terminal, this._capability.currentCommand.commandStartMarker, -(this._capability.currentCommand.promptHeight ?? 0));
 
 					// Adjust the last command if it's not in the same position as the following
 					// prompt start marker
 					const lastCommand = this._capability.commands.at(-1);
 					if (lastCommand && this._capability.currentCommand.commandStartMarker.line !== lastCommand.endMarker?.line) {
 						lastCommand.endMarker?.dispose();
-						lastCommand.endMarker = cloneMarker(this._terminal, this._capability.currentCommand.commandStartMarker);
+						lastCommand.endMarker = cloneMarker(this._terminal, this._capability.currentCommand.commandStartMarker, -(this._capability.currentCommand.promptHeight ?? 0));
 					}
 
 					// use the regex to set the position as it's possible input has occurred

src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts

@@ -392,6 +392,9 @@ export class ShellIntegrationAddon extends Disposable implements IShellIntegrati
 						this.capabilities.get(TerminalCapability.CommandDetection)?.setIsCommandStorageDisabled();
 						return true;
 					}
+					case 'PromptHeight': {
+						this.capabilities.get(TerminalCapability.CommandDetection)?.setPromptHeight(parseInt(value));
+					}
 				}
 			}
 			case VSCodeOscPt.SetMark: {

src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh

@@ -171,6 +171,11 @@ __vsc_update_cwd() {
 	builtin printf '\e]633;P;Cwd=%s\a' "$(__vsc_escape_value "$PWD")"
 }
 
+__vsc_update_prompt_height() {
+	__vsc_prompt_height="$(builtin printf "%s" "${PS1@P}" | wc -l)"
+	builtin printf '\e]633;P;PromptHeight=%s\a' "$(__vsc_escape_value "$__vsc_prompt_height")"
+}
+
 __vsc_command_output_start() {
 	builtin printf '\e]633;E;%s;%s\a' "$(__vsc_escape_value "${__vsc_current_command}")" $__vsc_nonce
 	builtin printf '\e]633;C\a'
@@ -218,6 +223,7 @@ __vsc_precmd() {
 	__vsc_command_complete "$__vsc_status"
 	__vsc_current_command=""
 	__vsc_update_prompt
+	__vsc_update_prompt_height
 	__vsc_first_prompt=1
 }
 

src/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1

@@ -87,7 +87,13 @@ function Global:Prompt() {
 		Write-Error "failure" -ea ignore
 	}
 	# Run the original prompt
-	$Result += $Global:__VSCodeOriginalPrompt.Invoke()
+	$OriginalPrompt += $Global:__VSCodeOriginalPrompt.Invoke()
+	$Result += $OriginalPrompt
+
+	# Prompt height
+	# OSC 633 ; <Property>=<Value> ST
+	$Result += "$([char]0x1b)]633;P;PromptHeight=$(__VSCode-Escape-Value ($OriginalPrompt -Split '\n').Count)`a"
+
 	# Write command started
 	$Result += "$([char]0x1b)]633;B`a"
 	$Global:__LastHistoryId = $LastHistoryEntry.Id