Skip to content

Commit 039b890

Browse files
committed
Sessions - tree rendering fixes
1 parent f9d4d43 commit 039b890

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

src/vs/sessions/contrib/changes/browser/changesView.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,10 +189,14 @@ function buildTreeChildren(items: IChangesFileItem[], treeRootInfo?: IChangesTre
189189
incompressible: true,
190190
});
191191
} else {
192-
// Folder node
192+
// Folder node. Ensure that the first level of folders under
193+
// the root folder are not being collapsed with the root folder
194+
// as that is a special node showing the workspace folder and
195+
// branch information.
193196
result.push({
194197
element: child,
195198
children: convertChildren(child),
199+
incompressible: child.parent?.parent === undefined,
196200
collapsible: true,
197201
collapsed: false,
198202
});
@@ -1706,6 +1710,7 @@ class ChangesTreeRenderer implements ICompressibleTreeRenderer<ChangesTreeElemen
17061710
private renderFolderElement(node: IResourceNode<IChangesFileItem, undefined>, templateData: IChangesTreeTemplate): void {
17071711
templateData.label.setFile(node.uri, {
17081712
fileKind: FileKind.FOLDER,
1713+
hidePath: true,
17091714
});
17101715

17111716
// Hide file-specific decorations for folders

0 commit comments

Comments
 (0)