Merge from vscode e6a45f4242ebddb7aa9a229f85555e8a3bd987e2 (#9253)

* Merge from vscode e6a45f4242ebddb7aa9a229f85555e8a3bd987e2

* skip failing tests

* remove github-authentication extensions

* ignore github compile steps

* ignore github compile steps

* check in compiled files

src/vs/base/common/async.ts

@@ -56,6 +56,20 @@ export function raceCancellation<T>(promise: Promise<T>, token: CancellationToke
 	return Promise.race([promise, new Promise<T>(resolve => token.onCancellationRequested(() => resolve(defaultValue)))]);
 }
 
+export function raceTimeout<T>(promise: Promise<T>, timeout: number, onTimeout?: () => void): Promise<T> {
+	let promiseResolve: (() => void) | undefined = undefined;
+
+	const timer = setTimeout(() => {
+		promiseResolve?.();
+		onTimeout?.();
+	}, timeout);
+
+	return Promise.race([
+		promise.finally(() => clearTimeout(timer)),
+		new Promise<T>(resolve => promiseResolve = resolve)
+	]);
+}
+
 export function asPromise<T>(callback: () => T | Thenable<T>): Promise<T> {
 	return new Promise<T>((resolve, reject) => {
 		const item = callback();

src/vs/base/common/date.ts

@@ -13,7 +13,7 @@ const month = day * 30;
 const year = day * 365;
 
 // TODO[ECA]: Localize strings
-export function fromNow(date: number | Date) {
+export function fromNow(date: number | Date, appendAgoLabel?: boolean): string {
 	if (typeof date !== 'number') {
 		date = date.getTime();
 	}
@@ -48,7 +48,7 @@ export function fromNow(date: number | Date) {
 		unit = 'yr';
 	}
 
-	return `${value} ${unit}${value === 1 ? '' : 's'}`;
+	return `${value} ${unit}${value === 1 ? '' : 's'}${appendAgoLabel ? ' ago' : ''}`;
 
 }