From 7488a47736832348a3b9a216c90425d547659683 Mon Sep 17 00:00:00 2001 From: Megan Rogge Date: Fri, 24 Jan 2025 12:24:14 -0600 Subject: [PATCH 1/6] use editor font info --- .../suggest/browser/terminalSuggestAddon.ts | 32 +--------- .../suggest/browser/simpleSuggestWidget.ts | 64 ++++++++++++++++--- .../browser/simpleSuggestWidgetRenderer.ts | 3 +- 3 files changed, 58 insertions(+), 41 deletions(-) diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts index a175d8f35d4f4..4a28688b89306 100644 --- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts +++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts @@ -19,16 +19,14 @@ import { TerminalCapability, type ITerminalCapabilityStore } from '../../../../. import type { IPromptInputModel, IPromptInputModelState } from '../../../../../platform/terminal/common/capabilities/commandDetection/promptInputModel.js'; import { getListStyles } from '../../../../../platform/theme/browser/defaultStyles.js'; import { activeContrastBorder } from '../../../../../platform/theme/common/colorRegistry.js'; -import { ITerminalConfigurationService } from '../../../terminal/browser/terminal.js'; import type { IXtermCore } from '../../../terminal/browser/xterm-private.js'; import { TerminalStorageKeys } from '../../../terminal/common/terminalStorageKeys.js'; import { terminalSuggestConfigSection, TerminalSuggestSettingId, type ITerminalSuggestConfiguration } from '../common/terminalSuggestConfiguration.js'; import { SimpleCompletionItem } from '../../../../services/suggest/browser/simpleCompletionItem.js'; import { LineContext, SimpleCompletionModel } from '../../../../services/suggest/browser/simpleCompletionModel.js'; import { ISimpleSelectedSuggestion, SimpleSuggestWidget } from '../../../../services/suggest/browser/simpleSuggestWidget.js'; -import type { ISimpleSuggestWidgetFontInfo } from '../../../../services/suggest/browser/simpleSuggestWidgetRenderer.js'; import { ITerminalCompletionService, TerminalCompletionItemKind } from './terminalCompletionService.js'; -import { TerminalSettingId, TerminalShellType } from '../../../../../platform/terminal/common/terminal.js'; +import { TerminalShellType } from '../../../../../platform/terminal/common/terminal.js'; import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js'; import { IExtensionService } from '../../../../services/extensions/common/extensions.js'; import { ThemeIcon } from '../../../../../base/common/themables.js'; @@ -80,8 +78,6 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest readonly onAcceptedCompletion = this._onAcceptedCompletion.event; private readonly _onDidReceiveCompletions = this._register(new Emitter()); readonly onDidReceiveCompletions = this._onDidReceiveCompletions.event; - private readonly _onDidFontConfigurationChange = this._register(new Emitter()); - readonly onDidFontConfigurationChange = this._onDidFontConfigurationChange.event; private _kindToIconMap = new Map([ [TerminalCompletionItemKind.File, Codicon.file], @@ -100,7 +96,6 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest @ITerminalCompletionService private readonly _terminalCompletionService: ITerminalCompletionService, @IConfigurationService private readonly _configurationService: IConfigurationService, @IInstantiationService private readonly _instantiationService: IInstantiationService, - @ITerminalConfigurationService private readonly _terminalConfigurationService: ITerminalConfigurationService, @IExtensionService private readonly _extensionService: IExtensionService ) { super(); @@ -395,36 +390,13 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest }); } - private _getFontInfo(): ISimpleSuggestWidgetFontInfo { - const c = this._terminalConfigurationService.config; - const font = this._terminalConfigurationService.getFont(dom.getActiveWindow()); - const fontInfo: ISimpleSuggestWidgetFontInfo = { - fontFamily: font.fontFamily, - fontSize: font.fontSize, - // In the editor's world, lineHeight is the pixels between the baselines of two lines of text - // In the terminal's world, lineHeight is the multiplier of the font size - // 1.5 is needed so that it's taller than a 16px icon - lineHeight: Math.ceil(c.lineHeight * font.fontSize * 1.5), - fontWeight: c.fontWeight.toString(), - letterSpacing: font.letterSpacing - }; - return fontInfo; - } + private _ensureSuggestWidget(terminal: Terminal): SimpleSuggestWidget { if (!this._suggestWidget) { - - this._register(this._configurationService.onDidChangeConfiguration(e => { - if (e.affectsConfiguration(TerminalSettingId.FontFamily) || e.affectsConfiguration(TerminalSettingId.FontSize) || e.affectsConfiguration(TerminalSettingId.LineHeight) || e.affectsConfiguration(TerminalSettingId.FontFamily) || e.affectsConfiguration('editor.fontSize') || e.affectsConfiguration('editor.fontFamily')) { - this._onDidFontConfigurationChange.fire(); - } - } - )); this._suggestWidget = this._register(this._instantiationService.createInstance( SimpleSuggestWidget, this._container!, this._instantiationService.createInstance(PersistedWidgetSize), - this._getFontInfo.bind(this), - this.onDidFontConfigurationChange, { statusBarMenuId: MenuId.MenubarTerminalSuggestStatusMenu, showStatusBarSettingId: TerminalSuggestSettingId.ShowStatusBar diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts index 6092257e73d43..c5d0bb8f89031 100644 --- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts +++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts @@ -23,7 +23,6 @@ import { IConfigurationService } from '../../../../platform/configuration/common import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js'; import { canExpandCompletionItem, SimpleSuggestDetailsOverlay, SimpleSuggestDetailsWidget } from './simpleSuggestWidgetDetails.js'; import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js'; -import { TerminalSettingId } from '../../../../platform/terminal/common/terminal.js'; const $ = dom.$; @@ -106,6 +105,8 @@ export class SimpleSuggestWidget extends Disposable { readonly onDidFocus: Event = this._onDidFocus.event; private readonly _onDidBlurDetails = this._register(new Emitter()); readonly onDidBlurDetails = this._onDidBlurDetails.event; + private readonly _onDidFontConfigurationChange = this._register(new Emitter()); + readonly onDidFontConfigurationChange = this._onDidFontConfigurationChange.event; get list(): List { return this._list; } @@ -114,8 +115,6 @@ export class SimpleSuggestWidget extends Disposable { constructor( private readonly _container: HTMLElement, private readonly _persistedSize: IPersistedWidgetSizeDelegate, - private readonly _getFontInfo: () => ISimpleSuggestWidgetFontInfo, - private readonly _onDidFontConfigurationChange: Event, private readonly _options: IWorkbenchSuggestWidgetOptions, @IInstantiationService instantiationService: IInstantiationService, @IConfigurationService private readonly _configurationService: IConfigurationService, @@ -180,7 +179,7 @@ export class SimpleSuggestWidget extends Disposable { const applyIconStyle = () => this.element.domNode.classList.toggle('no-icons', !_configurationService.getValue('editor.suggest.showIcons')); applyIconStyle(); - const renderer = new SimpleSuggestWidgetItemRenderer(_getFontInfo, this._configurationService); + const renderer = new SimpleSuggestWidgetItemRenderer(this._getFontInfo.bind(this), this._configurationService); this._register(renderer); this._listElement = dom.append(this.element.domNode, $('.tree')); this._list = this._register(new List('SuggestWidget', this._listElement, { @@ -229,7 +228,7 @@ export class SimpleSuggestWidget extends Disposable { this._messageElement = dom.append(this.element.domNode, dom.$('.message')); - const details: SimpleSuggestDetailsWidget = this._register(instantiationService.createInstance(SimpleSuggestDetailsWidget, this._getFontInfo, this._onDidFontConfigurationChange)); + const details: SimpleSuggestDetailsWidget = this._register(instantiationService.createInstance(SimpleSuggestDetailsWidget, this._getFontInfo.bind(this), this.onDidFontConfigurationChange)); this._register(details.onDidClose(() => this.toggleDetails())); this._details = this._register(new SimpleSuggestDetailsOverlay(details, this._listElement)); this._register(dom.addDisposableListener(this._details.widget.domNode, 'blur', (e) => this._onDidBlurDetails.fire(e))); @@ -247,9 +246,8 @@ export class SimpleSuggestWidget extends Disposable { if (e.affectsConfiguration('editor.suggest.showIcons')) { applyIconStyle(); } - if (this._completionModel && e.affectsConfiguration(TerminalSettingId.FontSize) || e.affectsConfiguration(TerminalSettingId.LineHeight) || e.affectsConfiguration(TerminalSettingId.FontFamily)) { - this._layout(undefined); - this._list.splice(0, this._list.length, this._completionModel!.items); + if (this._completionModel && (e.affectsConfiguration('editor.fontSize') || e.affectsConfiguration('editor.lineHeight') || e.affectsConfiguration('editor.fontFamily'))) { + this._list.splice(0, this._completionModel.items.length, this._completionModel!.items); } if (_options.statusBarMenuId && _options.showStatusBarSettingId && e.affectsConfiguration(_options.showStatusBarSettingId)) { const showStatusBar: boolean = _configurationService.getValue(_options.showStatusBarSettingId); @@ -267,6 +265,16 @@ export class SimpleSuggestWidget extends Disposable { this.element.domNode.classList.toggle('with-status-bar', showStatusBar); } })); + this._register(this._configurationService.onDidChangeConfiguration(e => { + if (e.affectsConfiguration('editor.fontSize') || + e.affectsConfiguration('editor.lineHeight') || + e.affectsConfiguration('editor.fontWeight') || + e.affectsConfiguration('editor.fontFamily')) { + this._onDidFontConfigurationChange.fire(); + this._layout(undefined); + } + } + )); } private _onListFocus(e: IListEvent): void { @@ -767,8 +775,46 @@ export class SimpleSuggestWidget extends Disposable { } } + private _getFontInfo(): ISimpleSuggestWidgetFontInfo { + let lineHeight: number = this._configurationService.getValue('editor.lineHeight'); + const fontSize: number = this._configurationService.getValue('editor.fontSize'); + const fontFamily: string = this._configurationService.getValue('editor.fontFamily'); + const fontWeight: string = this._configurationService.getValue('editor.fontWeight'); + const letterSpacing: number = this._configurationService.getValue('editor.letterSpacing'); + if (lineHeight === 0) { + lineHeight = fontSize; + } else if (lineHeight <= 8) { + lineHeight = fontSize * lineHeight; + } + const fontInfo = { + fontSize, + lineHeight, + fontWeight: fontWeight.toString(), + letterSpacing, + fontFamily + }; + console.log('fontInfo', fontInfo); + return fontInfo; + } + private _getLayoutInfo() { - const fontInfo = this._getFontInfo(); + let lineHeight: number = this._configurationService.getValue('editor.lineHeight'); + const fontSize: number = this._configurationService.getValue('editor.fontSize'); + const fontFamily: string = this._configurationService.getValue('editor.fontFamily'); + const fontWeight: string = this._configurationService.getValue('editor.fontWeight'); + const letterSpacing: number = this._configurationService.getValue('editor.letterSpacing'); + if (lineHeight === 0) { + lineHeight = fontSize; + } else if (lineHeight <= 8) { + lineHeight = fontSize * lineHeight; + } + const fontInfo = { + fontSize, + lineHeight, + fontWeight: fontWeight.toString(), + letterSpacing, + fontFamily + }; const itemHeight = clamp(fontInfo.lineHeight, 8, 1000); const statusBarHeight = !this._options.statusBarMenuId || !this._options.showStatusBarSettingId || !this._configurationService.getValue(this._options.showStatusBarSettingId) || this._state === State.Empty || this._state === State.Loading ? 0 : itemHeight; const borderWidth = this._details.widget.borderWidth; diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer.ts index 71129442dda41..a12d4e5440aae 100644 --- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer.ts +++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer.ts @@ -13,7 +13,6 @@ import { createMatches } from '../../../../base/common/filters.js'; import { DisposableStore } from '../../../../base/common/lifecycle.js'; import { ThemeIcon } from '../../../../base/common/themables.js'; import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js'; -import { TerminalSettingId } from '../../../../platform/terminal/common/terminal.js'; export function getAriaId(index: number): string { return `simple-suggest-aria-id-${index}`; @@ -117,7 +116,7 @@ export class SimpleSuggestWidgetItemRenderer implements IListRenderer { - if (e.affectsConfiguration(TerminalSettingId.FontSize) || e.affectsConfiguration(TerminalSettingId.FontFamily) || e.affectsConfiguration(TerminalSettingId.FontWeight) || e.affectsConfiguration(TerminalSettingId.LineHeight)) { + if (e.affectsConfiguration('editor.fontSize') || e.affectsConfiguration('editor.fontFamily') || e.affectsConfiguration('editor.lineHeight') || e.affectsConfiguration('editor.fontWeight')) { configureFont(); } })); From 77178bb62b748b2e048bc16f6bd161ffa30f6cce Mon Sep 17 00:00:00 2001 From: Megan Rogge Date: Fri, 24 Jan 2025 12:26:58 -0600 Subject: [PATCH 2/6] rm dupe --- .../suggest/browser/simpleSuggestWidget.ts | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts index c5d0bb8f89031..739462e14d3ff 100644 --- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts +++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts @@ -246,8 +246,13 @@ export class SimpleSuggestWidget extends Disposable { if (e.affectsConfiguration('editor.suggest.showIcons')) { applyIconStyle(); } - if (this._completionModel && (e.affectsConfiguration('editor.fontSize') || e.affectsConfiguration('editor.lineHeight') || e.affectsConfiguration('editor.fontFamily'))) { + if (this._completionModel && ( + e.affectsConfiguration('editor.fontSize') || + e.affectsConfiguration('editor.lineHeight') || + e.affectsConfiguration('editor.fontWeight') || + e.affectsConfiguration('editor.fontFamily'))) { this._list.splice(0, this._completionModel.items.length, this._completionModel!.items); + this._onDidFontConfigurationChange.fire(); } if (_options.statusBarMenuId && _options.showStatusBarSettingId && e.affectsConfiguration(_options.showStatusBarSettingId)) { const showStatusBar: boolean = _configurationService.getValue(_options.showStatusBarSettingId); @@ -265,16 +270,6 @@ export class SimpleSuggestWidget extends Disposable { this.element.domNode.classList.toggle('with-status-bar', showStatusBar); } })); - this._register(this._configurationService.onDidChangeConfiguration(e => { - if (e.affectsConfiguration('editor.fontSize') || - e.affectsConfiguration('editor.lineHeight') || - e.affectsConfiguration('editor.fontWeight') || - e.affectsConfiguration('editor.fontFamily')) { - this._onDidFontConfigurationChange.fire(); - this._layout(undefined); - } - } - )); } private _onListFocus(e: IListEvent): void { From 73216fb5f7525c5b78ca62cd1ceb6cc635fcb288 Mon Sep 17 00:00:00 2001 From: Megan Rogge Date: Fri, 24 Jan 2025 12:45:07 -0600 Subject: [PATCH 3/6] fix issues --- .../suggest/browser/simpleSuggestWidget.ts | 60 +++++++------------ 1 file changed, 23 insertions(+), 37 deletions(-) diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts index 739462e14d3ff..70bb64a639b5e 100644 --- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts +++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts @@ -611,23 +611,23 @@ export class SimpleSuggestWidget extends Disposable { } } - hide(): void { - this._pendingLayout.clear(); - this._pendingShowDetails.clear(); - // this._loadingTimeout?.dispose(); - - this._setState(State.Hidden); - this._onDidHide.fire(this); - dom.hide(this.element.domNode); - this.element.clearSashHoverState(); - // ensure that a reasonable widget height is persisted so that - // accidential "resize-to-single-items" cases aren't happening - const dim = this._persistedSize.restore(); - const minPersistedHeight = Math.ceil(this._getLayoutInfo().itemHeight * 4.3); - if (dim && dim.height < minPersistedHeight) { - this._persistedSize.store(dim.with(undefined, minPersistedHeight)); - } - } + // hide(): void { + // this._pendingLayout.clear(); + // this._pendingShowDetails.clear(); + // // this._loadingTimeout?.dispose(); + + // this._setState(State.Hidden); + // this._onDidHide.fire(this); + // dom.hide(this.element.domNode); + // this.element.clearSashHoverState(); + // // ensure that a reasonable widget height is persisted so that + // // accidential "resize-to-single-items" cases aren't happening + // const dim = this._persistedSize.restore(); + // const minPersistedHeight = Math.ceil(this._getLayoutInfo().itemHeight * 4.3); + // if (dim && dim.height < minPersistedHeight) { + // this._persistedSize.store(dim.with(undefined, minPersistedHeight)); + // } + // } private _layout(size: dom.Dimension | undefined): void { if (!this._cursorPosition) { @@ -776,11 +776,13 @@ export class SimpleSuggestWidget extends Disposable { const fontFamily: string = this._configurationService.getValue('editor.fontFamily'); const fontWeight: string = this._configurationService.getValue('editor.fontWeight'); const letterSpacing: number = this._configurationService.getValue('editor.letterSpacing'); - if (lineHeight === 0) { - lineHeight = fontSize; + + if (lineHeight <= 1) { + lineHeight = Math.ceil(fontSize * 1.5); } else if (lineHeight <= 8) { lineHeight = fontSize * lineHeight; } + const fontInfo = { fontSize, lineHeight, @@ -788,28 +790,12 @@ export class SimpleSuggestWidget extends Disposable { letterSpacing, fontFamily }; - console.log('fontInfo', fontInfo); + return fontInfo; } private _getLayoutInfo() { - let lineHeight: number = this._configurationService.getValue('editor.lineHeight'); - const fontSize: number = this._configurationService.getValue('editor.fontSize'); - const fontFamily: string = this._configurationService.getValue('editor.fontFamily'); - const fontWeight: string = this._configurationService.getValue('editor.fontWeight'); - const letterSpacing: number = this._configurationService.getValue('editor.letterSpacing'); - if (lineHeight === 0) { - lineHeight = fontSize; - } else if (lineHeight <= 8) { - lineHeight = fontSize * lineHeight; - } - const fontInfo = { - fontSize, - lineHeight, - fontWeight: fontWeight.toString(), - letterSpacing, - fontFamily - }; + const fontInfo = this._getFontInfo(); const itemHeight = clamp(fontInfo.lineHeight, 8, 1000); const statusBarHeight = !this._options.statusBarMenuId || !this._options.showStatusBarSettingId || !this._configurationService.getValue(this._options.showStatusBarSettingId) || this._state === State.Empty || this._state === State.Loading ? 0 : itemHeight; const borderWidth = this._details.widget.borderWidth; From 49bde4a6b1b8b82a6f5afe7292d30f49f170afa6 Mon Sep 17 00:00:00 2001 From: Megan Rogge Date: Fri, 24 Jan 2025 12:45:55 -0600 Subject: [PATCH 4/6] bring back hide --- .../suggest/browser/simpleSuggestWidget.ts | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts index 70bb64a639b5e..3a9bd2618c5ac 100644 --- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts +++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts @@ -611,23 +611,23 @@ export class SimpleSuggestWidget extends Disposable { } } - // hide(): void { - // this._pendingLayout.clear(); - // this._pendingShowDetails.clear(); - // // this._loadingTimeout?.dispose(); - - // this._setState(State.Hidden); - // this._onDidHide.fire(this); - // dom.hide(this.element.domNode); - // this.element.clearSashHoverState(); - // // ensure that a reasonable widget height is persisted so that - // // accidential "resize-to-single-items" cases aren't happening - // const dim = this._persistedSize.restore(); - // const minPersistedHeight = Math.ceil(this._getLayoutInfo().itemHeight * 4.3); - // if (dim && dim.height < minPersistedHeight) { - // this._persistedSize.store(dim.with(undefined, minPersistedHeight)); - // } - // } + hide(): void { + this._pendingLayout.clear(); + this._pendingShowDetails.clear(); + // this._loadingTimeout?.dispose(); + + this._setState(State.Hidden); + this._onDidHide.fire(this); + dom.hide(this.element.domNode); + this.element.clearSashHoverState(); + // ensure that a reasonable widget height is persisted so that + // accidential "resize-to-single-items" cases aren't happening + const dim = this._persistedSize.restore(); + const minPersistedHeight = Math.ceil(this._getLayoutInfo().itemHeight * 4.3); + if (dim && dim.height < minPersistedHeight) { + this._persistedSize.store(dim.with(undefined, minPersistedHeight)); + } + } private _layout(size: dom.Dimension | undefined): void { if (!this._cursorPosition) { From 5892cdbeeb45ed24a40aee4d7cf2b3b3cf431c7b Mon Sep 17 00:00:00 2001 From: Megan Rogge Date: Fri, 24 Jan 2025 12:47:33 -0600 Subject: [PATCH 5/6] add condition --- .../workbench/services/suggest/browser/simpleSuggestWidget.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts index 3a9bd2618c5ac..b1ed529e0523a 100644 --- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts +++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts @@ -777,7 +777,8 @@ export class SimpleSuggestWidget extends Disposable { const fontWeight: string = this._configurationService.getValue('editor.fontWeight'); const letterSpacing: number = this._configurationService.getValue('editor.letterSpacing'); - if (lineHeight <= 1) { + if (lineHeight <= 1 && fontSize < 16) { + // Scale so icon shows by default lineHeight = Math.ceil(fontSize * 1.5); } else if (lineHeight <= 8) { lineHeight = fontSize * lineHeight; From cc2bffde25b209770054e3221b9517328409c707 Mon Sep 17 00:00:00 2001 From: Megan Rogge Date: Fri, 24 Jan 2025 13:15:19 -0600 Subject: [PATCH 6/6] fix test --- .../test/browser/terminalSuggestAddon.integrationTest.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalSuggestAddon.integrationTest.ts b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalSuggestAddon.integrationTest.ts index bdfbb2661f9f5..ab229b5be42a7 100644 --- a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalSuggestAddon.integrationTest.ts +++ b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalSuggestAddon.integrationTest.ts @@ -95,11 +95,6 @@ suite('Terminal Contrib Suggest Recordings', () => { setup(async () => { const terminalConfig = { - fontFamily: 'monospace', - fontSize: 12, - fontWeight: 'normal', - letterSpacing: 0, - lineHeight: 1, integrated: { suggest: { enabled: true, @@ -121,7 +116,8 @@ suite('Terminal Contrib Suggest Recordings', () => { const instantiationService = workbenchInstantiationService({ configurationService: () => new TestConfigurationService({ files: { autoSave: false }, - terminal: terminalConfig + terminal: terminalConfig, + editor: { fontSize: 14, fontFamily: 'Arial', lineHeight: 12, fontWeight: 'bold' } }) }, store); const terminalConfigurationService = instantiationService.get(ITerminalConfigurationService) as TestTerminalConfigurationService;