Status bar item for prompt, look below cursor line

Author: Tyriar

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

@@ -5,6 +5,7 @@
 
 import { Event } from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
+import type { IPromptInputModel } from 'vs/platform/terminal/common/capabilities/commandDetection/promptInputModel';
 import { ICurrentPartialCommand } from 'vs/platform/terminal/common/capabilities/commandDetection/terminalCommand';
 import { ITerminalOutputMatch, ITerminalOutputMatcher } from 'vs/platform/terminal/common/terminal';
 import { ReplayEntry } from 'vs/platform/terminal/common/terminalProcess';
@@ -161,6 +162,7 @@ export interface IBufferMarkCapability {
 
 export interface ICommandDetectionCapability {
 	readonly type: TerminalCapability.CommandDetection;
+	readonly promptInputModel: IPromptInputModel;
 	readonly commands: readonly ITerminalCommand[];
 	/** The command currently being executed, otherwise undefined. */
 	readonly executingCommand: string | undefined;

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

@@ -130,11 +130,23 @@ export class PromptInputModel extends Disposable implements IPromptInputModel {
 					// TODO: Detect continuation
 					//       For pwsh: (Get-PSReadLineOption).ContinuationPrompt
 					// TODO: Wide/emoji length support
-					this._cursorIndex = Math.max(this._value.length - lineText.length + buffer.cursorX, 0);
+					this._cursorIndex = Math.max(this._value.length - lineText.length - (this._continuationPrompt?.length ?? 0) + buffer.cursorX, 0);
 				}
 			}
 		}
 
+		// TODO: Check below the cursor for continuations
+		for (let y = absoluteCursorY + 1; y < buffer.baseY + this._xterm.rows; y++) {
+			let lineText = buffer.getLine(y)?.translateToString(true);
+			if (lineText) {
+				// TODO: Detect line continuation if it's not set
+				if (this._continuationPrompt && lineText.startsWith(this._continuationPrompt)) {
+					lineText = lineText.substring(this._continuationPrompt.length);
+				}
+				this._value += `\n${lineText}`;
+			}
+		}
+
 		if (this._logService.getLevel() === LogLevel.Trace) {
 			this._logService.trace(`PromptInputModel#_sync: Input="${this._value.substring(0, this._cursorIndex)}|${this.value.substring(this._cursorIndex)}"`);
 		}

src/vs/workbench/contrib/terminalContrib/developer/browser/terminal.developer.contribution.ts

@@ -25,6 +25,7 @@ import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/termin
 import type { Terminal } from '@xterm/xterm';
 import { ITerminalCommand, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
 import { getWindow } from 'vs/base/browser/dom';
+import { IStatusbarService, StatusbarAlignment, type IStatusbarEntry, type IStatusbarEntryAccessor } from 'vs/workbench/services/statusbar/browser/statusbar';
 
 registerTerminalAction({
 	id: TerminalCommandId.ShowTextureAtlas,
@@ -121,19 +122,36 @@ class DevModeContribution extends Disposable implements ITerminalContribution {
 	private readonly _activeDevModeDisposables = new MutableDisposable();
 	private _currentColor = 0;
 
+	private _statusbarEntry: IStatusbarEntry | undefined;
+	private _statusbarEntryAccessor: IStatusbarEntryAccessor | undefined;
+
 	constructor(
 		private readonly _instance: ITerminalInstance,
 		processManager: ITerminalProcessManager,
 		widgetManager: TerminalWidgetManager,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@ITerminalConfigurationService private readonly _terminalConfigurationService: ITerminalConfigurationService,
+		@IStatusbarService private readonly _statusbarService: IStatusbarService,
 	) {
 		super();
 		this._register(this._configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration(TerminalSettingId.DevMode)) {
 				this._updateDevMode();
 			}
 		}));
+
+		setTimeout(() => {
+			const commandDetection = this._instance.capabilities.get(TerminalCapability.CommandDetection)
+			if (commandDetection) {
+				// TODO: Listen to capability add
+				// TODO: Add util for when capability is available?
+				commandDetection.promptInputModel.onDidChangeInput(() => {
+					// TODO: Create a status bar item sync
+					// TODO: Only show focused instance status bar item
+					this._updateDevMode();
+				});
+			}
+		}, 2000);
 	}
 
 	xtermReady(xterm: IXtermTerminal & { raw: Terminal }): void {
@@ -145,7 +163,26 @@ class DevModeContribution extends Disposable implements ITerminalContribution {
 		const devMode: boolean = this._isEnabled();
 		this._xterm?.raw.element?.classList.toggle('dev-mode', devMode);
 
-		// Text area syncing
+		const promptInputModel = this._instance.capabilities.get(TerminalCapability.CommandDetection)?.promptInputModel
+		if (promptInputModel) {
+			// Text area syncing
+			const promptInput = promptInputModel.value.replaceAll('\n', '\u23CE');
+			this._statusbarEntry = {
+				name: localize('terminalDevMode', 'Terminal Dev Mode'),
+				text: `$(terminal) ${promptInput.substring(0, promptInputModel.cursorIndex)}|${promptInput.substring(promptInputModel.cursorIndex)}`,
+				// tooltip: localize('nonResponsivePtyHost', "The connection to the terminal's pty host process is unresponsive, terminals may stop working. Click to manually restart the pty host."),
+				ariaLabel: localize('ptyHostStatus.ariaLabel', 'test'),
+				// command: TerminalCommandId.RestartPtyHost,
+				kind: 'warning'
+			};
+			if (!this._statusbarEntryAccessor) {
+				console.log('1');
+				this._statusbarEntryAccessor = this._statusbarService.addEntry(this._statusbarEntry, 'terminal.promptInput', StatusbarAlignment.LEFT);
+			} else {
+				console.log('2');
+				this._statusbarEntryAccessor.update(this._statusbarEntry);
+			}
+		}
 		if (this._xterm?.raw.textarea) {
 			const font = this._terminalConfigurationService.getFont(getWindow(this._xterm.raw.textarea));
 			this._xterm.raw.textarea.style.fontFamily = font.fontFamily;