Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-08-19 14:22:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

testing: improve performance of filtering file tests (#236112)

Browse Source 
Fixes #235819. Probably.
This commit is contained in:
Connor Peet
2024-12-14 00:53:23 +01:00
committed by GitHub
parent eb70dfe409
commit cdec0c6a14
2 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/testing/common/mainThreadTestCollection.ts
+5 -2
View File
@@ -5,6 +5,7 @@
import { Emitter } from '../../../../base/common/event.js';
import { Iterable } from '../../../../base/common/iterator.js';
import { LinkedList } from '../../../../base/common/linkedList.js';
import { ResourceMap } from '../../../../base/common/map.js';
import { URI } from '../../../../base/common/uri.js';
import { IMainThreadTestCollection } from './testService.js';
@@ -184,8 +185,10 @@ export class MainThreadTestCollection extends AbstractIncrementalTestCollection<
}
private *getIterator() {
const queue = [this.rootIds];
while (queue.length) {
const queue = new LinkedList<Iterable<string>>();
queue.push(this.rootIds);
while (queue.size > 0) {
for (const id of queue.pop()!) {
const node = this.getNodeById(id)!;
yield node;
src/vs/workbench/contrib/testing/common/testService.ts
+33 -12
View File
@@ -8,6 +8,7 @@ import { CancellationToken } from '../../../../base/common/cancellation.js';
import { Event } from '../../../../base/common/event.js';
import { Iterable } from '../../../../base/common/iterator.js';
import { IDisposable } from '../../../../base/common/lifecycle.js';
import { LinkedList } from '../../../../base/common/linkedList.js';
import { MarshalledId } from '../../../../base/common/marshallingIds.js';
import { IObservable } from '../../../../base/common/observable.js';
import { IPrefixTreeNode, WellDefinedPrefixTree } from '../../../../base/common/prefixTree.js';
@@ -172,24 +173,44 @@ const waitForTestToBeIdle = (testService: ITestService, test: IncrementalTestCol
* in strictly descending order.
*/
export const testsInFile = async function* (testService: ITestService, ident: IUriIdentityService, uri: URI, waitForIdle = true): AsyncIterable<IncrementalTestCollectionItem> {
for (const test of testService.collection.all) {
if (!test.item.uri) {
continue;
}
const queue = new LinkedList<Iterable<string>>();
if (ident.extUri.isEqual(uri, test.item.uri)) {
yield test;
}
const existing = [...testService.collection.getNodeByUrl(uri)];
queue.push(existing.length ? existing.map(e => e.item.extId) : testService.collection.rootIds);
if (ident.extUri.isEqualOrParent(uri, test.item.uri)) {
if (test.expand === TestItemExpandState.Expandable) {
await testService.collection.expand(test.item.extId, 1);
let n = 0;
while (queue.size > 0) {
for (const id of queue.pop()!) {
n++;
const test = testService.collection.getNodeById(id);
if (!test) {
continue; // possible because we expand async and things could delete
}
if (waitForIdle) {
await waitForTestToBeIdle(testService, test);
if (!test.item.uri) {
queue.push(test.children);
continue;
}
if (ident.extUri.isEqual(uri, test.item.uri)) {
yield test;
}
if (ident.extUri.isEqualOrParent(uri, test.item.uri)) {
if (test.expand === TestItemExpandState.Expandable) {
await testService.collection.expand(test.item.extId, 1);
}
if (waitForIdle) {
await waitForTestToBeIdle(testService, test);
}
if (test.children.size) {
queue.push(test.children);
}
}
}
}
console.log('iterated', n, 'times');
};
/**