Skip to content

Commit 3c28146

Browse files
authored
testing: remove back compat shims for coverage API (microsoft#209559)
Now that the API is finalized, remove the back compat shims that were in place
1 parent 0203900 commit 3c28146

File tree

2 files changed

+10
-42
lines changed

2 files changed

+10
-42
lines changed

src/vs/workbench/api/common/extHost.api.impl.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1666,7 +1666,6 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
16661666
StatementCoverage: extHostTypes.StatementCoverage,
16671667
BranchCoverage: extHostTypes.BranchCoverage,
16681668
DeclarationCoverage: extHostTypes.DeclarationCoverage,
1669-
FunctionCoverage: extHostTypes.DeclarationCoverage, // back compat for Feb 2024
16701669
WorkspaceTrustState: extHostTypes.WorkspaceTrustState,
16711670
LanguageStatusSeverity: extHostTypes.LanguageStatusSeverity,
16721671
QuickPickItemKind: extHostTypes.QuickPickItemKind,

src/vs/workbench/api/common/extHostTesting.ts

Lines changed: 10 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -434,10 +434,7 @@ class TestRunTracker extends Disposable {
434434
private readonly cts: CancellationTokenSource;
435435
private readonly endEmitter = this._register(new Emitter<void>());
436436
private readonly onDidDispose: Event<void>;
437-
private readonly publishedCoverage = new Map<string, {
438-
coverage: vscode.FileCoverage;
439-
backCompatResolve?: (token: vscode.CancellationToken) => Thenable<vscode.FileCoverageDetail[]>;
440-
}>();
437+
private readonly publishedCoverage = new Map<string, vscode.FileCoverage>();
441438

442439
/**
443440
* Fires when a test ends, and no more tests are left running.
@@ -492,21 +489,17 @@ class TestRunTracker extends Disposable {
492489
/** Gets details for a previously-emitted coverage object. */
493490
public getCoverageDetails(id: string, token: CancellationToken) {
494491
const [, taskId, covId] = TestId.fromString(id).path; /** runId, taskId, URI */
495-
const obj = this.publishedCoverage.get(covId);
496-
if (!obj) {
492+
const coverage = this.publishedCoverage.get(covId);
493+
if (!coverage) {
497494
return [];
498495
}
499496

500-
if (obj.backCompatResolve) {
501-
return obj.backCompatResolve(token);
502-
}
503-
504497
const task = this.tasks.get(taskId);
505498
if (!task) {
506499
throw new Error('unreachable: run task was not found');
507500
}
508501

509-
return this.profile?.loadDetailedCoverage?.(task.run, obj.coverage, token) ?? [];
502+
return this.profile?.loadDetailedCoverage?.(task.run, coverage, token) ?? [];
510503
}
511504

512505
/** Creates the public test run interface to give to extensions. */
@@ -545,42 +538,18 @@ class TestRunTracker extends Disposable {
545538
this.proxy.$appendTestMessagesInRun(runId, taskId, TestId.fromExtHostTestItem(test, ctrlId).toString(), converted);
546539
};
547540

548-
const addCoverage = (coverage: vscode.FileCoverage, backCompatResolve?: (token: vscode.CancellationToken) => Thenable<vscode.FileCoverageDetail[]>) => {
549-
const uriStr = coverage.uri.toString();
550-
const id = new TestId([runId, taskId, uriStr]).toString();
551-
this.publishedCoverage.set(uriStr, { coverage, backCompatResolve });
552-
this.proxy.$appendCoverage(runId, taskId, Convert.TestCoverage.fromFile(id, coverage));
553-
};
554-
555-
interface ICoverageProvider {
556-
provideFileCoverage(token: CancellationToken): vscode.ProviderResult<vscode.FileCoverage[]>;
557-
resolveFileCoverage?(coverage: vscode.FileCoverage, token: CancellationToken): vscode.ProviderResult<vscode.FileCoverage>;
558-
}
559-
560541
let ended = false;
561-
let coverageProvider: ICoverageProvider | undefined;
562-
const run: vscode.TestRun & { coverageProvider?: ICoverageProvider } = {
542+
const run: vscode.TestRun = {
563543
isPersisted: this.dto.isPersisted,
564544
token: this.cts.token,
565545
name,
566546
onDidDispose: this.onDidDispose,
567-
// todo@connor4312: back compat
568-
get coverageProvider() {
569-
return coverageProvider;
570-
},
571-
// todo@connor4312: back compat
572-
set coverageProvider(provider: ICoverageProvider | undefined) {
573-
coverageProvider = provider;
574-
if (provider) {
575-
Promise.resolve(provider.provideFileCoverage(CancellationToken.None)).then(coverage => {
576-
coverage?.forEach(c => addCoverage(c, provider.resolveFileCoverage && (async token => {
577-
const r = await provider.resolveFileCoverage!(c, token);
578-
return (r || c as any).detailedCoverage;
579-
})));
580-
});
581-
}
547+
addCoverage: coverage => {
548+
const uriStr = coverage.uri.toString();
549+
const id = new TestId([runId, taskId, uriStr]).toString();
550+
this.publishedCoverage.set(uriStr, coverage);
551+
this.proxy.$appendCoverage(runId, taskId, Convert.TestCoverage.fromFile(id, coverage));
582552
},
583-
addCoverage,
584553
//#region state mutation
585554
enqueued: guardTestMutation(test => {
586555
this.proxy.$updateTestStateInRun(runId, taskId, TestId.fromExtHostTestItem(test, ctrlId).toString(), TestResultState.Queued);

0 commit comments

Comments
 (0)