Adds new 'counts' Launchpad indicator label option

 - Displays an icon & count of each of the priority groups
Avoids unneeded indicator data refreshing on config changes
Avoids delay/cancellation potential for after startup loaded data
Avoids listening for enable/disable in the indicator as its life-cycle is controlled by the container
Adds missing enum descriptions

Author: eamodio

CHANGELOG.md

@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ### Added
 
+- Adds a new `counts` option to the `gitlens.launchpad.indicator.label` setting to show the status counts of items which need your attention in the _Launchpad_ status bar indicator
 - Adds _Search for Commits within Selection_ command to the editor context menu when there is a selection
 - Adds a `gitlens.launchpad.ignoredOrganizations` setting to specify an array of organizations (or users) to ignore in the _Launchpad_
 

package.json

@@ -2994,6 +2994,10 @@
 							"default",
 							"group"
 						],
+						"enumDescriptions": [
+							"Shows the Launchpad icon",
+							"Shows the icon of the highest priority group"
+						],
 						"default": "default",
 						"markdownDescription": "Specifies the style of the  _Launchpad_ status bar indicator icon",
 						"scope": "window",
@@ -3006,7 +3010,13 @@
 						],
 						"enum": [
 							false,
-							"item"
+							"item",
+							"counts"
+						],
+						"enumDescriptions": [
+							"Hides the label",
+							"Shows the highest priority item which needs your attention",
+							"Shows the status counts of items which need your attention"
 						],
 						"default": "item",
 						"markdownDescription": "Specifies the display of the  _Launchpad_ status bar indicator label",

src/config.ts

@@ -97,7 +97,7 @@ export interface Config {
 			readonly enabled: boolean;
 			readonly openInEditor: boolean;
 			readonly icon: 'default' | 'group';
-			readonly label: false | 'item';
+			readonly label: false | 'item' | 'counts';
 			readonly useColors: boolean;
 			readonly groups: ('mergeable' | 'blocked' | 'needs-review' | 'follow-up')[];
 			readonly polling: {

src/constants.ts

@@ -1315,7 +1315,7 @@ export type TelemetryEvents = {
 		'config.launchpad.indicator.enabled': boolean;
 		'config.launchpad.indicator.openInEditor': boolean;
 		'config.launchpad.indicator.icon': 'default' | 'group';
-		'config.launchpad.indicator.label': false | 'item';
+		'config.launchpad.indicator.label': false | 'item' | 'counts';
 		'config.launchpad.indicator.useColors': boolean;
 		'config.launchpad.indicator.groups': string;
 		'config.launchpad.indicator.polling.enabled': boolean;

src/container.ts

@@ -313,6 +313,9 @@ export class Container {
 				if (configuration.changed(e, 'launchpad.indicator.enabled')) {
 					this._focusIndicator?.dispose();
 					this._focusIndicator = undefined;
+
+					this.telemetry.sendEvent('launchpad/indicator/hidden');
+
 					if (configuration.get('launchpad.indicator.enabled')) {
 						this._disposables.push((this._focusIndicator = new FocusIndicator(this, this._focusProvider)));
 					}

src/plus/focus/focus.ts

@@ -54,6 +54,9 @@ import type {
 } from './focusProvider';
 import {
 	countFocusItemGroups,
+	focusGroupIconMap,
+	focusGroupLabelMap,
+	focusGroups,
 	getFocusItemIdHash,
 	groupAndSortFocusItems,
 	supportedFocusIntegrations,
@@ -73,20 +76,6 @@ const actionGroupMap = new Map<FocusActionCategory, string[]>([
 	['other', ['Other', `Opened by \${author} \${createdDateRelative}`]],
 ]);
 
-const groupMap = new Map<FocusGroup, [string, string | undefined]>([
-	['current-branch', ['Current Branch', 'git-branch']],
-	['pinned', ['Pinned', 'pinned']],
-	['mergeable', ['Ready to Merge', 'rocket']],
-	['blocked', ['Blocked', 'error']], //bracket-error
-	['follow-up', ['Requires Follow-up', 'report']],
-	// ['needs-attention', ['Needs Your Attention', 'bell-dot']], //comment-unresolved
-	['needs-review', ['Needs Your Review', 'comment-unresolved']], // feedback
-	['waiting-for-review', ['Waiting for Review', 'gitlens-clock']],
-	['draft', ['Draft', 'git-pull-request-draft']],
-	['other', ['Other', 'ellipsis']],
-	['snoozed', ['Snoozed', 'bell-slash']],
-]);
-
 export interface FocusItemQuickPickItem extends QuickPickItemOfT<FocusItem> {
 	group: FocusGroup;
 }
@@ -191,7 +180,7 @@ export class FocusCommand extends QuickCommand<State> {
 		const collapsed = new Map<FocusGroup, boolean>(storedCollapsed.map(g => [g, true]));
 		if (state.initialGroup != null) {
 			// set all to true except the initial group
-			for (const [group] of groupMap) {
+			for (const group of focusGroups) {
 				collapsed.set(group, group !== state.initialGroup);
 			}
 		}
@@ -343,9 +332,11 @@ export class FocusCommand extends QuickCommand<State> {
 					items.push(
 						createQuickPickSeparator(groupItems.length ? groupItems.length.toString() : undefined),
 						createDirectiveQuickPickItem(Directive.Reload, false, {
-							label: `$(${context.collapsed.get(ui) ? 'chevron-down' : 'chevron-up'})\u00a0\u00a0$(${
-								groupMap.get(ui)![1]
-							})\u00a0\u00a0${groupMap.get(ui)![0]?.toUpperCase()}`, //'\u00a0',
+							label: `$(${
+								context.collapsed.get(ui) ? 'chevron-down' : 'chevron-up'
+							})\u00a0\u00a0${focusGroupIconMap.get(ui)!}\u00a0\u00a0${focusGroupLabelMap
+								.get(ui)
+								?.toUpperCase()}`, //'\u00a0',
 							//detail: groupMap.get(group)?.[0].toUpperCase(),
 							onDidSelect: () => {
 								const collapsed = !context.collapsed.get(ui);