development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-07-17 02:57:19 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Fix test failures due to private mangling

Browse source
This commit is contained in:
Daniel Imms 2024-04-01 15:59:34 -07:00
parent 8f218ce2a5
commit 093332ee52
No known key found for this signature in database
GPG key ID: 5F0FF45B19E3A5D2
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/vs/workbench/contrib/terminal/browser/terminalConfigurationService.ts
View file

@ -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.

7
src/vs/workbench/contrib/terminal/test/browser/terminalConfigurationService.test.ts
View file

@ -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;
}