Adds number formatting to pluralize

Author: eamodio

src/system/date.ts

@@ -358,6 +358,14 @@ export function formatNumeric(
 	style?: 'decimal' | 'currency' | 'percent' | 'unit' | null | undefined,
 	locale?: string,
 ): string {
+	const format = getNumericFormat(style, locale);
+	return format(value);
+}
+
+export function getNumericFormat(
+	style?: 'decimal' | 'currency' | 'percent' | 'unit' | null | undefined,
+	locale?: string,
+): Intl.NumberFormat['format'] {
 	if (style == null) {
 		style = 'decimal';
 	}
@@ -381,5 +389,5 @@ export function formatNumeric(
 		numberFormatCache.set(key, formatter);
 	}
 
-	return formatter.format(value);
+	return formatter.format;
 }

src/system/string.ts

@@ -6,6 +6,7 @@ import type {
 } from '@gk-nzaytsev/fast-string-truncated-width';
 import getTruncatedStringWidth from '@gk-nzaytsev/fast-string-truncated-width';
 import { CharCode } from '../constants';
+import { getNumericFormat } from './date';
 
 export { fromBase64, base64 } from '@env/base64';
 
@@ -479,14 +480,16 @@ export function padOrTruncateEnd(s: string, maxLength: number, fillString?: stri
 	return s.padEnd(maxLength, fillString);
 }
 
+let numericFormat: ReturnType<typeof getNumericFormat> | undefined;
+
 export function pluralize(
 	s: string,
 	count: number,
 	options?: {
 		/** Controls the character/string between the count and the string */
 		infix?: string;
 		/** Formats the count */
-		format?: (count: number) => string | undefined;
+		format?: false | ((count: number) => string | undefined);
 		/** Controls if only the string should be included */
 		only?: boolean;
 		/** Controls the plural version of the string */
@@ -495,12 +498,27 @@ export function pluralize(
 		zero?: string;
 	},
 ) {
-	if (options == null) return `${count} ${s}${count === 1 ? '' : 's'}`;
+	if (options == null) {
+		numericFormat ??= getNumericFormat();
+		return `${numericFormat(count)} ${s}${count === 1 ? '' : 's'}`;
+	}
 
 	const suffix = count === 1 ? s : options.plural ?? `${s}s`;
 	if (options.only) return suffix;
 
-	return `${count === 0 ? options.zero ?? count : options.format?.(count) ?? count}${options.infix ?? ' '}${suffix}`;
+	let result;
+	if (count === 0) {
+		result = options.zero ?? count;
+	} else if (options.format === false) {
+		result = count;
+	} else if (options.format != null) {
+		result = options.format(count);
+	} else {
+		numericFormat ??= getNumericFormat();
+		result = numericFormat(count);
+	}
+
+	return `${result}${options.infix ?? ' '}${suffix}`;
 }
 
 // Removes \ / : * ? " < > | and C0 and C1 control codes

src/views/nodes/contributorNode.ts

@@ -4,6 +4,7 @@ import { GlyphChars } from '../../constants';
 import type { GitUri } from '../../git/gitUri';
 import type { GitContributor } from '../../git/models/contributor';
 import type { GitLog } from '../../git/models/log';
+import { formatNumeric } from '../../system/date';
 import { gate } from '../../system/decorators/gate';
 import { debug } from '../../system/decorators/log';
 import { map } from '../../system/iterable';
@@ -85,17 +86,15 @@ export class ContributorNode extends ViewNode<'contributor', ViewsWithContributo
 	async getTreeItem(): Promise<TreeItem> {
 		const presence = this.options?.presence?.get(this.contributor.email!);
 
-		const numberFormatter = new Intl.NumberFormat();
-
 		const shortStats =
 			this.contributor.stats != null
-				? ` (${pluralize('file', this.contributor.stats.files, {
-						format: numberFormatter.format,
-				  })}, +${numberFormatter.format(this.contributor.stats.additions)} -${numberFormatter.format(
+				? ` (${pluralize('file', this.contributor.stats.files)}, +${formatNumeric(
 						this.contributor.stats.additions,
-				  )} ${pluralize('line', this.contributor.stats.additions + this.contributor.stats.deletions, {
-						only: true,
-				  })})`
+				  )} -${formatNumeric(this.contributor.stats.additions)} ${pluralize(
+						'line',
+						this.contributor.stats.additions + this.contributor.stats.deletions,
+						{ only: true },
+				  )})`
 				: '';
 
 		const item = new TreeItem(
@@ -113,9 +112,6 @@ export class ContributorNode extends ViewNode<'contributor', ViewsWithContributo
 		}${this.contributor.date != null ? `${this.contributor.formatDateFromNow()}, ` : ''}${pluralize(
 			'commit',
 			this.contributor.count,
-			{
-				format: numberFormatter.format,
-			},
 		)}${shortStats}`;
 
 		let avatarUri;
@@ -146,13 +142,10 @@ export class ContributorNode extends ViewNode<'contributor', ViewsWithContributo
 
 		const stats =
 			this.contributor.stats != null
-				? `\\\n${pluralize('file', this.contributor.stats.files, {
-						format: numberFormatter.format,
-				  })} changed, ${pluralize('addition', this.contributor.stats.additions, {
-						format: numberFormatter.format,
-				  })}, ${pluralize('deletion', this.contributor.stats.deletions, {
-						format: numberFormatter.format,
-				  })}`
+				? `\\\n${pluralize('file', this.contributor.stats.files)} changed, ${pluralize(
+						'addition',
+						this.contributor.stats.additions,
+				  )}, ${pluralize('deletion', this.contributor.stats.deletions)}`
 				: '';
 
 		const link = this.contributor.email
@@ -168,7 +161,6 @@ export class ContributorNode extends ViewNode<'contributor', ViewsWithContributo
 			`${avatarMarkdown != null ? avatarMarkdown : ''} &nbsp;${link} \n\n${lastCommitted}${pluralize(
 				'commit',
 				this.contributor.count,
-				{ format: numberFormatter.format },
 			)}${stats}`,
 		);
 		markdown.supportHtml = true;