Merge pull request microsoft#223507 from microsoft/tyriar/210597

Inherit font from terminal for suggest

Author: Tyriar

src/vs/workbench/contrib/terminal/browser/terminalConfigurationService.ts

@@ -18,7 +18,7 @@ export class TerminalConfigurationService extends Disposable implements ITermina
 
 	protected _fontMetrics: TerminalFontMetrics;
 
-	private _config!: Readonly<ITerminalConfiguration>;
+	protected _config!: Readonly<ITerminalConfiguration>;
 	get config() { return this._config; }
 
 	private readonly _onConfigChanged = new Emitter<void>();
@@ -29,7 +29,7 @@ export class TerminalConfigurationService extends Disposable implements ITermina
 	) {
 		super();
 
-		this._fontMetrics = this._register(new TerminalFontMetrics(this, _configurationService));
+		this._fontMetrics = this._register(new TerminalFontMetrics(this, this._configurationService));
 
 		this._register(Event.runAndSubscribe(this._configurationService.onDidChangeConfiguration, e => {
 			if (!e || e.affectsConfiguration(TERMINAL_CONFIG_SECTION)) {
@@ -67,7 +67,7 @@ const enum FontConstants {
 	MaximumFontSize = 100,
 }
 
-class TerminalFontMetrics extends Disposable {
+export class TerminalFontMetrics extends Disposable {
 	private _panelContainer: HTMLElement | undefined;
 	private _charMeasureElement: HTMLElement | undefined;
 	private _lastFontMeasurement: ITerminalFont | undefined;
@@ -107,7 +107,7 @@ class TerminalFontMetrics extends Disposable {
 	getFont(w: Window, xtermCore?: IXtermCore, excludeDimensions?: boolean): ITerminalFont {
 		const editorConfig = this._configurationService.getValue<IEditorOptions>('editor');
 
-		let fontFamily = this._terminalConfigurationService.config.fontFamily || editorConfig.fontFamily || EDITOR_FONT_DEFAULTS.fontFamily;
+		let fontFamily = this._terminalConfigurationService.config.fontFamily || editorConfig.fontFamily || EDITOR_FONT_DEFAULTS.fontFamily || 'monospace';
 		let fontSize = clampInt(this._terminalConfigurationService.config.fontSize, FontConstants.MinimumFontSize, FontConstants.MaximumFontSize, EDITOR_FONT_DEFAULTS.fontSize);
 
 		// Work around bad font on Fedora/Ubuntu

src/vs/workbench/contrib/terminal/test/browser/terminalConfigurationService.test.ts

@@ -13,12 +13,7 @@ import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configur
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { ITerminalConfigurationService, LinuxDistro } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { TerminalConfigurationService } from 'vs/workbench/contrib/terminal/browser/terminalConfigurationService';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
-
-class TestTerminalConfigurationService extends TerminalConfigurationService {
-	get fontMetrics() { return this._fontMetrics; }
-}
+import { TestTerminalConfigurationService, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
 
 suite('Workbench - TerminalConfigurationService', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();

src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts

@@ -21,6 +21,7 @@ import type { IPromptInputModel, IPromptInputModelState } from 'vs/platform/term
 import { ShellIntegrationOscPs } from 'vs/platform/terminal/common/xterm/shellIntegrationAddon';
 import { getListStyles } from 'vs/platform/theme/browser/defaultStyles';
 import { activeContrastBorder } from 'vs/platform/theme/common/colorRegistry';
+import { ITerminalConfigurationService } from 'vs/workbench/contrib/terminal/browser/terminal';
 import type { IXtermCore } from 'vs/workbench/contrib/terminal/browser/xterm-private';
 import { TerminalStorageKeys } from 'vs/workbench/contrib/terminal/common/terminalStorageKeys';
 import { terminalSuggestConfigSection, type ITerminalSuggestConfiguration } from 'vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration';
@@ -141,6 +142,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		private readonly _terminalSuggestWidgetVisibleContextKey: IContextKey<boolean>,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@ITerminalConfigurationService private readonly _terminalConfigurationService: ITerminalConfigurationService,
 	) {
 		super();
 
@@ -502,6 +504,17 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 				SimpleSuggestWidget,
 				this._panel!,
 				this._instantiationService.createInstance(PersistedWidgetSize),
+				() => {
+					const c = this._terminalConfigurationService.config;
+					const font = this._terminalConfigurationService.getFont(dom.getActiveWindow());
+					return {
+						fontFamily: font.fontFamily,
+						fontSize: font.fontSize,
+						lineHeight: Math.ceil(1.5 * font.fontSize),
+						fontWeight: c.fontWeight.toString(),
+						letterSpacing: font.letterSpacing
+					};
+				},
 				{}
 			));
 			this._suggestWidget.list.style(getListStyles({

src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalSuggestAddon.integrationTest.ts

@@ -17,7 +17,7 @@ import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/termin
 import { parseCompletionsFromShell, SuggestAddon } from 'vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon';
 import { TerminalSuggestCommandId } from 'vs/workbench/contrib/terminalContrib/suggest/common/terminal.suggest';
 import type { ITerminalSuggestConfiguration } from 'vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration';
-import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { workbenchInstantiationService, type TestTerminalConfigurationService } from 'vs/workbench/test/browser/workbenchTestServices';
 
 import { events as macos_bash_echo_simple } from 'vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/macos_bash_echo_simple';
 import { events as macos_bash_echo_multiline } from 'vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/macos_bash_echo_multiline';
@@ -30,6 +30,7 @@ import { events as windows11_pwsh_writehost_multiline_nav_up } from 'vs/workbenc
 import { events as windows11_pwsh_writehost_multiline } from 'vs/workbench/contrib/terminalContrib/suggest/test/browser/recordings/windows11_pwsh_writehost_multiline';
 import { importAMDNodeModule } from 'vs/amdX';
 import { testRawPwshCompletions } from 'vs/workbench/contrib/terminalContrib/suggest/test/browser/testRawPwshCompletions';
+import { ITerminalConfigurationService } from 'vs/workbench/contrib/terminal/browser/terminal';
 
 const recordedTestCases: { name: string; events: RecordedSessionEvent[] }[] = [
 	{ name: 'macos_bash_echo_simple', events: macos_bash_echo_simple as any as RecordedSessionEvent[] },
@@ -70,25 +71,33 @@ suite('Terminal Contrib Suggest Recordings', () => {
 	let suggestAddon: SuggestAddon;
 
 	setup(async () => {
+		const terminalConfig = {
+			fontFamily: 'monospace',
+			fontSize: 12,
+			fontWeight: 'normal',
+			letterSpacing: 0,
+			lineHeight: 1,
+			integrated: {
+				suggest: {
+					enabled: true,
+					quickSuggestions: true,
+					suggestOnTriggerCharacters: true,
+					runOnEnter: 'never',
+					builtinCompletions: {
+						pwshCode: true,
+						pwshGit: true
+					}
+				} satisfies ITerminalSuggestConfiguration
+			}
+		};
 		const instantiationService = workbenchInstantiationService({
 			configurationService: () => new TestConfigurationService({
 				files: { autoSave: false },
-				terminal: {
-					integrated: {
-						suggest: {
-							enabled: true,
-							quickSuggestions: true,
-							suggestOnTriggerCharacters: true,
-							runOnEnter: 'never',
-							builtinCompletions: {
-								pwshCode: true,
-								pwshGit: true
-							}
-						} satisfies ITerminalSuggestConfiguration
-					}
-				}
+				terminal: terminalConfig
 			})
 		}, store);
+		const terminalConfigurationService = instantiationService.get(ITerminalConfigurationService) as TestTerminalConfigurationService;
+		terminalConfigurationService.setConfig(terminalConfig as any);
 		const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
 		xterm = store.add(new TerminalCtor({ allowProposedApi: true }));
 		const shellIntegrationAddon = store.add(new ShellIntegrationAddon('', true, undefined, new NullLogService));

src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts

@@ -84,6 +84,7 @@ export class SimpleSuggestWidget extends Disposable {
 	constructor(
 		private readonly _container: HTMLElement,
 		private readonly _persistedSize: IPersistedWidgetSizeDelegate,
+		private readonly _getFontInfo: () => { fontFamily: string; fontSize: number; lineHeight: number; fontWeight: string; letterSpacing: number },
 		options: IWorkbenchSuggestWidgetOptions,
 		@IInstantiationService instantiationService: IInstantiationService
 	) {
@@ -140,7 +141,7 @@ export class SimpleSuggestWidget extends Disposable {
 			state = undefined;
 		}));
 
-		const renderer = new SimpleSuggestWidgetItemRenderer();
+		const renderer = new SimpleSuggestWidgetItemRenderer(_getFontInfo);
 		this._register(renderer);
 		this._listElement = dom.append(this.element.domNode, $('.tree'));
 		this._list = this._register(new List('SuggestWidget', this._listElement, {
@@ -503,11 +504,8 @@ export class SimpleSuggestWidget extends Disposable {
 	}
 
 	private _getLayoutInfo() {
-		const fontInfo = {
-			lineHeight: 20,
-			typicalHalfwidthCharacterWidth: 10
-		}; //this.editor.getOption(EditorOption.fontInfo);
-		const itemHeight = clamp(fontInfo.lineHeight, 8, 1000);
+		const fontInfo = this._getFontInfo();
+		const itemHeight = clamp(Math.ceil(fontInfo.lineHeight), 8, 1000);
 		const statusBarHeight = 0; //!this.editor.getOption(EditorOption.suggest).showStatusBar || this._state === State.Empty || this._state === State.Loading ? 0 : itemHeight;
 		const borderWidth = 1; //this._details.widget.borderWidth;
 		const borderHeight = 2 * borderWidth;
@@ -517,7 +515,7 @@ export class SimpleSuggestWidget extends Disposable {
 			statusBarHeight,
 			borderWidth,
 			borderHeight,
-			typicalHalfwidthCharacterWidth: fontInfo.typicalHalfwidthCharacterWidth,
+			typicalHalfwidthCharacterWidth: 10,
 			verticalPadding: 22,
 			horizontalPadding: 14,
 			defaultSize: new dom.Dimension(430, statusBarHeight + 12 * itemHeight + borderHeight)

src/vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer.ts

@@ -49,6 +49,9 @@ export class SimpleSuggestWidgetItemRenderer implements IListRenderer<SimpleComp
 
 	readonly templateId = 'suggestion';
 
+	constructor(private readonly _getFontInfo: () => { fontFamily: string; fontSize: number; lineHeight: number; fontWeight: string; letterSpacing: number }) {
+	}
+
 	dispose(): void {
 		this._onDidToggleDetails.dispose();
 	}
@@ -80,15 +83,8 @@ export class SimpleSuggestWidgetItemRenderer implements IListRenderer<SimpleComp
 		// readMore.title = nls.localize('readMore', "Read More");
 
 		const configureFont = () => {
-			// TODO: Implement
-			// const options = this._editor.getOptions();
-			// const fontInfo = options.get(EditorOption.fontInfo);
-			const fontFamily = 'Hack'; //fontInfo.getMassagedFontFamily();
-			const fontFeatureSettings = ''; //fontInfo.fontFeatureSettings;
-			const fontSize = '12'; // = options.get(EditorOption.suggestFontSize) || fontInfo.fontSize;
-			const lineHeight = '20'; // options.get(EditorOption.suggestLineHeight) || fontInfo.lineHeight;
-			const fontWeight = 'normal'; //fontInfo.fontWeight;
-			const letterSpacing = '0'; // fontInfo.letterSpacing;
+			const fontFeatureSettings = '';
+			const { fontFamily, fontSize, lineHeight, fontWeight, letterSpacing } = this._getFontInfo();
 			const fontSizePx = `${fontSize}px`;
 			const lineHeightPx = `${lineHeight}px`;
 			const letterSpacingPx = `${letterSpacing}px`;

src/vs/workbench/test/browser/workbenchTestServices.ts

@@ -124,7 +124,7 @@ import { IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from
 import { IExtensionTerminalProfile, IShellLaunchConfig, ITerminalBackend, ITerminalLogService, ITerminalProfile, TerminalIcon, TerminalLocation, TerminalShellType } from 'vs/platform/terminal/common/terminal';
 import { ICreateTerminalOptions, IDeserializedTerminalEditorInput, ITerminalConfigurationService, ITerminalEditorService, ITerminalGroup, ITerminalGroupService, ITerminalInstance, ITerminalInstanceService, TerminalEditorLocation } from 'vs/workbench/contrib/terminal/browser/terminal';
 import { assertIsDefined, upcast } from 'vs/base/common/types';
-import { IRegisterContributedProfileArgs, IShellLaunchConfigResolveOptions, ITerminalProfileProvider, ITerminalProfileResolverService, ITerminalProfileService } from 'vs/workbench/contrib/terminal/common/terminal';
+import { IRegisterContributedProfileArgs, IShellLaunchConfigResolveOptions, ITerminalProfileProvider, ITerminalProfileResolverService, ITerminalProfileService, type ITerminalConfiguration } from 'vs/workbench/contrib/terminal/common/terminal';
 import { EditorResolverService } from 'vs/workbench/services/editor/browser/editorResolverService';
 import { FILE_EDITOR_INPUT_ID } from 'vs/workbench/contrib/files/common/files';
 import { IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService';
@@ -351,7 +351,7 @@ export function workbenchInstantiationService(
 	instantiationService.stub(ITerminalInstanceService, new TestTerminalInstanceService());
 	instantiationService.stub(ITerminalProfileService, new TestTerminalProfileService());
 	instantiationService.stub(ITerminalProfileResolverService, new TestTerminalProfileResolverService());
-	instantiationService.stub(ITerminalConfigurationService, disposables.add(instantiationService.createInstance(TerminalConfigurationService)));
+	instantiationService.stub(ITerminalConfigurationService, disposables.add(instantiationService.createInstance(TestTerminalConfigurationService)));
 	instantiationService.stub(ITerminalLogService, disposables.add(instantiationService.createInstance(TerminalLogService)));
 	instantiationService.stub(IEnvironmentVariableService, disposables.add(instantiationService.createInstance(EnvironmentVariableService)));
 	instantiationService.stub(IElevatedFileService, new BrowserElevatedFileService());
@@ -2073,6 +2073,11 @@ export class TestTerminalProfileResolverService implements ITerminalProfileResol
 	createProfileFromShellAndShellArgs(shell?: unknown, shellArgs?: unknown): Promise<string | ITerminalProfile> { throw new Error('Method not implemented.'); }
 }
 
+export class TestTerminalConfigurationService extends TerminalConfigurationService {
+	get fontMetrics() { return this._fontMetrics; }
+	setConfig(config: Partial<ITerminalConfiguration>) { this._config = config as any; }
+}
+
 export class TestQuickInputService implements IQuickInputService {
 	declare readonly _serviceBrand: undefined;