From 093332ee52d695b202b9e656dd4c117c53f8599a Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Mon, 1 Apr 2024 15:59:34 -0700
Subject: [PATCH] Fix test failures due to private mangling

---
 .../terminal/browser/terminalConfigurationService.ts      | 8 ++++----
 .../test/browser/terminalConfigurationService.test.ts     | 7 +++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/terminal/browser/terminalConfigurationService.ts b/src/vs/workbench/contrib/terminal/browser/terminalConfigurationService.ts
index 8c3689e0285..68f404ddad8 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalConfigurationService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalConfigurationService.ts
@@ -16,7 +16,7 @@ import { DEFAULT_BOLD_FONT_WEIGHT, DEFAULT_FONT_WEIGHT, DEFAULT_LETTER_SPACING,
 export class TerminalConfigurationService extends Disposable implements ITerminalConfigurationService {
 	declare _serviceBrand: undefined;
 
-	private _fontMetrics: TerminalFontMetrics;
+	protected _fontMetrics: TerminalFontMetrics;
 
 	private _config!: Readonly<ITerminalConfiguration>;
 	get config() { return this._config; }
@@ -72,7 +72,7 @@ class TerminalFontMetrics extends Disposable {
 	private _charMeasureElement: HTMLElement | undefined;
 	private _lastFontMeasurement: ITerminalFont | undefined;
 
-	protected _linuxDistro: LinuxDistro = LinuxDistro.Unknown;
+	linuxDistro: LinuxDistro = LinuxDistro.Unknown;
 
 	constructor(
 		private readonly _terminalConfigurationService: ITerminalConfigurationService,
@@ -112,10 +112,10 @@ class TerminalFontMetrics extends Disposable {
 
 		// Work around bad font on Fedora/Ubuntu
 		if (!this._terminalConfigurationService.config.fontFamily) {
-			if (this._linuxDistro === LinuxDistro.Fedora) {
+			if (this.linuxDistro === LinuxDistro.Fedora) {
 				fontFamily = '\'DejaVu Sans Mono\'';
 			}
-			if (this._linuxDistro === LinuxDistro.Ubuntu) {
+			if (this.linuxDistro === LinuxDistro.Ubuntu) {
 				fontFamily = '\'Ubuntu Mono\'';
 
 				// Ubuntu mono is somehow smaller, so set fontSize a bit larger to get the same perceived size.
diff --git a/src/vs/workbench/contrib/terminal/test/browser/terminalConfigurationService.test.ts b/src/vs/workbench/contrib/terminal/test/browser/terminalConfigurationService.test.ts
index 38792f2bef4..dec6d5b1f2e 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/terminalConfigurationService.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/terminalConfigurationService.test.ts
@@ -14,6 +14,9 @@ import { TestInstantiationService } from 'vs/platform/instantiation/test/common/
 import { ITerminalConfigurationService, LinuxDistro } from 'vs/workbench/contrib/terminal/browser/terminal';
 import { TerminalConfigurationService } from 'vs/workbench/contrib/terminal/browser/terminalConfigurationService';
 
+class TestTerminalConfigurationService extends TerminalConfigurationService {
+	get fontMetrics() { return this._fontMetrics; }
+}
 
 suite('Workbench - TerminalConfigurationService', () => {
 	let configurationService: TestConfigurationService;
@@ -58,11 +61,11 @@ suite('Workbench - TerminalConfigurationService', () => {
 	function createTerminalConfigationService(config: any, linuxDistro?: LinuxDistro): ITerminalConfigurationService {
 		const instantiationService = new TestInstantiationService();
 		instantiationService.set(IConfigurationService, new TestConfigurationService(config));
-		const terminalConfigurationService = store.add(instantiationService.createInstance(TerminalConfigurationService));
+		const terminalConfigurationService = store.add(instantiationService.createInstance(TestTerminalConfigurationService));
 		instantiationService.set(ITerminalConfigurationService, terminalConfigurationService);
 		terminalConfigurationService.setPanelContainer(mainWindow.document.body);
 		if (linuxDistro) {
-			(terminalConfigurationService as any)._fontMetrics._linuxDistro = linuxDistro;
+			terminalConfigurationService.fontMetrics.linuxDistro = linuxDistro;
 		}
 		return terminalConfigurationService;
 	}