fix delay issue for provideCodeLenses, microsoft#106267

jrieken · jrieken · commit 90a2bed8c802 · 2020-09-14T12:30:16.000+02:00
diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts
@@ -614,15 +614,15 @@ export class RunOnceScheduler {
 
 	protected runner: ((...args: any[]) => void) | null;
 
-	private timeoutToken: any;
-	private timeout: number;
-	private timeoutHandler: () => void;
+	private _timeoutToken: any;
+	private _timeout: number;
+	private _timeoutHandler: () => void;
 
 	constructor(runner: (...args: any[]) => void, timeout: number) {
-		this.timeoutToken = -1;
+		this._timeoutToken = -1;
 		this.runner = runner;
-		this.timeout = timeout;
-		this.timeoutHandler = this.onTimeout.bind(this);
+		this._timeout = timeout;
+		this._timeoutHandler = this.onTimeout.bind(this);
 	}
 
 	/**
@@ -638,28 +638,36 @@ export class RunOnceScheduler {
 	 */
 	cancel(): void {
 		if (this.isScheduled()) {
-			clearTimeout(this.timeoutToken);
-			this.timeoutToken = -1;
+			clearTimeout(this._timeoutToken);
+			this._timeoutToken = -1;
 		}
 	}
 
 	/**
 	 * Cancel previous runner (if any) & schedule a new runner.
 	 */
-	schedule(delay = this.timeout): void {
+	schedule(delay = this._timeout): void {
 		this.cancel();
-		this.timeoutToken = setTimeout(this.timeoutHandler, delay);
+		this._timeoutToken = setTimeout(this._timeoutHandler, delay);
+	}
+
+	get timeout(): number {
+		return this._timeout;
+	}
+
+	set timeout(value: number) {
+		this._timeout = value;
 	}
 
 	/**
 	 * Returns true if scheduled.
 	 */
 	isScheduled(): boolean {
-		return this.timeoutToken !== -1;
+		return this._timeoutToken !== -1;
 	}
 
 	private onTimeout() {
-		this.timeoutToken = -1;
+		this._timeoutToken = -1;
 		if (this.runner) {
 			this.doRun();
 		}
diff --git a/src/vs/editor/common/modes/languageFeatureRegistry.ts b/src/vs/editor/common/modes/languageFeatureRegistry.ts
@@ -207,16 +207,18 @@ export class LanguageFeatureRequestDelays {
 
 	get(model: ITextModel): number {
 		const key = this._key(model);
-		return this._clamp(this._cache.get(key)?.value);
+		const avg = this._cache.get(key);
+		return this._clamp(avg?.value);
 	}
 
-	update(model: ITextModel, value: number) {
+	update(model: ITextModel, value: number): number {
 		const key = this._key(model);
 		let avg = this._cache.get(key);
 		if (!avg) {
 			avg = new MovingAverage();
 			this._cache.set(key, avg);
 		}
 		avg.update(value);
+		return this.get(model);
 	}
 }
diff --git a/src/vs/editor/contrib/codelens/codelensController.ts b/src/vs/editor/contrib/codelens/codelensController.ts
@@ -160,7 +160,8 @@ export class CodeLensContribution implements IEditorContribution {
 				this._codeLensCache.put(model, result);
 
 				// update moving average
-				this._getCodeLensModelDelays.update(model, Date.now() - t1);
+				const newDelay = this._getCodeLensModelDelays.update(model, Date.now() - t1);
+				scheduler.timeout = newDelay;
 
 				// render lenses
 				this._renderCodeLensSymbols(result);
@@ -331,7 +332,7 @@ export class CodeLensContribution implements IEditorContribution {
 	private _resolveCodeLensesInViewportSoon(): void {
 		const model = this._editor.getModel();
 		if (model) {
-			this._resolveCodeLensesScheduler.schedule(this._resolveCodeLensesDelays.get(model));
+			this._resolveCodeLensesScheduler.schedule();
 		}
 	}
 
@@ -391,7 +392,8 @@ export class CodeLensContribution implements IEditorContribution {
 		this._resolveCodeLensesPromise.then(() => {
 
 			// update moving average
-			this._resolveCodeLensesDelays.update(model, Date.now() - t1);
+			const newDelay = this._resolveCodeLensesDelays.update(model, Date.now() - t1);
+			this._resolveCodeLensesScheduler.timeout = newDelay;
 
 			if (this._currentCodeLensModel) { // update the cached state with new resolved items
 				this._codeLensCache.put(model, this._currentCodeLensModel);

Original file line number	Diff line number	Diff line change
`@@ -207,16 +207,18 @@ export class LanguageFeatureRequestDelays {`
`207`	`207`
`208`	`208`	`get(model: ITextModel): number {`
`209`	`209`	`const key = this._key(model);`
`210`		`- return this._clamp(this._cache.get(key)?.value);`
	`210`	`+ const avg = this._cache.get(key);`
	`211`	`+ return this._clamp(avg?.value);`
`211`	`212`	`}`
`212`	`213`
`213`		`- update(model: ITextModel, value: number) {`
	`214`	`+ update(model: ITextModel, value: number): number {`
`214`	`215`	`const key = this._key(model);`
`215`	`216`	`let avg = this._cache.get(key);`
`216`	`217`	`if (!avg) {`
`217`	`218`	`avg = new MovingAverage();`
`218`	`219`	`this._cache.set(key, avg);`
`219`	`220`	`}`
`220`	`221`	`avg.update(value);`
	`222`	`+ return this.get(model);`
`221`	`223`	`}`
`222`	`224`	`}`