Skip to content

Sessions - fix sorting of the files #307915

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 6, 2026
+39 −7
Merged

Sessions - fix sorting of the files #307915

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
963bc8f
Sessions - fix sorting of the files
lszomoru Apr 5, 2026
1a1b556
Merge branch 'main' into lszomoru/running-catshark
lszomoru Apr 5, 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
46 changes: 39 additions & 7 deletions 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 @@ -7,15 +7,14 @@ import './media/changesView.css';
import * as dom from '../../../../base/browser/dom.js';
import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
import { IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
import { IObjectTreeElement } from '../../../../base/browser/ui/tree/tree.js';
import { IObjectTreeElement, ITreeSorter } from '../../../../base/browser/ui/tree/tree.js';
import { ActionRunner, IAction } from '../../../../base/common/actions.js';
import { Codicon } from '../../../../base/common/codicons.js';
import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
import { Event } from '../../../../base/common/event.js';
import { autorun, derived, IObservable } from '../../../../base/common/observable.js';
import { basename } from '../../../../base/common/path.js';
import { ProgressBar } from '../../../../base/browser/ui/progressbar/progressbar.js';
import { isEqual } from '../../../../base/common/resources.js';
import { basename, isEqual } from '../../../../base/common/resources.js';
import { ThemeIcon } from '../../../../base/common/themables.js';
import { URI } from '../../../../base/common/uri.js';
import { localize, localize2 } from '../../../../nls.js';
Expand Down Expand Up @@ -69,6 +68,7 @@ import { ActiveSessionContextKeys, CHANGES_VIEW_CONTAINER_ID, CHANGES_VIEW_ID, C
import { buildTreeChildren, ChangesTreeElement, ChangesTreeRenderer, IChangesFileItem, IChangesTreeRootInfo, isChangesFileItem, toIChangesFileItem } from './changesViewRenderer.js';
import { ChangesViewModel } from './changesViewModel.js';
import { ResourceTree } from '../../../../base/common/resourceTree.js';
import { compareFileNames, comparePaths } from '../../../../base/common/comparers.js';

const $ = dom.$;

Expand Down Expand Up @@ -763,8 +763,8 @@ export class ChangesViewPane extends ViewPane {
type: 'root',
uri: workspaceFolderUri,
name: repository.workingDirectory
? `${basename(repository.uri.fsPath)} (${branchName})`
: basename(repository.uri.fsPath),
? `${basename(repository.uri)} (${branchName})`
: basename(repository.uri),
},
resourceTreeRootUri,
};
Expand Down Expand Up @@ -883,7 +883,7 @@ export class ChangesViewPane extends ViewPane {
{
alwaysConsumeMouseWheel: false,
accessibilityProvider: {
getAriaLabel: (element: ChangesTreeElement) => isChangesFileItem(element) ? basename(element.uri.path) : element.name,
getAriaLabel: (element: ChangesTreeElement) => isChangesFileItem(element) ? basename(element.uri) : element.name,
getWidgetAriaLabel: () => localize('changesViewTree', "Changes Tree")
},
dnd: {
Expand Down Expand Up @@ -913,6 +913,7 @@ export class ChangesViewPane extends ViewPane {
},
indent: this.viewModel.viewModeObs.get() === ChangesViewMode.List ? 0 : 8,
compressionEnabled: true,
sorter: new ChangesTreeSorter(() => this.viewModel.viewModeObs.get()),
twistieAdditionalCssClass: (e: unknown) => {
return this.viewModel.viewModeObs.get() === ChangesViewMode.List
? 'force-no-twistie'
Expand Down Expand Up @@ -985,7 +986,7 @@ class ChangesViewActionRunner extends ActionRunner {
}
}

// --- Tree Delegate
// --- Tree Delegate and Sorter

class ChangesTreeDelegate implements IListVirtualDelegate<ChangesTreeElement> {
static readonly ROW_HEIGHT = 22;
Expand All @@ -999,6 +1000,37 @@ class ChangesTreeDelegate implements IListVirtualDelegate<ChangesTreeElement> {
}
}

class ChangesTreeSorter implements ITreeSorter<ChangesTreeElement> {
constructor(private readonly viewMode: () => ChangesViewMode) { }

compare(a: ChangesTreeElement, b: ChangesTreeElement): number {
if (this.viewMode() === ChangesViewMode.List) {
// List
const aPath = (a as IChangesFileItem).uri.fsPath;
const bPath = (b as IChangesFileItem).uri.fsPath;

return comparePaths(aPath, bPath);
}

// Tree
const aIsDirectory = ResourceTree.isResourceNode(a);
const bIsDirectory = ResourceTree.isResourceNode(b);

if (aIsDirectory !== bIsDirectory) {
return aIsDirectory ? -1 : 1;
}

const aName = ResourceTree.isResourceNode(a)
? a.name
: basename((a as IChangesFileItem).uri);
const bName = ResourceTree.isResourceNode(b)
? b.name
: basename((b as IChangesFileItem).uri);

return compareFileNames(aName, bName);
}
}

// --- View Mode Actions

class SetChangesListViewModeAction extends ViewAction<ChangesViewPane> {
Expand Down
Loading