Closes #3520 adds setting to show current branch on top

Author: eamodio

CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 
+### Added
+
+- Adds a `gitlens.views.showCurrentBranchOnTop` setting to specify whether the current branch is shown at the top of the views — closes [#3520](https://github.com/gitkraken/vscode-gitlens/issues/3520)
+
 ### Fixed
 
 - Fixes [#3514](https://github.com/gitkraken/vscode-gitlens/issues/3514) - Attempting to delete the main worktree's branch causes a invalid prompt to delete the main worktree

package.json

@@ -1393,6 +1393,13 @@
 						"scope": "window",
 						"order": 1
 					},
+					"gitlens.views.showCurrentBranchOnTop": {
+						"type": "boolean",
+						"default": true,
+						"markdownDescription": "Specifies whether to always show the current branch at the top of the views",
+						"scope": "window",
+						"order": 2
+					},
 					"gitlens.views.defaultItemLimit": {
 						"type": "number",
 						"default": 10,

src/config.ts

@@ -615,13 +615,16 @@ export interface ViewsCommonConfig {
 	};
 	readonly openChangesInMultiDiffEditor: boolean;
 	readonly pageItemLimit: number;
+	readonly showCurrentBranchOnTop: boolean;
 	readonly showRelativeDateMarkers: boolean;
 }
 
 export const viewsCommonConfigKeys: (keyof ViewsCommonConfig)[] = [
+	'collapseWorktreesWhenPossible',
 	'defaultItemLimit',
 	'formats',
 	'pageItemLimit',
+	'showCurrentBranchOnTop',
 	'showRelativeDateMarkers',
 ];
 

src/views/branchesView.ts

@@ -199,8 +199,7 @@ export class BranchesView extends ViewBase<'branches', BranchesViewNode, Branche
 			!configuration.changed(e, 'defaultGravatarsStyle') &&
 			!configuration.changed(e, 'defaultTimeFormat') &&
 			!configuration.changed(e, 'sortBranchesBy') &&
-			!configuration.changed(e, 'sortRepositoriesBy') &&
-			!configuration.changed(e, 'views.collapseWorktreesWhenPossible')
+			!configuration.changed(e, 'sortRepositoriesBy')
 		) {
 			return false;
 		}

src/views/nodes/branchesNode.ts

@@ -38,10 +38,12 @@ export class BranchesNode extends CacheableChildrenViewNode<'branches', ViewsWit
 			const branches = await this.repo.getBranches({
 				// only show local branches
 				filter: b => !b.remote,
-				sort: {
-					current: true,
-					openedWorktreesByBranch: getOpenedWorktreesByBranch(this.context.worktreesByBranch),
-				},
+				sort: this.view.config.showCurrentBranchOnTop
+					? {
+							current: true,
+							openedWorktreesByBranch: getOpenedWorktreesByBranch(this.context.worktreesByBranch),
+					  }
+					: { current: false },
 			});
 			if (branches.values.length === 0) return [new MessageNode(this.view, this, 'No branches could be found.')];
 

src/views/repositoriesView.ts

@@ -258,6 +258,7 @@ export class RepositoriesView extends ViewBase<'repositories', RepositoriesNode,
 
 		return true;
 	}
+
 	protected override onConfigurationChanged(e: ConfigurationChangeEvent) {
 		if (configuration.changed(e, `views.${this.configKey}.autoRefresh` as const)) {
 			void this.setAutoRefresh(configuration.get('views.repositories.autoRefresh'));

src/views/workspacesView.ts

@@ -1,4 +1,4 @@
-import type { CancellationToken, Disposable } from 'vscode';
+import type { CancellationToken, ConfigurationChangeEvent, Disposable } from 'vscode';
 import { ProgressLocation, TreeItem, TreeItemCollapsibleState, window } from 'vscode';
 import type { WorkspacesViewConfig } from '../config';
 import { previewBadge, urls } from '../constants';
@@ -8,6 +8,7 @@ import { unknownGitUri } from '../git/gitUri';
 import type { Repository } from '../git/models/repository';
 import { ensurePlusFeaturesEnabled } from '../plus/gk/utils';
 import { executeCommand } from '../system/command';
+import { configuration } from '../system/configuration';
 import { gate } from '../system/decorators/gate';
 import { debug } from '../system/decorators/log';
 import { openUrl, openWorkspace } from '../system/utils';
@@ -313,4 +314,26 @@ export class WorkspacesView extends ViewBase<'workspaces', WorkspacesViewNode, W
 			),
 		];
 	}
+
+	protected override filterConfigurationChanged(e: ConfigurationChangeEvent) {
+		const changed = super.filterConfigurationChanged(e);
+		if (
+			!changed &&
+			!configuration.changed(e, 'defaultDateFormat') &&
+			!configuration.changed(e, 'defaultDateLocale') &&
+			!configuration.changed(e, 'defaultDateShortFormat') &&
+			!configuration.changed(e, 'defaultDateSource') &&
+			!configuration.changed(e, 'defaultDateStyle') &&
+			!configuration.changed(e, 'defaultGravatarsStyle') &&
+			!configuration.changed(e, 'defaultTimeFormat') &&
+			!configuration.changed(e, 'sortBranchesBy') &&
+			!configuration.changed(e, 'sortContributorsBy') &&
+			!configuration.changed(e, 'sortTagsBy') &&
+			!configuration.changed(e, 'sortRepositoriesBy')
+		) {
+			return false;
+		}
+
+		return true;
+	}
 }