Skip to content

Remove adaptive debouce from VS Code 1.50.0 #1074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jdneo merged 1 commit into from
Oct 12, 2020
Merged

Remove adaptive debouce from VS Code 1.50.0 #1074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 3 additions & 22 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 3 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
],
"aiKey": "90c182a8-8dab-45d4-bfb8-1353eb55aa7f",
"engines": {
"vscode": "^1.44.0"
"vscode": "^1.50.0"
},
"categories": [
"Other"
Expand Down Expand Up @@ -398,12 +398,11 @@
"devDependencies": {
"@types/fs-extra": "^5.1.0",
"@types/lodash": "^4.14.150",
"@types/lru-cache": "^5.1.0",
"@types/mocha": "^2.2.48",
"@types/node": "^14.0.1",
"@types/pug": "^2.0.4",
"@types/sinon": "^9.0.3",
"@types/vscode": "1.44.0",
"@types/vscode": "1.50.0",
"bootstrap": "^4.5.0",
"filemanager-webpack-plugin": "^2.0.5",
"gulp": "^4.0.2",
Expand All @@ -425,10 +424,9 @@
"get-port": "^4.2.0",
"iconv-lite": "^0.4.24",
"lodash": "^4.17.19",
"lru-cache": "^6.0.0",
"pug": "^2.0.4",
"vscode-extension-telemetry-wrapper": "^0.8.0",
"winston": "^3.2.1",
"winston-transport": "^4.3.0"
}
}
}
18 changes: 0 additions & 18 deletions src/codelens/MovingAverage.ts
View file
Open in desktop

This file was deleted.

44 changes: 3 additions & 41 deletions src/codelens/TestCodeLensProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license.

import * as LRUCache from 'lru-cache';
import {performance} from 'perf_hooks';
import { CancellationToken, CodeLens, CodeLensProvider, Disposable, Event, EventEmitter, TextDocument, Uri } from 'vscode';
import { CancellationToken, CodeLens, CodeLensProvider, Disposable, Event, EventEmitter, TextDocument } from 'vscode';
import { JavaTestRunnerCommands } from '../constants/commands';
import { logger } from '../logger/logger';
import { ITestItem, TestLevel } from '../protocols';
import { ITestResult, TestStatus } from '../runners/models';
import { testItemModel } from '../testItemModel';
import { testResultManager } from '../testResultManager';
import { MovingAverage } from './MovingAverage';

export class TestCodeLensProvider implements CodeLensProvider, Disposable {
private onDidChangeCodeLensesEmitter: EventEmitter<void> = new EventEmitter<void>();
private lruCache: LRUCache<Uri, MovingAverage> = new LRUCache<Uri, MovingAverage>(32);
private isActivated: boolean = true;

get onDidChangeCodeLenses(): Event<void> {
Expand All @@ -36,18 +32,8 @@ export class TestCodeLensProvider implements CodeLensProvider, Disposable {
}

try {
const timeout: number = this.getRequestDelay(document.uri);
return new Promise<CodeLens[]>((resolve: (ids: CodeLens[]) => void): void => {
token.onCancellationRequested(() => {
clearTimeout(timeoutHandle);
resolve([]);
});

const timeoutHandle: NodeJS.Timeout = setTimeout(async () => {
resolve(await this.resolveAllCodeLenses(document.uri, token));
}, timeout);

});
const items: ITestItem[] = await testItemModel.getItemsForCodeLens(document.uri, token);
return this.getCodeLenses(items);
} catch (error) {
logger.error('Failed to provide Code Lens', error);
return [];
Expand All @@ -58,30 +44,6 @@ export class TestCodeLensProvider implements CodeLensProvider, Disposable {
this.onDidChangeCodeLensesEmitter.dispose();
}

private getRequestDelay(uri: Uri): number {
const avg: MovingAverage | undefined = this.lruCache.get(uri);
if (!avg) {
return 350;
}
return Math.max(350, Math.floor(1.3 * avg.value));
}

private async resolveAllCodeLenses(uri: Uri, token: CancellationToken): Promise<CodeLens[]> {
if (token.isCancellationRequested) {
return [];
}

const startTime: number = performance.now();
const items: ITestItem[] = await testItemModel.getItemsForCodeLens(uri, token);
const result: CodeLens[] = this.getCodeLenses(items);
const executionTime: number = performance.now() - startTime;

const movingAverage: MovingAverage = this.lruCache.get(uri) || new MovingAverage();
movingAverage.update(executionTime);
this.lruCache.set(uri, movingAverage);
return result;
}

private getCodeLenses(items: ITestItem[]): CodeLens[] {
const codeLenses: CodeLens[] = [];
for (const item of items) {
Expand Down