Merge remote-tracking branch 'origin/main' into tyriar/258480

Author: Tyriar

build/filters.js

@@ -24,8 +24,10 @@ module.exports.all = [
 	'test/**/*',
 	'!cli/**/*',
 	'!out*/**',
+	'!extensions/**/out*/**',
 	'!test/**/out/**',
 	'!**/node_modules/**',
+	'!**/*.js.map',
 ];
 
 module.exports.unicodeFilter = [

package-lock.json

@@ -161,32 +161,6 @@ export function raceTimeout<T>(promise: Promise<T>, timeout: number, onTimeout?:
 	]);
 }
 
-export function raceFilter<T>(promises: Promise<T>[], filter: (result: T) => boolean): Promise<T | undefined> {
-	return new Promise((resolve, reject) => {
-		if (promises.length === 0) {
-			resolve(undefined);
-			return;
-		}
-
-		let resolved = false;
-		let unresolvedCount = promises.length;
-		for (const promise of promises) {
-			promise.then(result => {
-				unresolvedCount--;
-				if (!resolved) {
-					if (filter(result)) {
-						resolved = true;
-						resolve(result);
-					} else if (unresolvedCount === 0) {
-						// Last one has to resolve the promise
-						resolve(undefined);
-					}
-				}
-			}).catch(reject);
-		}
-	});
-}
-
 export function asPromise<T>(callback: () => T | Thenable<T>): Promise<T> {
 	return new Promise<T>((resolve, reject) => {
 		const item = callback();

src/vs/base/common/async.ts

@@ -611,24 +611,6 @@ export namespace Event {
 		return promise;
 	}
 
-	/**
-	 * Creates an event out of a promise that fires once when the promise is
-	 * resolved with the result of the promise or `undefined`.
-	 */
-	export function fromPromise<T>(promise: Promise<T>): Event<T | undefined> {
-		const result = new Emitter<T | undefined>();
-
-		promise.then(res => {
-			result.fire(res);
-		}, () => {
-			result.fire(undefined);
-		}).finally(() => {
-			result.dispose();
-		});
-
-		return result.event;
-	}
-
 	/**
 	 * A convenience function for forwarding an event to another emitter which
 	 * improves readability.

src/vs/base/common/event.ts

@@ -634,35 +634,6 @@ export class RefCountedDisposable {
 	}
 }
 
-/**
- * A safe disposable can be `unset` so that a leaked reference (listener)
- * can be cut-off.
- */
-export class SafeDisposable implements IDisposable {
-
-	dispose: () => void = () => { };
-	unset: () => void = () => { };
-	isset: () => boolean = () => false;
-
-	constructor() {
-		trackDisposable(this);
-	}
-
-	set(fn: Function) {
-		let callback: Function | undefined = fn;
-		this.unset = () => callback = undefined;
-		this.isset = () => callback !== undefined;
-		this.dispose = () => {
-			if (callback) {
-				callback();
-				callback = undefined;
-				markAsDisposed(this);
-			}
-		};
-		return this;
-	}
-}
-
 export interface IReference<T> extends IDisposable {
 	readonly object: T;
 }

src/vs/base/common/lifecycle.ts

@@ -782,34 +782,6 @@ export function lcut(text: string, n: number, prefix = ''): string {
 	return prefix + trimmed.substring(i).trimStart();
 }
 
-/**
- * Given a string and a max length returns a shorted version. Shorting
- * happens at favorable positions - such as whitespace or punctuation characters.
- * The return value can be longer than the given value of `n`. Trailing whitespace is always trimmed.
- */
-export function rcut(text: string, n: number, suffix = ''): string {
-	const trimmed = text.trimEnd();
-
-	if (trimmed.length < n) {
-		return trimmed;
-	}
-
-	const parts = text.split(/\b/);
-	let result = '';
-	for (const part of parts) {
-		if (result.length > 0 && result.length + part.length > n) {
-			break;
-		}
-		result += part;
-	}
-
-	if (result === trimmed) {
-		return result;
-	}
-
-	return result.trim().replace(/b$/, '') + suffix;
-}
-
 // Defacto standard: https://invisible-island.net/xterm/ctlseqs/ctlseqs.html
 const CSI_SEQUENCE = /(?:\x1b\[|\x9b)[=?>!]?[\d;:]*["$#'* ]?[a-zA-Z@^`{}|~]/;
 const OSC_SEQUENCE = /(?:\x1b\]|\x9d).*?(?:\x1b\\|\x07|\x9c)/;

src/vs/base/common/strings.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
 import { stub } from 'sinon';
-import { DeferredPromise, timeout } from '../../common/async.js';
+import { timeout } from '../../common/async.js';
 import { CancellationToken } from '../../common/cancellation.js';
 import { errorHandler, setUnexpectedErrorHandler } from '../../common/errors.js';
 import { AsyncEmitter, DebounceEmitter, DynamicListEventMultiplexer, Emitter, Event, EventBufferer, EventMultiplexer, IWaitUntil, ListenerLeakError, ListenerRefusalError, MicrotaskEmitter, PauseableEmitter, Relay, createEventDeliveryQueue } from '../../common/event.js';
@@ -1221,48 +1221,6 @@ suite('Event utils', () => {
 		listener.dispose(); // should not crash
 	});
 
-	suite('fromPromise', () => {
-
-		test('not yet resolved', async function () {
-			return new Promise(resolve => {
-				let promise = new DeferredPromise<number>();
-
-				ds.add(Event.fromPromise(promise.p)(e => {
-					assert.strictEqual(e, 1);
-
-					promise = new DeferredPromise();
-
-					ds.add(Event.fromPromise(promise.p)(() => {
-						resolve();
-					}));
-
-					promise.error(undefined);
-				}));
-
-				promise.complete(1);
-			});
-		});
-
-		test('already resolved', async function () {
-			return new Promise(resolve => {
-				let promise = new DeferredPromise<number>();
-				promise.complete(1);
-
-				ds.add(Event.fromPromise(promise.p)(e => {
-					assert.strictEqual(e, 1);
-
-					promise = new DeferredPromise();
-					promise.error(undefined);
-
-					ds.add(Event.fromPromise(promise.p)(() => {
-						resolve();
-					}));
-				}));
-
-			});
-		});
-	});
-
 	suite('Relay', () => {
 		test('should input work', () => {
 			const e1 = ds.add(new Emitter<number>());

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

@@ -5,7 +5,7 @@
 
 import assert from 'assert';
 import { Emitter } from '../../common/event.js';
-import { DisposableStore, dispose, IDisposable, markAsSingleton, ReferenceCollection, SafeDisposable, thenIfNotDisposed, toDisposable } from '../../common/lifecycle.js';
+import { DisposableStore, dispose, IDisposable, markAsSingleton, ReferenceCollection, thenIfNotDisposed, toDisposable } from '../../common/lifecycle.js';
 import { ensureNoDisposablesAreLeakedInTestSuite, throwIfDisposablesAreLeaked } from './utils.js';
 
 class Disposable implements IDisposable {
@@ -108,25 +108,6 @@ suite('Lifecycle', () => {
 		const setValues2 = dispose(setValues);
 		assert.ok(setValues === setValues2);
 	});
-
-	test('SafeDisposable, dispose', function () {
-		let disposed = 0;
-		const actual = () => disposed += 1;
-		const d = new SafeDisposable();
-		d.set(actual);
-		d.dispose();
-		assert.strictEqual(disposed, 1);
-	});
-
-	test('SafeDisposable, unset', function () {
-		let disposed = 0;
-		const actual = () => disposed += 1;
-		const d = new SafeDisposable();
-		d.set(actual);
-		d.unset();
-		d.dispose();
-		assert.strictEqual(disposed, 0);
-	});
 });
 
 suite('DisposableStore', () => {

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

@@ -155,24 +155,6 @@ suite('Strings', () => {
 		assert.strictEqual(strings.lcut('............a', 10, '…'), '............a');
 	});
 
-	suite('rcut', () => {
-		test('basic truncation', () => {
-			assert.strictEqual(strings.rcut('foo bar', 0), 'foo');
-			assert.strictEqual(strings.rcut('foo bar', 1), 'foo');
-			assert.strictEqual(strings.rcut('foo bar', 4), 'foo');
-			assert.strictEqual(strings.rcut('foo bar', 7), 'foo bar');
-			assert.strictEqual(strings.rcut('test string 0.1.2.3', 3), 'test');
-		});
-
-		test('truncation with suffix', () => {
-			assert.strictEqual(strings.rcut('foo bar', 0, '…'), 'foo…');
-			assert.strictEqual(strings.rcut('foo bar', 1, '…'), 'foo…');
-			assert.strictEqual(strings.rcut('foo bar', 4, '…'), 'foo…');
-			assert.strictEqual(strings.rcut('foo bar', 7, '…'), 'foo bar');
-			assert.strictEqual(strings.rcut('test string 0.1.2.3', 3, '…'), 'test…');
-		});
-	});
-
 	test('escape', () => {
 		assert.strictEqual(strings.escape(''), '');
 		assert.strictEqual(strings.escape('foo'), 'foo');

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

@@ -990,6 +990,8 @@ export type LifetimeSummary = {
 	shownDuration: number;
 	shownDurationUncollapsed: number;
 	timeUntilShown: number | undefined;
+	timeUntilProviderRequest: number;
+	timeUntilProviderResponse: number;
 	editorType: string;
 	viewKind: string | undefined;
 	error: string | undefined;