Skip to content

Commit 11e16d4

Browse files
authored
SCM - fix regression for source control provider that version folders (microsoft#199614)
1 parent 92979f5 commit 11e16d4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/vs/workbench/contrib/scm/browser/scmViewPane.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3279,7 +3279,7 @@ class SCMTreeDataSource implements IAsyncDataSource<ISCMViewService, TreeElement
32793279
// Resources (Tree)
32803280
const children: TreeElement[] = [];
32813281
for (const node of inputOrElement.resourceTree.root.children) {
3282-
children.push(node.element ?? node);
3282+
children.push(node.element && node.childrenCount === 0 ? node.element : node);
32833283
}
32843284

32853285
return children;
@@ -3288,7 +3288,7 @@ class SCMTreeDataSource implements IAsyncDataSource<ISCMViewService, TreeElement
32883288
// Resources (Tree), History item changes (Tree)
32893289
const children: TreeElement[] = [];
32903290
for (const node of inputOrElement.children) {
3291-
children.push(node.element ?? node);
3291+
children.push(node.element && node.childrenCount === 0 ? node.element : node);
32923292
}
32933293

32943294
return children;

0 commit comments

Comments
 (0)