Improve wording, add duration string helper function

Author: Tyriar

src/vs/base/common/date.ts

@@ -199,6 +199,37 @@ export function fromNow(date: number | Date, appendAgoLabel?: boolean, useFullTi
 	}
 }
 
+/**
+ * Gets a readable duration with intelligent/lossy precision. For example "40ms" or "3.040s")
+ * @param ms The duration to get in milliseconds.
+ * @param useFullTimeWords Whether to use full words (eg. seconds) instead of
+ * shortened (eg. secs).
+ */
+export function getDurationString(ms: number, useFullTimeWords?: boolean) {
+	const seconds = Math.abs(ms / 1000);
+	if (seconds < 1) {
+		return useFullTimeWords
+			? localize('duration.ms.full', '{0} milliseconds', ms)
+			: localize('duration.ms', '{0}ms', ms);
+	}
+	if (seconds < minute) {
+		return useFullTimeWords
+			? localize('duration.s.full', '{0} seconds', Math.round(ms) / 1000)
+			: localize('duration.s', '{0}s', Math.round(ms) / 1000);
+	}
+	if (seconds < hour) {
+		return useFullTimeWords
+			? localize('duration.m.full', '{0} minutes', Math.round(ms / (1000 * minute)))
+			: localize('duration.m', '{0} mins', Math.round(ms / (1000 * minute)));
+	}
+	if (seconds < day) {
+		return useFullTimeWords
+			? localize('duration.h.full', '{0} hours', Math.round(ms / (1000 * hour)))
+			: localize('duration.h', '{0} hrs', Math.round(ms / (1000 * hour)));
+	}
+	return localize('duration.d', '{0} days', Math.round(ms / (1000 * day)));
+}
+
 export function toLocalISOString(date: Date): string {
 	return date.getFullYear() +
 		'-' + String(date.getMonth() + 1).padStart(2, '0') +

src/vs/base/test/common/date.test.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { strictEqual } from 'assert';
-import { fromNow } from 'vs/base/common/date';
+import { fromNow, getDurationString } from 'vs/base/common/date';
 import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 
 suite('Date', () => {
@@ -27,4 +27,29 @@ suite('Date', () => {
 			strictEqual(fromNow(Date.now() - 5000, undefined, undefined, true), '5 secs');
 		});
 	});
+
+	suite('getDurationString', () => {
+		test('basic', () => {
+			strictEqual(getDurationString(1), '1ms');
+			strictEqual(getDurationString(999), '999ms');
+			strictEqual(getDurationString(1000), '1s');
+			strictEqual(getDurationString(1000 * 60 - 1), '59.999s');
+			strictEqual(getDurationString(1000 * 60), '1 mins');
+			strictEqual(getDurationString(1000 * 60 * 60 - 1), '60 mins');
+			strictEqual(getDurationString(1000 * 60 * 60), '1 hrs');
+			strictEqual(getDurationString(1000 * 60 * 60 * 24 - 1), '24 hrs');
+			strictEqual(getDurationString(1000 * 60 * 60 * 24), '1 days');
+		});
+		test('useFullTimeWords', () => {
+			strictEqual(getDurationString(1, true), '1 milliseconds');
+			strictEqual(getDurationString(999, true), '999 milliseconds');
+			strictEqual(getDurationString(1000, true), '1 seconds');
+			strictEqual(getDurationString(1000 * 60 - 1, true), '59.999 seconds');
+			strictEqual(getDurationString(1000 * 60, true), '1 minutes');
+			strictEqual(getDurationString(1000 * 60 * 60 - 1, true), '60 minutes');
+			strictEqual(getDurationString(1000 * 60 * 60, true), '1 hours');
+			strictEqual(getDurationString(1000 * 60 * 60 * 24 - 1, true), '24 hours');
+			strictEqual(getDurationString(1000 * 60 * 60 * 24, true), '1 days');
+		});
+	});
 });

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

@@ -5,7 +5,7 @@
 
 import * as dom from 'vs/base/browser/dom';
 import { Delayer } from 'vs/base/common/async';
-import { fromNow } from 'vs/base/common/date';
+import { fromNow, getDurationString } from 'vs/base/common/date';
 import { MarkdownString } from 'vs/base/common/htmlContent';
 import { combinedDisposable, Disposable, IDisposable } from 'vs/base/common/lifecycle';
 import { localize } from 'vs/nls';
@@ -71,14 +71,29 @@ export class TerminalDecorationHoverManager extends Disposable {
 						} else {
 							return;
 						}
-					} else if (command.exitCode) {
-						if (command.exitCode === -1) {
-							hoverContent += localize('terminalPromptCommandFailed', 'Command executed {0} for {1} ms and failed', fromNow(command.timestamp, true), command.duration);
+					} else {
+						if (command.duration) {
+							const durationText = getDurationString(command.duration);
+							if (command.exitCode) {
+								if (command.exitCode === -1) {
+									hoverContent += localize('terminalPromptCommandFailed.duration', 'Command executed {0}, took {1} and failed', fromNow(command.timestamp, true), durationText);
+								} else {
+									hoverContent += localize('terminalPromptCommandFailedWithExitCode.duration', 'Command executed {0}, took {1} and failed (Exit Code {2})', fromNow(command.timestamp, true), durationText, command.exitCode);
+								}
+							} else {
+								hoverContent += localize('terminalPromptCommandSuccess.duration', 'Command executed {0} and took {1}', fromNow(command.timestamp, true), durationText);
+							}
 						} else {
-							hoverContent += localize('terminalPromptCommandFailedWithExitCode', 'Command executed {0} for {2} ms and failed (Exit Code {1})', fromNow(command.timestamp, true), command.exitCode, command.duration);
+							if (command.exitCode) {
+								if (command.exitCode === -1) {
+									hoverContent += localize('terminalPromptCommandFailed', 'Command executed {0} and failed', fromNow(command.timestamp, true));
+								} else {
+									hoverContent += localize('terminalPromptCommandFailedWithExitCode', 'Command executed {0} and failed (Exit Code {1})', fromNow(command.timestamp, true), command.exitCode);
+								}
+							} else {
+								hoverContent += localize('terminalPromptCommandSuccess', 'Command executed {0}', fromNow(command.timestamp, true));
+							}
 						}
-					} else {
-						hoverContent += localize('terminalPromptCommandSuccess', 'Command executed {0} for {1} ms', fromNow(command.timestamp, true), command.duration);
 					}
 					this._hoverService.showHover({ content: new MarkdownString(hoverContent), target: element });
 				});