Cancel pending change delayer on cleanup and handle re-entrant delayer tasks

client-node-tests/src/converter.test.ts

@@ -1783,3 +1783,17 @@ suite('Code Converter', () => {
 		strictEqual(result.selectedCompletionInfo.text, item.selectedCompletionInfo!.text);
 	});
 });
+
+suite('Delayer', () => {
+
+	test('A task can trigger the delayer again', async () => {
+		const delayer = new async.Delayer<void>(0);
+		let retriggered = false;
+		let retry: Promise<void> | undefined;
+		await delayer.trigger(async () => {
+			retry = delayer.trigger(async () => { retriggered = true; });
+		});
+		await retry;
+		ok(retriggered);
+	});
+});

client/src/common/client.ts

@@ -1679,6 +1679,7 @@ export abstract class BaseLanguageClient implements FeatureClient<Middleware, La
 		// purge outstanding file events.
 		this._fileEvents = [];
 		this._fileEventDelayer.cancel();
+		this._pendingChangeDelayer.cancel();
 
 		const disposables = this._listeners.splice(0, this._listeners.length);
 		for (const disposable of disposables) {

client/src/common/utils/async.ts

@@ -36,9 +36,9 @@ export class Delayer<T> {
 			}).then(() => {
 				this.completionPromise = undefined;
 				this.onSuccess = undefined;
-				const result = this.task!();
+				const task = this.task!;
 				this.task = undefined;
-				return result;
+				return task();
 			});
 		}
 
@@ -57,11 +57,11 @@ export class Delayer<T> {
 			return undefined;
 		}
 		this.cancelTimeout();
-		const result: T = this.task!();
+		const task = this.task!;
 		this.completionPromise = undefined;
 		this.onSuccess = undefined;
 		this.task = undefined;
-		return result;
+		return task();
 	}
 
 	public isTriggered(): boolean {