@@ -434,10 +434,7 @@ class TestRunTracker extends Disposable {
434
434
private readonly cts : CancellationTokenSource ;
435
435
private readonly endEmitter = this . _register ( new Emitter < void > ( ) ) ;
436
436
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 > ( ) ;
441
438
442
439
/**
443
440
* Fires when a test ends, and no more tests are left running.
@@ -492,21 +489,17 @@ class TestRunTracker extends Disposable {
492
489
/** Gets details for a previously-emitted coverage object. */
493
490
public getCoverageDetails ( id : string , token : CancellationToken ) {
494
491
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 ) {
497
494
return [ ] ;
498
495
}
499
496
500
- if ( obj . backCompatResolve ) {
501
- return obj . backCompatResolve ( token ) ;
502
- }
503
-
504
497
const task = this . tasks . get ( taskId ) ;
505
498
if ( ! task ) {
506
499
throw new Error ( 'unreachable: run task was not found' ) ;
507
500
}
508
501
509
- return this . profile ?. loadDetailedCoverage ?.( task . run , obj . coverage , token ) ?? [ ] ;
502
+ return this . profile ?. loadDetailedCoverage ?.( task . run , coverage , token ) ?? [ ] ;
510
503
}
511
504
512
505
/** Creates the public test run interface to give to extensions. */
@@ -545,42 +538,18 @@ class TestRunTracker extends Disposable {
545
538
this . proxy . $appendTestMessagesInRun ( runId , taskId , TestId . fromExtHostTestItem ( test , ctrlId ) . toString ( ) , converted ) ;
546
539
} ;
547
540
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
-
560
541
let ended = false ;
561
- let coverageProvider : ICoverageProvider | undefined ;
562
- const run : vscode . TestRun & { coverageProvider ?: ICoverageProvider } = {
542
+ const run : vscode . TestRun = {
563
543
isPersisted : this . dto . isPersisted ,
564
544
token : this . cts . token ,
565
545
name,
566
546
onDidDispose : this . onDidDispose ,
567
- // todo@connor 4312: back compat
568
- get coverageProvider ( ) {
569
- return coverageProvider ;
570
- } ,
571
- // todo@connor 4312: 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 ) ) ;
582
552
} ,
583
- addCoverage,
584
553
//#region state mutation
585
554
enqueued : guardTestMutation ( test => {
586
555
this . proxy . $updateTestStateInRun ( runId , taskId , TestId . fromExtHostTestItem ( test , ctrlId ) . toString ( ) , TestResultState . Queued ) ;
0 commit comments