Skip to content

Fix tree for empty children #235121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexr00 merged 1 commit into from
Dec 3, 2024
Merged

Fix tree for empty children #235121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/vs/workbench/api/browser/mainThreadTreeViews.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ class TreeViewDataProvider implements ITreeViewDataProvider {
}

private convertTransferChildren(parents: ITreeItem[], children: (number | ITreeItem)[][] | undefined) {
const convertedChildren: ITreeItem[][] = Array(parents.length);
const convertedChildren: (ITreeItem[] | undefined)[] = Array(parents.length);
if (children) {
for (const childGroup of children) {
const childGroupIndex = childGroup[0] as number;
Expand Down Expand Up @@ -344,7 +344,7 @@ class TreeViewDataProvider implements ITreeViewDataProvider {
return this.itemsMap.size === 0;
}

private async postGetChildren(elementGroups: ITreeItem[][] | undefined): Promise<ResolvableTreeItem[][] | undefined> {
private async postGetChildren(elementGroups: (ITreeItem[] | undefined)[] | undefined): Promise<ResolvableTreeItem[][] | undefined> {
if (elementGroups === undefined) {
return undefined;
}
Expand All @@ -354,6 +354,9 @@ class TreeViewDataProvider implements ITreeViewDataProvider {
for (const elements of elementGroups) {
const result: ResolvableTreeItem[] = [];
resultGroups.push(result);
if (!elements) {
continue;
}
for (const element of elements) {
const resolvable = new ResolvableTreeItem(element, hasResolve ? (token) => {
return this._proxy.$resolve(this.treeViewId, element.handle, token);
Expand Down