maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "Fix #127621"

Browse source 
This reverts commit 07a0575b6c.
This commit is contained in:
Christof Marti 2021-07-01 11:17:22 +02:00
parent ac1c2eab44
commit 1fc68f3cf2
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/vs/workbench/contrib/search/browser/searchView.ts
View file

@ -510,26 +510,25 @@ export class SearchView extends ViewPane {
}
refreshTree(event?: IChangeEvent): void {
const setChildrenOpts = { diffIdentityProvider: { getId(element: RenderableMatch) { return element.id; } } };
const collapseResults = this.searchConfig.collapseResults;
if (!event || event.added || event.removed) {
// Refresh whole tree
if (this.searchConfig.sortOrder === SearchSortOrder.Modified) {
// Ensure all matches have retrieved their file stat
this.retrieveFileStats()
.then(() => this.tree.setChildren(null, this.createResultIterator(collapseResults), setChildrenOpts));
.then(() => this.tree.setChildren(null, this.createResultIterator(collapseResults)));
} else {
this.tree.setChildren(null, this.createResultIterator(collapseResults), setChildrenOpts);
this.tree.setChildren(null, this.createResultIterator(collapseResults));
}
} else {
// If updated counts affect our search order, re-sort the view.
if (this.searchConfig.sortOrder === SearchSortOrder.CountAscending ||
this.searchConfig.sortOrder === SearchSortOrder.CountDescending) {
this.tree.setChildren(null, this.createResultIterator(collapseResults), setChildrenOpts);
this.tree.setChildren(null, this.createResultIterator(collapseResults));
} else {
// FileMatch modified, refresh those elements
event.elements.forEach(element => {
this.tree.setChildren(element, this.createIterator(element, collapseResults), setChildrenOpts);
this.tree.setChildren(element, this.createIterator(element, collapseResults));
this.tree.rerender(element);
});
}