Add duration to the terminal command SI tooltip

Author: hsfzxjy

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

@@ -242,6 +242,7 @@ interface IBaseTerminalCommand {
 	command: string;
 	isTrusted: boolean;
 	timestamp: number;
+	duration: number;
 
 	// Optional serializable
 	cwd: string | undefined;

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

@@ -14,6 +14,7 @@ export interface ITerminalCommandProperties {
 	command: string;
 	isTrusted: boolean;
 	timestamp: number;
+	duration: number;
 	marker: IXtermMarker | undefined;
 	cwd: string | undefined;
 	exitCode: number | undefined;
@@ -34,6 +35,7 @@ export class TerminalCommand implements ITerminalCommand {
 	get command() { return this._properties.command; }
 	get isTrusted() { return this._properties.isTrusted; }
 	get timestamp() { return this._properties.timestamp; }
+	get duration() { return this._properties.duration; }
 	get promptStartMarker() { return this._properties.promptStartMarker; }
 	get marker() { return this._properties.marker; }
 	get endMarker() { return this._properties.endMarker; }
@@ -77,6 +79,7 @@ export class TerminalCommand implements ITerminalCommand {
 			executedMarker,
 			executedX: serialized.executedX,
 			timestamp: serialized.timestamp,
+			duration: serialized.duration,
 			cwd: serialized.cwd,
 			commandStartLineContent: serialized.commandStartLineContent,
 			exitCode: serialized.exitCode,
@@ -101,6 +104,7 @@ export class TerminalCommand implements ITerminalCommand {
 			exitCode: this.exitCode,
 			commandStartLineContent: this.commandStartLineContent,
 			timestamp: this.timestamp,
+			duration: this.duration,
 			markProperties: this.markProperties,
 		};
 	}
@@ -251,6 +255,9 @@ export class PartialTerminalCommand implements ICurrentPartialCommand {
 	commandExecutedMarker?: IMarker;
 	commandExecutedX?: number;
 
+	private commandExecutedTimestamp?: number;
+	private commandDuration?: number;
+
 	commandFinishedMarker?: IMarker;
 
 	currentContinuationMarker?: IMarker;
@@ -284,6 +291,7 @@ export class PartialTerminalCommand implements ICurrentPartialCommand {
 			exitCode: undefined,
 			commandStartLineContent: undefined,
 			timestamp: 0,
+			duration: 0,
 			markProperties: undefined
 		};
 	}
@@ -305,6 +313,7 @@ export class PartialTerminalCommand implements ICurrentPartialCommand {
 				executedMarker: this.commandExecutedMarker,
 				executedX: this.commandExecutedX,
 				timestamp: Date.now(),
+				duration: this.commandDuration || 0,
 				cwd,
 				exitCode,
 				commandStartLineContent: this.commandStartLineContent,
@@ -315,6 +324,18 @@ export class PartialTerminalCommand implements ICurrentPartialCommand {
 		return undefined;
 	}
 
+	markExecutedTime() {
+		if (this.commandExecutedTimestamp === undefined) {
+			this.commandExecutedTimestamp = Date.now();
+		}
+	}
+
+	markFinishedTime() {
+		if (this.commandDuration === undefined && this.commandExecutedTimestamp !== undefined) {
+			this.commandDuration = Date.now() - this.commandExecutedTimestamp;
+		}
+	}
+
 	getPromptRowCount(): number {
 		return getPromptRowCount(this, this._xterm.buffer.active);
 	}

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

@@ -303,9 +303,11 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 
 	handleCommandExecuted(options?: IHandleCommandOptions): void {
 		this._ptyHeuristics.value.handleCommandExecuted(options);
+		this._currentCommand.markExecutedTime();
 	}
 
 	handleCommandFinished(exitCode: number | undefined, options?: IHandleCommandOptions): void {
+		this._currentCommand.markFinishedTime();
 		this._ptyHeuristics.value.preHandleCommandFinished?.();
 
 		this._logService.debug('CommandDetectionCapability#handleCommandFinished', this._terminal.buffer.active.cursorX, options?.marker?.line, this._currentCommand.command, this._currentCommand);

src/vs/workbench/contrib/terminal/browser/xterm/decorationStyles.ts

@@ -73,12 +73,12 @@ export class TerminalDecorationHoverManager extends Disposable {
 						}
 					} else if (command.exitCode) {
 						if (command.exitCode === -1) {
-							hoverContent += localize('terminalPromptCommandFailed', 'Command executed {0} and failed', fromNow(command.timestamp, true));
+							hoverContent += localize('terminalPromptCommandFailed', 'Command executed {0} for {1} ms and failed', fromNow(command.timestamp, true), command.duration);
 						} else {
-							hoverContent += localize('terminalPromptCommandFailedWithExitCode', 'Command executed {0} and failed (Exit Code {1})', fromNow(command.timestamp, true), command.exitCode);
+							hoverContent += localize('terminalPromptCommandFailedWithExitCode', 'Command executed {0} for {2} ms and failed (Exit Code {1})', fromNow(command.timestamp, true), command.exitCode, command.duration);
 						}
 					} else {
-						hoverContent += localize('terminalPromptCommandSuccess', 'Command executed {0}', fromNow(command.timestamp, true));
+						hoverContent += localize('terminalPromptCommandSuccess', 'Command executed {0} for {1} ms', fromNow(command.timestamp, true), command.duration);
 					}
 					this._hoverService.showHover({ content: new MarkdownString(hoverContent), target: element });
 				});

src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkOpeners.test.ts

@@ -142,6 +142,7 @@ suite('Workbench - TerminalLinkOpeners', () => {
 				isTrusted: true,
 				cwd: '/initial/cwd',
 				timestamp: 0,
+				duration: 0,
 				executedX: undefined,
 				startX: undefined,
 				marker: {
@@ -279,6 +280,7 @@ suite('Workbench - TerminalLinkOpeners', () => {
 					isTrusted: true,
 					cwd,
 					timestamp: 0,
+					duration: 0,
 					executedX: undefined,
 					startX: undefined,
 					marker: {
@@ -374,6 +376,7 @@ suite('Workbench - TerminalLinkOpeners', () => {
 					executedX: undefined,
 					startX: undefined,
 					timestamp: 0,
+					duration: 0,
 					marker: {
 						line: 0
 					} as Partial<IXtermMarker> as any,