Skip to content

Commit cf6dc50

Browse files
committed
1 parent 9d19915 commit cf6dc50

3 files changed

Lines changed: 67 additions & 24 deletions

File tree

‎src/vs/base/browser/ui/tree/asyncDataTree.ts‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
452452

453453
const viewStateContext = viewState && { viewState, focus: [], selection: [] } as IAsyncDataTreeViewStateContext<TInput, T>;
454454

455-
await this._updateChildren(input, true, viewStateContext);
455+
await this._updateChildren(input, true, false, viewStateContext);
456456

457457
if (viewStateContext) {
458458
this.tree.setFocus(viewStateContext.focus);
@@ -464,11 +464,11 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
464464
}
465465
}
466466

467-
async updateChildren(element: TInput | T = this.root.element, recursive = true): Promise<void> {
468-
await this._updateChildren(element, recursive);
467+
async updateChildren(element: TInput | T = this.root.element, recursive = true, rerender = false): Promise<void> {
468+
await this._updateChildren(element, recursive, rerender);
469469
}
470470

471-
private async _updateChildren(element: TInput | T = this.root.element, recursive = true, viewStateContext?: IAsyncDataTreeViewStateContext<TInput, T>): Promise<void> {
471+
private async _updateChildren(element: TInput | T = this.root.element, recursive = true, rerender = false, viewStateContext?: IAsyncDataTreeViewStateContext<TInput, T>): Promise<void> {
472472
if (typeof this.root.element === 'undefined') {
473473
throw new TreeError(this.user, 'Tree input not set');
474474
}
@@ -478,7 +478,12 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
478478
await Event.toPromise(this._onDidRender.event);
479479
}
480480

481-
await this.refreshAndRenderNode(this.getDataNode(element), recursive, viewStateContext);
481+
const node = this.getDataNode(element);
482+
await this.refreshAndRenderNode(node, recursive, viewStateContext);
483+
484+
if (rerender) {
485+
this.tree.rerender(node);
486+
}
482487
}
483488

484489
resort(element: TInput | T = this.root.element, recursive = true): void {

‎src/vs/base/test/browser/ui/tree/asyncDataTree.test.ts‎

Lines changed: 56 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,28 @@ import { timeout } from 'vs/base/common/async';
1212

1313
interface Element {
1414
id: string;
15+
suffix?: string;
1516
children?: Element[];
1617
}
1718

18-
function find(elements: Element[] | undefined, id: string): Element {
19-
while (elements) {
20-
for (const element of elements) {
21-
if (element.id === id) {
22-
return element;
23-
}
19+
function find(element: Element, id: string): Element | undefined {
20+
if (element.id === id) {
21+
return element;
22+
}
23+
24+
if (!element.children) {
25+
return undefined;
26+
}
27+
28+
for (const child of element.children) {
29+
const result = find(child, id);
30+
31+
if (result) {
32+
return result;
2433
}
2534
}
2635

27-
throw new Error('element not found');
36+
return undefined;
2837
}
2938

3039
class Renderer implements ITreeRenderer<Element, void, HTMLElement> {
@@ -33,7 +42,7 @@ class Renderer implements ITreeRenderer<Element, void, HTMLElement> {
3342
return container;
3443
}
3544
renderElement(element: ITreeNode<Element, void>, index: number, templateData: HTMLElement): void {
36-
templateData.textContent = element.element.id;
45+
templateData.textContent = element.element.id + (element.element.suffix || '');
3746
}
3847
disposeTemplate(templateData: HTMLElement): void {
3948
// noop
@@ -65,7 +74,13 @@ class Model {
6574
constructor(readonly root: Element) { }
6675

6776
get(id: string): Element {
68-
return find(this.root.children, id);
77+
const result = find(this.root, id);
78+
79+
if (!result) {
80+
throw new Error('element not found');
81+
}
82+
83+
return result;
6984
}
7085
}
7186

@@ -389,4 +404,36 @@ suite('AsyncDataTree', function () {
389404
assert(!hasClass(twistie, 'collapsible'));
390405
assert(!hasClass(twistie, 'collapsed'));
391406
});
407+
408+
test('issues #84569, #82629 - rerender', async () => {
409+
const container = document.createElement('div');
410+
const model = new Model({
411+
id: 'root',
412+
children: [{
413+
id: 'a',
414+
children: [{
415+
id: 'b',
416+
suffix: '1'
417+
}]
418+
}]
419+
});
420+
421+
const tree = new AsyncDataTree<Element, Element>('test', container, new VirtualDelegate(), [new Renderer()], new DataSource(), { identityProvider: new IdentityProvider() });
422+
tree.layout(200);
423+
424+
await tree.setInput(model.root);
425+
await tree.expand(model.get('a'));
426+
assert.deepEqual(Array.from(container.querySelectorAll('.monaco-list-row')).map(e => e.textContent), ['a', 'b1']);
427+
428+
const a = model.get('a');
429+
const b = model.get('b');
430+
a.children?.splice(0, 1, { id: 'b', suffix: '2' });
431+
432+
await Promise.all([
433+
tree.updateChildren(a, true, true),
434+
tree.updateChildren(b, true, true)
435+
]);
436+
437+
assert.deepEqual(Array.from(container.querySelectorAll('.monaco-list-row')).map(e => e.textContent), ['a', 'b2']);
438+
});
392439
});

‎src/vs/workbench/browser/parts/views/customView.ts‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -614,16 +614,7 @@ export class CustomTreeView extends Disposable implements ITreeView {
614614
const tree = this.tree;
615615
if (tree && this.visible) {
616616
this.refreshing = true;
617-
await Promise.all(elements.map(element => tree.updateChildren(element, true)));
618-
619-
elements.map(element => {
620-
try {
621-
tree.rerender(element);
622-
} catch {
623-
// noop
624-
}
625-
});
626-
617+
await Promise.all(elements.map(element => tree.updateChildren(element, true, true)));
627618
this.refreshing = false;
628619
this.updateContentAreas();
629620
if (this.focused) {

0 commit comments

Comments
 (0)