Skip to content

Sessions - tree rendering fixes #307272

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
lszomoru merged 2 commits into from
Apr 1, 2026
Merged

Sessions - tree rendering fixes #307272

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
039b890
Sessions - tree rendering fixes
lszomoru Apr 1, 2026
16a65a2
Pull request feedback
lszomoru Apr 1, 2026
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
11 changes: 10 additions & 1 deletion src/vs/sessions/contrib/changes/browser/changesView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,14 @@ function buildTreeChildren(items: IChangesFileItem[], treeRootInfo?: IChangesTre
incompressible: true,
});
} else {
// Folder node
// Folder node. Ensure that the first level of folders under
// the root folder are not being collapsed with the root folder
// as that is a special node showing the workspace folder and
// branch information.
result.push({
element: child,
children: convertChildren(child),
incompressible: parent === resourceTree.root,
collapsible: true,
collapsed: false,
});
Expand Down Expand Up @@ -1542,6 +1546,10 @@ class ChangesTreeRenderer implements ICompressibleTreeRenderer<ChangesTreeElemen
return activeSession?.sessionType ?? '';
}));

templateDisposables.add(bindContextKey(hasGitRepositoryContextKey, contextKeyService, reader => {
return this.viewModel.activeSessionHasGitRepositoryObs.read(reader);
}));

templateDisposables.add(bindContextKey(changesVersionModeContextKey, contextKeyService, reader => {
return this.viewModel.versionModeObs.read(reader);
}));
Expand Down Expand Up @@ -1706,6 +1714,7 @@ class ChangesTreeRenderer implements ICompressibleTreeRenderer<ChangesTreeElemen
private renderFolderElement(node: IResourceNode<IChangesFileItem, undefined>, templateData: IChangesTreeTemplate): void {
templateData.label.setFile(node.uri, {
fileKind: FileKind.FOLDER,
hidePath: true,
});

// Hide file-specific decorations for folders
Expand Down
Loading